[PATCH] cxgbit: fix dma_addr

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH] cxgbit: fix dma_addr_t printk format
@ 2016-03-05  0:04 Arnd Bergmann
  2016-03-05  0:25 ` Joe Perches
  2016-03-07 14:14 ` Varun Prakash
  0 siblings, 2 replies; 5+ messages in thread
From: Arnd Bergmann @ 2016-03-05  0:04 UTC (permalink / raw)
  To: Nicholas A. Bellinger
  Cc: Arnd Bergmann, Varun Prakash, linux-scsi, target-devel,
	linux-kernel

The newly added driver prints a dma_addr_t using the %llx format string,
but that is wrong on most 32-bit architectures:

drivers/target/iscsi/cxgbit/cxgbit_ddp.c: In function 'cxgbit_dump_sgl':
drivers/target/iscsi/cxgbit/cxgbit_ddp.c:180:10: error: format '%llx' expects argument of type 'long long unsigned int', but argument 8 has type 'dma_addr_t {aka unsigned int}' [-Werror=format=]
   pr_info("\t%d/%u, 0x%p: len %u, off %u, pg 0x%p, dma 0x%llx, %u\n",

Unfortunately, we can't use the %pad format string here because
we are not printing an lvalue, so we have to add a cast to u64, which
matches the format string on all architectures.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: c49aa56e556d ("cxgbit: add cxgbit_ddp.c")
---
 drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/target/iscsi/cxgbit/cxgbit_ddp.c b/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
index 07e2bc86d0df..d667bc88e21d 100644
--- a/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
+++ b/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
@@ -179,7 +179,7 @@ cxgbit_dump_sgl(const char *cap, struct scatterlist *sgl, int nents)
 	for_each_sg(sgl, sg, nents, i)
 		pr_info("\t%d/%u, 0x%p: len %u, off %u, pg 0x%p, dma 0x%llx, %u\n",
 			i, nents, sg, sg->length, sg->offset, sg_page(sg),
-			sg_dma_address(sg), sg_dma_len(sg));
+			(u64)sg_dma_address(sg), sg_dma_len(sg));
 }
 
 static int cxgbit_ddp_sgl_check(struct scatterlist *sgl, int nents)
-- 
2.7.0

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] cxgbit: fix dma_addr_t printk format
  2016-03-05  0:04 [PATCH] cxgbit: fix dma_addr_t printk format Arnd Bergmann
@ 2016-03-05  0:25 ` Joe Perches
  2016-03-05  0:34   ` Arnd Bergmann
  2016-03-07 14:14 ` Varun Prakash
  1 sibling, 1 reply; 5+ messages in thread
From: Joe Perches @ 2016-03-05  0:25 UTC (permalink / raw)
  To: Arnd Bergmann, Nicholas A. Bellinger
  Cc: Varun Prakash, linux-scsi, target-devel, linux-kernel

On Sat, 2016-03-05 at 01:04 +0100, Arnd Bergmann wrote:
> The newly added driver prints a dma_addr_t using the %llx format string,
> but that is wrong on most 32-bit architectures:
> 
> drivers/target/iscsi/cxgbit/cxgbit_ddp.c: In function 'cxgbit_dump_sgl':
> drivers/target/iscsi/cxgbit/cxgbit_ddp.c:180:10: error: format '%llx' expects argument of type 'long long unsigned int', but argument 8 has type 'dma_addr_t {aka unsigned int}' [-Werror=format=]
>    pr_info("\t%d/%u, 0x%p: len %u, off %u, pg 0x%p, dma 0x%llx, %u\n",
> 
> Unfortunately, we can't use the %pad format string here because
> we are not printing an lvalue, so we have to add a cast to u64, which
> matches the format string on all architectures.
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: c49aa56e556d ("cxgbit: add cxgbit_ddp.c")
> ---
>  drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/target/iscsi/cxgbit/cxgbit_ddp.c b/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
> index 07e2bc86d0df..d667bc88e21d 100644
> --- a/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
> +++ b/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
> @@ -179,7 +179,7 @@ cxgbit_dump_sgl(const char *cap, struct scatterlist *sgl, int nents)
>  	for_each_sg(sgl, sg, nents, i)
>  		pr_info("\t%d/%u, 0x%p: len %u, off %u, pg 0x%p, dma 0x%llx, %u\n",
>  			i, nents, sg, sg->length, sg->offset, sg_page(sg),
> -			sg_dma_address(sg), sg_dma_len(sg));
> +			(u64)sg_dma_address(sg), sg_dma_len(sg));
>  }
>  
>  static int cxgbit_ddp_sgl_check(struct scatterlist *sgl, int nents)

You could create a temporary:

 	for_each_sg(sgl, sg, nents, i) {
		dma_addr_t addr = sg_dma_address(sg);

		pr_info("\t%d/%u, 0x%p: len %u, off %u, pg 0x%p, dma %pad, %u\n",
			i, nents, sg, sg->length, sg->offset, sg_page(sg),
			&addr, sg_dma_len(sg));
	}

> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] cxgbit: fix dma_addr_t printk format
  2016-03-05  0:25 ` Joe Perches
@ 2016-03-05  0:34   ` Arnd Bergmann
  2016-03-05  2:20     ` Joe Perches
  0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2016-03-05  0:34 UTC (permalink / raw)
  To: Joe Perches
  Cc: Nicholas A. Bellinger, Varun Prakash, linux-scsi, target-devel,
	linux-kernel

