[PATCH] scripts/dtc: fix '%zx' warning

[PATCH] scripts/dtc: fix '%zx' warning

[Russell King]

dtc uses an incorrect format specifier for printing a uint64_t value.
uint64_t may be either 'unsigned long' or 'unsigned long long' depending
on the host architecture.

Fix this by using %llx and casting to unsigned long long, which ensures
that we always have a wide enough variable to print 64 bits of hex.

  HOSTCC  scripts/dtc/checks.o
scripts/dtc/checks.c: In function 'check_simple_bus_reg':
scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
  snprintf(unit_addr, sizeof(unit_addr), "%zx", reg);
  ^
scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]

Fixes: 828d4cdd012c ("dtc: check.c fix compile error")
Signed-off-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>
---
 scripts/dtc/checks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

I've been carrying this patch for some time, but I guess hardly anyone
builds DT based kernels on 32-bit x86 boxes anymore as it has remained
unfixed.

diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c
index 4b72b530c84f..62ea8f83d4a0 100644
--- a/scripts/dtc/checks.c
+++ b/scripts/dtc/checks.c
@@ -873,7 +873,7 @@ static void check_simple_bus_reg(struct check *c, struct dt_info *dti, struct no
 	while (size--)
 		reg = (reg << 32) | fdt32_to_cpu(*(cells++));
 
-	snprintf(unit_addr, sizeof(unit_addr), "%zx", reg);
+	snprintf(unit_addr, sizeof(unit_addr), "%llx", (unsigned long long)reg);
 	if (!streq(unitname, unit_addr))
 		FAIL(c, dti, "Node %s simple-bus unit address format error, expected \"%s\"",
 		     node->fullpath, unit_addr);
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] scripts/dtc: fix '%zx' warning

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 2128 bytes --]

On Tue, Jul 25, 2017 at 05:20:09PM +0100, Russell King wrote:
> dtc uses an incorrect format specifier for printing a uint64_t value.
> uint64_t may be either 'unsigned long' or 'unsigned long long' depending
> on the host architecture.
> 
> Fix this by using %llx and casting to unsigned long long, which ensures
> that we always have a wide enough variable to print 64 bits of hex.
> 
>   HOSTCC  scripts/dtc/checks.o
> scripts/dtc/checks.c: In function 'check_simple_bus_reg':
> scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
>   snprintf(unit_addr, sizeof(unit_addr), "%zx", reg);
>   ^
> scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
> 
> Fixes: 828d4cdd012c ("dtc: check.c fix compile error")
> Signed-off-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>

This (embarrassing) error is already fixed in upstream dtc.

> ---
>  scripts/dtc/checks.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> I've been carrying this patch for some time, but I guess hardly anyone
> builds DT based kernels on 32-bit x86 boxes anymore as it has remained
> unfixed.
> 
> diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c
> index 4b72b530c84f..62ea8f83d4a0 100644
> --- a/scripts/dtc/checks.c
> +++ b/scripts/dtc/checks.c
> @@ -873,7 +873,7 @@ static void check_simple_bus_reg(struct check *c, struct dt_info *dti, struct no
>  	while (size--)
>  		reg = (reg << 32) | fdt32_to_cpu(*(cells++));
>  
> -	snprintf(unit_addr, sizeof(unit_addr), "%zx", reg);
> +	snprintf(unit_addr, sizeof(unit_addr), "%llx", (unsigned long long)reg);
>  	if (!streq(unitname, unit_addr))
>  		FAIL(c, dti, "Node %s simple-bus unit address format error, expected \"%s\"",
>  		     node->fullpath, unit_addr);

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] scripts/dtc: fix '%zx' warning

[Russell King - ARM Linux]

On Wed, Jul 26, 2017 at 11:30:04AM +1000, David Gibson wrote:
> On Tue, Jul 25, 2017 at 05:20:09PM +0100, Russell King wrote:
> > dtc uses an incorrect format specifier for printing a uint64_t value.
> > uint64_t may be either 'unsigned long' or 'unsigned long long' depending
> > on the host architecture.
> > 
> > Fix this by using %llx and casting to unsigned long long, which ensures
> > that we always have a wide enough variable to print 64 bits of hex.
> > 
> >   HOSTCC  scripts/dtc/checks.o
> > scripts/dtc/checks.c: In function 'check_simple_bus_reg':
> > scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
> >   snprintf(unit_addr, sizeof(unit_addr), "%zx", reg);
> >   ^
> > scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
> > 
> > Fixes: 828d4cdd012c ("dtc: check.c fix compile error")
> > Signed-off-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>
> 
> This (embarrassing) error is already fixed in upstream dtc.

It remains unfixed in 4.13-rc4.  How do we get this fixed in the
kernel's dtc?  From what I can see, sending a patch to fix stuff
doesn't work.

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] scripts/dtc: fix '%zx' warning

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1716 bytes --]

