OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/arm/armsse: Make SRAM bank size configurable

Browse Source 
For the IoTKit the SRAM bank size is always 32K (15 bits); for the
SSE-200 this is a configurable parameter, which defaults to 32K but
can be changed when it is built into a particular SoC. For instance
the Musca-B1 board sets it to 128K (17 bits).

Make the bank size a QOM property. We follow the SSE-200 hardware in
naming the parameter SRAM_ADDR_WIDTH, which specifies the number of
address bits of a single SRAM bank.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20190121185118.18550-11-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2019-02-01 14:55:42 +00:00
parent f0cab7fe88
commit 4b635cf7a9
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/arm/armsse.c
View File

@ -221,6 +221,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
DeviceState *dev_apb_ppc1; DeviceState *dev_apb_ppc1;
DeviceState *dev_secctl; DeviceState *dev_secctl;
DeviceState *dev_splitter; DeviceState *dev_splitter;
uint32_t addr_width_max;
if (!s->board_memory) { if (!s->board_memory) {
error_setg(errp, "memory property was not set"); error_setg(errp, "memory property was not set");
@ -232,6 +233,15 @@ static void armsse_realize(DeviceState *dev, Error **errp)
return; return;
} }
/* max SRAM_ADDR_WIDTH: 24 - log2(SRAM_NUM_BANK) */
assert(is_power_of_2(info->sram_banks));
addr_width_max = 24 - ctz32(info->sram_banks);
if (s->sram_addr_width < 1 || s->sram_addr_width > addr_width_max) {
error_setg(errp, "SRAM_ADDR_WIDTH must be between 1 and %d",
addr_width_max);
return;
}
/* Handling of which devices should be available only to secure /* Handling of which devices should be available only to secure
* code is usually done differently for M profile than for A profile. * code is usually done differently for M profile than for A profile.
* Instead of putting some devices only into the secure address space, * Instead of putting some devices only into the secure address space,
@ -352,8 +362,10 @@ static void armsse_realize(DeviceState *dev, Error **errp)
for (i = 0; i < info->sram_banks; i++) { for (i = 0; i < info->sram_banks; i++) {
char *ramname = g_strdup_printf("armsse.sram%d", i); char *ramname = g_strdup_printf("armsse.sram%d", i);
SysBusDevice *sbd_mpc; SysBusDevice *sbd_mpc;
uint32_t sram_bank_size = 1 << s->sram_addr_width;
memory_region_init_ram(&s->sram[i], NULL, ramname, 0x00008000, &err); memory_region_init_ram(&s->sram[i], NULL, ramname,
sram_bank_size, &err);
g_free(ramname); g_free(ramname);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
@ -372,7 +384,8 @@ static void armsse_realize(DeviceState *dev, Error **errp)
} }
/* Map the upstream end of the MPC into the right place... */ /* Map the upstream end of the MPC into the right place... */
sbd_mpc = SYS_BUS_DEVICE(&s->mpc[i]); sbd_mpc = SYS_BUS_DEVICE(&s->mpc[i]);
memory_region_add_subregion(&s->container, 0x20000000 + i * 0x8000, memory_region_add_subregion(&s->container,
0x20000000 + i * sram_bank_size,
sysbus_mmio_get_region(sbd_mpc, 1)); sysbus_mmio_get_region(sbd_mpc, 1));
/* ...and its register interface */ /* ...and its register interface */
memory_region_add_subregion(&s->container, 0x50083000 + i * 0x1000, memory_region_add_subregion(&s->container, 0x50083000 + i * 0x1000,
@ -748,6 +761,7 @@ static Property armsse_properties[] = {
MemoryRegion *), MemoryRegion *),
DEFINE_PROP_UINT32("EXP_NUMIRQ", ARMSSE, exp_numirq, 64), DEFINE_PROP_UINT32("EXP_NUMIRQ", ARMSSE, exp_numirq, 64),
DEFINE_PROP_UINT32("MAINCLK", ARMSSE, mainclk_frq, 0), DEFINE_PROP_UINT32("MAINCLK", ARMSSE, mainclk_frq, 0),
DEFINE_PROP_UINT32("SRAM_ADDR_WIDTH", ARMSSE, sram_addr_width, 15),
DEFINE_PROP_END_OF_LIST() DEFINE_PROP_END_OF_LIST()
}; };

1
include/hw/arm/armsse.h
View File

@ -146,6 +146,7 @@ typedef struct ARMSSE {
MemoryRegion *board_memory; MemoryRegion *board_memory;
uint32_t exp_numirq; uint32_t exp_numirq;
uint32_t mainclk_frq; uint32_t mainclk_frq;
uint32_t sram_addr_width;
} ARMSSE; } ARMSSE;
typedef struct ARMSSEInfo ARMSSEInfo; typedef struct ARMSSEInfo ARMSSEInfo;