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

[thirdparty/kernel/stable.git] / arch / powerpc / platforms / pseries / firmware.c

diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c
index 1236a9d6146a686a60285c8173346535fd10275a..06639fa2d61dd92a2537c4ca933b37af4215a324 100644 (file)
--- 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");
 }