2022-12-20 08:27:17

by Nikolaus Voss

Subject: [PATCH v2] crypto: caam: blob_gen.c: fix CAAM io mem access

IO memory access has to be done with accessors defined in caam/regs.h
as there are little-endian architectures with a big-endian CAAM unit.

Fixes: 6a83830f649a ("crypto: caam - warn if blob_gen key is insecure")
Signed-off-by: Nikolaus Voss <[email protected]>
Reviewed-by: Ahmad Fatoum <[email protected]>

---
v2: added upstream commit ref and reviewed-by line

drivers/crypto/caam/blob_gen.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/caam/blob_gen.c b/drivers/crypto/caam/blob_gen.c
index 1f65df4898478..f46b161d2cda6 100644
--- a/drivers/crypto/caam/blob_gen.c
+++ b/drivers/crypto/caam/blob_gen.c
@@ -104,7 +104,7 @@ int caam_process_blob(struct caam_blob_priv *priv,
}

ctrlpriv = dev_get_drvdata(jrdev->parent);
- moo = FIELD_GET(CSTA_MOO, ioread32(&ctrlpriv->ctrl->perfmon.status));
+ moo = FIELD_GET(CSTA_MOO, rd_reg32(&ctrlpriv->ctrl->perfmon.status));
if (moo != CSTA_MOO_SECURE && moo != CSTA_MOO_TRUSTED)
dev_warn(jrdev,
"using insecure test key, enable HAB to use unique device key!\n");
--
2.34.1

2022-12-30 15:18:36

by Herbert Xu

Subject: Re: [PATCH v2] crypto: caam: blob_gen.c: fix CAAM io mem access

On Tue, Dec 20, 2022 at 09:17:50AM +0100, Nikolaus Voss wrote:
> IO memory access has to be done with accessors defined in caam/regs.h
> as there are little-endian architectures with a big-endian CAAM unit.
>
> Fixes: 6a83830f649a ("crypto: caam - warn if blob_gen key is insecure")
> Signed-off-by: Nikolaus Voss <[email protected]>
> Reviewed-by: Ahmad Fatoum <[email protected]>
>
> ---
> v2: added upstream commit ref and reviewed-by line
>
> drivers/crypto/caam/blob_gen.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt