[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH][RESEND] Fix non-ACPI Timer Interrupt Routing - v3
From: |
Beth Kon |
Subject: |
[Qemu-devel] [PATCH][RESEND] Fix non-ACPI Timer Interrupt Routing - v3 |
Date: |
Fri, 19 Jun 2009 14:22:00 -0400 |
***NOTE: Anthony, this needs to replace
0013_fix-non-acpi-timer-interrupt-routing.patch.***
Replicate ACPI irq0->inti2 override in mp table for non-acpi case.
v1 -> v2 adds comment suggested by Ryan.
v2 -> v3 clarifies comment and corrects entry count
Anthony, the old version of this patch needs to be removed and replaced with
this version.
Signed-off-by: Beth Kon <address@hidden>
---
diff --git a/bios/rombios32.c b/bios/rombios32.c
index 1a1ed64..d789e20 100644
--- a/bios/rombios32.c
+++ b/bios/rombios32.c
@@ -1124,7 +1124,11 @@ static void mptable_init(void)
putstr(&q, "0.1 "); /* vendor id */
putle32(&q, 0); /* OEM table ptr */
putle16(&q, 0); /* OEM table size */
+#ifdef BX_QEMU
+ putle16(&q, smp_cpus + 17); /* entry count */
+#else
putle16(&q, smp_cpus + 18); /* entry count */
+#endif
putle32(&q, 0xfee00000); /* local APIC addr */
putle16(&q, 0); /* ext table length */
putb(&q, 0); /* ext table checksum */
@@ -1166,6 +1170,12 @@ static void mptable_init(void)
/* irqs */
for(i = 0; i < 16; i++) {
+#ifdef BX_QEMU
+ /* One entry per ioapic interrupt destination. Destination 2 is covered
+ by irq0->inti2 override (i == 0). Source IRQ 2 is unused */
+ if (i == 2)
+ continue;
+#endif
putb(&q, 3); /* entry type = I/O interrupt */
putb(&q, 0); /* interrupt type = vectored interrupt */
putb(&q, 0); /* flags: po=0, el=0 */
@@ -1173,7 +1183,11 @@ static void mptable_init(void)
putb(&q, 0); /* source bus ID = ISA */
putb(&q, i); /* source bus IRQ */
putb(&q, ioapic_id); /* dest I/O APIC ID */
+#ifdef BX_QEMU
+ putb(&q, i == 0 ? 2 : i); /* dest I/O APIC interrupt in */
+#else
putb(&q, i); /* dest I/O APIC interrupt in */
+#endif
}
/* patch length */
len = q - mp_config_table;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH][RESEND] Fix non-ACPI Timer Interrupt Routing - v3,
Beth Kon <=