[POWERPC] Distinguish POWER6 partition modes and tell userspace

This adds code to look at the properties firmware puts in the device
tree to determine what compatibility mode the partition is in on
POWER6 machines, and set the ELF aux vector AT_HWCAP and AT_PLATFORM
entries appropriately.

Specifically, we look at the cpu-version property in the cpu node(s).
If that contains a "logical" PVR value (of the form 0x0f00000x), we
call identify_cpu again with this PVR value.  A value of 0x0f000001
indicates the partition is in POWER5+ compatibility mode, and a value
of 0x0f000002 indicates "POWER6 architected" mode, with various
extensions disabled.  We also look for various other properties:
ibm,dfp, ibm,purr and ibm,spurr.

Signed-off-by: Paul Mackerras <paulus@samba.org>

5 files changed, 117 insertions, 43 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 992121b2d261..911ac442f44a 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -277,10 +277,45 @@ static struct cpu_spec cpu_specs[] = {
                 .oprofile_mmcra_sipr    = MMCRA_SIPR,
                 .platform               = "power5+",
         },
+        {       /* POWER6 in P5+ mode; 2.04-compliant processor */
+                .pvr_mask               = 0xffffffff,
+                .pvr_value              = 0x0f000001,
+                .cpu_name               = "POWER5+",
+                .cpu_features           = CPU_FTRS_POWER5,
+                .cpu_user_features      = COMMON_USER_POWER5_PLUS,
+                .icache_bsize           = 128,
+                .dcache_bsize           = 128,
+                .num_pmcs               = 6,
+                .oprofile_cpu_type      = "ppc64/power6",
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .oprofile_mmcra_sihv    = POWER6_MMCRA_SIHV,
+                .oprofile_mmcra_sipr    = POWER6_MMCRA_SIPR,
+                .oprofile_mmcra_clear   = POWER6_MMCRA_THRM |
+                        POWER6_MMCRA_OTHER,
+                .platform               = "power5+",
+        },
         {       /* Power6 */
                 .pvr_mask               = 0xffff0000,
                 .pvr_value              = 0x003e0000,
-                .cpu_name               = "POWER6",
+                .cpu_name               = "POWER6 (raw)",
+                .cpu_features           = CPU_FTRS_POWER6,
+                .cpu_user_features      = COMMON_USER_POWER6 |
+                        PPC_FEATURE_POWER6_EXT,
+                .icache_bsize           = 128,
+                .dcache_bsize           = 128,
+                .num_pmcs               = 6,
+                .oprofile_cpu_type      = "ppc64/power6",
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .oprofile_mmcra_sihv    = POWER6_MMCRA_SIHV,
+                .oprofile_mmcra_sipr    = POWER6_MMCRA_SIPR,
+                .oprofile_mmcra_clear   = POWER6_MMCRA_THRM |
+                        POWER6_MMCRA_OTHER,
+                .platform               = "power6x",
+        },
+        {       /* 2.05-compliant processor, i.e. Power6 "architected" mode */
+                .pvr_mask               = 0xffffffff,
+                .pvr_value              = 0x0f000002,
+                .cpu_name               = "POWER6 (architected)",
                 .cpu_features           = CPU_FTRS_POWER6,
                 .cpu_user_features      = COMMON_USER_POWER6,
                 .icache_bsize           = 128,
@@ -1173,19 +1208,15 @@ static struct cpu_spec cpu_specs[] = {
 #endif /* CONFIG_PPC32 */
 };
 
-struct cpu_spec *identify_cpu(unsigned long offset)
+struct cpu_spec *identify_cpu(unsigned long offset, unsigned int pvr)
 {
         struct cpu_spec *s = cpu_specs;
         struct cpu_spec **cur = &cur_cpu_spec;
-        unsigned int pvr = mfspr(SPRN_PVR);
         int i;
 
         s = PTRRELOC(s);
         cur = PTRRELOC(cur);
 
-        if (*cur != NULL)
-                return PTRRELOC(*cur);
-
         for (i = 0; i < ARRAY_SIZE(cpu_specs); i++,s++)
                 if ((pvr & s->pvr_mask) == s->pvr_value) {
                         *cur = cpu_specs + i;
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 16d29d16b96f..c18dbe77fdc2 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -538,35 +538,31 @@ static struct ibm_pa_feature {
         {CPU_FTR_REAL_LE, PPC_FEATURE_TRUE_LE, 5, 0, 0},
 };
 
-static void __init check_cpu_pa_features(unsigned long node)
+static void __init scan_features(unsigned long node, unsigned char *ftrs,
+                                 unsigned long tablelen,
+                                 struct ibm_pa_feature *fp,
+                                 unsigned long ft_size)
 {
-        unsigned char *pa_ftrs;
-        unsigned long len, tablelen, i, bit;
-
-        pa_ftrs = of_get_flat_dt_prop(node, "ibm,pa-features", &tablelen);
-        if (pa_ftrs == NULL)
-                return;
+        unsigned long i, len, bit;
 
         /* find descriptor with type == 0 */
         for (;;) {
                 if (tablelen < 3)
                         return;
-                len = 2 + pa_ftrs[0];
+                len = 2 + ftrs[0];
                 if (tablelen < len)
                         return;         /* descriptor 0 not found */
-                if (pa_ftrs[1] == 0)
+                if (ftrs[1] == 0)
                         break;
                 tablelen -= len;
-                pa_ftrs += len;
+                ftrs += len;
         }
 
         /* loop over bits we know about */
-        for (i = 0; i < ARRAY_SIZE(ibm_pa_features); ++i) {
-                struct ibm_pa_feature *fp = &ibm_pa_features[i];
-
-                if (fp->pabyte >= pa_ftrs[0])
+        for (i = 0; i < ft_size; ++i, ++fp) {
+                if (fp->pabyte >= ftrs[0])
                         continue;
-                bit = (pa_ftrs[2 + fp->pabyte] >> (7 - fp->pabit)) & 1;
+                bit = (ftrs[2 + fp->pabyte] >> (7 - fp->pabit)) & 1;
                 if (bit ^ fp->invert) {
                         cur_cpu_spec->cpu_features |= fp->cpu_features;
                         cur_cpu_spec->cpu_user_features |= fp->cpu_user_ftrs;
@@ -577,16 +573,59 @@ static void __init check_cpu_pa_features(unsigned long node)
         }
 }
 
+static void __init check_cpu_pa_features(unsigned long node)
+{
+        unsigned char *pa_ftrs;
+        unsigned long tablelen;
+
+        pa_ftrs = of_get_flat_dt_prop(node, "ibm,pa-features", &tablelen);
+        if (pa_ftrs == NULL)
+                return;
+
+        scan_features(node, pa_ftrs, tablelen,
+                      ibm_pa_features, ARRAY_SIZE(ibm_pa_features));
+}
+
+static struct feature_property {
+        const char *name;
+        u32 min_value;
+        unsigned long cpu_feature;
+        unsigned long cpu_user_ftr;
+} feature_properties[] __initdata = {
+#ifdef CONFIG_ALTIVEC
+        {"altivec", 0, CPU_FTR_ALTIVEC, PPC_FEATURE_HAS_ALTIVEC},
+        {"ibm,vmx", 1, CPU_FTR_ALTIVEC, PPC_FEATURE_HAS_ALTIVEC},
+#endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_PPC64
+        {"ibm,dfp", 1, 0, PPC_FEATURE_HAS_DFP},
+        {"ibm,purr", 1, CPU_FTR_PURR, 0},
+        {"ibm,spurr", 1, CPU_FTR_SPURR, 0},
+#endif /* CONFIG_PPC64 */
+};
+
+static void __init check_cpu_feature_properties(unsigned long node)
+{
+        unsigned long i;
+        struct feature_property *fp = feature_properties;
+        const u32 *prop;
+
+        for (i = 0; i < ARRAY_SIZE(feature_properties); ++i, ++fp) {
+                prop = of_get_flat_dt_prop(node, fp->name, NULL);
+                if (prop && *prop >= fp->min_value) {
+                        cur_cpu_spec->cpu_features |= fp->cpu_feature;
+                        cur_cpu_spec->cpu_user_features |= fp->cpu_user_ftr;
+                }
+        }
+}
+
 static int __init early_init_dt_scan_cpus(unsigned long node,
                                           const char *uname, int depth,
                                           void *data)
 {
         static int logical_cpuid = 0;
         char *type = of_get_flat_dt_prop(node, "device_type", NULL);
-#ifdef CONFIG_ALTIVEC
-        u32 *prop;
-#endif
-        u32 *intserv;
+        const u32 *prop;
+        const u32 *intserv;
         int i, nthreads;
         unsigned long len;
         int found = 0;
@@ -643,24 +682,27 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
                         intserv[i]);
                 boot_cpuid = logical_cpuid;
                 set_hard_smp_processor_id(boot_cpuid, intserv[i]);
-        }
 
-#ifdef CONFIG_ALTIVEC
-        /* Check if we have a VMX and eventually update CPU features */
-        prop = (u32 *)of_get_flat_dt_prop(node, "ibm,vmx", NULL);
-        if (prop && (*prop) > 0) {
-                cur_cpu_spec->cpu_features |= CPU_FTR_ALTIVEC;
-                cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC;
-        }
-
-        /* Same goes for Apple's "altivec" property */
-        prop = (u32 *)of_get_flat_dt_prop(node, "altivec", NULL);
-        if (prop) {
-                cur_cpu_spec->cpu_features |= CPU_FTR_ALTIVEC;
-                cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC;
+                /*
+                 * PAPR defines "logical" PVR values for cpus that
+                 * meet various levels of the architecture:
+                 * 0x0f000001   Architecture version 2.04
+                 * 0x0f000002   Architecture version 2.05
+                 * If the cpu-version property in the cpu node contains
+                 * such a value, we call identify_cpu again with the
+                 * logical PVR value in order to use the cpu feature
+                 * bits appropriate for the architecture level.
+                 *
+                 * A POWER6 partition in "POWER6 architected" mode
+                 * uses the 0x0f000002 PVR value; in POWER5+ mode
+                 * it uses 0x0f000001.
+                 */
+                prop = of_get_flat_dt_prop(node, "cpu-version", NULL);
+                if (prop && (*prop & 0xff000000) == 0x0f000000)
+                        identify_cpu(0, *prop);
         }
-#endif /* CONFIG_ALTIVEC */
 
+        check_cpu_feature_properties(node);
         check_cpu_pa_features(node);
 
 #ifdef CONFIG_PPC_PSERIES
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 8671eb634a92..396109a537cd 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -627,6 +627,7 @@ static void __init early_cmdline_parse(void)
 /* Option vector 3: processor options supported */
 #define OV3_FP                  0x80    /* floating point */
 #define OV3_VMX                 0x40    /* VMX/Altivec */
+#define OV3_DFP                 0x20    /* decimal FP */
 
 /* Option vector 5: PAPR/OF options supported */
 #define OV5_LPAR                0x80    /* logical partitioning supported */
@@ -668,7 +669,7 @@ static unsigned char ibm_architecture_vec[] = {
         /* option vector 3: processor options supported */
         3 - 2,                          /* length */
         0,                              /* don't ignore, don't halt */
-        OV3_FP | OV3_VMX,
+        OV3_FP | OV3_VMX | OV3_DFP,
 
         /* option vector 4: IBM PAPR implementation */
         2 - 2,                          /* length */
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 04df53a3c86d..61c65d19ef06 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -97,7 +97,7 @@ unsigned long __init early_init(unsigned long dt_ptr)
          * Identify the CPU type and fix up code sections
          * that depend on which cpu we have.
          */
-        spec = identify_cpu(offset);
+        spec = identify_cpu(offset, mfspr(SPRN_PVR));
 
         do_feature_fixups(spec->cpu_features,
                           PTRRELOC(&__start___ftr_fixup),
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index f602a53b1b79..3733de30e84d 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -171,7 +171,7 @@ void __init setup_paca(int cpu)
 void __init early_setup(unsigned long dt_ptr)
 {
         /* Identify CPU type */
-        identify_cpu(0);
+        identify_cpu(0, mfspr(SPRN_PVR));
 
         /* Assume we're on cpu 0 for now. Don't write to the paca yet! */
         setup_paca(0);