RE: 256 apic id for amd64

[YhLu <YhLu@tyan.com>]

[-- Attachment #1: Type: text/plain, Size: 560 bytes --]

Try this one.

-----Original Message-----
From: Andi Kleen [mailto:ak@muc.de] 
Sent: Monday, January 10, 2005 11:44 AM
To: YhLu
Cc: 'Mikael Pettersson'; jamesclv@us.ibm.com; Matt_Domsch@dell.com;
discuss@x86-64.org; linux-kernel@vger.kernel.org; suresh.b.siddha@intel.com
Subject: Re: 256 apic id for amd64

On Mon, Jan 10, 2005 at 11:41:02AM -0800, YhLu wrote:
> Please refer the patch.

That's unreadable. Can you generate against a recent BK snapshot
(2.6.10 + latest from ftp://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots/)

and use diff -u  ? 

-Andi


[-- Attachment #2: x86_64_phy_proc_id.patch --]
[-- Type: application/octet-stream, Size: 1175 bytes --]

--- linux-2.6.10/arch/x86_64/kernel/setup.c	2005-01-10 12:26:21.414190368 -0800
+++ linux-2.6.10.new.x86_64/arch/x86_64/kernel/setup.c	2005-01-10 12:30:53.656803200 -0800
@@ -738,7 +738,6 @@
 {
 #ifdef CONFIG_SMP
 	u32 	eax, ebx, ecx, edx;
-	int 	index_lsb, index_msb, tmp;
 	int 	cpu = smp_processor_id();
 	
 	if (!cpu_has(c, X86_FEATURE_HT))
@@ -750,8 +749,6 @@
 	if (smp_num_siblings == 1) {
 		printk(KERN_INFO  "CPU: Hyper-Threading is disabled\n");
 	} else if (smp_num_siblings > 1) {
-		index_lsb = 0;
-		index_msb = 31;
 		/*
 		 * At this point we only support two siblings per
 		 * processor package.
@@ -761,19 +758,8 @@
 			smp_num_siblings = 1;
 			return;
 		}
-		tmp = smp_num_siblings;
-		while ((tmp & 1) == 0) {
-			tmp >>=1 ;
-			index_lsb++;
-		}
-		tmp = smp_num_siblings;
-		while ((tmp & 0x80000000 ) == 0) {
-			tmp <<=1 ;
-			index_msb--;
-		}
-		if (index_lsb != index_msb )
-			index_msb++;
-		phys_proc_id[cpu] = phys_pkg_id(index_msb);
+
+		phys_proc_id[cpu] = c->x86_apicid >> hweight32(c->x86_num_cores - 1);
 		
 		printk(KERN_INFO  "CPU: Physical Processor ID: %d\n",
 		       phys_proc_id[cpu]);