summary refs log tree commit diff stats
path: root/hw/slavio_intctl.c
diff options
context:
space:
mode:
authorArtyom Tarasenko <atar4qemu@googlemail.com>2010-01-16 09:06:32 +0000
committerBlue Swirl <blauwirbel@gmail.com>2010-01-16 09:06:32 +0000
commit10760f0fa7c089e45d629d9ad2803c91f2bcb90f (patch)
treedc7925f3633b86d5847286ff002bbcf4458c6757 /hw/slavio_intctl.c
parent694b9309462f07307d16f492961f01271f10c245 (diff)
downloadfocaccia-qemu-10760f0fa7c089e45d629d9ad2803c91f2bcb90f.tar.gz
focaccia-qemu-10760f0fa7c089e45d629d9ad2803c91f2bcb90f.zip
sparc32 do not clear interrupts when masking
Don't clear interrupts on disabling, because
* Sun4M_SystemArchitecture_edited2.pdf doesn't describe
  that masking or un-masking IRQ shall clear pending ones.

* Field tests also show that SPARCstation-20 doesn't
  clear them.

* The patch makes Solaris 2.5.1/2.6 boot ~1500 times
  faster (~20 seconds instead of ~8 hours)

Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/slavio_intctl.c')
-rw-r--r--hw/slavio_intctl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index 9aff892f25..b76d3acadd 100644
--- a/hw/slavio_intctl.c
+++ b/hw/slavio_intctl.c
@@ -185,11 +185,10 @@ static void slavio_intctlm_mem_writel(void *opaque, target_phys_addr_t addr,
                 s->intregm_disabled);
         slavio_check_interrupts(s, 1);
         break;
-    case 3: // set (disable, clear pending)
+    case 3: // set (disable; doesn't affect 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);