From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0370BC433EF for ; Mon, 28 Mar 2022 11:25:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240819AbiC1L0l (ORCPT ); Mon, 28 Mar 2022 07:26:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241729AbiC1LYJ (ORCPT ); Mon, 28 Mar 2022 07:24:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA2A356222; Mon, 28 Mar 2022 04:21:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 559576114A; Mon, 28 Mar 2022 11:21:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D611CC340EC; Mon, 28 Mar 2022 11:21:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648466507; bh=4iVXIPkT3ePxCznX2ZMKrI8so8HKS+0aauaqn24SB9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KfWcXDfpmz1A88JWC4iqh3ZqMIpqr+sHb7NXqz9C4uXbfOvDL7YoCa6eF36TvYczv JldGPO4fZc9pIEUUHFozxbtVKAcfJnNKjeQmBAr/N/utVfwcg1nABtMdWh144E7dv5 oHySNxFZi6aQ9XtfMFf3LDp5Ri7+cW7KqkoGUAwenHzWK1eEapYl3AW73Tp1e21bGV YXUBZXzkwkbK99VywTgi3ECOsm5tuQ4rF8JLwdK53UnybP7EuDHY0WSkLarz2a1TnQ vs02cZpwynideqyxq78bvALdpGT/4CwSB9G8yVdDEaS7UP83XYZbGo16hqIOTU0V0c xNHJjhsT9sf8A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kai Ye , Herbert Xu , Sasha Levin , liulongfang@huawei.com, davem@davemloft.net, linux-crypto@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 09/29] crypto: hisilicon/sec - not need to enable sm4 extra mode at HW V3 Date: Mon, 28 Mar 2022 07:21:11 -0400 Message-Id: <20220328112132.1555683-9-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328112132.1555683-1-sashal@kernel.org> References: <20220328112132.1555683-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kai Ye [ Upstream commit f8a2652826444d13181061840b96a5d975d5b6c6 ] It is not need to enable sm4 extra mode in at HW V3. Here is fix it. Signed-off-by: Kai Ye Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/hisilicon/sec2/sec_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c index 90551bf38b52..03d239cfdf8c 100644 --- a/drivers/crypto/hisilicon/sec2/sec_main.c +++ b/drivers/crypto/hisilicon/sec2/sec_main.c @@ -443,9 +443,11 @@ static int sec_engine_init(struct hisi_qm *qm) writel(SEC_SAA_ENABLE, qm->io_base + SEC_SAA_EN_REG); - /* Enable sm4 extra mode, as ctr/ecb */ - writel_relaxed(SEC_BD_ERR_CHK_EN0, - qm->io_base + SEC_BD_ERR_CHK_EN_REG0); + /* HW V2 enable sm4 extra mode, as ctr/ecb */ + if (qm->ver < QM_HW_V3) + writel_relaxed(SEC_BD_ERR_CHK_EN0, + qm->io_base + SEC_BD_ERR_CHK_EN_REG0); + /* Enable sm4 xts mode multiple iv */ writel_relaxed(SEC_BD_ERR_CHK_EN1, qm->io_base + SEC_BD_ERR_CHK_EN_REG1); -- 2.34.1