From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjO6p-0002wl-3N for qemu-devel@nongnu.org; Fri, 06 Jan 2012 23:42:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RjO6n-0006Ls-SL for qemu-devel@nongnu.org; Fri, 06 Jan 2012 23:42:23 -0500 Received: from cantor2.suse.de ([195.135.220.15]:51018 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjO6n-0006Li-JV for qemu-devel@nongnu.org; Fri, 06 Jan 2012 23:42:21 -0500 Message-ID: <4F07CCD2.4040003@suse.de> Date: Sat, 07 Jan 2012 05:40:50 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1325876308-28097-1-git-send-email-peter.maydell@linaro.org> <1325876308-28097-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1325876308-28097-3-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4 2/2] hw/integratorcp: Simplify flash remap code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: =?ISO-8859-15?Q?Beno=EEt_Canet?= , qemu-devel@nongnu.org, patches@linaro.org, Avi Kivity Am 06.01.2012 19:58, schrieb Peter Maydell: > Use the new memory mutator API to simplify the flash remap code; > this allows us to drop the flash_mapped flag. >=20 > Signed-off-by: Peter Maydell Reviewed-by: Andreas F=E4rber I noticed you're dropping a comment about tlb_flush(). Is that because it was dead code, or does the Memory API take care of it for us? (I assume the former because memory_region_set_enabled() does not take a CPUState* to operate on.) Andreas > --- > hw/integratorcp.c | 26 +++++++------------------- > 1 files changed, 7 insertions(+), 19 deletions(-) >=20 > diff --git a/hw/integratorcp.c b/hw/integratorcp.c > index d9d8da3..e5712fc 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,12 @@ static uint64_t integratorcm_read(void *opaque, t= arget_phys_addr_t offset, > } > } > =20 > -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 =3D false; > - } > - } else { > - if (!s->flash_mapped) { > - sysbus_add_memory_overlap(&s->busdev, 0, &s->flash, 1); > - s->flash_mapped =3D true; > - } > - } > - //??? tlb_flush (cpu_single_env, 1); > + /* Sync memory region state with CM_CTRL REMAP bit: > + * bit 0 =3D> flash at address 0; bit 1 =3D> RAM > + */ > + memory_region_set_enabled(&s->flash, !(s->cm_ctrl & 4)); > } > =20 > static void integratorcm_set_ctrl(integratorcm_state *s, uint32_t valu= e) > @@ -131,9 +122,6 @@ static void integratorcm_set_ctrl(integratorcm_stat= e *s, uint32_t value) > if (value & 8) { > qemu_system_reset_request(); > } > - if ((s->cm_ctrl ^ value) & 4) { > - integratorcm_do_remap(s, (value & 4) =3D=3D 0); > - } > if ((s->cm_ctrl ^ value) & 1) { > /* (value & 1) !=3D 0 means the green "MISC LED" is lit. > * We don't have any nice place to display LEDs. printf is a b= ad > @@ -143,6 +131,7 @@ static void integratorcm_set_ctrl(integratorcm_stat= e *s, uint32_t value) > } > /* Note that the RESET bit [3] always reads as zero */ > s->cm_ctrl =3D (s->cm_ctrl & ~5) | (value & 5); > + integratorcm_do_remap(s); > } > =20 > static void integratorcm_update(integratorcm_state *s) > @@ -263,13 +252,12 @@ static int integratorcm_init(SysBusDevice *dev) > s->cm_init =3D 0x00000112; > memory_region_init_ram(&s->flash, "integrator.flash", 0x100000); > vmstate_register_ram_global(&s->flash); > - s->flash_mapped =3D false; > =20 > memory_region_init_io(&s->iomem, &integratorcm_ops, s, > "integratorcm", 0x00800000); > sysbus_init_mmio(dev, &s->iomem); > =20 > - integratorcm_do_remap(s, 1); > + integratorcm_do_remap(s); > /* ??? Save/restore. */ > return 0; > } --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg