mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
[POWERPC] PS3: Compare firmware version
Add a utility routine ps3_compare_firmware_version() to compare system firmware versions. Uses the existing ps3_get_firmware_version() routine. Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
848cfdc5c1
commit
1322810c14
2 changed files with 23 additions and 14 deletions
|
@ -46,19 +46,27 @@
|
||||||
static void smp_send_stop(void) {}
|
static void smp_send_stop(void) {}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int ps3_get_firmware_version(union ps3_firmware_version *v)
|
static union ps3_firmware_version ps3_firmware_version;
|
||||||
|
|
||||||
|
void ps3_get_firmware_version(union ps3_firmware_version *v)
|
||||||
{
|
{
|
||||||
int result = lv1_get_version_info(&v->raw);
|
*v = ps3_firmware_version;
|
||||||
|
|
||||||
if (result) {
|
|
||||||
v->raw = 0;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(ps3_get_firmware_version);
|
EXPORT_SYMBOL_GPL(ps3_get_firmware_version);
|
||||||
|
|
||||||
|
int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
|
||||||
|
{
|
||||||
|
union ps3_firmware_version x;
|
||||||
|
|
||||||
|
x.pad = 0;
|
||||||
|
x.major = major;
|
||||||
|
x.minor = minor;
|
||||||
|
x.rev = rev;
|
||||||
|
|
||||||
|
return (ps3_firmware_version.raw - x.raw);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(ps3_compare_firmware_version);
|
||||||
|
|
||||||
static void ps3_power_save(void)
|
static void ps3_power_save(void)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
@ -146,13 +154,13 @@ static int ps3_set_dabr(u64 dabr)
|
||||||
|
|
||||||
static void __init ps3_setup_arch(void)
|
static void __init ps3_setup_arch(void)
|
||||||
{
|
{
|
||||||
union ps3_firmware_version v;
|
|
||||||
|
|
||||||
DBG(" -> %s:%d\n", __func__, __LINE__);
|
DBG(" -> %s:%d\n", __func__, __LINE__);
|
||||||
|
|
||||||
ps3_get_firmware_version(&v);
|
lv1_get_version_info(&ps3_firmware_version.raw);
|
||||||
printk(KERN_INFO "PS3 firmware version %u.%u.%u\n", v.major, v.minor,
|
printk(KERN_INFO "PS3 firmware version %u.%u.%u\n",
|
||||||
v.rev);
|
ps3_firmware_version.major, ps3_firmware_version.minor,
|
||||||
|
ps3_firmware_version.rev);
|
||||||
|
|
||||||
ps3_spu_set_platform();
|
ps3_spu_set_platform();
|
||||||
ps3_map_htab();
|
ps3_map_htab();
|
||||||
|
|
|
@ -35,7 +35,8 @@ union ps3_firmware_version {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
int ps3_get_firmware_version(union ps3_firmware_version *v);
|
void ps3_get_firmware_version(union ps3_firmware_version *v);
|
||||||
|
int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev);
|
||||||
|
|
||||||
/* 'Other OS' area */
|
/* 'Other OS' area */
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue