Received-SPF: pass (google.com: domain of linux-crypto+bounces-1772-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: JiaJie Ho <jiajie.ho@starfivetech.com>
To: 'Herbert Xu' <herbert@gondor.apana.org.au>
CC: "'David S . Miller'" <davem@davemloft.net>, 'Rob Herring'
	<robh+dt@kernel.org>, 'Krzysztof Kozlowski'
	<krzysztof.kozlowski+dt@linaro.org>, 'Conor Dooley' <conor+dt@kernel.org>,
	"'linux-crypto@vger.kernel.org'" <linux-crypto@vger.kernel.org>,
	"'devicetree@vger.kernel.org'" <devicetree@vger.kernel.org>,
	"'linux-kernel@vger.kernel.org'" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v2 4/5] crypto: starfive: Add sm3 support for JH8100
Thread-Topic: [PATCH v2 4/5] crypto: starfive: Add sm3 support for JH8100
Thread-Index: AQHaSFqmtg6Zzl/qkUuu0ddSCEXpi7Drn0sAgAlEKdA=
Date: Thu, 1 Feb 2024 03:02:06 +0000
Message-ID:
 <BJSPR01MB065907F9CE1376F198086AD28A43A@BJSPR01MB0659.CHNPR01.prod.partner.outlook.cn>
References: <20240116090135.75737-1-jiajie.ho@starfivetech.com>
 <20240116090135.75737-5-jiajie.ho@starfivetech.com>
 <ZbNCKrTLXmPcsrSH@gondor.apana.org.au>
