Received-SPF: pass (google.com: domain of linux-crypto+bounces-1464-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Gaurav Jain <gaurav.jain@nxp.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
	"David S . Miller" <davem@davemloft.net>,
	Eric Biggers <ebiggers@google.com>,
	Horia Geanta <horia.geanta@nxp.com>,
	Pankaj Gupta <pankaj.gupta@nxp.com>,
	Varun Sethi <V.Sethi@nxp.com>,
	Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>,
	Aisheng Dong <aisheng.dong@nxp.com>
Cc: Silvano Di Ninno <silvano.dininno@nxp.com>,
	linux-crypto@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-imx@nxp.com,
	Gaurav Jain <gaurav.jain@nxp.com>
Subject: [PATCH] crypto: caam/hash - fix asynchronous hash
Date: Tue, 16 Jan 2024 15:14:05 +0530
Message-Id: <20240116094405.744466-1-gaurav.jain@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?AFZpKaINR7bduMezTGwOpFeQYhsSxfDBHwFMSTI/e5qYzf8wPOlczWVZlR/A?=
 =?us-ascii?Q?lrIiPheUqJG7gF7pPOHR40l+g0j18euVz3lCmsfL43t8PtbCGMGsIyXn0Hng?=
 =?us-ascii?Q?n3jGSTT0F5ujTsa6JIs4mGZUadGbAkkewpElpvx5Bmfxt8hI4SS4Po8fN4ci?=
 =?us-ascii?Q?t7nffw/q5apBavHpVocSgDmVxVBahMJ7c55hclFCc1SlWXIaecNxt1ACeU3s?=
 =?us-ascii?Q?/D5Lhq+RVxgq9n78YdKw5O8K6nu0TtDZ1eIVAdLX23/Lm2N3iXi/yLizNtY7?=
 =?us-ascii?Q?pvbnBa2a4b33ad0IGWoVRUICWo1+Bh0LAuK8Ndt3cnR/vq3J82bYc7dIU388?=
 =?us-ascii?Q?RuRpY+Rny0nc+OmFuAwsz4DMh9wFPOJVyHc68N6Oo4pUUkJNxPpxZH8tnpdb?=
 =?us-ascii?Q?Fooace5+P0I/7MmgNwf+m2VcFU8NkUzwd4sV2VeDVzmfaJ9RWy6poxcLYoki?=
 =?us-ascii?Q?VrY9HHbcmLNjdfjBZpbixCcFS8xSpu2SNwqSPyRWgVPOXPRZ3C82P3+qYN07?=
 =?us-ascii?Q?TNC5bh+9gFDLXR4g+aednx/EkvSfGsuTjfTIvXi7UdXaEnqlySkv8a35HQUX?=
 =?us-ascii?Q?kIBBI1p+mmUQSlyyemRhOfRnDR++TvbWbzDuMty6O5tJKg8sBhmp4zGzRwjD?=
 =?us-ascii?Q?MQDHlz7pAggqmaBGjRMdPeWkNF2staCdRymRCnQA5iJJXxkvGCJZHz14Rv8c?=
 =?us-ascii?Q?TB2MtEAYdAupynsVocoqFO4PmdPbDtDJy1PCtghi0f4uee+LU34EtT0Hadxr?=
 =?us-ascii?Q?1F3JxRR7ZKkYst0Nvg9I2F/xjgG/VNXIYQbofuQi5Gpdr8l35Bp7YsZsJyeP?=
 =?us-ascii?Q?UKNkyBgHEsFPgH+lhuTZh/5v24hNJUD8I8eEprbwae6wgFEuvN6CUDmLA0jD?=
 =?us-ascii?Q?/TOFKM1TumDTSn8VvaChqpq8c/9JzJLexKMbeAKEqwa2c9G578+1mTjWSP6S?=
 =?us-ascii?Q?i1FTxSfDOehhCXIoNx5C0i0mM4UXf3ud8eut51bHtJxKoLzmzlZzqCoodL9C?=
 =?us-ascii?Q?WyIh5Pa9QkAot3o3d2++DGhDpLuHvJYtaqvcXqJxoEIs0GSOidekOaHSC5g6?=
 =?us-ascii?Q?pk+Msb6/epxh9VcT68OqZo4ofPqx3N17bWSImo8bKlOsybA/fry74PCZQ9mg?=
 =?us-ascii?Q?0sKvPWYBZMYrXVuN9IrW7TFJSeYE3ctjfXhey4I1vg6kRfae5gzJ/535KoPL?=
 =?us-ascii?Q?CIzPLCw780siwe02I+kxNCbEwwt6hYOXpmGrLoxdOz2uWHPlf4jvdO/2PmLM?=
 =?us-ascii?Q?kjiUgVpmE9aHb9b6NbnZpkGKWZQfSF9tlqvORpVrevfw1hwuRpuo2C7GyTyE?=
 =?us-ascii?Q?GLi7Cm3YHfEJIptc5zgMtGVM+hDfunP2ZJi1ebDQL+6sDnhfCTyigHS5L1bP?=
 =?us-ascii?Q?LA67fsavmy+/QuLx706SNVXIBHNsRegQCwFuQGbMSGgJeAsNtAZODEa8UMVC?=
 =?us-ascii?Q?dSq9BH3K2cfAp8/MvTMGnFAEcxNGt2lvd4vrtoK84BxMTOdpuun3AxNAPZWJ?=
 =?us-ascii?Q?iPnKzESRAXT18r54ahyYhtNA4YDaIYdgy50FugMbXUTpp81aNjgRjv7QMurH?=
 =?us-ascii?Q?WsLlKdkzfo3fv9WwNMVVBLjoEWWZ9t51d3xSIZ3y?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: db7e6c08-eabe-4a4c-9bae-08dc1677bb4a
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6004.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2024 09:44:28.0733
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: gIrFBVEBXdqgSmQ5nxqJekxw1BAmeAacBmm6mqgqL/Y3T1R3rmdct4VI21Z3MhNKnMYqiyh20s46flOJhWNNHg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8337

ahash_alg->setkey is updated to ahash_nosetkey in ahash.c
so updating the handling of setkey in caam driver.

Fixes: 2f1f34c1bf7b ("crypto: ahash - optimize performance when wrapping shash")
Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
---
 drivers/crypto/caam/caamalg_qi2.c | 4 ++--
 drivers/crypto/caam/caamhash.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c
index a148ff1f0872..93a400e286b4 100644
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -4571,7 +4571,7 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm)
 
 	ctx->dev = caam_hash->dev;
 
