From c6d25871212c05af647eccaad6efc07a6f7a4acb Mon Sep 17 00:00:00 2001
From: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
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 <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
---
 ...0013_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 <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
index 791f8586e8230ba1b36314ada6e6d1ad807db743..d4e6919e817f423a3426596f7f0ec818ac4beb6d 100644
GIT binary patch
delta 954
zcmY*XT}YE*6n@XQA7`z7&eT>pH*F5xbhaCF{h>|i&ry*Vf%FIEML$rWl@U4pHv7aD
zlXD?qg=KhAP{e0qS~{(^B7*QDqPmEFH&W>5A|2J&`6QDr-otaw`@H9U-uF3vzs~R1
zrMn{|))dC>geeqGf4??de=EI01re-Ky@jLF3iS_w7A(;&fmUgg_M`^R;KTXWqEMNE
zHB9pTnic}?ara}<n?{*HndmhV3e2E%LP0d@ofd^Bdb9s=%>Ot!3P-BdX9Jv*PAvGM
zDMjLj>g|m0=Y%m3K^TSRWET}1Cfj|F2G0-@MpNs;|LuqH(!u~-z-1ZhGq22C2GqD`
z262S0VpE36+)H^(ZBsMG;*Gy#**zZWvr|HMwd}#Zj7AtmS7s+fF`795Z?GvVpG#Yb
zy;*jM<I^k)Ji*DV4)}mgi{3+xw9nKGa9H}dI9J6jD8p29Ep+34^KF>Ir8ym3st0f6
z9O0IFB&%hNgGzjt>wwLYA@48;Wzs2|6HFBz18eua5Gxe5>nIT`6t!L)$#+8)e$CH-
zO{le>rei_-RmBTOK^{e4K>-xwv4T!A#86lQWw^G`LU>o<fT@n!%sw*tNtXG3ZLHF!
zK8Y@e*{T>ZWYjR$_Hu$BCaWTzXMAuA6_jtDZpDL+1MmQ!J96P3PC0CF8O=@?^kTKM
z2ySAd^Bdg7Lq*lAg(SxZJ^^FF@hDS;Hl#$$fkn$XS}Iy<CT`V;JG6Y@I&nlJIVnVR
zLXtlnZHwXOA`6&MUz`i~(N%oYlD%q9vh%$x$4kG-@@0{RG8o~5J@~WO*Ys%aS#6az
zU3};rQT#+%rKzXLx8hG(j#cSvlwMUjDly?fcI~d+I}>4|M$1#UL6X8qM#B1Amj60G
zsG?eeR|@@vl%HE}G_bh-HT_&_`<iNMbZ1J>u-mnLkusY6@Iv7}@WaYndd3<yHcxlq
zypp`VXXo_A``#*2blucwR>QVevK$toX`Ua)&$s&~Vu}>fsh?OmBUc&8S?V!59sf!p
Wv7KbOBX!}#KvI^aizVJ?0r&%B|5C;P

delta 926
zcmY*XYe-XZ6u)O~HgoR!m^#b3P3O?fW+O?bA(`3>_aQKd>_O%ON+U=svvhM#t_*2%
zK3EiC6cPnRToWzOsrd*B)F7n3sni68WgqfYw{r!RzWna*oclZH{LjPTkUJdmNULu^
zw}WB&yacH$zn=FOzmCicf=(<Bnt>C1rt~*JDW(VSf(rh4@GTis;z+12tvXA|)Go3;
zvQi?}DeDI=Kb)+KWO4Zs#L6~UB(ZXgP?)u%j?0hV(rC6c38IECQN#mW;ctcoWc#m?
zwynm<usssj5OClc1m|i!Icpa^_VKrs#9V_R72f~;SL36oX1I+>sw2@&8^wSUyEd4F
zSTi=N)S4Eu$D{@+!!Z83KZ0PLYU?(VLA9C=Vz;Ue9-}3?1G;cDx)*%d7?Ugs*sv?c
z2;=xEMhh=+F{T|xurYQHGWasJ6Tr@YkJAT97BewKQvwbw*Svvg+?~)ana{$P30Ea+
zS-eg=Bmo1?>P=wgm5J37Q1iD9W>D*GO2%WK=JLeXCX&JBiLXt<fn+Nr<IiLjm@wGb
zKw)m<Q*jrjlte;%N(zMG^^^`;h%z-D)R>#9C4MfoSACe$Y&N<2LlD@W;IRUO^fX#b
z8lAX^cM&p%Y5lsu_S33-wh7j)C5JfXl?uFUx&%-0i%Ab{xNI_j6E$WFv|y1r4enx{
zc?lk3Ra#N;Xu+gBh#-U^*eOD&2nvQPo($v8Oe*Qi(*9hl;kBRJdL1-mPhr6N!F(ss
zy2hQ7dQJvfmj{>S+#wkqkk2hN#CcJ*M-NYM|DIRc_3Z5?_RR@`KX*wG9&>c2ZXfHe
zN2$er^x1Z!tpx_Te|VN84wB@^Y6#hu2kU|`R;b9xp<IP>axt#=@g?WZpPj!)Qkv1;
z2qoh`fP<FOSn=xE{wUWlu>Io6*@kM5Ialg2J3aA2)pjBO+>Dr0-bs<0$(-K=!Rs0g
zxBb3x-(z1G11dxX6(7YO3gzOpZA!Z++OMbL^Ywq}{CpMOdH<>)bhP(D6z@wvIDy_A
HT{HXx%9Tvv

-- 
2.11.0