On Tue, Aug 08, 2017 at 12:28:19PM +0100, Russell King - ARM Linux wrote:
> On Wed, Jul 26, 2017 at 11:30:04AM +1000, David Gibson wrote:
> > On Tue, Jul 25, 2017 at 05:20:09PM +0100, Russell King wrote:
> > > dtc uses an incorrect format specifier for printing a uint64_t value.
> > > uint64_t may be either 'unsigned long' or 'unsigned long long' depending
> > > on the host architecture.
> > > 
> > > Fix this by using %llx and casting to unsigned long long, which ensures
> > > that we always have a wide enough variable to print 64 bits of hex.
> > > 
> > >   HOSTCC  scripts/dtc/checks.o
> > > scripts/dtc/checks.c: In function 'check_simple_bus_reg':
> > > scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
> > >   snprintf(unit_addr, sizeof(unit_addr), "%zx", reg);
> > >   ^
> > > scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
> > > 
> > > Fixes: 828d4cdd012c ("dtc: check.c fix compile error")
> > > Signed-off-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>
> > 
> > This (embarrassing) error is already fixed in upstream dtc.
> 
> It remains unfixed in 4.13-rc4.  How do we get this fixed in the
> kernel's dtc?  From what I can see, sending a patch to fix stuff
> doesn't work.

Um.. I don't know.  I haven't been the person doing updates of the
kernel dtc to match upstream dtc for ages.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] scripts/dtc: fix '%zx' warning

[Rob Herring]

On Tue, Aug 8, 2017 at 11:06 PM, David Gibson
<david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org> wrote:
> On Tue, Aug 08, 2017 at 12:28:19PM +0100, Russell King - ARM Linux wrote:
>> On Wed, Jul 26, 2017 at 11:30:04AM +1000, David Gibson wrote:
>> > On Tue, Jul 25, 2017 at 05:20:09PM +0100, Russell King wrote:
>> > > dtc uses an incorrect format specifier for printing a uint64_t value.
>> > > uint64_t may be either 'unsigned long' or 'unsigned long long' depending
>> > > on the host architecture.
>> > >
>> > > Fix this by using %llx and casting to unsigned long long, which ensures
>> > > that we always have a wide enough variable to print 64 bits of hex.
>> > >
>> > >   HOSTCC  scripts/dtc/checks.o
>> > > scripts/dtc/checks.c: In function 'check_simple_bus_reg':
>> > > scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
>> > >   snprintf(unit_addr, sizeof(unit_addr), "%zx", reg);
>> > >   ^
>> > > scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
>> > >
>> > > Fixes: 828d4cdd012c ("dtc: check.c fix compile error")
>> > > Signed-off-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>
>> >
>> > This (embarrassing) error is already fixed in upstream dtc.
>>
>> It remains unfixed in 4.13-rc4.  How do we get this fixed in the
>> kernel's dtc?  From what I can see, sending a patch to fix stuff
>> doesn't work.

Sorry, didn't see this until Andrew M picked it up.

> Um.. I don't know.  I haven't been the person doing updates of the
> kernel dtc to match upstream dtc for ages.

The flow is submit a patch to upstream dtc on
devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org and then bug me to cherry-pick or
sync dtc.

I will cherry-pick the upstream version.

Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] scripts/dtc: fix '%zx' warning

[Russell King - ARM Linux]

On Thu, Aug 31, 2017 at 10:58:12AM -0500, Rob Herring wrote:
> On Tue, Aug 8, 2017 at 11:06 PM, David Gibson
> <david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org> wrote:
> > On Tue, Aug 08, 2017 at 12:28:19PM +0100, Russell King - ARM Linux wrote:
> >> On Wed, Jul 26, 2017 at 11:30:04AM +1000, David Gibson wrote:
> >> > On Tue, Jul 25, 2017 at 05:20:09PM +0100, Russell King wrote:
> >> > > dtc uses an incorrect format specifier for printing a uint64_t value.
> >> > > uint64_t may be either 'unsigned long' or 'unsigned long long' depending
> >> > > on the host architecture.
> >> > >
> >> > > Fix this by using %llx and casting to unsigned long long, which ensures
> >> > > that we always have a wide enough variable to print 64 bits of hex.
> >> > >
> >> > >   HOSTCC  scripts/dtc/checks.o
> >> > > scripts/dtc/checks.c: In function 'check_simple_bus_reg':
> >> > > scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
> >> > >   snprintf(unit_addr, sizeof(unit_addr), "%zx", reg);
> >> > >   ^
> >> > > scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
> >> > >
> >> > > Fixes: 828d4cdd012c ("dtc: check.c fix compile error")
> >> > > Signed-off-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>
> >> >
> >> > This (embarrassing) error is already fixed in upstream dtc.
> >>
> >> It remains unfixed in 4.13-rc4.  How do we get this fixed in the
> >> kernel's dtc?  From what I can see, sending a patch to fix stuff
> >> doesn't work.
> 
> Sorry, didn't see this until Andrew M picked it up.

