From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSx3w-0005PX-4U for qemu-devel@nongnu.org; Tue, 22 Nov 2011 15:35:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RSx3p-0004md-OD for qemu-devel@nongnu.org; Tue, 22 Nov 2011 15:35:22 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:33584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSx3p-0004kR-2R for qemu-devel@nongnu.org; Tue, 22 Nov 2011 15:35:21 -0500 Received: by mail-ww0-f53.google.com with SMTP id 27so930098wwf.10 for ; Tue, 22 Nov 2011 12:35:20 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 22 Nov 2011 21:35:01 +0100 Message-Id: <1321994102-28263-11-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1321994102-28263-1-git-send-email-benoit.canet@gmail.com> References: <1321994102-28263-1-git-send-email-benoit.canet@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v3 10/11] bonito: convert ldma to memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Signed-off-by: Benoît Canet --- hw/bonito.c | 39 ++++++++++++++++----------------------- 1 files changed, 16 insertions(+), 23 deletions(-) diff --git a/hw/bonito.c b/hw/bonito.c index b4c3387..8972f55 100644 --- a/hw/bonito.c +++ b/hw/bonito.c @@ -204,6 +204,7 @@ typedef struct PCIBonitoState MemoryRegion iomem; MemoryRegion iomem_pciconf; MemoryRegion iomem_spciconf; + MemoryRegion iomem_ldma; target_phys_addr_t bonito_pciio_start; target_phys_addr_t bonito_pciio_length; @@ -213,10 +214,6 @@ typedef struct PCIBonitoState target_phys_addr_t bonito_localio_length; int bonito_localio_handle; - target_phys_addr_t bonito_ldma_start; - target_phys_addr_t bonito_ldma_length; - int bonito_ldma_handle; - target_phys_addr_t bonito_cop_start; target_phys_addr_t bonito_cop_length; int bonito_cop_handle; @@ -346,7 +343,8 @@ static const MemoryRegionOps bonito_pciconf_ops = { }, }; -static uint32_t bonito_ldma_readl(void *opaque, target_phys_addr_t addr) +static uint64_t bonito_ldma_readl(void *opaque, target_phys_addr_t addr, + unsigned size) { uint32_t val; PCIBonitoState *s = opaque; @@ -357,23 +355,21 @@ static uint32_t bonito_ldma_readl(void *opaque, target_phys_addr_t addr) } static void bonito_ldma_writel(void *opaque, target_phys_addr_t addr, - uint32_t val) + uint64_t val, unsigned size) { PCIBonitoState *s = opaque; ((uint32_t *)(&s->bonldma))[addr/sizeof(uint32_t)] = val & 0xffffffff; } -static CPUWriteMemoryFunc * const bonito_ldma_write[] = { - NULL, - NULL, - bonito_ldma_writel, -}; - -static CPUReadMemoryFunc * const bonito_ldma_read[] = { - NULL, - NULL, - bonito_ldma_readl, +static const MemoryRegionOps bonito_ldma_ops = { + .read = bonito_ldma_readl, + .write = bonito_ldma_writel, + .endianness = DEVICE_NATIVE_ENDIAN, + .valid = { + .min_access_size = 4, + .max_access_size = 4, + }, }; static uint32_t bonito_cop_readl(void *opaque, target_phys_addr_t addr) @@ -709,13 +705,10 @@ static int bonito_initfn(PCIDevice *dev) sysbus_init_mmio_region(sysbus, &s->iomem_spciconf); sysbus_mmio_map(sysbus, 2, BONITO_SPCICONFIG_BASE); - s->bonito_ldma_handle = cpu_register_io_memory(bonito_ldma_read, - bonito_ldma_write, s, - DEVICE_NATIVE_ENDIAN); - s->bonito_ldma_start = 0xbfe00200; - s->bonito_ldma_length = 0x100; - cpu_register_physical_memory(s->bonito_ldma_start, s->bonito_ldma_length, - s->bonito_ldma_handle); + memory_region_init_io(&s->iomem_ldma, &bonito_ldma_ops, s, + "ldma", 0x100); + sysbus_init_mmio_region(sysbus, &s->iomem_ldma); + sysbus_mmio_map(sysbus, 3, 0xbfe00200); s->bonito_cop_handle = cpu_register_io_memory(bonito_cop_read, bonito_cop_write, s, -- 1.7.7.3