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
---
 ...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 00000000000..c9d74e838d0
--- /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 0cd0a18aa87..6011467e6cc 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
zc-mD{OH30{6n%I4p=j+;1guJF!O}nr#cq)L3kXC-8a1#mA^s9&;V01qKNus0X>kbF
zl-z|es6jC-G|`wrf}l`PTa7U>ER0bX#%~)j@v{&bb-dH4;Nsn!bLYH!&wKZc&!_YG
zbm{K!s5OPLTOkUC)8DR)G~GzAP(c{$Rj=Wov`qaSpbbm3i=bVq(H_&lNxVPTS`;iZ
zutT5t0ZkhL_k{bQSeZslASPBC3Hg&KolpRcdZ(o=$+Q1y%>OhwibiVCX9Jv;j?Vk6
zDMiW$o9v7q;Dm7yK^TM9M0c`dr}x3oNkYO{YGdfX??JpU-w)?-NyggDOUc4Og?p2T
zBXk*CGEC+^;!(9t%@~U{|CD9-M6lmZgnG5@!2XP87(-X)8Hivca}Zu(OIALYwjBGi
z>=47pSr&MNpR&5(9kwiZ3-!`2Q!BuJ>HWf76*sR8Q_T&~gS*W)VG0-LbaAO3yq0r-
zTkMgnmT?ZM@J+4*Hb{oN{T!4@$8An9Rd@`n)B8-UP~5H|B33AFD{(a64b}K1KLct|
zYd=BT0`|+wEF1-S6ukunP>hEQ&d@*%g(Xmis|ziJw-pYW8a*?IOni`Ken1<ovZ;@u
z%VD-EgBUhy80&aG$&b*e!k#C5U?U}zYn*P!y^cL_51%@6;SNqYY;Y0HP8alHt+NQO
zW3%%s+{S%HwJU`L$NN73V}XeXQw7(hM9P6h$~jspT52Y4(uiBMy#Fd`L?cZ~2<wCd
ze<IQm#g9c6FrmIU7w)2~__`%~#f)X=TUm~kewF2mB0b7Lm=E;gk794jgPCJ>RM~W~
z;Ws4lkz|FYi6Y;QKV&&tt*=*VRqH6lgnQWy+qQ3whe#SJPvM3@NrrWC>n~aUGx;GE
zg*dMy1{6*$mKqH#rhiE{m)g0iR{1@q^bC7kbqkcI$&btz?gBreygSeMq4llP-8iQt
zZ|A95*WUkHv7+mtLVrDMej&>tA(H0#e&lSYcQOjeX4U%1<w?8hS#}T8?${R!@j9~Q
S4mXD4g9%xd&X-g^@xyOp|5C;P

delta 926
zc-mD`Ye-XZ6u)O~HcNMX%(cq7M{~GMXQL>m5t-VH_8~Bc>_KJ=N+U=sTjkbua%D)9
z^TDDBC6Op7;+9x}ZI+LqAPXYuTS`qxSoJ}j*6rLuX<vT#ch3Et*Z&-!PwDe1Go9gQ
zh9wO1I7DEb{ds4g>Op2%5_Dlz(r4H$Y>-a_)L>EaO7I9flg}&Q7!EBn6x0{1n8qo#
zPf<g}`PTW8FHa}y2w8l22C>=%%OrLbGg9sPnuMM6Pow*%$(1xhb!ra4N#R^tOtJnn
z`P&;T4BIE;27w1I0{*x+Q8DNqeR7N#7fJDi{`+5#H?vyc0<KnX%f6gQ43wBlFd4BH
zY*uS^tz?hL&2oleqD{X<(fPLhp@j^pb$K&BR5w94I<h;V7l*U^A&kwMJXy?zy&4OQ
z;%ki_?&6fD1BS49`2?&JYPEg<xA0|!F-bPH0aJ9<;KQT3NALkx<#xy>i}7CWDcM}H
zV9*cBz>MQY8`uSvsa^(J;ey!?TBA$F1l=F_GO1e=8GM=4?P`3M=Y%}`o~H&ICR;91
zSisUF?ZTFCB6R2HLmHmR@1%vOtVN*3O;$begVuiSR@cIi@voxD_9c&0nC1J>Vbd9;
zMLf+=FihLWZ|nfAD(rg02K3~Ro^jTLCv3-|2jAO_(2g@UGx$+wcR(xdvKPP=Y_k7=
z8(3Gct7^DnOqoQG!VoN#V3`D|3|}>t#_u0f(U+zDaPjoUckTT?>LyqjbH21+jJ3`2
zd*#7Bv9_7WjFR7?paTjA#7iqes4g_ZEnHuCUq4^6FvQvkQH*Z-A&T8RooOJ<2D~VD
zxVPV47__aztc*S%Cy9?FrHTeZw)OhFD2`O7t}7*7rIK6>_adkI;GqMPS4m2tYcf<!
zbR$L_HOr-|V+XRh=fDm~C*>M!+~J?~Vo8zdaNVL8o%k%}RCZD1-(>zzq8Q?a(_PbN
zuLa%TMnJkKs{5)WQCGgGZZAbgjZ}Qn`<u=$><LXq<D%Hv@ffm%aM9*B7%DZiz#qz$
BOyK|k

-- 
2.39.5