Pull model-name into release branch

3 files changed, 42 insertions, 10 deletions

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 7ad0d9cc6db6..84f93c0f2c66 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -509,7 +509,7 @@ show_cpuinfo (struct seq_file *m, void *v)
                 { 1UL << 1, "spontaneous deferral"},
                 { 1UL << 2, "16-byte atomic ops" }
         };
-        char family[32], features[128], *cp, sep;
+        char features[128], *cp, sep;
         struct cpuinfo_ia64 *c = v;
         unsigned long mask;
         unsigned long proc_freq;
@@ -517,12 +517,6 @@ show_cpuinfo (struct seq_file *m, void *v)
 
         mask = c->features;
 
-        switch (c->family) {
-              case 0x07:        memcpy(family, "Itanium", 8); break;
-              case 0x1f:        memcpy(family, "Itanium 2", 10); break;
-              default:          sprintf(family, "%u", c->family); break;
-        }
-
         /* build the feature string: */
         memcpy(features, " standard", 10);
         cp = features;
@@ -553,8 +547,9 @@ show_cpuinfo (struct seq_file *m, void *v)
                    "processor  : %d\n"
                    "vendor     : %s\n"
                    "arch       : IA-64\n"
-                   "family     : %s\n"
+                   "family     : %u\n"
                    "model      : %u\n"
+                   "model name : %s\n"
                    "revision   : %u\n"
                    "archrev    : %u\n"
                    "features   :%s\n"   /* don't change this---it _is_ right! */
@@ -563,7 +558,8 @@ show_cpuinfo (struct seq_file *m, void *v)
                    "cpu MHz    : %lu.%06lu\n"
                    "itc MHz    : %lu.%06lu\n"
                    "BogoMIPS   : %lu.%02lu\n",
-                   cpunum, c->vendor, family, c->model, c->revision, c->archrev,
+                   cpunum, c->vendor, c->family, c->model,
+                   c->model_name, c->revision, c->archrev,
                    features, c->ppn, c->number,
                    proc_freq / 1000, proc_freq % 1000,
                    c->itc_freq / 1000000, c->itc_freq % 1000000,
@@ -611,6 +607,31 @@ struct seq_operations cpuinfo_op = {
         .show =         show_cpuinfo
 };
 
+static char brandname[128];
+
+static char * __cpuinit
+get_model_name(__u8 family, __u8 model)
+{
+        char brand[128];
+
+        if (ia64_pal_get_brand_info(brand)) {
+                if (family == 0x7)
+                        memcpy(brand, "Merced", 7);
+                else if (family == 0x1f) switch (model) {
+                        case 0: memcpy(brand, "McKinley", 9); break;
+                        case 1: memcpy(brand, "Madison", 8); break;
+                        case 2: memcpy(brand, "Madison up to 9M cache", 23); break;
+                } else
+                        memcpy(brand, "Unknown", 8);
+        }
+        if (brandname[0] == '\0')
+                return strcpy(brandname, brand);
+        else if (strcmp(brandname, brand) == 0)
+                return brandname;
+        else
+                return kstrdup(brand, GFP_KERNEL);
+}
+
 static void __cpuinit
 identify_cpu (struct cpuinfo_ia64 *c)
 {
@@ -640,7 +661,6 @@ identify_cpu (struct cpuinfo_ia64 *c)
         pal_status_t status;
         unsigned long impl_va_msb = 50, phys_addr_size = 44;    /* Itanium defaults */
         int i;
-
         for (i = 0; i < 5; ++i)
                 cpuid.bits[i] = ia64_get_cpuid(i);
 
@@ -663,6 +683,7 @@ identify_cpu (struct cpuinfo_ia64 *c)
         c->family = cpuid.field.family;
         c->archrev = cpuid.field.archrev;
         c->features = cpuid.field.features;
+        c->model_name = get_model_name(c->family, c->model);
 
         status = ia64_pal_vm_summary(&vm1, &vm2);
         if (status == PAL_STATUS_SUCCESS) {
diff --git a/include/asm-ia64/pal.h b/include/asm-ia64/pal.h
index 20a8d618c845..d1587e4f5759 100644
--- a/include/asm-ia64/pal.h
+++ b/include/asm-ia64/pal.h
@@ -78,6 +78,7 @@
 #define PAL_VM_TR_READ          261     /* read contents of translation register */
 #define PAL_GET_PSTATE          262     /* get the current P-state */
 #define PAL_SET_PSTATE          263     /* set the P-state */
+#define PAL_BRAND_INFO          274     /* Processor branding information */
 
 #ifndef __ASSEMBLY__
 
@@ -1133,6 +1134,15 @@ ia64_pal_set_pstate (u64 pstate_index)
         return iprv.status;
 }
 
+/* Processor branding information*/
+static inline s64
+ia64_pal_get_brand_info (char *brand_info)
+{
+        struct ia64_pal_retval iprv;
+        PAL_CALL_STK(iprv, PAL_BRAND_INFO, 0, (u64)brand_info, 0);
+        return iprv.status;
+}
+
 /* Cause the processor to enter LIGHT HALT state, where prefetching and execution are
  * suspended, but cache and TLB coherency is maintained.
  */
diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index 265f4824db0e..ead68f8eb883 100644
--- a/include/asm-ia64/processor.h
+++ b/include/asm-ia64/processor.h
@@ -163,6 +163,7 @@ struct cpuinfo_ia64 {
         __u8 family;
         __u8 archrev;
         char vendor[16];
+        char *model_name;
 
 #ifdef CONFIG_NUMA
         struct ia64_node_data *node_data;