In-Reply-To: <ZbNCKrTLXmPcsrSH@gondor.apana.org.au>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0:
 =?us-ascii?Q?RUsIyHQ9CvN8HvevpQiKB6C5bXZZFBx5nrPRObqCMnNkIlzMpDDyYmnPQCJd?=
 =?us-ascii?Q?qTAAWPouvRvw9csjf89mKs6nHAQmJflQzIDirHxHTuOnVAvNmBByqneezL04?=
 =?us-ascii?Q?udCXqCDIt67dBmf3+YM+JRq49cwjPLFhNdV4GH2pNiFPAIMsi9JEo6Du6Vlu?=
 =?us-ascii?Q?gWTlBOqzRCWIHD12c481F7+ZSuKa4xFhVLPsqU0RZ1M+N/7J8CBK0XRHiczZ?=
 =?us-ascii?Q?NpdDRZn/PYNtRcZ6v8FsXLdMpdizEz24kzrWTcC2ZDF+luHM7PWS4Lofn3Mc?=
 =?us-ascii?Q?/jfLvgjga5btvXLkwqu+MB5eBxkpo/vN6+WDdAHEKFPefds5JRBY1jtge2IC?=
 =?us-ascii?Q?u6ip+d4rgW2ghgQQ4iR0tJVAIdqLkbwD3liOWz/9a80148WeRj7Gwlke9zAT?=
 =?us-ascii?Q?4wp9NUsNUApMq680gulW74qRORG8TbxPialDAefid6E5i+IFkdyWKadrR8wY?=
 =?us-ascii?Q?Z9xlQ7RIYjX//vunba+tdAg7AcivjrLOgmdEYGveeJyr/2vND0rvgV1fGqeK?=
 =?us-ascii?Q?GNTyZg3jPkjoeUjW/gzGfciWxNgmdB8yySMRjoSMCAaBu0n/JXJhUkXLpzoL?=
 =?us-ascii?Q?7Sg/BwOLXQZ+rjpJxOael9jhb7U8pwtEzc8POQ6yLPLzaaQyPo6wcc+tyL99?=
 =?us-ascii?Q?s5R6FTXAqiXV2D+h5DGz+ZYc+v4SonMH59YjMl4dfEEt76BItjNqDXL1Ou5j?=
 =?us-ascii?Q?nfh/ox+VSu0xBBmghpv9e4BidzRq6XKZNBpoz9jPIdpt3BMnfvXZSIejEdL3?=
 =?us-ascii?Q?DSZchzKyKle8IvGM5zH/w9DAMH9Kd2yRSVWWxdlyoAmhkSF/i4IFBS8Nj2la?=
 =?us-ascii?Q?XnYeD6KacdbFckJ1kGL2ykXI93iVK4DRyunoif6DoEm2rZCobO+7Vy6jGgmq?=
 =?us-ascii?Q?hUlUzXDGsS7Vh4lzyScEvNbga8hcrNi8m+H9wQ6Y1vF6c/It4DJt7LGCWsbK?=
 =?us-ascii?Q?bVBBtRdhz1YmC6VTm3KFv6X9vzuE3JgxLMmzvpJn+rP1WdJqsjGV3N5IduDM?=
 =?us-ascii?Q?sbSVfyQhDeI5QT+GyWSFKwN0Q/a4LI40LqrOyy1rg9W5oggiuCGPzc1Qe4Bx?=
 =?us-ascii?Q?jpKHKScpdxnYGEpsTDCDDOs5w339rzIG6aBxDj8Ye7M6xmcColCLRGMmPcuH?=
 =?us-ascii?Q?EfJVLJA9q6X/cnR/W04qpRrjH59+EPUOooYkwNfFOq0Jx1wdGlaGwcrrRPlC?=
 =?us-ascii?Q?XwDBa081XaRGIK8QQTkOm/82l69SLrX1dJouz6087m/L5fv6Rgqgc5MDiuvX?=
 =?us-ascii?Q?ELJMqGxnG+C6ZvymrDOb0Dyu60FhQHT/dvWZSjJTfPyhfS8ayHR+VIqeqrKV?=
 =?us-ascii?Q?v5T8UNueKKuKZRw+hUduTg9+7VIt/bf4sekR3qK44BECvTLd59dAELt7GnGc?=
 =?us-ascii?Q?6XzYgwbOd+u4RIwvvrQHJxwxklOFXrc/nn2piRCgsONc15gdZCISIyxfMNid?=
 =?us-ascii?Q?L49ZHcarROQkENMykgk3FZvvG0S4cPnJC9CkxnEDHkUXKCF4U9b+0GyTiz82?=
 =?us-ascii?Q?ZCCcYolI9tyE+B1TGtbtdQSUwiR4tySLnpw4sdlqziaKhuTulwF573d8eL9M?=
 =?us-ascii?Q?jJaiss6r9XvvJnRuZyJgWsaTFpHhlwrvKH2OKfvFjByFeFF1Fiy4P0IqOkds?=
 =?us-ascii?Q?Zg=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-crypto@vger.kernel.org
