From c6d25871212c05af647eccaad6efc07a6f7a4acb Mon Sep 17 00:00:00 2001 From: aliguori Date: Fri, 17 Apr 2009 21:01:11 +0000 Subject: [PATCH] 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 Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7169 c046a42c-6fe2-441c-8c8c-71466251a162 --- ...fix-non-acpi-timer-interrupt-routing.patch | 38 ++++++++++++++++++ pc-bios/bios-pq/series | 1 + pc-bios/bios.bin | Bin 131072 -> 131072 bytes 3 files changed, 39 insertions(+) create mode 100644 pc-bios/bios-pq/0013_fix-non-acpi-timer-interrupt-routing.patch 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 +Signed-off-by: Anthony Liguori + +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 index 791f8586e8230ba1b36314ada6e6d1ad807db743..d4e6919e817f423a3426596f7f0ec818ac4beb6d 100644 GIT binary patch delta 954 zcmZo@;Am*z5HdWlUxA&0Vdn&P1_sTapI7ZG*(l`5%y?jO2=gPx!p-I^-x(R3ChN0F zF}7{?Vyj|hY@d9TTS2GSf{&r}E&n#wCJR0W!%K!IJDdghx3M-`@G*2a3-WJcZ2_}{ z__wjPP8Q_RmItZpaF&6qk%g;~1F6{@%_GCe*tfZY_XDfhWD7oq-V!wi{%uUnhZs8; zn-4NJ{+bQ8vD^2=u67GPhUSBuX%kT7dneBmZeg4=Sy{wgbP?EcM*eNAi@_`={%x#F zCfAEd$S$+sV>r&D!otA7@S^hX|Nn-Udbg-CFfcIiZ)-}JyhWsv@!(`V(dmrGCLa^s z!T4Zuy_hPKfYsz>Vrq;pCZ83PXFNUmt=L4yr<3c&pD>1OPLXJ2WX#?COj41ViPvH> zr))Iig2}0}TN!^$mX@2y#A!Ksom>HvwB=?6`9n;ME|VWCYB73m=2OaLVzk&?qoU0y z;b_Un(CvGp!x7|KCrdtt4o8q{ohR>CHDq+1{83ee(Q7iBS{Opt#V|P-1MF z?5m-{s5`k#V>)B|WIj!OMvKXIn(~b8ljAgZNTgXJJo)SS|Ns2k*p9oXuvAUf(~?yH zMZ|7FRtAR7TW|RH3G#0{V0nSR)t{At0Tj$X+a_mgWicL^d`(M{aqr|GS}KeSC(CN< zF)o|zqpicZesZPuC&oRKb98)cntw6zw>)QLU}(K`jDfk=gZ-ETBf~KVCWd1U%nZjI zSQt72SUV!v_*+&pGB9)qHXmYaKEToZi@)wz=kdv}b>tZ(CiCbjG9I3+r@LNW#v0*d z?I-{LzcBms|Np`cb_Ryl1N^OvC;!p)tv`YAR;P;!$BW&M|Nmduz|O#6&050Fz`)-& z`Op9V$6a|sKxVmeurn|)G#`jTOjKX@1>FVG7X2PIAZeZtL$8Tt2t(xv60 zQqRVpvnO-uD<$?I-1lP3Bal-#76|ge-4J;D|NjZi#{?|Dm(T3>eRCY-6o%ujJa4S{ u7>>JgfRZH4xn+<3|9|oE(f|K1ga7^iZ+IYW!pj}M{{P=RSKs+U3nKty|5C;P delta 926 zcmZo@;Am*z5HdWlUxA&0Vdn&P1_sTapI7Y**(l`5%(!532=gPxz|H0?-x(Q`ChN0F zF{W+yVyj|hOrLy|TR|t+f{&r}E&n#wBnv(U!%K!IJDdghx3MN$@G*2a3-WJcO#!on z__wj9P8Q_RmItZpaF&6qk%g;~1F6{@%_GCen76rt_XDe0u>~JPZ;2WM|2C%PLyR4a z%?BA9e^rBR?DjpeE8T*Rq4^+Z+5{B&+{yEVTNrC5D~q^`Hi0c?sWG0Id{#`JarNZ4ViOsUPOcY!!f3KNMWT_B(RcGRNkwL+x8{>M zWuqAzCa217WxO$2T5clKON+_tj=5X z-+YL%`IkWH<=!0)3=9n2t{)6fYS(_~{M`}3(jEGt^T)v-934)qhL;QvwEnM?oG@8L zSCMh?WHa6M@_(!lo-ls$|NjfSPyhcf>|keLXg$E+T0NOX&(~uG!lRuoDjY8kKmPxJ zVFNn@gEeajI|BoM+w4F8{~vedF|p=jIPS{9&cMLXd_*QXEHvX)hY^AT1n1itB#gj)MGdUIr^1%&jy#4?G zgyv%cmfy=~cKg0L&In3T$6a~Ofc)Uf0ZMH!dzU@>|Nn*J