Patchwork [13/14] sun4m_iommu: convert to memory API

login
register
mail settings
Submitter Benoit Canet
Date Nov. 15, 2011, 11:14 a.m.
Message ID <1321355644-1982-14-git-send-email-benoit.canet@gmail.com>
Download mbox | patch
Permalink /patch/125776/
State New
Headers show

Comments

Benoit Canet - Nov. 15, 2011, 11:14 a.m.
Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
---
 hw/sun4m_iommu.c |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

Patch

diff --git a/hw/sun4m_iommu.c b/hw/sun4m_iommu.c
index 6eeadfa..86d135a 100644
--- a/hw/sun4m_iommu.c
+++ b/hw/sun4m_iommu.c
@@ -128,13 +128,15 @@ 
 
 typedef struct IOMMUState {
     SysBusDevice busdev;
+    MemoryRegion iomem;
     uint32_t regs[IOMMU_NREGS];
     target_phys_addr_t iostart;
     qemu_irq irq;
     uint32_t version;
 } IOMMUState;
 
-static uint32_t iommu_mem_readl(void *opaque, target_phys_addr_t addr)
+static uint64_t iommu_mem_readl(void *opaque, target_phys_addr_t addr,
+                                unsigned size)
 {
     IOMMUState *s = opaque;
     target_phys_addr_t saddr;
@@ -156,7 +158,7 @@  static uint32_t iommu_mem_readl(void *opaque, target_phys_addr_t addr)
 }
 
 static void iommu_mem_writel(void *opaque, target_phys_addr_t addr,
-                             uint32_t val)
+                             uint64_t val, unsigned size)
 {
     IOMMUState *s = opaque;
     target_phys_addr_t saddr;
@@ -237,16 +239,14 @@  static void iommu_mem_writel(void *opaque, target_phys_addr_t addr,
     }
 }
 
-static CPUReadMemoryFunc * const iommu_mem_read[3] = {
-    NULL,
-    NULL,
-    iommu_mem_readl,
-};
-
-static CPUWriteMemoryFunc * const iommu_mem_write[3] = {
-    NULL,
-    NULL,
-    iommu_mem_writel,
+static const MemoryRegionOps iommu_mem_ops = {
+    .read = iommu_mem_readl,
+    .write = iommu_mem_writel,
+    .endianness = DEVICE_NATIVE_ENDIAN,
+    .impl = {
+        .min_access_size = 4,
+        .max_access_size = 4,
+    },
 };
 
 static uint32_t iommu_page_get_flags(IOMMUState *s, target_phys_addr_t addr)
@@ -347,13 +347,12 @@  static void iommu_reset(DeviceState *d)
 static int iommu_init1(SysBusDevice *dev)
 {
     IOMMUState *s = FROM_SYSBUS(IOMMUState, dev);
-    int io;
 
     sysbus_init_irq(dev, &s->irq);
 
-    io = cpu_register_io_memory(iommu_mem_read, iommu_mem_write, s,
-                                DEVICE_NATIVE_ENDIAN);
-    sysbus_init_mmio(dev, IOMMU_NREGS * sizeof(uint32_t), io);
+    memory_region_init_io(&s->iomem, &iommu_mem_ops, s,
+                          "iommu", IOMMU_NREGS * sizeof(uint32_t));
+    sysbus_init_mmio_region(dev, &s->iomem);
 
     return 0;
 }