From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiul6-0002Eg-NG for qemu-devel@nongnu.org; Fri, 27 Jul 2018 00:53:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fiul5-0002Fv-BZ for qemu-devel@nongnu.org; Fri, 27 Jul 2018 00:53:44 -0400 Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= References: <20180725085944.11856-1-stefanha@redhat.com> <20180725085944.11856-4-stefanha@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Fri, 27 Jul 2018 01:53:32 -0300 MIME-Version: 1.0 In-Reply-To: <20180725085944.11856-4-stefanha@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [Qemu-arm] [PATCH v3 3/7] hw/arm: make bitbanded IO optional on ARM M Profile List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Peter Maydell , jim@groklearning.com, mail@steffen-goertz.de, Su Hang , ilg@livius.net, Alistair Francis , Subbaraya Sundeep , Steffen Gortz , qemu-arm@nongnu.org, Joel Stanley , Julia Suvorova On 07/25/2018 05:59 AM, Stefan Hajnoczi wrote: > Some ARM CPUs have bitbanded IO, a memory region that allows convenient > bit access via 32-bit memory loads/stores. This eliminates the need for > read-modify-update instruction sequences. > > This patch makes this optional feature a ARMMProfile qdev property, > allowing boards to choose whether they want bitbanding or not. > > Status of boards: > * iotkit (Cortex M33), no bitband > * mps2 (Cortex M3), bitband > * msf2 (Cortex M3), bitband > * stellaris (Cortex M3), bitband > * stm32f205 (Cortex M3), bitband > > Signed-off-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daudé > --- > include/hw/arm/arm-m-profile.h | 2 ++ > hw/arm/arm-m-profile.c | 38 +++++++++++++++++++--------------- > hw/arm/mps2.c | 1 + > hw/arm/msf2-soc.c | 1 + > hw/arm/stellaris.c | 1 + > hw/arm/stm32f205_soc.c | 1 + > 6 files changed, 27 insertions(+), 17 deletions(-) > > diff --git a/include/hw/arm/arm-m-profile.h b/include/hw/arm/arm-m-profile.h > index ea496d9b88..1eb7a5c328 100644 > --- a/include/hw/arm/arm-m-profile.h > +++ b/include/hw/arm/arm-m-profile.h > @@ -50,6 +50,7 @@ typedef struct { > * devices will be automatically layered on top of this view.) > * + Property "idau": IDAU interface (forwarded to CPU object) > * + Property "init-svtor": secure VTOR reset value (forwarded to CPU object) > + * + Property "enable-bitband": expose bitbanded IO > */ > typedef struct { > /*< private >*/ > @@ -70,6 +71,7 @@ typedef struct { > MemoryRegion *board_memory; > Object *idau; > uint32_t init_svtor; > + bool enable_bitband; > } ARMMProfileState; > > typedef struct { > diff --git a/hw/arm/arm-m-profile.c b/hw/arm/arm-m-profile.c > index b7dd2370d4..8bafd6602d 100644 > --- a/hw/arm/arm-m-profile.c > +++ b/hw/arm/arm-m-profile.c > @@ -212,25 +212,27 @@ static void arm_m_profile_realize(DeviceState *dev, Error **errp) > memory_region_add_subregion(&s->container, 0xe000e000, > sysbus_mmio_get_region(sbd, 0)); > > - for (i = 0; i < ARRAY_SIZE(s->bitband); i++) { > - Object *obj = OBJECT(&s->bitband[i]); > - SysBusDevice *sbd = SYS_BUS_DEVICE(&s->bitband[i]); > + if (s->enable_bitband) { > + for (i = 0; i < ARRAY_SIZE(s->bitband); i++) { > + Object *obj = OBJECT(&s->bitband[i]); > + SysBusDevice *sbd = SYS_BUS_DEVICE(&s->bitband[i]); > > - object_property_set_int(obj, bitband_input_addr[i], "base", &err); > - if (err != NULL) { > - error_propagate(errp, err); > - return; > - } > - object_property_set_link(obj, OBJECT(s->board_memory), > - "source-memory", &error_abort); > - object_property_set_bool(obj, true, "realized", &err); > - if (err != NULL) { > - error_propagate(errp, err); > - return; > - } > + object_property_set_int(obj, bitband_input_addr[i], "base", &err); > + if (err != NULL) { > + error_propagate(errp, err); > + return; > + } > + object_property_set_link(obj, OBJECT(s->board_memory), > + "source-memory", &error_abort); > + object_property_set_bool(obj, true, "realized", &err); > + if (err != NULL) { > + error_propagate(errp, err); > + return; > + } > > - memory_region_add_subregion(&s->container, bitband_output_addr[i], > - sysbus_mmio_get_region(sbd, 0)); > + memory_region_add_subregion(&s->container, bitband_output_addr[i], > + sysbus_mmio_get_region(sbd, 0)); > + } > } > } > > @@ -241,6 +243,8 @@ static Property arm_m_profile_properties[] = { > DEFINE_PROP_LINK("idau", ARMMProfileState, idau, > TYPE_IDAU_INTERFACE, Object *), > DEFINE_PROP_UINT32("init-svtor", ARMMProfileState, init_svtor, 0), > + DEFINE_PROP_BOOL("enable-bitband", ARMMProfileState, > + enable_bitband, false), > DEFINE_PROP_END_OF_LIST(), > }; > > diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c > index 912e1297d5..b232162dbd 100644 > --- a/hw/arm/mps2.c > +++ b/hw/arm/mps2.c > @@ -186,6 +186,7 @@ static void mps2_common_init(MachineState *machine) > g_assert_not_reached(); > } > qdev_prop_set_string(armv7m, "cpu-type", machine->cpu_type); > + qdev_prop_set_bit(armv7m, "enable-bitband", true); > object_property_set_link(OBJECT(&mms->armv7m), OBJECT(system_memory), > "memory", &error_abort); > object_property_set_bool(OBJECT(&mms->armv7m), true, "realized", > diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c > index 09cdc61f44..fb5d16338f 100644 > --- a/hw/arm/msf2-soc.c > +++ b/hw/arm/msf2-soc.c > @@ -117,6 +117,7 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp) > armv7m = DEVICE(&s->armv7m); > qdev_prop_set_uint32(armv7m, "num-irq", 81); > qdev_prop_set_string(armv7m, "cpu-type", s->cpu_type); > + qdev_prop_set_bit(armv7m, "enable-bitband", true); > object_property_set_link(OBJECT(&s->armv7m), OBJECT(get_system_memory()), > "memory", &error_abort); > object_property_set_bool(OBJECT(&s->armv7m), true, "realized", &err); > diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c > index 42785f5bd1..cb22684ffe 100644 > --- a/hw/arm/stellaris.c > +++ b/hw/arm/stellaris.c > @@ -1304,6 +1304,7 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board) > nvic = qdev_create(NULL, TYPE_ARM_M_PROFILE); > qdev_prop_set_uint32(nvic, "num-irq", NUM_IRQ_LINES); > qdev_prop_set_string(nvic, "cpu-type", ms->cpu_type); > + qdev_prop_set_bit(nvic, "enable-bitband", true); > object_property_set_link(OBJECT(nvic), OBJECT(get_system_memory()), > "memory", &error_abort); > /* This will exit with an error if the user passed us a bad cpu_type */ > diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c > index 7de1474ade..f78b89d205 100644 > --- a/hw/arm/stm32f205_soc.c > +++ b/hw/arm/stm32f205_soc.c > @@ -109,6 +109,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp) > armv7m = DEVICE(&s->armv7m); > qdev_prop_set_uint32(armv7m, "num-irq", 96); > qdev_prop_set_string(armv7m, "cpu-type", s->cpu_type); > + qdev_prop_set_bit(armv7m, "enable-bitband", true); > object_property_set_link(OBJECT(&s->armv7m), OBJECT(get_system_memory()), > "memory", &error_abort); > object_property_set_bool(OBJECT(&s->armv7m), true, "realized", &err); >