List-Id: <linux-crypto.vger.kernel.org>
List-Subscribe: <mailto:linux-crypto+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-crypto+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-OriginatorOrg: starfivetech.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BJSPR01MB0659.CHNPR01.prod.partner.outlook.cn
X-MS-Exchange-CrossTenant-Network-Message-Id: 6205cf6a-5795-48ac-d667-08dc22d22c47
X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Feb 2024 03:02:06.1079
 (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: qRDZyyo6nDys3R2epIjiiEu1BoSao3vrbaNVDHqlYSr/S4oFNDkqB0u7YHdr/09DHQKzYR+DhLxjhnLWbxUhxhQxlRWOnHEC5jsSueytgiQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BJSPR01MB0786

> > Add driver support for SM3 hash/HMAC for JH8100 SoC. JH8100 contains a
> > separate SM algo engine and new dedicated dma that supports 64-bit
> > address access.
> >
> > Signed-off-by: Jia Jie Ho <jiajie.ho@starfivetech.com>
> > ---
> >  drivers/crypto/starfive/Kconfig       |  25 +-
> >  drivers/crypto/starfive/Makefile      |   3 +
> >  drivers/crypto/starfive/jh7110-cryp.c |  48 ++-
> > drivers/crypto/starfive/jh7110-cryp.h |  59 +++
> > drivers/crypto/starfive/jh7110-hash.c |  20 +-
> > drivers/crypto/starfive/jh8100-sm3.c  | 532
> ++++++++++++++++++++++++++
> >  6 files changed, 677 insertions(+), 10 deletions(-)  create mode
> > 100644 drivers/crypto/starfive/jh8100-sm3.c
> >
> > diff --git a/drivers/crypto/starfive/Kconfig
> > b/drivers/crypto/starfive/Kconfig index 0fe389e9f932..e6bf02d0ed1f
> > 100644
> > --- a/drivers/crypto/starfive/Kconfig
> > +++ b/drivers/crypto/starfive/Kconfig
> > @@ -5,7 +5,7 @@
> >  config CRYPTO_DEV_JH7110
> >  	tristate "StarFive JH7110 cryptographic engine driver"
> >  	depends on (SOC_STARFIVE && AMBA_PL08X) || COMPILE_TEST
> > -	depends on HAS_DMA
> > +	depends on HAS_DMA && !CRYPTO_DEV_JH8100
> >  	select CRYPTO_ENGINE
> >  	select CRYPTO_HMAC
> >  	select CRYPTO_SHA256
> > @@ -24,3 +24,26 @@ config CRYPTO_DEV_JH7110
> >  	  skciphers, AEAD and hash functions.
> >
> >  	  If you choose 'M' here, this module will be called jh7110-crypto.
> > +
> > +config CRYPTO_DEV_JH8100
> > +	tristate "StarFive JH8100 cryptographic engine drivers"
> > +	depends on (SOC_STARFIVE && DW_AXI_DMAC) || COMPILE_TEST
> > +	depends on HAS_DMA
> > +	select CRYPTO_ENGINE
> > +	select CRYPTO_HMAC
> > +	select CRYPTO_SHA256
> > +	select CRYPTO_SHA512
> > +	select CRYPTO_SM3_GENERIC
> > +	select CRYPTO_RSA
> > +	select CRYPTO_AES
> > +	select CRYPTO_CCM
> > +	select CRYPTO_GCM
> > +	select CRYPTO_CBC
> > +	select CRYPTO_ECB
> > +	select CRYPTO_CTR
> > +	help
> > +	  Support for StarFive JH8100 crypto hardware acceleration engine.
> > +	  This module provides additional support for SM2 signature
> verification,
> > +	  SM3 hash/hmac functions and SM4 skcipher.
> > +
> > +	  If you choose 'M' here, this module will be called jh8100-crypto.
> > diff --git a/drivers/crypto/starfive/Makefile
> > b/drivers/crypto/starfive/Makefile
> > index 8c137afe58ad..67717fca3f5d 100644
> > --- a/drivers/crypto/starfive/Makefile
> > +++ b/drivers/crypto/starfive/Makefile
> > @@ -2,3 +2,6 @@
> >
> >  obj-$(CONFIG_CRYPTO_DEV_JH7110) +=3D jh7110-crypto.o
> > jh7110-crypto-objs :=3D jh7110-cryp.o jh7110-hash.o jh7110-rsa.o
> > jh7110-aes.o
> > +
> > +obj-$(CONFIG_CRYPTO_DEV_JH8100) +=3D jh8100-crypto.o jh8100-crypto-
> objs
> > +:=3D jh7110-cryp.o jh7110-hash.o jh7110-rsa.o jh7110-aes.o jh8100-sm3.=
o
> > diff --git a/drivers/crypto/starfive/jh7110-cryp.c
> > b/drivers/crypto/starfive/jh7110-cryp.c
> > index fe33e87f25ab..fb7c19705fbf 100644
> > --- a/drivers/crypto/starfive/jh7110-cryp.c
> > +++ b/drivers/crypto/starfive/jh7110-cryp.c
> > @@ -106,6 +106,26 @@ static irqreturn_t starfive_cryp_irq(int irq, void
> *priv)
> >  	return IRQ_HANDLED;
> >  }
> >
> > +#ifdef CONFIG_CRYPTO_DEV_JH8100
> > +static irqreturn_t starfive_cryp_irq1(int irq, void *priv) {
> > +	u32 status;
> > +	u32 mask;
> > +	struct starfive_cryp_dev *cryp =3D (struct starfive_cryp_dev *)priv;
> > +
> > +	mask =3D readl(cryp->base + STARFIVE_SM_IE_MASK_OFFSET);
> > +	status =3D readl(cryp->base + STARFIVE_SM_IE_FLAG_OFFSET);
> > +
> > +	if (status & STARFIVE_SM_IE_FLAG_SM3_DONE) {
> > +		mask |=3D STARFIVE_SM_IE_MASK_SM3_DONE;
> > +		writel(mask, cryp->base + STARFIVE_SM_IE_MASK_OFFSET);
> > +		tasklet_schedule(&cryp->sm3_done);
> > +	}
> > +
> > +	return IRQ_HANDLED;
> > +}
> > +#endif
> > +
> >  static int starfive_cryp_probe(struct platform_device *pdev)  {
> >  	struct starfive_cryp_dev *cryp;
> > @@ -156,6 +176,16 @@ static int starfive_cryp_probe(struct
> platform_device *pdev)
> >  		return dev_err_probe(&pdev->dev, ret,
> >  				     "Failed to register interrupt handler\n");
> >
> > +#ifdef CONFIG_CRYPTO_DEV_JH8100
> > +	tasklet_init(&cryp->sm3_done, starfive_sm3_done_task, (unsigned
> > +long)cryp);
> > +
> > +	irq =3D platform_get_irq(pdev, 1);
> > +	if (irq < 0)
> > +		return irq;
> > +
> > +	ret =3D devm_request_irq(&pdev->dev, irq, starfive_cryp_irq1, 0,
> > +			       pdev->name, (void *)cryp);
> > +#endif
> >  	clk_prepare_enable(cryp->hclk);
> >  	clk_prepare_enable(cryp->ahb);
> >  	reset_control_deassert(cryp->rst);
> > @@ -191,8 +221,17 @@ static int starfive_cryp_probe(struct
> platform_device *pdev)
> >  	if (ret)
> >  		goto err_algs_rsa;
> >
> > +#ifdef CONFIG_CRYPTO_DEV_JH8100
> > +	ret =3D starfive_sm3_register_algs();
> > +	if (ret)
> > +		goto err_algs_sm3;
> > +#endif
> >  	return 0;
> >
> > +#ifdef CONFIG_CRYPTO_DEV_JH8100
> > +err_algs_sm3:
> > +	starfive_rsa_unregister_algs();
> > +#endif
> >  err_algs_rsa:
> >  	starfive_hash_unregister_algs();
> >  err_algs_hash:
> > @@ -213,7 +252,9 @@ static int starfive_cryp_probe(struct
> platform_device *pdev)
> >  	reset_control_assert(cryp->rst);
> >
> >  	tasklet_kill(&cryp->hash_done);
> > -
> > +#ifdef CONFIG_CRYPTO_DEV_JH8100
> > +	tasklet_kill(&cryp->sm3_done);
> > +#endif
>=20
> Please use if instead if ifdef where possible:
>=20
> 	if (IS_ENABLED(CONFIG_CRYPTO_DEV_JH8100))
> 		tasklet_kill(&cryp->sm3_done);
>=20

Hi Herbert,
Thanks for reviewing this.
I am using ifdef so unused codes would not be compiled into the drivers for=
 unsupported device.=20
Is the final driver size a concern in this case?

Best regards,
Jia Jie