On 08/01/2011 01:02 PM, Andre Heider wrote:
> ---
> arch/powerpc/include/asm/ps3.h | 7 +++++++
> arch/powerpc/platforms/ps3/platform.h | 4 ++++
> arch/powerpc/platforms/ps3/repository.c | 19 +++++++++++++++++++
> arch/powerpc/platforms/ps3/setup.c | 22 ++++++++++++++++++++++
> 4 files changed, 52 insertions(+), 0 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/ps3.h b/arch/powerpc/include/asm/ps3.h
> index 7f065e1..136354a 100644
> --- a/arch/powerpc/include/asm/ps3.h
> +++ b/arch/powerpc/include/asm/ps3.h
> @@ -39,6 +39,13 @@ 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);
>
> +enum ps3_ss_laid {
> + PS3_SS_LAID_GAMEOS = 0x1070000002000001UL,
> + PS3_SS_LAID_OTHEROS = 0x1080000004000001UL,
Only PS3_SS_LAID_OTHEROS is used for anything outside ps3_setup_arch(),
so I think it makes sense to split this into two patches with one adding
just PS3_SS_LAID_OTHEROS and ps3_get_ss_laid() with a comment that
it adds the ps3_get_ss_laid routine.
> +};
> +
> +enum ps3_ss_laid ps3_get_ss_laid(void);
> +
> /* 'Other OS' area */
>
> enum ps3_param_av_multi_out {
> diff --git a/arch/powerpc/platforms/ps3/platform.h
> b/arch/powerpc/platforms/ps3/platform.h
> index 9a196a8..1ba15b8 100644
> --- a/arch/powerpc/platforms/ps3/platform.h
> +++ b/arch/powerpc/platforms/ps3/platform.h
> @@ -232,4 +232,8 @@ int ps3_repository_read_spu_resource_id(unsigned int
> res_index,
> int ps3_repository_read_vuart_av_port(unsigned int *port);
> int ps3_repository_read_vuart_sysmgr_port(unsigned int *port);
>
> +/* repository ss info */
> +
> +int ps3_repository_read_ss_laid(enum ps3_ss_laid *laid);
> +
> #endif
> diff --git a/arch/powerpc/platforms/ps3/repository.c
> b/arch/powerpc/platforms/ps3/repository.c
> index 5e304c2..6fa3e96 100644
> --- a/arch/powerpc/platforms/ps3/repository.c
> +++ b/arch/powerpc/platforms/ps3/repository.c
> @@ -1002,6 +1002,25 @@ int ps3_repository_read_lpm_privileges(unsigned int
> be_index, u64 *lpar,
> lpar, rights);
> }
>
> +/**
> + * ps3_repository_read_ss_laid - Read the lpar auth id
> + */
> +
> +int ps3_repository_read_ss_laid(enum ps3_ss_laid *laid)
> +{
> + int result;
> + u64 id, v1;
> +
> + lv1_get_logical_partition_id(&id);
> + result = read_node(PS3_LPAR_ID_PME,
> + make_first_field("ss", 0),
> + make_field("laid", 0),
> + id, 0,
> + &v1, NULL);
> + *laid = v1;
> + return result;
> +}
> +
> #if defined(DEBUG)
>
> int ps3_repository_dump_resource_info(const struct ps3_repository_device
> *repo)
> diff --git a/arch/powerpc/platforms/ps3/setup.c
> b/arch/powerpc/platforms/ps3/setup.c
> index 149bea2..f430279 100644
> --- a/arch/powerpc/platforms/ps3/setup.c
> +++ b/arch/powerpc/platforms/ps3/setup.c
> @@ -47,6 +47,7 @@ DEFINE_MUTEX(ps3_gpu_mutex);
> EXPORT_SYMBOL_GPL(ps3_gpu_mutex);
>
> static union ps3_firmware_version ps3_firmware_version;
> +static enum ps3_ss_laid ps3_ss_laid;
>
> void ps3_get_firmware_version(union ps3_firmware_version *v)
> {
> @@ -68,6 +69,12 @@ int ps3_compare_firmware_version(u16 major, u16 minor, u16
> rev)
> }
> EXPORT_SYMBOL_GPL(ps3_compare_firmware_version);
>
> +enum ps3_ss_laid ps3_get_ss_laid(void)
> +{
> + return ps3_ss_laid;
> +}
> +EXPORT_SYMBOL_GPL(ps3_get_ss_laid);
> +
> static void ps3_power_save(void)
> {
> /*
> @@ -192,6 +199,7 @@ static int ps3_set_dabr(unsigned long dabr)
>
> static void __init ps3_setup_arch(void)
> {
> + const char *laid_str;
>
> DBG(" -> %s:%d\n", __func__, __LINE__);
>
> @@ -200,6 +208,20 @@ static void __init ps3_setup_arch(void)
> ps3_firmware_version.major, ps3_firmware_version.minor,
> ps3_firmware_version.rev);
>
> + ps3_repository_read_ss_laid(&ps3_ss_laid);
> + switch (ps3_ss_laid) {
> + case PS3_SS_LAID_GAMEOS:
> + laid_str = "GameOS";
> + break;
> + case PS3_SS_LAID_OTHEROS:
> + laid_str = "OtherOS";
> + break;
> + default:
> + laid_str = "unknown";
> + break;
> + }
> + printk(KERN_INFO "Running in %s lpar\n", laid_str);
> +
> ps3_spu_set_platform();
>
> #ifdef CONFIG_SMP
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
