[PATCH] PS3: fix the bug the major version part is not compared

[PATCH] PS3: fix the bug the major version part is not compared

[Masakazu Mokuno]

Fix the bug that the major version part of the firmware 
is not compared.

Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
CC: Geoff Levand <geoffrey.levand@am.sony.com>
---
 arch/powerpc/platforms/ps3/setup.c |    2 +-
 include/asm-powerpc/ps3.h          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -54,7 +54,7 @@ void ps3_get_firmware_version(union ps3_
 }
 EXPORT_SYMBOL_GPL(ps3_get_firmware_version);
 
-int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
+s64 ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
 {
 	union ps3_firmware_version x;
 
--- a/include/asm-powerpc/ps3.h
+++ b/include/asm-powerpc/ps3.h
@@ -36,7 +36,7 @@ union ps3_firmware_version {
 };
 
 void ps3_get_firmware_version(union ps3_firmware_version *v);
-int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev);
+s64 ps3_compare_firmware_version(u16 major, u16 minor, u16 rev);
 
 /* 'Other OS' area */
 

--
Masakazu MOKUNO

Re: [PATCH] PS3: fix the bug the major version part is not compared

[Andreas Schwab]

Masakazu Mokuno <mokuno@sm.sony.co.jp> writes:

> Fix the bug that the major version part of the firmware 
> is not compared.
>
> Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
> CC: Geoff Levand <geoffrey.levand@am.sony.com>
> ---
>  arch/powerpc/platforms/ps3/setup.c |    2 +-
>  include/asm-powerpc/ps3.h          |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> --- a/arch/powerpc/platforms/ps3/setup.c
> +++ b/arch/powerpc/platforms/ps3/setup.c
> @@ -54,7 +54,7 @@ void ps3_get_firmware_version(union ps3_
>  }
>  EXPORT_SYMBOL_GPL(ps3_get_firmware_version);
>  
> -int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
> +s64 ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
>  {
>  	union ps3_firmware_version x;
>  

Better yet: normalize the return value.

	return (ps3_firmware_version.raw > x.raw) -
               (ps3_firmware_version.raw < x.raw);

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [PATCH] PS3: fix the bug the major version part is not compared

[Masakazu Mokuno]

On Tue, 28 Aug 2007 15:26:50 +0200
Andreas Schwab <schwab@suse.de> wrote:

> Masakazu Mokuno <mokuno@sm.sony.co.jp> writes:
> 
> > Fix the bug that the major version part of the firmware 
> > is not compared.
> >
> > Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
> > CC: Geoff Levand <geoffrey.levand@am.sony.com>
> > ---
> >  arch/powerpc/platforms/ps3/setup.c |    2 +-
> >  include/asm-powerpc/ps3.h          |    2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > --- a/arch/powerpc/platforms/ps3/setup.c
> > +++ b/arch/powerpc/platforms/ps3/setup.c
> > @@ -54,7 +54,7 @@ void ps3_get_firmware_version(union ps3_
> >  }
> >  EXPORT_SYMBOL_GPL(ps3_get_firmware_version);
> >  
> > -int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
> > +s64 ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
> >  {
> >  	union ps3_firmware_version x;
> >  
> 
> Better yet: normalize the return value.
> 
> 	return (ps3_firmware_version.raw > x.raw) -
>                (ps3_firmware_version.raw < x.raw);


Thank you!
I'll submit new patch.


--
Masakazu MOKUNO

Re: [PATCH] PS3: fix the bug the major version part is not compared

[Geoff Levand]

Masakazu Mokuno wrote:
> Fix the bug that the major version part of the firmware 
> is not compared.
> 
> Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
> CC: Geoff Levand <geoffrey.levand@am.sony.com>
> ---
>  arch/powerpc/platforms/ps3/setup.c |    2 +-
>  include/asm-powerpc/ps3.h          |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Paul,

Firmware 2.0.x will be out in the coming months, so it would
be nice if this could go in for 2.6.23.


Acked-by: Geoff Levand <geoffrey.levand@am.sony.com>