diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 21:01:11 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 21:01:11 +0000 |
| commit | c6d25871212c05af647eccaad6efc07a6f7a4acb (patch) | |
| tree | 8c3ec8a8286fada94fc076a721cbb9af4f1e391b | |
| parent | 3787324101bbc68c0d13a6aca51e6a90d1f7ce06 (diff) | |
Fix non-ACPI Timer Interrupt Routing (Beth Kon)
Replicate ACPI irq0->inti2 override in mp table for non-acpi case.
v1 -> v2 adds comment suggested by Ryan.
Signed-off-by: Beth Kon <eak@us.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7169 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | pc-bios/bios-pq/0013_fix-non-acpi-timer-interrupt-routing.patch | 38 | ||||
| -rw-r--r-- | pc-bios/bios-pq/series | 1 | ||||
| -rw-r--r-- | pc-bios/bios.bin | bin | 131072 -> 131072 bytes |
3 files changed, 39 insertions, 0 deletions
diff --git a/pc-bios/bios-pq/0013_fix-non-acpi-timer-interrupt-routing.patch b/pc-bios/bios-pq/0013_fix-non-acpi-timer-interrupt-routing.patch new file mode 100644 index 0000000000..c9d74e838d --- /dev/null +++ b/pc-bios/bios-pq/0013_fix-non-acpi-timer-interrupt-routing.patch @@ -0,0 +1,38 @@ +Fix non-ACPI Timer Interrupt Routing (Beth Kon) + +Replicate ACPI irq0->inti2 override in mp table for non-acpi case. + +v1 -> v2 adds comment suggested by Ryan. + +Signed-off-by: Beth Kon <eak@us.ibm.com> +Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> + +diff --git a/bios/rombios32.c b/bios/rombios32.c +index 7be4216..dc7b5f3 100644 +--- a/bios/rombios32.c ++++ b/bios/rombios32.c +@@ -1168,6 +1168,12 @@ static void mptable_init(void) + + /* irqs */ + for(i = 0; i < 16; i++) { ++#ifdef BX_QEMU ++ /* One entry per ioapic input. Input 2 is covered by ++ irq0->inti2 override (i == 0). 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 */ +@@ -1175,7 +1181,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; diff --git a/pc-bios/bios-pq/series b/pc-bios/bios-pq/series index 0cd0a18aa8..6011467e6c 100644 --- a/pc-bios/bios-pq/series +++ b/pc-bios/bios-pq/series @@ -10,3 +10,4 @@ 0010_bios-mark-the-acpi-sci-interrupt-as-connected-to-irq-9.patch 0011_read-additional-acpi-tables-from-a-vm.patch 0012-load-smbios-entries-and-files-from-qemu.patch +0013_fix-non-acpi-timer-interrupt-routing.patch diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin Binary files differindex 791f8586e8..d4e6919e81 100644 --- a/pc-bios/bios.bin +++ b/pc-bios/bios.bin |