[PATCH] create generalised apic_to_node mapping

Create a generalised apicid_to_node mapping, replacing the local
apicid_to_quad I had just locally in NUMA-Q subarch before.

diff --git a/include/asm-i386/mach-default/mach_apic.h b/include/asm-i386/mach-default/mach_apic.h
index 905bc7a1284d0051522e60ae9e6184d381f13736..a560a19efd720728db0aa98a59b0d37852c9ee27 100644 (file)
--- a/include/asm-i386/mach-default/mach_apic.h
+++ b/include/asm-i386/mach-default/mach_apic.h
@@ -53,6 +53,11 @@ static inline int multi_timer_check(int apic, int irq)
        return 0;
 }
 
+static inline int apicid_to_node(int logical_apicid)
+{
+       return 0;
+}
+
 static inline int cpu_present_to_apicid(int mps_cpu)
 {
        return  mps_cpu;

diff --git a/include/asm-i386/mach-numaq/mach_apic.h b/include/asm-i386/mach-numaq/mach_apic.h
index 94d2f5f2827506369cdb673b226cb6a7676953d5..c1ab5465337eb147c427b5dc7e99a5421dbd724a 100644 (file)
--- a/include/asm-i386/mach-numaq/mach_apic.h
+++ b/include/asm-i386/mach-numaq/mach_apic.h
@@ -47,14 +47,14 @@ static inline int generate_logical_apicid(int quad, int phys_apicid)
        return ( (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1) );
 }
 
-static inline int apicid_to_quad(int logical_apicid) 
+static inline int apicid_to_node(int logical_apicid) 
 {
        return (logical_apicid >> 4);
 }
 
 static inline unsigned long apicid_to_cpu_present(int logical_apicid)
 {
-       return ( (logical_apicid&0xf) << (4*apicid_to_quad(logical_apicid)) );
+       return ( (logical_apicid&0xf) << (4*apicid_to_node(logical_apicid)) );
 }
 
 static inline int mpc_apic_id(struct mpc_config_processor *m, int quad)

diff --git a/include/asm-i386/mach-summit/mach_apic.h b/include/asm-i386/mach-summit/mach_apic.h
index bf601c3368ad66da2b0a618029bb947ce1501883..e1aea8aedfcd08112f778f750e7f1d23cf9cadc4 100644 (file)
--- a/include/asm-i386/mach-summit/mach_apic.h
+++ b/include/asm-i386/mach-summit/mach_apic.h
@@ -32,6 +32,11 @@ static inline void clustered_apic_check(void)
                (x86_summit ? "Summit" : "Flat"), nr_ioapics);
 }
 
+static inline int apicid_to_node(int logical_apicid)
+{
+       return (logical_apicid >> 5);          /* 2 clusterids per CEC */
+}
+
 static inline int cpu_present_to_apicid(int mps_cpu)
 {
        if (x86_summit)