PPC: Fix dma interrupt

[qemu.git] / hw / apb_pci.c

diff --git a/hw/apb_pci.c b/hw/apb_pci.c
index 1a45420c5679986c7cb0307c58e30b85b80946c2..7eb0c2bbcb7e68bf8845efa7e28f8a41e52b43c8 100644 (file)
--- a/hw/apb_pci.c
+++ b/hw/apb_pci.c
@@ -27,13 +27,13 @@
    the secondary PCI bridge.  */
 
 #include "sysbus.h"
    the secondary PCI bridge.  */
 
 #include "sysbus.h"

-#include "pci.h"
-#include "pci_host.h"
-#include "pci_bridge.h"
-#include "pci_internals.h"
+#include "pci/pci.h"
+#include "pci/pci_host.h"
+#include "pci/pci_bridge.h"
+#include "pci/pci_bus.h"

 #include "apb_pci.h"
 #include "apb_pci.h"

-#include "sysemu.h"
-#include "exec-memory.h"
+#include "sysemu/sysemu.h"
+#include "exec/address-spaces.h"

 
 /* debug APB */
 //#define DEBUG_APB
 
 /* debug APB */
 //#define DEBUG_APB


@@ -66,6 +66,8 @@ do { printf("APB: " fmt , ## __VA_ARGS__); } while (0)
 #define RESET_WCMASK 0x98000000
 #define RESET_WMASK  0x60000000
 
 #define RESET_WCMASK 0x98000000
 #define RESET_WMASK  0x60000000
 

+#define MAX_IVEC 0x30
+

 typedef struct APBState {
     SysBusDevice busdev;
     PCIBus      *bus;
 typedef struct APBState {
     SysBusDevice busdev;
     PCIBus      *bus;


@@ -77,17 +79,20 @@ typedef struct APBState {
     uint32_t pci_control[16];
     uint32_t pci_irq_map[8];
     uint32_t obio_irq_map[32];
     uint32_t pci_control[16];
     uint32_t pci_irq_map[8];
     uint32_t obio_irq_map[32];

-    qemu_irq pci_irqs[32];
+    qemu_irq *pbm_irqs;
+    qemu_irq *ivec_irqs;

     uint32_t reset_control;
     unsigned int nr_resets;
 } APBState;
 
     uint32_t reset_control;
     unsigned int nr_resets;
 } APBState;
 

-static void apb_config_writel (void *opaque, target_phys_addr_t addr,
+static void pci_apb_set_irq(void *opaque, int irq_num, int level);
+
+static void apb_config_writel (void *opaque, hwaddr addr,

                                uint64_t val, unsigned size)
 {
     APBState *s = opaque;
 
                                uint64_t val, unsigned size)
 {
     APBState *s = opaque;
 

-    APB_DPRINTF("%s: addr " TARGET_FMT_lx " val %x\n", __func__, addr, val);
+    APB_DPRINTF("%s: addr " TARGET_FMT_lx " val %" PRIx64 "\n", __func__, addr, val);

 
     switch (addr & 0xffff) {
     case 0x30 ... 0x4f: /* DMA error registers */
 
     switch (addr & 0xffff) {
     case 0x30 ... 0x4f: /* DMA error registers */


@@ -104,6 +109,22 @@ static void apb_config_writel (void *opaque, target_phys_addr_t addr,
             s->pci_irq_map[(addr & 0x3f) >> 3] |= val & ~PBM_PCI_IMR_MASK;
         }
         break;
             s->pci_irq_map[(addr & 0x3f) >> 3] |= val & ~PBM_PCI_IMR_MASK;
         }
         break;

+    case 0x1000 ... 0x1080: /* OBIO interrupt control */
+        if (addr & 4) {
+            s->obio_irq_map[(addr & 0xff) >> 3] &= PBM_PCI_IMR_MASK;
+            s->obio_irq_map[(addr & 0xff) >> 3] |= val & ~PBM_PCI_IMR_MASK;
+        }
+        break;
+    case 0x1400 ... 0x143f: /* PCI interrupt clear */
+        if (addr & 4) {
+            pci_apb_set_irq(s, (addr & 0x3f) >> 3, 0);
+        }
+        break;
+    case 0x1800 ... 0x1860: /* OBIO interrupt clear */
+        if (addr & 4) {
+            pci_apb_set_irq(s, 0x20 | ((addr & 0xff) >> 3), 0);
+        }
+        break;

     case 0x2000 ... 0x202f: /* PCI control */
         s->pci_control[(addr & 0x3f) >> 2] = val;
         break;
     case 0x2000 ... 0x202f: /* PCI control */
         s->pci_control[(addr & 0x3f) >> 2] = val;
         break;


@@ -131,7 +152,7 @@ static void apb_config_writel (void *opaque, target_phys_addr_t addr,
 }
 
 static uint64_t apb_config_readl (void *opaque,
 }
 
 static uint64_t apb_config_readl (void *opaque,

-                                  target_phys_addr_t addr, unsigned size)
+                                  hwaddr addr, unsigned size)

 {
     APBState *s = opaque;
     uint32_t val;
 {
     APBState *s = opaque;
     uint32_t val;


@@ -154,6 +175,13 @@ static uint64_t apb_config_readl (void *opaque,
             val = 0;
         }
         break;
             val = 0;
         }
         break;

+    case 0x1000 ... 0x1080: /* OBIO interrupt control */
+        if (addr & 4) {
+            val = s->obio_irq_map[(addr & 0xff) >> 3];
+        } else {
+            val = 0;
+        }
+        break;

     case 0x2000 ... 0x202f: /* PCI control */
         val = s->pci_control[(addr & 0x3f) >> 2];
         break;
     case 0x2000 ... 0x202f: /* PCI control */
         val = s->pci_control[(addr & 0x3f) >> 2];
         break;


@@ -184,17 +212,17 @@ static const MemoryRegionOps apb_config_ops = {
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 

-static void apb_pci_config_write(void *opaque, target_phys_addr_t addr,
+static void apb_pci_config_write(void *opaque, hwaddr addr,

                                  uint64_t val, unsigned size)
 {
     APBState *s = opaque;
 
     val = qemu_bswap_len(val, size);
                                  uint64_t val, unsigned size)
 {
     APBState *s = opaque;
 
     val = qemu_bswap_len(val, size);

-    APB_DPRINTF("%s: addr " TARGET_FMT_lx " val %x\n", __func__, addr, val);
+    APB_DPRINTF("%s: addr " TARGET_FMT_lx " val %" PRIx64 "\n", __func__, addr, val);

     pci_data_write(s->bus, addr, val, size);
 }
 
     pci_data_write(s->bus, addr, val, size);
 }
 

-static uint64_t apb_pci_config_read(void *opaque, target_phys_addr_t addr,
+static uint64_t apb_pci_config_read(void *opaque, hwaddr addr,

                                     unsigned size)
 {
     uint32_t ret;
                                     unsigned size)
 {
     uint32_t ret;


@@ -206,25 +234,25 @@ static uint64_t apb_pci_config_read(void *opaque, target_phys_addr_t addr,
     return ret;
 }
 
     return ret;
 }
 

-static void pci_apb_iowriteb (void *opaque, target_phys_addr_t addr,
+static void pci_apb_iowriteb (void *opaque, hwaddr addr,

                                   uint32_t val)
 {
     cpu_outb(addr & IOPORTS_MASK, val);
 }
 
                                   uint32_t val)
 {
     cpu_outb(addr & IOPORTS_MASK, val);
 }
 

-static void pci_apb_iowritew (void *opaque, target_phys_addr_t addr,
+static void pci_apb_iowritew (void *opaque, hwaddr addr,

                                   uint32_t val)
 {
     cpu_outw(addr & IOPORTS_MASK, bswap16(val));
 }
 
                                   uint32_t val)
 {
     cpu_outw(addr & IOPORTS_MASK, bswap16(val));
 }
 

-static void pci_apb_iowritel (void *opaque, target_phys_addr_t addr,
+static void pci_apb_iowritel (void *opaque, hwaddr addr,

                                 uint32_t val)
 {
     cpu_outl(addr & IOPORTS_MASK, bswap32(val));
 }
 
                                 uint32_t val)
 {
     cpu_outl(addr & IOPORTS_MASK, bswap32(val));
 }
 

-static uint32_t pci_apb_ioreadb (void *opaque, target_phys_addr_t addr)
+static uint32_t pci_apb_ioreadb (void *opaque, hwaddr addr)

 {
     uint32_t val;
 
 {
     uint32_t val;
 


@@ -232,7 +260,7 @@ static uint32_t pci_apb_ioreadb (void *opaque, target_phys_addr_t addr)
     return val;
 }
 
     return val;
 }
 

-static uint32_t pci_apb_ioreadw (void *opaque, target_phys_addr_t addr)
+static uint32_t pci_apb_ioreadw (void *opaque, hwaddr addr)

 {
     uint32_t val;
 
 {
     uint32_t val;
 


@@ -240,7 +268,7 @@ static uint32_t pci_apb_ioreadw (void *opaque, target_phys_addr_t addr)
     return val;
 }
 
     return val;
 }
 

-static uint32_t pci_apb_ioreadl (void *opaque, target_phys_addr_t addr)
+static uint32_t pci_apb_ioreadl (void *opaque, hwaddr addr)

 {
     uint32_t val;
 
 {
     uint32_t val;
 


@@ -280,10 +308,19 @@ static void pci_apb_set_irq(void *opaque, int irq_num, int level)
     if (irq_num < 32) {
         if (s->pci_irq_map[irq_num >> 2] & PBM_PCI_IMR_ENABLED) {
             APB_DPRINTF("%s: set irq %d level %d\n", __func__, irq_num, level);
     if (irq_num < 32) {
         if (s->pci_irq_map[irq_num >> 2] & PBM_PCI_IMR_ENABLED) {
             APB_DPRINTF("%s: set irq %d level %d\n", __func__, irq_num, level);

-            qemu_set_irq(s->pci_irqs[irq_num], level);
+            qemu_set_irq(s->ivec_irqs[irq_num], level);
+        } else {
+            APB_DPRINTF("%s: not enabled: lower irq %d\n", __func__, irq_num);
+            qemu_irq_lower(s->ivec_irqs[irq_num]);
+        }
+    } else {
+        /* OBIO IRQ map onto the next 16 INO.  */
+        if (s->obio_irq_map[irq_num - 32] & PBM_PCI_IMR_ENABLED) {
+            APB_DPRINTF("%s: set irq %d level %d\n", __func__, irq_num, level);
+            qemu_set_irq(s->ivec_irqs[irq_num], level);

         } else {
             APB_DPRINTF("%s: not enabled: lower irq %d\n", __func__, irq_num);
         } else {
             APB_DPRINTF("%s: not enabled: lower irq %d\n", __func__, irq_num);

-            qemu_irq_lower(s->pci_irqs[irq_num]);
+            qemu_irq_lower(s->ivec_irqs[irq_num]);

         }
     }
 }
         }
     }
 }


@@ -314,21 +351,21 @@ static int apb_pci_bridge_initfn(PCIDevice *dev)
     return 0;
 }
 
     return 0;
 }
 

-PCIBus *pci_apb_init(target_phys_addr_t special_base,
-                     target_phys_addr_t mem_base,
-                     qemu_irq *pic, PCIBus **bus2, PCIBus **bus3)
+PCIBus *pci_apb_init(hwaddr special_base,
+                     hwaddr mem_base,
+                     qemu_irq *ivec_irqs, PCIBus **bus2, PCIBus **bus3,
+                     qemu_irq **pbm_irqs)

 {
     DeviceState *dev;
     SysBusDevice *s;
     APBState *d;
 {
     DeviceState *dev;
     SysBusDevice *s;
     APBState *d;

-    unsigned int i;

     PCIDevice *pci_dev;
     PCIBridge *br;
 
     /* Ultrasparc PBM main bus */
     dev = qdev_create(NULL, "pbm");
     qdev_init_nofail(dev);
     PCIDevice *pci_dev;
     PCIBridge *br;
 
     /* Ultrasparc PBM main bus */
     dev = qdev_create(NULL, "pbm");
     qdev_init_nofail(dev);

-    s = sysbus_from_qdev(dev);
+    s = SYS_BUS_DEVICE(dev);

     /* apb_config */
     sysbus_mmio_map(s, 0, special_base);
     /* PCI configuration space */
     /* apb_config */
     sysbus_mmio_map(s, 0, special_base);
     /* PCI configuration space */


@@ -346,9 +383,8 @@ PCIBus *pci_apb_init(target_phys_addr_t special_base,
                               get_system_io(),
                               0, 32);
 
                               get_system_io(),
                               0, 32);
 

-    for (i = 0; i < 32; i++) {
-        sysbus_connect_irq(s, i, pic[i]);
-    }
+    *pbm_irqs = d->pbm_irqs;
+    d->ivec_irqs = ivec_irqs;

 
     pci_create_simple(d->bus, 0, "pbm-pci");
 
 
     pci_create_simple(d->bus, 0, "pbm-pci");
 


@@ -380,6 +416,9 @@ static void pci_pbm_reset(DeviceState *d)
     for (i = 0; i < 8; i++) {
         s->pci_irq_map[i] &= PBM_PCI_IMR_MASK;
     }
     for (i = 0; i < 8; i++) {
         s->pci_irq_map[i] &= PBM_PCI_IMR_MASK;
     }

+    for (i = 0; i < 32; i++) {
+        s->obio_irq_map[i] &= PBM_PCI_IMR_MASK;
+    }

 
     if (s->nr_resets++ == 0) {
         /* Power on reset */
 
     if (s->nr_resets++ == 0) {
         /* Power on reset */


@@ -403,8 +442,9 @@ static int pci_pbm_init_device(SysBusDevice *dev)
         s->pci_irq_map[i] = (0x1f << 6) | (i << 2);
     }
     for (i = 0; i < 32; i++) {
         s->pci_irq_map[i] = (0x1f << 6) | (i << 2);
     }
     for (i = 0; i < 32; i++) {

-        sysbus_init_irq(dev, &s->pci_irqs[i]);
+        s->obio_irq_map[i] = ((0x1f << 6) | 0x20) + i;

     }
     }

+    s->pbm_irqs = qemu_allocate_irqs(pci_apb_set_irq, s, MAX_IVEC);

 
     /* apb_config */
     memory_region_init_io(&s->apb_config, &apb_config_ops, s, "apb-config",
 
     /* apb_config */
     memory_region_init_io(&s->apb_config, &apb_config_ops, s, "apb-config",


@@ -444,31 +484,34 @@ static void pbm_pci_host_class_init(ObjectClass *klass, void *data)
     k->vendor_id = PCI_VENDOR_ID_SUN;
     k->device_id = PCI_DEVICE_ID_SUN_SABRE;
     k->class_id = PCI_CLASS_BRIDGE_HOST;
     k->vendor_id = PCI_VENDOR_ID_SUN;
     k->device_id = PCI_DEVICE_ID_SUN_SABRE;
     k->class_id = PCI_CLASS_BRIDGE_HOST;

-    k->is_bridge = 1;

 }
 
 }
 

-static DeviceInfo pbm_pci_host_info = {
-    .name = "pbm-pci",
-    .size = sizeof(PCIDevice),
-    .class_init = pbm_pci_host_class_init,
+static const TypeInfo pbm_pci_host_info = {
+    .name          = "pbm-pci",
+    .parent        = TYPE_PCI_DEVICE,
+    .instance_size = sizeof(PCIDevice),
+    .class_init    = pbm_pci_host_class_init,

 };
 
 static void pbm_host_class_init(ObjectClass *klass, void *data)
 {
 };
 
 static void pbm_host_class_init(ObjectClass *klass, void *data)
 {

+    DeviceClass *dc = DEVICE_CLASS(klass);

     SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 
     k->init = pci_pbm_init_device;
     SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 
     k->init = pci_pbm_init_device;

+    dc->reset = pci_pbm_reset;

 }
 
 }
 

-static DeviceInfo pbm_host_info = {
-    .name = "pbm",
-    .size = sizeof(APBState),
-    .reset = pci_pbm_reset,
-    .class_init = pbm_host_class_init,
+static const TypeInfo pbm_host_info = {
+    .name          = "pbm",
+    .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(APBState),
+    .class_init    = pbm_host_class_init,

 };
 
 static void pbm_pci_bridge_class_init(ObjectClass *klass, void *data)
 {
 };
 
 static void pbm_pci_bridge_class_init(ObjectClass *klass, void *data)
 {

+    DeviceClass *dc = DEVICE_CLASS(klass);

     PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
 
     k->init = apb_pci_bridge_initfn;
     PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
 
     k->init = apb_pci_bridge_initfn;


@@ -478,21 +521,22 @@ static void pbm_pci_bridge_class_init(ObjectClass *klass, void *data)
     k->revision = 0x11;
     k->config_write = pci_bridge_write_config;
     k->is_bridge = 1;
     k->revision = 0x11;
     k->config_write = pci_bridge_write_config;
     k->is_bridge = 1;

+    dc->reset = pci_bridge_reset;
+    dc->vmsd = &vmstate_pci_device;

 }
 
 }
 

-static DeviceInfo pbm_pci_bridge_info = {
-    .name = "pbm-bridge",
-    .size = sizeof(PCIBridge),
-    .vmsd = &vmstate_pci_device,
-    .reset = pci_bridge_reset,
-    .class_init = pbm_pci_bridge_class_init,
+static const TypeInfo pbm_pci_bridge_info = {
+    .name          = "pbm-bridge",
+    .parent        = TYPE_PCI_DEVICE,
+    .instance_size = sizeof(PCIBridge),
+    .class_init    = pbm_pci_bridge_class_init,

 };
 
 };
 

-static void pbm_register_devices(void)
+static void pbm_register_types(void)

 {
 {

-    sysbus_register_withprop(&pbm_host_info);
-    pci_qdev_register(&pbm_pci_host_info);
-    pci_qdev_register(&pbm_pci_bridge_info);
+    type_register_static(&pbm_host_info);
+    type_register_static(&pbm_pci_host_info);
+    type_register_static(&pbm_pci_bridge_info);

 }
 
 }
 

-device_init(pbm_register_devices)
+type_init(pbm_register_types)