How do we know whether whatever is in upstream dtc fixes the problem
that I'm seeing?

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] scripts/dtc: fix '%zx' warning

[Rob Herring]

On Thu, Aug 31, 2017 at 11:16 AM, Russell King - ARM Linux
<linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org> wrote:
> On Thu, Aug 31, 2017 at 10:58:12AM -0500, Rob Herring wrote:
>> On Tue, Aug 8, 2017 at 11:06 PM, David Gibson
>> <david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org> wrote:
>> > On Tue, Aug 08, 2017 at 12:28:19PM +0100, Russell King - ARM Linux wrote:
>> >> On Wed, Jul 26, 2017 at 11:30:04AM +1000, David Gibson wrote:
>> >> > On Tue, Jul 25, 2017 at 05:20:09PM +0100, Russell King wrote:
>> >> > > dtc uses an incorrect format specifier for printing a uint64_t value.
>> >> > > uint64_t may be either 'unsigned long' or 'unsigned long long' depending
>> >> > > on the host architecture.
>> >> > >
>> >> > > Fix this by using %llx and casting to unsigned long long, which ensures
>> >> > > that we always have a wide enough variable to print 64 bits of hex.
>> >> > >
>> >> > >   HOSTCC  scripts/dtc/checks.o
>> >> > > scripts/dtc/checks.c: In function 'check_simple_bus_reg':
>> >> > > scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
>> >> > >   snprintf(unit_addr, sizeof(unit_addr), "%zx", reg);
>> >> > >   ^
>> >> > > scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
>> >> > >
>> >> > > Fixes: 828d4cdd012c ("dtc: check.c fix compile error")
>> >> > > Signed-off-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>
>> >> >
>> >> > This (embarrassing) error is already fixed in upstream dtc.
>> >>
>> >> It remains unfixed in 4.13-rc4.  How do we get this fixed in the
>> >> kernel's dtc?  From what I can see, sending a patch to fix stuff
>> >> doesn't work.
>>
>> Sorry, didn't see this until Andrew M picked it up.
>
> How do we know whether whatever is in upstream dtc fixes the problem
> that I'm seeing?

Build upstream dtc or here's a branch[1] with the cherry-picked fix.

Rob

[1] git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git dt/testing
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] scripts/dtc: fix '%zx' warning

[Rob Herring]

On Thu, Aug 31, 2017 at 12:01 PM, Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:
> On Thu, Aug 31, 2017 at 11:16 AM, Russell King - ARM Linux
> <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org> wrote:
>> On Thu, Aug 31, 2017 at 10:58:12AM -0500, Rob Herring wrote:
>>> On Tue, Aug 8, 2017 at 11:06 PM, David Gibson
>>> <david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org> wrote:
>>> > On Tue, Aug 08, 2017 at 12:28:19PM +0100, Russell King - ARM Linux wrote:
>>> >> On Wed, Jul 26, 2017 at 11:30:04AM +1000, David Gibson wrote:
>>> >> > On Tue, Jul 25, 2017 at 05:20:09PM +0100, Russell King wrote:
>>> >> > > dtc uses an incorrect format specifier for printing a uint64_t value.
>>> >> > > uint64_t may be either 'unsigned long' or 'unsigned long long' depending
>>> >> > > on the host architecture.
>>> >> > >
>>> >> > > Fix this by using %llx and casting to unsigned long long, which ensures
>>> >> > > that we always have a wide enough variable to print 64 bits of hex.
>>> >> > >
>>> >> > >   HOSTCC  scripts/dtc/checks.o
>>> >> > > scripts/dtc/checks.c: In function 'check_simple_bus_reg':
>>> >> > > scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
>>> >> > >   snprintf(unit_addr, sizeof(unit_addr), "%zx", reg);
>>> >> > >   ^
>>> >> > > scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
>>> >> > >
>>> >> > > Fixes: 828d4cdd012c ("dtc: check.c fix compile error")
>>> >> > > Signed-off-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>
>>> >> >
>>> >> > This (embarrassing) error is already fixed in upstream dtc.
>>> >>
>>> >> It remains unfixed in 4.13-rc4.  How do we get this fixed in the
>>> >> kernel's dtc?  From what I can see, sending a patch to fix stuff
>>> >> doesn't work.
>>>
>>> Sorry, didn't see this until Andrew M picked it up.
>>
>> How do we know whether whatever is in upstream dtc fixes the problem
>> that I'm seeing?
>
> Build upstream dtc or here's a branch[1] with the cherry-picked fix.

Well, your fix went in before I got the cherry-pick sent to Linus.
Still, let me know if there's any issue with the upstream fix because
when I sync dtc this fix is going to be overwritten with upstream.

Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html