[PATCH] x86: Silence 32bit compiler warning in intel_graphics_stolen()

[PATCH] x86: Silence 32bit compiler warning in intel_graphics_stolen()

[Chris Wilson]

arch/x86/kernel/early-quirks.c: In function ‘intel_graphics_stolen’:
arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
argument of type ‘long long unsigned int’, but argument 2 has type ‘phys_addr_t’ [-Wformat=]
         "0x%llx-0x%llx\n", base, base + size - 1);
         ^
arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
argument of type ‘long long unsigned int’, but argument 3 has type ‘phys_addr_t’ [-Wformat=]

Fixes: ee0629cfd3c16 (drm/i915: Function per early graphics quirk)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
---
 arch/x86/kernel/early-quirks.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index d2f75b4..068ab3f 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -535,8 +535,8 @@ intel_graphics_stolen(int num, int slot, int func,
 	if (!size || !base)
 		return;
 
-	printk(KERN_INFO "Reserving Intel graphics stolen memory at "
-	       "0x%llx-0x%llx\n", base, base + size - 1);
+	printk(KERN_INFO "Reserving Intel graphics memory at 0x%llx-0x%llx\n",
+	       (long long)base, (long long)(base + size - 1));
 
 	/* Mark this space as reserved */
 	e820_add_region(base, size, E820_RESERVED);
-- 
2.8.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for x86: Silence 32bit compiler warning in intel_graphics_stolen()

[Patchwork]

== Series Details ==

Series: x86: Silence 32bit compiler warning in intel_graphics_stolen()
URL   : https://patchwork.freedesktop.org/series/6788/
State : success

== Summary ==

Series 6788v1 x86: Silence 32bit compiler warning in intel_graphics_stolen()
http://patchwork.freedesktop.org/api/1.0/series/6788/revisions/1/mbox/


bdw-nuci7-2      total:226  pass:26   dwarn:0   dfail:1   fail:52  skip:147
bsw-nuc-2        total:225  pass:22   dwarn:0   dfail:1   fail:60  skip:142
byt-nuc          total:225  pass:20   dwarn:0   dfail:1   fail:60  skip:144
hsw-brixbox      total:226  pass:22   dwarn:0   dfail:1   fail:60  skip:143
hsw-gt2          total:226  pass:27   dwarn:0   dfail:1   fail:60  skip:138
skl-i7k-2        total:226  pass:22   dwarn:0   dfail:1   fail:60  skip:143
skl-nuci5        total:226  pass:26   dwarn:0   dfail:1   fail:60  skip:139
snb-dellxps      total:226  pass:23   dwarn:0   dfail:1   fail:60  skip:142

Results at /archive/results/CI_IGT_test/Patchwork_2143/

e3ce93fd16e024faa9c95ae0ba193f98f34c1900 drm-intel-nightly: 2016y-05m-05d-13h-18m-55s UTC integration manifest
6d11854 x86: Silence 32bit compiler warning in intel_graphics_stolen()

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] x86: Silence 32bit compiler warning in intel_graphics_stolen()

[Ville Syrjälä]

On Thu, May 05, 2016 at 05:15:17PM +0100, Chris Wilson wrote:
> arch/x86/kernel/early-quirks.c: In function ‘intel_graphics_stolen’:
> arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
> argument of type ‘long long unsigned int’, but argument 2 has type ‘phys_addr_t’ [-Wformat=]
>          "0x%llx-0x%llx\n", base, base + size - 1);
>          ^
> arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
> argument of type ‘long long unsigned int’, but argument 3 has type ‘phys_addr_t’ [-Wformat=]

