hw/intc/exynos4210_gic: Constify array of combiner interrupts

[qemu.git] / hw / intc / ioapic.c

diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index 31791b0986030fa1de0d09edc5f6d9d898c7b926..37c4386ae3a446fb08758211af9f6660b846e536 100644 (file)
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -30,9 +30,10 @@
 #include "hw/i386/ioapic_internal.h"
 #include "include/hw/pci/msi.h"
 #include "sysemu/kvm.h"
 #include "hw/i386/ioapic_internal.h"
 #include "include/hw/pci/msi.h"
 #include "sysemu/kvm.h"

-#include "target-i386/cpu.h"
+#include "target/i386/cpu.h"

 #include "hw/i386/apic-msidef.h"
 #include "hw/i386/x86-iommu.h"
 #include "hw/i386/apic-msidef.h"
 #include "hw/i386/x86-iommu.h"

+#include "trace.h"

 
 //#define DEBUG_IOAPIC
 
 
 //#define DEBUG_IOAPIC
 


@@ -115,6 +116,7 @@ static void ioapic_service(IOAPICCommonState *s)
                     s->irr &= ~mask;
                 } else {
                     coalesce = s->ioredtbl[i] & IOAPIC_LVT_REMOTE_IRR;
                     s->irr &= ~mask;
                 } else {
                     coalesce = s->ioredtbl[i] & IOAPIC_LVT_REMOTE_IRR;

+                    trace_ioapic_set_remote_irr(i);

                     s->ioredtbl[i] |= IOAPIC_LVT_REMOTE_IRR;
                 }
 
                     s->ioredtbl[i] |= IOAPIC_LVT_REMOTE_IRR;
                 }
 


@@ -220,6 +222,8 @@ void ioapic_eoi_broadcast(int vector)
     uint64_t entry;
     int i, n;
 
     uint64_t entry;
     int i, n;
 

+    trace_ioapic_eoi_broadcast(vector);
+

     for (i = 0; i < MAX_IOAPICS; i++) {
         s = ioapics[i];
         if (!s) {
     for (i = 0; i < MAX_IOAPICS; i++) {
         s = ioapics[i];
         if (!s) {


@@ -229,6 +233,7 @@ void ioapic_eoi_broadcast(int vector)
             entry = s->ioredtbl[n];
             if ((entry & IOAPIC_LVT_REMOTE_IRR)
                 && (entry & IOAPIC_VECTOR_MASK) == vector) {
             entry = s->ioredtbl[n];
             if ((entry & IOAPIC_LVT_REMOTE_IRR)
                 && (entry & IOAPIC_VECTOR_MASK) == vector) {

+                trace_ioapic_clear_remote_irr(n, vector);

                 s->ioredtbl[n] = entry & ~IOAPIC_LVT_REMOTE_IRR;
                 if (!(entry & IOAPIC_LVT_MASKED) && (s->irr & (1 << n))) {
                     ioapic_service(s);
                 s->ioredtbl[n] = entry & ~IOAPIC_LVT_REMOTE_IRR;
                 if (!(entry & IOAPIC_LVT_MASKED) && (s->irr & (1 << n))) {
                     ioapic_service(s);


@@ -256,7 +261,9 @@ ioapic_mem_read(void *opaque, hwaddr addr, unsigned int size)
     int index;
     uint32_t val = 0;
 
     int index;
     uint32_t val = 0;
 

-    switch (addr & 0xff) {
+    addr &= 0xff;
+
+    switch (addr) {

     case IOAPIC_IOREGSEL:
         val = s->ioregsel;
         break;
     case IOAPIC_IOREGSEL:
         val = s->ioregsel;
         break;


@@ -286,6 +293,9 @@ ioapic_mem_read(void *opaque, hwaddr addr, unsigned int size)
         DPRINTF("read: %08x = %08x\n", s->ioregsel, val);
         break;
     }
         DPRINTF("read: %08x = %08x\n", s->ioregsel, val);
         break;
     }

+
+    trace_ioapic_mem_read(addr, size, val);
+

     return val;
 }
 
     return val;
 }
 


@@ -324,7 +334,10 @@ ioapic_mem_write(void *opaque, hwaddr addr, uint64_t val,
     IOAPICCommonState *s = opaque;
     int index;
 
     IOAPICCommonState *s = opaque;
     int index;
 

-    switch (addr & 0xff) {
+    addr &= 0xff;
+    trace_ioapic_mem_write(addr, size, val);
+
+    switch (addr) {

     case IOAPIC_IOREGSEL:
         s->ioregsel = val;
         break;
     case IOAPIC_IOREGSEL:
         s->ioregsel = val;
         break;


@@ -395,13 +408,15 @@ static void ioapic_machine_done_notify(Notifier *notifier, void *data)
 #endif
 }
 
 #endif
 }
 

+#define IOAPIC_VER_DEF 0x20
+

 static void ioapic_realize(DeviceState *dev, Error **errp)
 {
     IOAPICCommonState *s = IOAPIC_COMMON(dev);
 
     if (s->version != 0x11 && s->version != 0x20) {
         error_report("IOAPIC only supports version 0x11 or 0x20 "
 static void ioapic_realize(DeviceState *dev, Error **errp)
 {
     IOAPICCommonState *s = IOAPIC_COMMON(dev);
 
     if (s->version != 0x11 && s->version != 0x20) {
         error_report("IOAPIC only supports version 0x11 or 0x20 "

-                     "(default: 0x11).");
+                     "(default: 0x%x).", IOAPIC_VER_DEF);

         exit(1);
     }
 
         exit(1);
     }
 


@@ -416,7 +431,7 @@ static void ioapic_realize(DeviceState *dev, Error **errp)
 }
 
 static Property ioapic_properties[] = {
 }
 
 static Property ioapic_properties[] = {

-    DEFINE_PROP_UINT8("version", IOAPICCommonState, version, 0x11),
+    DEFINE_PROP_UINT8("version", IOAPICCommonState, version, IOAPIC_VER_DEF),

     DEFINE_PROP_END_OF_LIST(),
 };
 
     DEFINE_PROP_END_OF_LIST(),
 };
 


@@ -426,6 +441,11 @@ static void ioapic_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
 
     k->realize = ioapic_realize;
     DeviceClass *dc = DEVICE_CLASS(klass);
 
     k->realize = ioapic_realize;

+    /*
+     * If APIC is in kernel, we need to update the kernel cache after
+     * migration, otherwise first 24 gsi routes will be invalid.
+     */
+    k->post_load = ioapic_update_kvm_routes;

     dc->reset = ioapic_reset_common;
     dc->props = ioapic_properties;
 }
     dc->reset = ioapic_reset_common;
     dc->props = ioapic_properties;
 }