[IA64] /proc/cpuinfo "physical id" field cleanups

Clean up the process for presenting the "physical id" field in
/proc/cpuinfo.

	- remove global smp_num_cpucores, as it is mostly useless

	- remove check_for_logical_procs(), since we do the same
	  functionality in identify_siblings()

	- reflow logic in identify_siblings(). If an older CPU
	  does not implement PAL_LOGICAL_TO_PHYSICAL, we may still
	  be able to get useful information from SAL_PHYSICAL_ID_INFO

	- in identify_siblings(), threads/cores are a property of
	  the CPU, not the platform

	- remove useless printk's about multi-core / thread
	  capability in identify_siblings(), as that information
	  is readily available in /proc/cpuinfo, and printing for
	  the BSP only adds little value

	- smp_num_siblings is now meaningful if any CPU in the
	  system supports threads, not just the BSP

	- expose "physical id" field, even on CPUs that are not
	  multi-core / multi-threaded (as long as we have a valid
	  value). Now we know what sockets Madisons live in too.

Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 14 insertions, 7 deletions

diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index c57dbce25c12..f0fc4d8465ad 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -142,7 +142,6 @@ DEFINE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map);
 EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
 
 int smp_num_siblings = 1;
-int smp_num_cpucores = 1;
 
 /* which logical CPU number maps to which CPU (physical APIC ID) */
 volatile int ia64_cpu_to_sapicid[NR_CPUS];
@@ -886,13 +885,17 @@ identify_siblings(struct cpuinfo_ia64 *c)
         u16 pltid;
         pal_logical_to_physical_t info;
 
-        if (smp_num_cpucores == 1 && smp_num_siblings == 1)
-                return;
-
         if ((status = ia64_pal_logical_to_phys(-1, &info)) != PAL_STATUS_SUCCESS) {
-                printk(KERN_ERR "ia64_pal_logical_to_phys failed with %ld\n",
-                       status);
-                return;
+                if (status != PAL_STATUS_UNIMPLEMENTED) {
+                        printk(KERN_ERR
+                                "ia64_pal_logical_to_phys failed with %ld\n",
+                                status);
+                        return;
+                }
+
+                info.overview_ppid = 0;
+                info.overview_cpp  = 1;
+                info.overview_tpc  = 1;
         }
         if ((status = ia64_sal_physical_id_info(&pltid)) != PAL_STATUS_SUCCESS) {
                 printk(KERN_ERR "ia64_sal_pltid failed with %ld\n", status);
@@ -900,6 +903,10 @@ identify_siblings(struct cpuinfo_ia64 *c)
         }
 
         c->socket_id =  (pltid << 8) | info.overview_ppid;
+
+        if (info.overview_cpp == 1 && info.overview_tpc == 1)
+                return;
+
         c->cores_per_socket = info.overview_cpp;
         c->threads_per_core = info.overview_tpc;
         c->num_log = info.overview_num_log;