This also makes the actual printk output crap. On my non-PAE machine
I saw somehting resembling this:
Reserving Intel graphics memory at 0x37ffffff3ffffffff-0x200000000

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> 
> Fixes: ee0629cfd3c16 (drm/i915: Function per early graphics quirk)
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> ---
>  arch/x86/kernel/early-quirks.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index d2f75b4..068ab3f 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -535,8 +535,8 @@ intel_graphics_stolen(int num, int slot, int func,
>  	if (!size || !base)
>  		return;
>  
> -	printk(KERN_INFO "Reserving Intel graphics stolen memory at "
> -	       "0x%llx-0x%llx\n", base, base + size - 1);
> +	printk(KERN_INFO "Reserving Intel graphics memory at 0x%llx-0x%llx\n",
> +	       (long long)base, (long long)(base + size - 1));
>  
>  	/* Mark this space as reserved */
>  	e820_add_region(base, size, E820_RESERVED);
> -- 
> 2.8.1

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] x86: Silence 32bit compiler warning in intel_graphics_stolen()

[Joonas Lahtinen]

On pe, 2016-05-06 at 13:57 +0300, Ville Syrjälä wrote:
> On Thu, May 05, 2016 at 05:15:17PM +0100, Chris Wilson wrote:
> > 
> > arch/x86/kernel/early-quirks.c: In function ‘intel_graphics_stolen’:
> > arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
> > argument of type ‘long long unsigned int’, but argument 2 has type ‘phys_addr_t’ [-Wformat=]
> >          "0x%llx-0x%llx\n", base, base + size - 1);
> >          ^
> > arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
> > argument of type ‘long long unsigned int’, but argument 3 has type ‘phys_addr_t’ [-Wformat=]
> This also makes the actual printk output crap. On my non-PAE machine
> I saw somehting resembling this:
> Reserving Intel graphics memory at 0x37ffffff3ffffffff-0x200000000
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> > 
> > 
> > Fixes: ee0629cfd3c16 (drm/i915: Function per early graphics quirk)
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Ingo Molnar <mingo@redhat.com>
> > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > ---
> >  arch/x86/kernel/early-quirks.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> > index d2f75b4..068ab3f 100644
> > --- a/arch/x86/kernel/early-quirks.c
> > +++ b/arch/x86/kernel/early-quirks.c
> > @@ -535,8 +535,8 @@ intel_graphics_stolen(int num, int slot, int func,
> >  	if (!size || !base)
> >  		return;
> >  
> > -	printk(KERN_INFO "Reserving Intel graphics stolen memory at "
> > -	       "0x%llx-0x%llx\n", base, base + size - 1);
> > +	printk(KERN_INFO "Reserving Intel graphics memory at 0x%llx-0x%llx\n",
> > +	       (long long)base, (long long)(base + size - 1));

Any reason not to make this %pa and %zx while at it?

	printk(KERN_INFO "Reserving Intel graphics memory at %pa (size 0x%zx)\n", &base, size);

Regards, Joonas

> >  
> >  	/* Mark this space as reserved */
> >  	e820_add_region(base, size, E820_RESERVED);
> > -- 
> > 2.8.1
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] x86: Silence 32bit compiler warning in intel_graphics_stolen()

[Ville Syrjälä]

