| From foo@baz Fri Mar 16 15:43:17 CET 2018 |
| From: "Horia Geantă" <horia.geanta@nxp.com> |
| Date: Tue, 28 Nov 2017 18:48:08 +0200 |
| Subject: crypto: caam/qi - use correct print specifier for size_t |
| |
| From: "Horia Geantă" <horia.geanta@nxp.com> |
| |
| |
| [ Upstream commit 9db09e3bad65393dc23b0279beb7f3754d77065c ] |
| |
| Fix below warnings on ARMv7 by using %zu for printing size_t values: |
| |
| drivers/crypto/caam/caamalg_qi.c: In function aead_edesc_alloc: |
| drivers/crypto/caam/caamalg_qi.c:417:17: warning: format %lu expects argument of type long unsigned int, but argument 4 has type unsigned int [-Wformat=] |
| sizeof(struct qm_sg_entry)) |
| ^ |
| drivers/crypto/caam/caamalg_qi.c:672:16: note: in expansion of macro CAAM_QI_MAX_AEAD_SG |
| qm_sg_ents, CAAM_QI_MAX_AEAD_SG); |
| ^ |
| drivers/crypto/caam/caamalg_qi.c: In function ablkcipher_edesc_alloc: |
| drivers/crypto/caam/caamalg_qi.c:440:17: warning: format %lu expects argument of type long unsigned int, but argument 4 has type unsigned int [-Wformat=] |
| sizeof(struct qm_sg_entry)) |
| ^ |
| drivers/crypto/caam/caamalg_qi.c:909:16: note: in expansion of macro CAAM_QI_MAX_ABLKCIPHER_SG |
| qm_sg_ents, CAAM_QI_MAX_ABLKCIPHER_SG); |
| ^ |
| drivers/crypto/caam/caamalg_qi.c: In function ablkcipher_giv_edesc_alloc: |
| drivers/crypto/caam/caamalg_qi.c:440:17: warning: format %lu expects argument of type long unsigned int, but argument 4 has type unsigned int [-Wformat=] |
| sizeof(struct qm_sg_entry)) |
| ^ |
| drivers/crypto/caam/caamalg_qi.c:1062:16: note: in expansion of macro CAAM_QI_MAX_ABLKCIPHER_SG |
| qm_sg_ents, CAAM_QI_MAX_ABLKCIPHER_SG); |
| ^ |
| |
| Fixes: eb9ba37dc15a ("crypto: caam/qi - handle large number of S/Gs case") |
| Signed-off-by: Horia Geantă <horia.geanta@nxp.com> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/crypto/caam/caamalg_qi.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/crypto/caam/caamalg_qi.c |
| +++ b/drivers/crypto/caam/caamalg_qi.c |
| @@ -668,7 +668,7 @@ static struct aead_edesc *aead_edesc_all |
| qm_sg_ents = 1 + !!ivsize + mapped_src_nents + |
| (mapped_dst_nents > 1 ? mapped_dst_nents : 0); |
| if (unlikely(qm_sg_ents > CAAM_QI_MAX_AEAD_SG)) { |
| - dev_err(qidev, "Insufficient S/G entries: %d > %lu\n", |
| + dev_err(qidev, "Insufficient S/G entries: %d > %zu\n", |
| qm_sg_ents, CAAM_QI_MAX_AEAD_SG); |
| caam_unmap(qidev, req->src, req->dst, src_nents, dst_nents, |
| iv_dma, ivsize, op_type, 0, 0); |
| @@ -905,7 +905,7 @@ static struct ablkcipher_edesc *ablkciph |
| |
| qm_sg_ents += mapped_dst_nents > 1 ? mapped_dst_nents : 0; |
| if (unlikely(qm_sg_ents > CAAM_QI_MAX_ABLKCIPHER_SG)) { |
| - dev_err(qidev, "Insufficient S/G entries: %d > %lu\n", |
| + dev_err(qidev, "Insufficient S/G entries: %d > %zu\n", |
| qm_sg_ents, CAAM_QI_MAX_ABLKCIPHER_SG); |
| caam_unmap(qidev, req->src, req->dst, src_nents, dst_nents, |
| iv_dma, ivsize, op_type, 0, 0); |
| @@ -1058,7 +1058,7 @@ static struct ablkcipher_edesc *ablkciph |
| } |
| |
| if (unlikely(qm_sg_ents > CAAM_QI_MAX_ABLKCIPHER_SG)) { |
| - dev_err(qidev, "Insufficient S/G entries: %d > %lu\n", |
| + dev_err(qidev, "Insufficient S/G entries: %d > %zu\n", |
| qm_sg_ents, CAAM_QI_MAX_ABLKCIPHER_SG); |
| caam_unmap(qidev, req->src, req->dst, src_nents, dst_nents, |
| iv_dma, ivsize, GIVENCRYPT, 0, 0); |