-	if (alg->setkey) {
+	if (crypto_hash_alg_has_setkey(halg)) {
 		ctx->adata.key_dma = dma_map_single_attrs(ctx->dev, ctx->key,
 							  ARRAY_SIZE(ctx->key),
 							  DMA_TO_DEVICE,
@@ -4611,7 +4611,7 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm)
 	 * For keyed hash algorithms shared descriptors
 	 * will be created later in setkey() callback
 	 */
-	return alg->setkey ? 0 : ahash_set_sh_desc(ahash);
+	return crypto_hash_alg_has_setkey(halg) ? 0 : ahash_set_sh_desc(ahash);
 }
 
 static void caam_hash_cra_exit(struct crypto_tfm *tfm)
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index 290c8500c247..4d50356b593c 100644
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -1804,7 +1804,7 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm)
 	} else {
 		if (priv->era >= 6) {
 			ctx->dir = DMA_BIDIRECTIONAL;
-			ctx->key_dir = alg->setkey ? DMA_TO_DEVICE : DMA_NONE;
+			ctx->key_dir = crypto_hash_alg_has_setkey(halg) ? DMA_TO_DEVICE : DMA_NONE;
 		} else {
 			ctx->dir = DMA_TO_DEVICE;
 			ctx->key_dir = DMA_NONE;
@@ -1862,7 +1862,7 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm)
 	 * For keyed hash algorithms shared descriptors
 	 * will be created later in setkey() callback
 	 */
-	return alg->setkey ? 0 : ahash_set_sh_desc(ahash);
+	return crypto_hash_alg_has_setkey(halg) ? 0 : ahash_set_sh_desc(ahash);
 }
 
 static void caam_hash_cra_exit(struct crypto_tfm *tfm)
-- 
2.25.1