On Mon, May 09, 2016 at 04:04:31PM +0300, Joonas Lahtinen wrote:
> On pe, 2016-05-06 at 13:57 +0300, Ville Syrjälä wrote:
> > On Thu, May 05, 2016 at 05:15:17PM +0100, Chris Wilson wrote:
> > > 
> > > arch/x86/kernel/early-quirks.c: In function ‘intel_graphics_stolen’:
> > > arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
> > > argument of type ‘long long unsigned int’, but argument 2 has type ‘phys_addr_t’ [-Wformat=]
> > >          "0x%llx-0x%llx\n", base, base + size - 1);
> > >          ^
> > > arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
> > > argument of type ‘long long unsigned int’, but argument 3 has type ‘phys_addr_t’ [-Wformat=]
> > This also makes the actual printk output crap. On my non-PAE machine
> > I saw somehting resembling this:
> > Reserving Intel graphics memory at 0x37ffffff3ffffffff-0x200000000
> > 
> > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > > 
> > > 
> > > Fixes: ee0629cfd3c16 (drm/i915: Function per early graphics quirk)
> > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > > Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> > > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > > Cc: Thomas Gleixner <tglx@linutronix.de>
> > > Cc: Ingo Molnar <mingo@redhat.com>
> > > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > > ---
> > >  arch/x86/kernel/early-quirks.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> > > index d2f75b4..068ab3f 100644
> > > --- a/arch/x86/kernel/early-quirks.c
> > > +++ b/arch/x86/kernel/early-quirks.c
> > > @@ -535,8 +535,8 @@ intel_graphics_stolen(int num, int slot, int func,
> > >  	if (!size || !base)
> > >  		return;
> > >  
> > > -	printk(KERN_INFO "Reserving Intel graphics stolen memory at "
> > > -	       "0x%llx-0x%llx\n", base, base + size - 1);
> > > +	printk(KERN_INFO "Reserving Intel graphics memory at 0x%llx-0x%llx\n",
> > > +	       (long long)base, (long long)(base + size - 1));
> 
> Any reason not to make this %pa and %zx while at it?
> 
> 	printk(KERN_INFO "Reserving Intel graphics memory at %pa (size 0x%zx)\n", &base, size);

The start-end style matches better with the e820 dump and whatnot.
IIRC that was the reason I made it look like it does.

> 
> Regards, Joonas
> 
> > >  
> > >  	/* Mark this space as reserved */
> > >  	e820_add_region(base, size, E820_RESERVED);
> > > -- 
> > > 2.8.1
> -- 
> Joonas Lahtinen
> Open Source Technology Center
> Intel Corporation

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH v2] x86: Silence 32bit compiler warning in intel_graphics_stolen()

[Chris Wilson]

arch/x86/kernel/early-quirks.c: In function ‘intel_graphics_stolen’:
arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
argument of type ‘long long unsigned int’, but argument 2 has type ‘phys_addr_t’ [-Wformat=]
         "0x%llx-0x%llx\n", base, base + size - 1);
         ^
arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
argument of type ‘long long unsigned int’, but argument 3 has type ‘phys_addr_t’ [-Wformat=]

v2: Use %pa for addresses

Fixes: ee0629cfd3c16 (drm/i915: Function per early graphics quirk)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> #v1
---
 arch/x86/kernel/early-quirks.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index d2f75b49236c..757390eb562b 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -526,7 +526,7 @@ static void __init
 intel_graphics_stolen(int num, int slot, int func,
 		      const struct intel_early_ops *early_ops)
 {
-	phys_addr_t base;
+	phys_addr_t base, end;
 	size_t size;
 
 	size = early_ops->stolen_size(num, slot, func);
@@ -535,8 +535,9 @@ intel_graphics_stolen(int num, int slot, int func,
 	if (!size || !base)
 		return;
 
-	printk(KERN_INFO "Reserving Intel graphics stolen memory at "
-	       "0x%llx-0x%llx\n", base, base + size - 1);
+	end = base + size - 1;
+	printk(KERN_INFO "Reserving Intel graphics memory at %pa-%pa\n",
+	       &base, &end);
 
 	/* Mark this space as reserved */
 	e820_add_region(base, size, E820_RESERVED);
-- 
2.8.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2] x86: Silence 32bit compiler warning in intel_graphics_stolen()

[Joonas Lahtinen]

On ma, 2016-05-09 at 17:39 +0100, Chris Wilson wrote:
> arch/x86/kernel/early-quirks.c: In function ‘intel_graphics_stolen’:
> arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
> argument of type ‘long long unsigned int’, but argument 2 has type ‘phys_addr_t’ [-Wformat=]
>          "0x%llx-0x%llx\n", base, base + size - 1);
>          ^
> arch/x86/kernel/early-quirks.c:539:9: warning: format ‘%llx’ expects
> argument of type ‘long long unsigned int’, but argument 3 has type ‘phys_addr_t’ [-Wformat=]
> 
> v2: Use %pa for addresses
> 
> Fixes: ee0629cfd3c16 (drm/i915: Function per early graphics quirk)
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> #v1

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Thanks for the fixup, merging it in to the drm-intel tree.

Regards, Joonas

-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx