From: Anthony Liguori <anthony@codemonkey.ws>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [7172] Fix non-ACPI Timer Interrupt Routing (Beth Kon)
Date: Fri, 17 Apr 2009 21:09:14 +0000 [thread overview]
Message-ID: <E1LuvJC-0000kl-GI@cvs.savannah.gnu.org> (raw)
Revision: 7172
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7172
Author: aliguori
Date: 2009-04-17 21:09:14 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
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>
Modified Paths:
--------------
branches/stable_0_10/pc-bios/bios-pq/series
Added Paths:
-----------
branches/stable_0_10/pc-bios/bios-pq/0013_fix-non-acpi-timer-interrupt-routing.patch
Added: branches/stable_0_10/pc-bios/bios-pq/0013_fix-non-acpi-timer-interrupt-routing.patch
===================================================================
--- branches/stable_0_10/pc-bios/bios-pq/0013_fix-non-acpi-timer-interrupt-routing.patch (rev 0)
+++ branches/stable_0_10/pc-bios/bios-pq/0013_fix-non-acpi-timer-interrupt-routing.patch 2009-04-17 21:09:14 UTC (rev 7172)
@@ -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;
Modified: branches/stable_0_10/pc-bios/bios-pq/series
===================================================================
--- branches/stable_0_10/pc-bios/bios-pq/series 2009-04-17 21:05:45 UTC (rev 7171)
+++ branches/stable_0_10/pc-bios/bios-pq/series 2009-04-17 21:09:14 UTC (rev 7172)
@@ -9,3 +9,4 @@
0009_qemu-bios-pci-hotplug-support.patch
0010_bios-mark-the-acpi-sci-interrupt-as-connected-to-irq-9.patch
0011_read-additional-acpi-tables-from-a-vm.patch
+0013_fix-non-acpi-timer-interrupt-routing.patch
reply other threads:[~2009-04-17 21:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1LuvJC-0000kl-GI@cvs.savannah.gnu.org \
--to=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).