2022-09-05 05:28:49

by Neal Liu

Subject: [PATCH v2] crypto: aspeed: fix format unexpected build warning

This fixes the following similar build warning when
enabling compile test:

aspeed-hace-hash.c:188:9: warning: format '%x' expects argument of type
'unsigned int', but argument 7 has type 'size_t' {aka 'long unsigned int'}
[-Wformat=]

Reported-by: kernel test robot <[email protected]>
Signed-off-by: Neal Liu <[email protected]>
---
v2: Use "%zu" format to print size_t.

drivers/crypto/aspeed/aspeed-hace-hash.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/aspeed/aspeed-hace-hash.c b/drivers/crypto/aspeed/aspeed-hace-hash.c
index 0a44ffc0e13b..6e833d238253 100644
--- a/drivers/crypto/aspeed/aspeed-hace-hash.c
+++ b/drivers/crypto/aspeed/aspeed-hace-hash.c
@@ -185,7 +185,7 @@ static int aspeed_ahash_dma_prepare_sg(struct aspeed_hace_dev *hace_dev)
remain = (rctx->total + rctx->bufcnt) % rctx->block_size;
length = rctx->total + rctx->bufcnt - remain;

- AHASH_DBG(hace_dev, "%s:0x%x, %s:0x%x, %s:0x%x, %s:0x%x\n",
+ AHASH_DBG(hace_dev, "%s:0x%x, %s:%zu, %s:0x%x, %s:0x%x\n",
"rctx total", rctx->total, "bufcnt", rctx->bufcnt,
"length", length, "remain", remain);

@@ -324,7 +324,7 @@ static int aspeed_hace_ahash_trigger(struct aspeed_hace_dev *hace_dev,
struct ahash_request *req = hash_engine->req;
struct aspeed_sham_reqctx *rctx = ahash_request_ctx(req);

- AHASH_DBG(hace_dev, "src_dma:0x%x, digest_dma:0x%x, length:0x%x\n",
+ AHASH_DBG(hace_dev, "src_dma:%zu, digest_dma:%zu, length:%zu\n",
hash_engine->src_dma, hash_engine->digest_dma,
hash_engine->src_length);

--
2.25.1

2022-09-05 14:34:35

by Randy Dunlap

Subject: Re: [PATCH v2] crypto: aspeed: fix format unexpected build warning

On 9/4/22 22:24, Neal Liu wrote:
> This fixes the following similar build warning when
> enabling compile test:
>
> aspeed-hace-hash.c:188:9: warning: format '%x' expects argument of type
> 'unsigned int', but argument 7 has type 'size_t' {aka 'long unsigned int'}
> [-Wformat=]
>
> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: Neal Liu <[email protected]>

Acked-by: Randy Dunlap <[email protected]>

Thanks.

> ---
> v2: Use "%zu" format to print size_t.
>
> drivers/crypto/aspeed/aspeed-hace-hash.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/crypto/aspeed/aspeed-hace-hash.c b/drivers/crypto/aspeed/aspeed-hace-hash.c
> index 0a44ffc0e13b..6e833d238253 100644
> --- a/drivers/crypto/aspeed/aspeed-hace-hash.c
> +++ b/drivers/crypto/aspeed/aspeed-hace-hash.c
> @@ -185,7 +185,7 @@ static int aspeed_ahash_dma_prepare_sg(struct aspeed_hace_dev *hace_dev)
> remain = (rctx->total + rctx->bufcnt) % rctx->block_size;
> length = rctx->total + rctx->bufcnt - remain;
>
> - AHASH_DBG(hace_dev, "%s:0x%x, %s:0x%x, %s:0x%x, %s:0x%x\n",
> + AHASH_DBG(hace_dev, "%s:0x%x, %s:%zu, %s:0x%x, %s:0x%x\n",
> "rctx total", rctx->total, "bufcnt", rctx->bufcnt,
> "length", length, "remain", remain);
>
> @@ -324,7 +324,7 @@ static int aspeed_hace_ahash_trigger(struct aspeed_hace_dev *hace_dev,
> struct ahash_request *req = hash_engine->req;
> struct aspeed_sham_reqctx *rctx = ahash_request_ctx(req);
>
> - AHASH_DBG(hace_dev, "src_dma:0x%x, digest_dma:0x%x, length:0x%x\n",
> + AHASH_DBG(hace_dev, "src_dma:%zu, digest_dma:%zu, length:%zu\n",
> hash_engine->src_dma, hash_engine->digest_dma,
> hash_engine->src_length);
>

--
~Randy

2022-09-07 02:20:32

by Herbert Xu

Subject: Re: [PATCH v2] crypto: aspeed: fix format unexpected build warning

On Mon, Sep 05, 2022 at 01:24:49PM +0800, Neal Liu wrote:
>
> @@ -324,7 +324,7 @@ static int aspeed_hace_ahash_trigger(struct aspeed_hace_dev *hace_dev,
> struct ahash_request *req = hash_engine->req;
> struct aspeed_sham_reqctx *rctx = ahash_request_ctx(req);
>
> - AHASH_DBG(hace_dev, "src_dma:0x%x, digest_dma:0x%x, length:0x%x\n",
> + AHASH_DBG(hace_dev, "src_dma:%zu, digest_dma:%zu, length:%zu\n",
> hash_engine->src_dma, hash_engine->digest_dma,
> hash_engine->src_length);

Shouldn't we use %pad instead of %zu for dma_addr_t (you'll also
need to pass in a dma_addr_t pointer instead of the value)?

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

2022-09-07 03:11:43

by Randy Dunlap

Subject: Re: [PATCH v2] crypto: aspeed: fix format unexpected build warning

On 9/6/22 19:13, Herbert Xu wrote:
> On Mon, Sep 05, 2022 at 01:24:49PM +0800, Neal Liu wrote:
>>
>> @@ -324,7 +324,7 @@ static int aspeed_hace_ahash_trigger(struct aspeed_hace_dev *hace_dev,
>> struct ahash_request *req = hash_engine->req;
>> struct aspeed_sham_reqctx *rctx = ahash_request_ctx(req);
>>
>> - AHASH_DBG(hace_dev, "src_dma:0x%x, digest_dma:0x%x, length:0x%x\n",
>> + AHASH_DBG(hace_dev, "src_dma:%zu, digest_dma:%zu, length:%zu\n",
>> hash_engine->src_dma, hash_engine->digest_dma,
>> hash_engine->src_length);
>
> Shouldn't we use %pad instead of %zu for dma_addr_t (you'll also
> need to pass in a dma_addr_t pointer instead of the value)?

That sounds correct.
I only looked at the size_t parts...

--
~Randy

2022-09-07 03:16:11

by Neal Liu

Subject: RE: [PATCH v2] crypto: aspeed: fix format unexpected build warning

> On 9/6/22 19:13, Herbert Xu wrote:
> > On Mon, Sep 05, 2022 at 01:24:49PM +0800, Neal Liu wrote:
> >>
> >> @@ -324,7 +324,7 @@ static int aspeed_hace_ahash_trigger(struct
> aspeed_hace_dev *hace_dev,
> >> struct ahash_request *req = hash_engine->req;
> >> struct aspeed_sham_reqctx *rctx = ahash_request_ctx(req);
> >>
> >> - AHASH_DBG(hace_dev, "src_dma:0x%x, digest_dma:0x%x,
> length:0x%x\n",
> >> + AHASH_DBG(hace_dev, "src_dma:%zu, digest_dma:%zu, length:%zu\n",
> >> hash_engine->src_dma, hash_engine->digest_dma,
> >> hash_engine->src_length);
> >
> > Shouldn't we use %pad instead of %zu for dma_addr_t (you'll also need
> > to pass in a dma_addr_t pointer instead of the value)?
>
> That sounds correct.
> I only looked at the size_t parts...

True. I'll revise it and send next patch, thanks.