Skip to contentSkip to conversation

clustered apic patch missing APIC_DFR_CLUSTER def

PATCH In review Chris Wright 3 participants 4 messages Oct 28, 2004 – Oct 29, 2004

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clustered apic patch missing APIC_DFR_CLUSTER def

The cluster apic support does not compile. I added the APIC_DFR_CLUSTER def to asm-x86_64/apicdef.h (stolen from i386 one). Also added APIC_DFR_FLAT while there. This may only be papering over real fix.

Additionally, cluster_cpu_present_to_apicid() is defined but not used anywhere. So remove it.

===== include/asm-x86_64/apicdef.h 1.6 vs edited =====

include/asm-x86_64/apicdef.h +2 -0
@@ -32,6 +32,8 @@
 #define			SET_APIC_LOGICAL_ID(x)	(((x)<<24))
 #define			APIC_ALL_CPUS		0xFFu
 #define		APIC_DFR	0xE0
+#define			APIC_DFR_CLUSTER		0x0FFFFFFFu
+#define			APIC_DFR_FLAT			0xFFFFFFFFu
 #define		APIC_SPIV	0xF0
 #define			APIC_SPIV_FOCUS_DISABLED	(1<<9)
 #define			APIC_SPIV_APIC_ENABLED		(1<<8)

===== arch/x86_64/kernel/genapic_cluster.c 1.1 vs edited =====

arch/x86_64/kernel/genapic_cluster.c +0 -8
@@ -57,14 +57,6 @@
 	apic_write_around(APIC_LDR, val);
 }
 
-static int cluster_cpu_present_to_apicid(int mps_cpu)
-{
-	if ((unsigned)mps_cpu < NR_CPUS)
-		return (int)bios_cpu_apicid[mps_cpu];
-	else
-		return BAD_APICID;
-}
-
 /* Start with all IRQs pointing to boot CPU.  IRQ balancing will shift them. */
 
 static cpumask_t cluster_target_cpus(void)
#1 lore raw

Hmmm... The patch containing APIC_DFR_CLUSTER and friends went into the -mm tree in the June/July timeframe. It must not have been pushed with the main cluster patch.

You're right, we're using the generic version of
cpu_present_to_apicid(). The cluster one can go.

Quoted 41 lines · Chris Wright

The cluster apic support does not compile. I added the APIC_DFR_CLUSTER def to asm-x86_64/apicdef.h (stolen from i386 one). Also added APIC_DFR_FLAT while there. This may only be papering over real fix.

Additionally, cluster_cpu_present_to_apicid() is defined but not used anywhere. So remove it.

===== include/asm-x86_64/apicdef.h 1.6 vs edited =====

include/asm-x86_64/apicdef.h +2 -0
@@ -32,6 +32,8 @@
 #define			SET_APIC_LOGICAL_ID(x)	(((x)<<24))
 #define			APIC_ALL_CPUS		0xFFu
 #define		APIC_DFR	0xE0
+#define			APIC_DFR_CLUSTER		0x0FFFFFFFu
+#define			APIC_DFR_FLAT			0xFFFFFFFFu
 #define		APIC_SPIV	0xF0
 #define			APIC_SPIV_FOCUS_DISABLED	(1<<9)
 #define			APIC_SPIV_APIC_ENABLED		(1<<8)

===== arch/x86_64/kernel/genapic_cluster.c 1.1 vs edited =====
--- 1.1/arch/x86_64/kernel/genapic_cluster.c 2004-10-28 00:39:50
-07:00 +++ edited/arch/x86_64/kernel/genapic_cluster.c 2004-10-28
11:18:10 -07:00 @@ -57,14 +57,6 @@

include/asm-x86_64/apicdef.h +0 -8
 	apic_write_around(APIC_LDR, val);
 }
 
-static int cluster_cpu_present_to_apicid(int mps_cpu)
-{
-	if ((unsigned)mps_cpu < NR_CPUS)
-		return (int)bios_cpu_apicid[mps_cpu];
-	else
-		return BAD_APICID;
-}
-
 /* Start with all IRQs pointing to boot CPU.  IRQ balancing will

shift them. */

static cpumask_t cluster_target_cpus(void)

Signature · 3 lines
James Cleverdon
IBM LTC (xSeries Linux Solutions)
{jamesclv(Unix, preferred), cleverdj(Notes)} at us dot ibm dot comm
#2 lore raw
Quoted 3 lines · James Cleverdon

Hmmm... The patch containing APIC_DFR_CLUSTER and friends went into the -mm tree in the June/July timeframe. It must not have been pushed with the main cluster patch.

Andrew moved it into the x86-64 kexec APIC patch for some unknown reason. And that obviously was not pushed ...

I already sent a patch to Linus and will send patches for the other known buglets too (warnings, safe_smp_processor_id())

-Andi

#3 lore raw
In reply to James Cleverdon
Quoted 3 lines · * James Cleverdon ([email protected]) wrote:

Hmmm... The patch containing APIC_DFR_CLUSTER and friends went into the -mm tree in the June/July timeframe. It must not have been pushed with the main cluster patch.

OK, looks like Andi just sent something similar (i dropped the l (ell), since it looked meant to be only 32bit).

Quoted 2 lines

You're right, we're using the generic version of
cpu_present_to_apicid(). The cluster one can go.

This part resent (below).

thanks,
-chris

Remove cluster_cpu_present_to_apicid(), it's defined but not used anywhere.

===== arch/x86_64/kernel/genapic_cluster.c 1.1 vs edited =====

arch/x86_64/kernel/genapic_cluster.c +0 -8
@@ -57,14 +57,6 @@
 	apic_write_around(APIC_LDR, val);
 }
 
-static int cluster_cpu_present_to_apicid(int mps_cpu)
-{
-	if ((unsigned)mps_cpu < NR_CPUS)
-		return (int)bios_cpu_apicid[mps_cpu];
-	else
-		return BAD_APICID;
-}
-
 /* Start with all IRQs pointing to boot CPU.  IRQ balancing will shift them. */
 
 static cpumask_t cluster_target_cpus(void)