qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] sparc32 irq clearing (guest Solaris performance+NetBSD) fix
@ 2009-11-14  1:03 Artyom Tarasenko
  2009-11-14 15:26 ` [Qemu-devel] " Blue Swirl
  0 siblings, 1 reply; 16+ messages in thread
From: Artyom Tarasenko @ 2009-11-14  1:03 UTC (permalink / raw)
  To: qemu-devel, Blue Swirl

[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]

According to NCR89C105 documentation
http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR89C105.txt

Interrupts are cleared by disabling and then re-enabling them.
This patch implements the specified behaviour. The most visible effects:
- NetBSD 1.3.3 - 1.5.3 boots successfully
- Solaris 2.5.1 - 7 boots ~1500 times faster (~20 seconds instead of ~8 hours)

Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
---
diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index 9680392..779c661 100644
--- a/hw/slavio_intctl.c
+++ b/hw/slavio_intctl.c
@@ -177,19 +177,19 @@ static void slavio_intctlm_mem_writel(void
*opaque, target_phys_addr_t addr,
     saddr = addr >> 2;
     DPRINTF("write system reg 0x" TARGET_FMT_plx " = %x\n", addr, val);
     switch (saddr) {
-    case 2: // clear (enable)
+    case 2: // clear (enable, clear formerly disabled pending)
         // Force clear unused bits
         val &= MASTER_IRQ_MASK;
+        s->intregm_pending &= (s->intregm_disabled & val);
         s->intregm_disabled &= ~val;
         DPRINTF("Enabled master irq mask %x, curmask %x\n", val,
                 s->intregm_disabled);
         slavio_check_interrupts(s, 1);
         break;
-    case 3: // set (disable, clear pending)
+    case 3: // set (disable, do not clear pending)
         // Force clear unused bits
         val &= MASTER_IRQ_MASK;
         s->intregm_disabled |= val;
-        s->intregm_pending &= ~val;
         slavio_check_interrupts(s, 1);
         DPRINTF("Disabled master irq mask %x, curmask %x\n", val,
                 s->intregm_disabled);

[-- Attachment #2: 0001-slavio-clear-pending-on-enable.patch --]
[-- Type: application/octet-stream, Size: 1218 bytes --]

Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
---
diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index 9680392..779c661 100644
--- a/hw/slavio_intctl.c
+++ b/hw/slavio_intctl.c
@@ -177,19 +177,19 @@ static void slavio_intctlm_mem_writel(void *opaque, target_phys_addr_t addr,
     saddr = addr >> 2;
     DPRINTF("write system reg 0x" TARGET_FMT_plx " = %x\n", addr, val);
     switch (saddr) {
-    case 2: // clear (enable)
+    case 2: // clear (enable, clear formerly disabled pending)
         // Force clear unused bits
         val &= MASTER_IRQ_MASK;
+        s->intregm_pending &= (s->intregm_disabled & val);
         s->intregm_disabled &= ~val;
         DPRINTF("Enabled master irq mask %x, curmask %x\n", val,
                 s->intregm_disabled);
         slavio_check_interrupts(s, 1);
         break;
-    case 3: // set (disable, clear pending)
+    case 3: // set (disable, do not clear pending)
         // Force clear unused bits
         val &= MASTER_IRQ_MASK;
         s->intregm_disabled |= val;
-        s->intregm_pending &= ~val;
         slavio_check_interrupts(s, 1);
         DPRINTF("Disabled master irq mask %x, curmask %x\n", val,
                 s->intregm_disabled);

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2010-01-15 22:38 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-14  1:03 [Qemu-devel] [PATCH] sparc32 irq clearing (guest Solaris performance+NetBSD) fix Artyom Tarasenko
2009-11-14 15:26 ` [Qemu-devel] " Blue Swirl
2009-11-14 23:15   ` Artyom Tarasenko
2009-11-15 22:13     ` Blue Swirl
2009-11-16 11:47       ` Artyom Tarasenko
2009-11-16 16:14         ` Blue Swirl
2009-11-16 17:19           ` Artyom Tarasenko
2009-11-16 21:53             ` Blue Swirl
2009-11-16 22:31               ` Jamie Lokier
2009-11-16 22:50               ` Artyom Tarasenko
2009-11-16 22:35             ` Jamie Lokier
2009-11-16 22:44               ` Artyom Tarasenko
2009-11-17 20:45               ` Blue Swirl
2010-01-15 22:37                 ` Artyom Tarasenko
2009-11-16 16:45         ` Artyom Tarasenko
2009-11-16 22:27         ` Jamie Lokier

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).