powerpc/pseries: Update firmware_has_feature() to check architecture vector 5 bits

The firmware_has_feature() function makes it easy to check for supported
features of the hypervisor. This patch extends the capability of
firmware_has_feature() to include checking for specified bits
in vector 5 of the architecture vector as reported in the device tree.

As part of this the #defines used for the architecture vector are re-defined
such that each option has the index into vector 5 and the feature bit encoded
into it. This makes checking for architecture bits when initiating data
for firmware_has_feature much easier.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

3 files changed, 70 insertions, 24 deletions

diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c
index 1236a9d6146a..06639fa2d61d 100644
--- a/arch/powerpc/platforms/pseries/firmware.c
+++ b/arch/powerpc/platforms/pseries/firmware.c
@@ -28,18 +28,18 @@
 
 #include "pseries.h"
 
-typedef struct {
+struct hypertas_fw_feature {
     unsigned long val;
     char * name;
-} firmware_feature_t;
+};
 
 /*
  * The names in this table match names in rtas/ibm,hypertas-functions.  If the
  * entry ends in a '*', only upto the '*' is matched.  Otherwise the entire
  * string must match.
  */
-static __initdata firmware_feature_t
-firmware_features_table[] = {
+static __initdata struct hypertas_fw_feature
+hypertas_fw_features_table[] = {
         {FW_FEATURE_PFT,                "hcall-pft"},
         {FW_FEATURE_TCE,                "hcall-tce"},
         {FW_FEATURE_SPRG0,              "hcall-sprg0"},
@@ -69,16 +69,16 @@ firmware_features_table[] = {
  * device-tree/ibm,hypertas-functions.  Ultimately this functionality may
  * be moved into prom.c prom_init().
  */
-void __init fw_feature_init(const char *hypertas, unsigned long len)
+void __init fw_hypertas_feature_init(const char *hypertas, unsigned long len)
 {
         const char *s;
         int i;
 
-        pr_debug(" -> fw_feature_init()\n");
+        pr_debug(" -> fw_hypertas_feature_init()\n");
 
         for (s = hypertas; s < hypertas + len; s += strlen(s) + 1) {
-                for (i = 0; i < ARRAY_SIZE(firmware_features_table); i++) {
-                        const char *name = firmware_features_table[i].name;
+                for (i = 0; i < ARRAY_SIZE(hypertas_fw_features_table); i++) {
+                        const char *name = hypertas_fw_features_table[i].name;
                         size_t size;
 
                         /*
@@ -94,10 +94,39 @@ void __init fw_feature_init(const char *hypertas, unsigned long len)
 
                         /* we have a match */
                         powerpc_firmware_features |=
-                                firmware_features_table[i].val;
+                                hypertas_fw_features_table[i].val;
                         break;
                 }
         }
 
-        pr_debug(" <- fw_feature_init()\n");
+        pr_debug(" <- fw_hypertas_feature_init()\n");
+}
+
+struct vec5_fw_feature {
+        unsigned long   val;
+        unsigned int    feature;
+};
+
+static __initdata struct vec5_fw_feature
+vec5_fw_features_table[] = {
+        {FW_FEATURE_TYPE1_AFFINITY,     OV5_TYPE1_AFFINITY},
+};
+
+void __init fw_vec5_feature_init(const char *vec5, unsigned long len)
+{
+        unsigned int index, feat;
+        int i;
+
+        pr_debug(" -> fw_vec5_feature_init()\n");
+
+        for (i = 0; i < ARRAY_SIZE(vec5_fw_features_table); i++) {
+                index = OV5_INDX(vec5_fw_features_table[i].feature);
+                feat = OV5_FEAT(vec5_fw_features_table[i].feature);
+
+                if (vec5[index] & feat)
+                        powerpc_firmware_features |=
+                                vec5_fw_features_table[i].val;
+        }
+
+        pr_debug(" <- fw_vec5_feature_init()\n");
 }
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
index 9a3dda07566f..8af71e4cc17f 100644
--- a/arch/powerpc/platforms/pseries/pseries.h
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -19,7 +19,10 @@ extern void request_event_sources_irqs(struct device_node *np,
 
 #include <linux/of.h>
 
-extern void __init fw_feature_init(const char *hypertas, unsigned long len);
+extern void __init fw_hypertas_feature_init(const char *hypertas,
+                                            unsigned long len);
+extern void __init fw_vec5_feature_init(const char *hypertas,
+                                        unsigned long len);
 
 struct pt_regs;
 
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 8bcc9ca6682f..ac932a9eb440 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -628,25 +628,39 @@ static void __init pSeries_init_early(void)
  * Called very early, MMU is off, device-tree isn't unflattened
  */
 
-static int __init pSeries_probe_hypertas(unsigned long node,
-                                         const char *uname, int depth,
-                                         void *data)
+static int __init pseries_probe_fw_features(unsigned long node,
+                                            const char *uname, int depth,
+                                            void *data)
 {
-        const char *hypertas;
+        const char *prop;
         unsigned long len;
+        static int hypertas_found;
+        static int vec5_found;
 
-        if (depth != 1 ||
-            (strcmp(uname, "rtas") != 0 && strcmp(uname, "rtas@0") != 0))
+        if (depth != 1)
                 return 0;
 
-        hypertas = of_get_flat_dt_prop(node, "ibm,hypertas-functions", &len);
-        if (!hypertas)
-                return 1;
+        if (!strcmp(uname, "rtas") || !strcmp(uname, "rtas@0")) {
+                prop = of_get_flat_dt_prop(node, "ibm,hypertas-functions",
+                                           &len);
+                if (prop) {
+                        powerpc_firmware_features |= FW_FEATURE_LPAR;
+                        fw_hypertas_feature_init(prop, len);
+                }
 
-        powerpc_firmware_features |= FW_FEATURE_LPAR;
-        fw_feature_init(hypertas, len);
+                hypertas_found = 1;
+        }
 
-        return 1;
+        if (!strcmp(uname, "chosen")) {
+                prop = of_get_flat_dt_prop(node, "ibm,architecture-vec-5",
+                                           &len);
+                if (prop)
+                        fw_vec5_feature_init(prop, len);
+
+                vec5_found = 1;
+        }
+
+        return hypertas_found && vec5_found;
 }
 
 static int __init pSeries_probe(void)
@@ -669,7 +683,7 @@ static int __init pSeries_probe(void)
         pr_debug("pSeries detected, looking for LPAR capability...\n");
 
         /* Now try to figure out if we are running on LPAR */
-        of_scan_flat_dt(pSeries_probe_hypertas, NULL);
+        of_scan_flat_dt(pseries_probe_fw_features, NULL);
 
         if (firmware_has_feature(FW_FEATURE_LPAR))
                 hpte_init_lpar();