From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:44447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ra3QW-0003pi-0K for qemu-devel@nongnu.org; Mon, 12 Dec 2011 05:48:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ra3QO-000694-IM for qemu-devel@nongnu.org; Mon, 12 Dec 2011 05:48:07 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:45674) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ra3QO-000684-Aq for qemu-devel@nongnu.org; Mon, 12 Dec 2011 05:48:00 -0500 From: Peter Maydell Date: Mon, 12 Dec 2011 10:47:46 +0000 Message-Id: <1323686869-15567-6-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1323686869-15567-1-git-send-email-peter.maydell@linaro.org> References: <1323686869-15567-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 5/8] hw/realview_gic: Use GIC memory region for the CPU interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org Use the GIC provided memory region for the CPU interface rather than implementing our own. Signed-off-by: Peter Maydell --- hw/realview_gic.c | 25 +------------------------ 1 files changed, 1 insertions(+), 24 deletions(-) diff --git a/hw/realview_gic.c b/hw/realview_gic.c index 479f939..8c4d509 100644 --- a/hw/realview_gic.c +++ b/hw/realview_gic.c @@ -23,36 +23,13 @@ gic_get_current_cpu(void) typedef struct { gic_state gic; - MemoryRegion iomem; MemoryRegion container; } RealViewGICState; -static uint64_t realview_gic_cpu_read(void *opaque, target_phys_addr_t offset, - unsigned size) -{ - gic_state *s = (gic_state *)opaque; - return gic_cpu_read(s, gic_get_current_cpu(), offset); -} - -static void realview_gic_cpu_write(void *opaque, target_phys_addr_t offset, - uint64_t value, unsigned size) -{ - gic_state *s = (gic_state *)opaque; - gic_cpu_write(s, gic_get_current_cpu(), offset, value); -} - -static const MemoryRegionOps realview_gic_cpu_ops = { - .read = realview_gic_cpu_read, - .write = realview_gic_cpu_write, - .endianness = DEVICE_NATIVE_ENDIAN, -}; - static void realview_gic_map_setup(RealViewGICState *s) { memory_region_init(&s->container, "realview-gic-container", 0x2000); - memory_region_init_io(&s->iomem, &realview_gic_cpu_ops, &s->gic, - "realview-gic", 0x1000); - memory_region_add_subregion(&s->container, 0, &s->iomem); + memory_region_add_subregion(&s->container, 0, &s->gic.cpuiomem[0]); memory_region_add_subregion(&s->container, 0x1000, &s->gic.iomem); } -- 1.7.1