Received-SPF: pass (google.com: domain of linux-kernel+bounces-161794-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Jia Jie Ho <jiajie.ho@starfivetech.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
	"David S . Miller" <davem@davemloft.net>,
	linux-crypto@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH -next 4/4] crypto: starfive: Use fallback for unaligned dma access
Date: Mon, 29 Apr 2024 14:06:40 +0800
Message-Id: <20240429060640.2451685-5-jiajie.ho@starfivetech.com>
In-Reply-To: <20240429060640.2451685-1-jiajie.ho@starfivetech.com>
References: <20240429060640.2451685-1-jiajie.ho@starfivetech.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?YQd5OHhDFwTJKC8E6FQmS6DyResCLqwDq6wHeGDPH+RKMjuEhxEFndzcxTWl?=
 =?us-ascii?Q?z2HeDQTNzfvuObVbNWDTKh6Yx1Hf5Gkpzv3LW0x8yvIjBnPO9Lk0+D9+oJkD?=
 =?us-ascii?Q?XzzxG9SVIUqNdQhT3EHQ8JBtlcaMBI+F1S4NLiLxaPfHC/JXKF4QjhbPnS/m?=
 =?us-ascii?Q?locFl1ffjs7shdeUQHYdSY+8b/x6LbWo6WgvPT4QkUUf19RE8mYwIz2hxT5y?=
 =?us-ascii?Q?ubFdaK8/loA0fSFcDyyH0j3WreF4FGDhrYWgRJQF8U3D+OHp3KfAzDz5++Ix?=
 =?us-ascii?Q?4AOA8ZcKpz66llW9KKlwQQheHbW2bQbLZqFLNn8N6w1jM1vc7BtdqINJ0S7t?=
 =?us-ascii?Q?PmKMINlFu/nVGk6ftQPEe02N88KsQNonBz24HoWMx9KhlDr2PEpA19zWWCUr?=
 =?us-ascii?Q?LghNqEhUMzEwWMMmfkEMWGHDqHchotJuTYJ2lDEyT6LTnj9WzduZz1HVRb2x?=
 =?us-ascii?Q?kxu3rBW/wDGvApVCrakAvFj/QPq/wfP7p+At86HxaVFBHW/dg5lF8mNPHeaB?=
 =?us-ascii?Q?9/+opnqqQbDIeUE5N0JMxyu4a96/r0XhFck6SPZjevJjgIS7N4Owa6/MHUg9?=
 =?us-ascii?Q?/Qy4SbP1xhJ1+SytBofGtxUNnNDKWeaFwJA7OvZZdPfpiHgIHg6Wux4caZ2T?=
 =?us-ascii?Q?o0kkPT5zrQ5FiS61BPs+nqd4aowOMDMObYljHAtoFGkVD50doVnmwuiQX6xy?=
 =?us-ascii?Q?2FZs1n1DLBUz/+78cCycsOO6+7fcqbbu1NeyEv7VcmgPdQVDUF6KG/eTfEtr?=
 =?us-ascii?Q?SP0T2ki7l+TxGr0lOMe2z0+KR4QsiBUnKZo1kSc6K1czLHhEmL94vNDS1Ql5?=
 =?us-ascii?Q?7YW30+qtogxJ2Cz2bBu075YARKffqr/XYaVTBrKdicDVN6ebpPU95C9nYodp?=
 =?us-ascii?Q?oI0homfJJeJBsuq9CLpk8uQaKcga0Q0tFuPr6MA/uPLZ2ANdT6plbjimbSG5?=
 =?us-ascii?Q?5Bkal1xCZLBxsdW0WcbzRH0yV/FLXtpXqGBSQM4G+zPwRZNPXFfKnbRqAdLb?=
 =?us-ascii?Q?RKl7jOPzMJMdACmFihVy9yPwNAKbSizUWwrT0+i6bTfcGrKTD7b2PuLdd+Dm?=
 =?us-ascii?Q?zOrdkNQKGQWin1wInYUksFp8jRvtzoDdQ9t7NiXW18ucqaiJsxAy0uod2JfO?=
 =?us-ascii?Q?6PF6GbNZZMMPcXfiW2G//4i1IS3/ixfbBoNUL2vEqZB4gtV0ah1imYPi4E22?=
 =?us-ascii?Q?LRan/v6Tun0wwhBJib4kKm+OM/MFTxs51wLQpic5i0akcXVcFMt8ijeM0Nrp?=
 =?us-ascii?Q?OV5xA4wQl0v81A0l6s7bG2pnpKnv8OaQQzg+CZC0Go+dJHuwL8YqFnvuPg3s?=
 =?us-ascii?Q?TzztbFOM6VTtguWnTdAS+r53tfHsTv3TG1KesOVAb6pMZVe3jDbmKCboeOsB?=
 =?us-ascii?Q?f2iLio/0tIbBBEFFUvJMDosVJ0cNWRLDOMHhnjB4W7umhz+HuOmuOGSZtYGH?=
 =?us-ascii?Q?uD5hRAKVANH3at55lt8/jtJKUKqu7YCwr8kFaYOwYDgqBvLOuuRTvJcAvmgy?=
 =?us-ascii?Q?qTu3OOKWWKCDQ6cS+9akxa/X4DzNfvGHEYVj9YkiSK6XHVu8qpxGzWp4OUEe?=
 =?us-ascii?Q?K/KaVgb3WeC4bqnBt5e+tEg8df0B3MqfsbmTxt8K01LnM4kY0BwMgj53CL45?=
 =?us-ascii?Q?Pw=3D=3D?=
