From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd2WN-0003em-1P for qemu-devel@nongnu.org; Tue, 20 Dec 2011 11:26:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rd2WK-0000G0-3U for qemu-devel@nongnu.org; Tue, 20 Dec 2011 11:26:31 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:54523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd2WJ-0000FX-Nw for qemu-devel@nongnu.org; Tue, 20 Dec 2011 11:26:27 -0500 From: Peter Maydell Date: Tue, 20 Dec 2011 16:08:56 +0000 Message-Id: <1324397336-31206-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1324397336-31206-1-git-send-email-peter.maydell@linaro.org> References: <1324397336-31206-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v2 2/2] hw/integratorcp: Simplify flash remap code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Avi Kivity , patches@linaro.org Use the new memory mutator API to simplify the flash remap code; this allows us to drop the flash_mapped flag. Signed-off-by: Peter Maydell --- hw/integratorcp.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/hw/integratorcp.c b/hw/integratorcp.c index 8e4c154..fb243e1 100644 --- a/hw/integratorcp.c +++ b/hw/integratorcp.c @@ -21,7 +21,6 @@ typedef struct { MemoryRegion iomem; uint32_t memsz; MemoryRegion flash; - bool flash_mapped; uint32_t cm_osc; uint32_t cm_ctrl; uint32_t cm_lock; @@ -110,20 +109,16 @@ static uint64_t integratorcm_read(void *opaque, target_phys_addr_t offset, } } -static void integratorcm_do_remap(integratorcm_state *s, int flash) +static void integratorcm_do_remap(integratorcm_state *s) { - if (!flash) { - if (s->flash_mapped) { - sysbus_del_memory(&s->busdev, &s->flash); - s->flash_mapped = false; - } + /* Sync memory region state with CM_CTRL REMAP bit: + * bit 0 => flash at address 0; bit 1 => RAM + */ + if (s->cm_ctrl & 4) { + memory_region_set_enabled(&s->flash, 0); } else { - if (!s->flash_mapped) { - sysbus_add_memory_overlap(&s->busdev, 0, &s->flash, 1); - s->flash_mapped = true; - } + memory_region_set_enabled(&s->flash, 1); } - //??? tlb_flush (cpu_single_env, 1); } static void integratorcm_set_ctrl(integratorcm_state *s, uint32_t value) @@ -131,9 +126,6 @@ static void integratorcm_set_ctrl(integratorcm_state *s, uint32_t value) if (value & 8) { qemu_system_reset_request(); } - if ((s->cm_ctrl ^ value) & 4) { - integratorcm_do_remap(s, (value & 4) == 0); - } if ((s->cm_ctrl ^ value) & 1) { /* (value & 1) != 0 means the green "MISC LED" is lit. * We don't have any nice place to display LEDs. printf is a bad @@ -143,6 +135,7 @@ static void integratorcm_set_ctrl(integratorcm_state *s, uint32_t value) } /* Note that the RESET bit [3] always reads as zero */ s->cm_ctrl = (s->cm_ctrl & ~5) | (value & 5); + integratorcm_do_remap(s); } static void integratorcm_update(integratorcm_state *s) @@ -262,13 +255,12 @@ static int integratorcm_init(SysBusDevice *dev) memcpy(integrator_spd + 73, "QEMU-MEMORY", 11); s->cm_init = 0x00000112; memory_region_init_ram(&s->flash, NULL, "integrator.flash", 0x100000); - s->flash_mapped = false; memory_region_init_io(&s->iomem, &integratorcm_ops, s, "integratorcm", 0x00800000); sysbus_init_mmio(dev, &s->iomem); - integratorcm_do_remap(s, 1); + integratorcm_do_remap(s); /* ??? Save/restore. */ return 0; } -- 1.7.5.4