From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60880) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFohD-0008R4-HB for qemu-devel@nongnu.org; Wed, 22 Jun 2016 16:24:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFoh8-0003wv-A9 for qemu-devel@nongnu.org; Wed, 22 Jun 2016 16:24:22 -0400 Received: from mail-sn1nam02on0089.outbound.protection.outlook.com ([104.47.36.89]:14976 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFoh8-0003wq-0M for qemu-devel@nongnu.org; Wed, 22 Jun 2016 16:24:18 -0400 From: Alistair Francis Date: Wed, 22 Jun 2016 13:23:59 -0700 Message-ID: <6ae9a75f0189ac76f8fc0b74ec85eb45b443d9af.1466626975.git.alistair.francis@xilinx.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v7 06/12] register: Add block initialise helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: alistair.francis@xilinx.com, crosthwaitepeter@gmail.com, edgar.iglesias@xilinx.com, edgar.iglesias@gmail.com, afaerber@suse.de, fred.konrad@greensocs.com, alex.bennee@linaro.org From: Peter Crosthwaite Add a helper that will scan a static RegisterAccessInfo Array and populate a container MemoryRegion with registers as defined. Signed-off-by: Peter Crosthwaite Signed-off-by: Alistair Francis --- The reason that I'm not using GArray is because the array needs to store the memory region that covers all of the registers. V7: - Return the memory region instead of adding it as a subregion V6: - Fixup the loop logic V5: - Convert to only using one memory region V3: - Fix typo V2: - Use memory_region_add_subregion_no_print() hw/core/register.c | 36 ++++++++++++++++++++++++++++++++++++ include/hw/register.h | 24 ++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/hw/core/register.c b/hw/core/register.c index 41c11c8..f32faac 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -224,6 +224,42 @@ uint64_t register_read_memory(void *opaque, hwaddr addr, return extract64(read_val, 0, size * 8); } +MemoryRegion *register_init_block32(DeviceState *owner, + const RegisterAccessInfo *rae, + int num, RegisterInfo *ri, uint32_t *data, + const MemoryRegionOps *ops, + bool debug_enabled, uint64_t memory_size) +{ + const char *device_prefix = object_get_typename(OBJECT(owner)); + RegisterInfoArray *r_array = g_malloc(sizeof(RegisterInfoArray)); + int i; + + r_array->r = g_malloc_n(num, sizeof(RegisterInfo *)); + r_array->num_elements = num; + r_array->debug = debug_enabled; + r_array->prefix = device_prefix; + + for (i = 0; i < num; i++) { + int index = rae[i].addr / 4; + RegisterInfo *r = &ri[index]; + + *r = (RegisterInfo) { + .data = &data[index], + .data_size = sizeof(uint32_t), + .access = &rae[i], + .opaque = owner, + }; + register_init(r); + + r_array->r[i] = r; + } + + memory_region_init_io(&r_array->mem, OBJECT(owner), ops, r_array, + device_prefix, memory_size); + + return &r_array->mem; +} + static const TypeInfo register_info = { .name = TYPE_REGISTER, .parent = TYPE_DEVICE, diff --git a/include/hw/register.h b/include/hw/register.h index 18a63df..104d381 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -100,6 +100,8 @@ struct RegisterInfo { */ struct RegisterInfoArray { + MemoryRegion mem; + int num_elements; RegisterInfo **r; @@ -166,6 +168,28 @@ void register_write_memory(void *opaque, hwaddr addr, uint64_t value, uint64_t register_read_memory(void *opaque, hwaddr addr, unsigned size); +/** + * Init a block of registers into a container MemoryRegion. A + * number of constant register definitions are parsed to create a corresponding + * array of RegisterInfo's. + * + * @owner: device owning the registers + * @rae: Register definitions to init + * @num: number of registers to init (length of @rae) + * @ri: Register array to init + * @data: Array to use for register data + * @ops: Memory region ops to access registers. + * @debug enabled: turn on/off verbose debug information + * returns: A pointer to an initalised memory region that the caller should + * add to a container. + */ + +MemoryRegion *register_init_block32(DeviceState *owner, + const RegisterAccessInfo *rae, + int num, RegisterInfo *ri, uint32_t *data, + const MemoryRegionOps *ops, + bool debug_enabled, uint64_t memory_size); + /* Define constants for a 32 bit register */ /* This macro will define A_FOO, for the byte address of a register -- 2.7.4