X-OriginatorOrg: starfivetech.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 072da6fa-cfa0-47a0-46d8-08dc6812b888
X-MS-Exchange-CrossTenant-AuthSource: NT0PR01MB1182.CHNPR01.prod.partner.outlook.cn
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 06:07:59.6339
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 35JYr+PWgf8HkU8kkR8wEeuYOCp523Gublx2OpatcKQkDHROKzvQ3+P8nGvT/zDZgQEFMXg3qHnIS0ojcPc+O7e8X92z7RoL+TeJoU10S+I=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: NT0PR01MB1278

Dma address mapping fails on unaligned scatterlist offset. Use sw
fallback for these cases.

Signed-off-by: Jia Jie Ho <jiajie.ho@starfivetech.com>
---
 drivers/crypto/starfive/jh7110-aes.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/crypto/starfive/jh7110-aes.c b/drivers/crypto/starfive/jh7110-aes.c
index 9d6e2f936f03..86a1a1fa9f8f 100644
--- a/drivers/crypto/starfive/jh7110-aes.c
+++ b/drivers/crypto/starfive/jh7110-aes.c
@@ -314,7 +314,7 @@ static int starfive_aes_read_authtag(struct starfive_cryp_ctx *ctx)
 					 cryp->total_in, cryp->authsize, 1);
 	} else {
 		if (crypto_memneq(cryp->tag_in, cryp->tag_out, cryp->authsize))
-			return dev_err_probe(cryp->dev, -EBADMSG, "Failed tag verification\n");
+			return -EBADMSG;
 	}
 
 	return 0;
@@ -753,14 +753,16 @@ static bool starfive_aes_check_unaligned(struct starfive_cryp_dev *cryp,
 	int i;
 
 	for_each_sg(src, tsg, sg_nents(src), i)
-		if (!IS_ALIGNED(tsg->length, AES_BLOCK_SIZE) &&
-		    !sg_is_last(tsg))
+		if (!IS_ALIGNED(tsg->offset, sizeof(u32)) ||
+		    (!IS_ALIGNED(tsg->length, AES_BLOCK_SIZE) &&
+		     !sg_is_last(tsg)))
 			return true;
 
 	if (src != dst)
 		for_each_sg(dst, tsg, sg_nents(dst), i)
-			if (!IS_ALIGNED(tsg->length, AES_BLOCK_SIZE) &&
-			    !sg_is_last(tsg))
+			if (!IS_ALIGNED(tsg->offset, sizeof(u32)) ||
+			    (!IS_ALIGNED(tsg->length, AES_BLOCK_SIZE) &&
+			     !sg_is_last(tsg)))
 				return true;
 
 	return false;
-- 
2.40.1