By means of Zen, voodoo, and guessing the method from the results, I
came to a conclusion somewhat resembling this patch.
Since this has approximately zero resemblance to the "Pee Cee" case,
I think it best to avoid crossdressing the box to get it to survive
IO-APIC init and just break off our own version which blindly trusts
the BIOS and doesn't panic() at the drop of a hat, much unlike the
Pee Cee version. It also runs (mostly) silent, which I consider a bonus.
100% untested. I'll spin it sometime tomorrow.
-- wli
===== arch/i386/kernel/io_apic.c 1.40 vs edited =====
--- 1.40/arch/i386/kernel/io_apic.c Tue Jan 14 03:02:28 2003
+++ edited/arch/i386/kernel/io_apic.c Sun Jan 19 04:59:04 2003
@@ -1132,7 +1132,40 @@
* by Matt Domsch <Matt_Domsch@dell.com> Tue Dec 21 12:25:05 CST 1999
*/
-static void __init setup_ioapic_ids_from_mpc (void)
+#ifdef CONFIG_X86_NUMAQ
+static void __init setup_ioapic_ids_from_mpc(void)
+{
+ int io_apic;
+
+ for (io_apic = 0; io_apic < nr_ioapics; ++io_apic) {
+ struct IO_APIC_reg_00 reg;
+ int node, local, global, *regval = (int *)®
+
+ global = mp_ioapics[apic].mpc_apicid;
+ for (node = 0; node < MAX_NUMNODES; ++node) {
+ if (mp_ioapic_id_map[node][0][0] == global)
+ local = mp_ioapic_id_map[node][0][1];
+ else if (mp_ioapic_id_map[node][1][0] == global)
+ local = mp_ioapic_id_map[node][1][1];
+ }
+
+ if (!local) {
+ printk("mystery IO-APIC, it will die\n");
+ continue;
+ }
+
+
+ spin_lock_irqsave(&ioapic_lock, flags);
+ *regval = io_apic_read(apic, 0);
+ if (reg.ID != local) {
+ reg.ID = local;
+ io_apic_write(apic, 0, *regval);
+ }
+ spin_unlock_irqrestore(&ioapic_lock, flags);
+ }
+}
+#else /* !CONFIG_X86_NUMAQ */
+static void __init setup_ioapic_ids_from_mpc(void)
{
struct IO_APIC_reg_00 reg_00;
unsigned long phys_id_present_map;
@@ -1225,6 +1258,7 @@
printk(" ok.\n");
}
}
+#endif
/*
* There is a nasty bug in some older SMP boards, their mptable lies
===== arch/i386/kernel/mpparse.c 1.32 vs edited =====
--- 1.32/arch/i386/kernel/mpparse.c Mon Jan 13 16:41:17 2003
+++ edited/arch/i386/kernel/mpparse.c Sun Jan 19 04:19:09 2003
@@ -47,6 +47,7 @@
int mp_bus_id_to_local [MAX_MP_BUSSES];
int quad_local_to_mp_bus_id [NR_CPUS/4][4];
int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };
+int mp_ioapic_id_map [MAX_NUMNODES][2][2];
int mp_current_pci_id;
/* I/O APIC entries */
@@ -232,6 +233,7 @@
return;
}
mp_ioapics[nr_ioapics] = *m;
+ mpc_oem_ioapic(m, str, translation_table[mpc_record]);
nr_ioapics++;
}
===== include/asm-i386/mpspec.h 1.11 vs edited =====
--- 1.11/include/asm-i386/mpspec.h Tue Jan 14 03:02:28 2003
+++ edited/include/asm-i386/mpspec.h Sun Jan 19 04:40:31 2003
@@ -204,6 +204,7 @@
extern int mp_bus_id_to_local [MAX_MP_BUSSES];
extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];
extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
+extern int mp_ioapic_id_map [MAX_NUMNODES][2][2];
extern unsigned int boot_cpu_physical_apicid;
extern unsigned long phys_cpu_present_map;
===== include/asm-i386/mach-default/mach_mpparse.h 1.2 vs edited =====
--- 1.2/include/asm-i386/mach-default/mach_mpparse.h Mon Jan 13 16:41:17 2003
+++ edited/include/asm-i386/mach-default/mach_mpparse.h Sun Jan 19 04:26:45 2003
@@ -12,6 +12,11 @@
{
}
+static inline void mpc_oem_ioapic(struct mpc_config_ioapic *m,
+ struct mpc_config_translation *translation)
+{
+}
+
static inline void mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid)
{
===== include/asm-i386/mach-numaq/mach_mpparse.h 1.4 vs edited =====
--- 1.4/include/asm-i386/mach-numaq/mach_mpparse.h Mon Jan 13 16:41:17 2003
+++ edited/include/asm-i386/mach-numaq/mach_mpparse.h Sun Jan 19 04:57:29 2003
@@ -24,6 +24,25 @@
quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
}
+static inline void mpc_oem_ioapic(struct mpc_config_ioapic *m,
+ struct mpc_config_translation *translation)
+{
+ int quad = translation->trans_quad;
+ int local = translation->trans_local;
+ int *info;
+
+ if (!mp_ioapic_id_map[quad][0][0])
+ info = mp_ioapic_id_map[quad][0];
+ else if (!mp_ioapic_id_map[quad][1][0])
+ info = mp_ioapic_id_map[quad][1];
+ else {
+ printk("bad IO-APIC! go to your quad!\n");
+ return;
+ }
+ info[0] = global;
+ info[1] = local;
+}
+
static inline void mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid)
{
===== include/asm-i386/mach-summit/mach_mpparse.h 1.3 vs edited =====
--- 1.3/include/asm-i386/mach-summit/mach_mpparse.h Tue Jan 14 03:02:28 2003
+++ edited/include/asm-i386/mach-summit/mach_mpparse.h Sun Jan 19 04:30:32 2003
@@ -12,6 +12,11 @@
{
}
+static inline void mpc_oem_ioapic(struct mpc_config_ioapic *m,
+ struct mpc_config_translation *translation)
+{
+}
+
static inline void mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid)
{
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Jan 23 2003 - 22:00:21 EST