On Friday 04 March 2016 16:25:07 Joe Perches wrote:
> > 
> > diff --git a/drivers/target/iscsi/cxgbit/cxgbit_ddp.c b/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
> > index 07e2bc86d0df..d667bc88e21d 100644
> > --- a/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
> > +++ b/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
> > @@ -179,7 +179,7 @@ cxgbit_dump_sgl(const char *cap, struct scatterlist *sgl, int nents)
> >       for_each_sg(sgl, sg, nents, i)
> >               pr_info("\t%d/%u, 0x%p: len %u, off %u, pg 0x%p, dma 0x%llx, %u\n",
> >                       i, nents, sg, sg->length, sg->offset, sg_page(sg),
> > -                     sg_dma_address(sg), sg_dma_len(sg));
> > +                     (u64)sg_dma_address(sg), sg_dma_len(sg));
> >  }
> >  
> >  static int cxgbit_ddp_sgl_check(struct scatterlist *sgl, int nents)
> 
> You could create a temporary:
> 
>         for_each_sg(sgl, sg, nents, i) {
>                 dma_addr_t addr = sg_dma_address(sg);
> 
>                 pr_info("\t%d/%u, 0x%p: len %u, off %u, pg 0x%p, dma %pad, %u\n",
>                         i, nents, sg, sg->length, sg->offset, sg_page(sg),
>                         &addr, sg_dma_len(sg));
>         }
> 

Sure, but the cast seemed nicer in this case, the result is the same.
	
	Arnd

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] cxgbit: fix dma_addr_t printk format
  2016-03-05  0:34   ` Arnd Bergmann
@ 2016-03-05  2:20     ` Joe Perches
  0 siblings, 0 replies; 5+ messages in thread
From: Joe Perches @ 2016-03-05  2:20 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Nicholas A. Bellinger, Varun Prakash, linux-scsi, target-devel,
	linux-kernel

On Sat, 2016-03-05 at 01:34 +0100, Arnd Bergmann wrote:
> On Friday 04 March 2016 16:25:07 Joe Perches wrote:
> > > diff --git a/drivers/target/iscsi/cxgbit/cxgbit_ddp.c b/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
[]
> > > @@ -179,7 +179,7 @@ cxgbit_dump_sgl(const char *cap, struct scatterlist *sgl, int nents)
> > >       for_each_sg(sgl, sg, nents, i)
> > >               pr_info("\t%d/%u, 0x%p: len %u, off %u, pg 0x%p, dma 0x%llx, %u\n",
> > >                       i, nents, sg, sg->length, sg->offset, sg_page(sg),
> > > -                     sg_dma_address(sg), sg_dma_len(sg));
> > > +                     (u64)sg_dma_address(sg), sg_dma_len(sg));
[]
> > You could create a temporary:


        for_each_sg(sgl, sg, nents, i) {
                dma_addr_t addr = sg_dma_address(sg);


                pr_info("\t%d/%u, 0x%p: len %u, off %u, pg 0x%p, dma %pad, %u\n",
                        i, nents, sg, sg->length, sg->offset, sg_page(sg),
                        &addr, sg_dma_len(sg));
        }

Sure, but the cast seemed nicer in this case, the result is the same.

Not quite as 0x%llx isn't always the same width and doesn't
have leading 0's like %pad

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] cxgbit: fix dma_addr_t printk format
  2016-03-05  0:04 [PATCH] cxgbit: fix dma_addr_t printk format Arnd Bergmann
  2016-03-05  0:25 ` Joe Perches
@ 2016-03-07 14:14 ` Varun Prakash
  1 sibling, 0 replies; 5+ messages in thread
From: Varun Prakash @ 2016-03-07 14:14 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Nicholas A. Bellinger, linux-scsi, target-devel, linux-kernel

On Sat, Mar 05, 2016 at 01:04:41AM +0100, Arnd Bergmann wrote:
> The newly added driver prints a dma_addr_t using the %llx format string,
> but that is wrong on most 32-bit architectures:
> 
> drivers/target/iscsi/cxgbit/cxgbit_ddp.c: In function 'cxgbit_dump_sgl':
> drivers/target/iscsi/cxgbit/cxgbit_ddp.c:180:10: error: format '%llx' expects argument of type 'long long unsigned int', but argument 8 has type 'dma_addr_t {aka unsigned int}' [-Werror=format=]
>    pr_info("\t%d/%u, 0x%p: len %u, off %u, pg 0x%p, dma 0x%llx, %u\n",
> 
> Unfortunately, we can't use the %pad format string here because
> we are not printing an lvalue, so we have to add a cast to u64, which
> matches the format string on all architectures.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: c49aa56e556d ("cxgbit: add cxgbit_ddp.c")
> ---
>  drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/target/iscsi/cxgbit/cxgbit_ddp.c b/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
> index 07e2bc86d0df..d667bc88e21d 100644
> --- a/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
> +++ b/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
> @@ -179,7 +179,7 @@ cxgbit_dump_sgl(const char *cap, struct scatterlist *sgl, int nents)
>  	for_each_sg(sgl, sg, nents, i)
>  		pr_info("\t%d/%u, 0x%p: len %u, off %u, pg 0x%p, dma 0x%llx, %u\n",
>  			i, nents, sg, sg->length, sg->offset, sg_page(sg),
> -			sg_dma_address(sg), sg_dma_len(sg));
> +			(u64)sg_dma_address(sg), sg_dma_len(sg));
>  }
>  
>  static int cxgbit_ddp_sgl_check(struct scatterlist *sgl, int nents)

Ok, I will update the original commit in v2 series, thanks.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-03-07 14:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-05  0:04 [PATCH] cxgbit: fix dma_addr_t printk format Arnd Bergmann
2016-03-05  0:25 ` Joe Perches
2016-03-05  0:34   ` Arnd Bergmann
2016-03-05  2:20     ` Joe Perches
2016-03-07 14:14 ` Varun Prakash

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox