| Message ID | 1466699607-30406-5-git-send-email-clg@kaod.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 23 June 2016 at 17:33, Cédric Le Goater <clg@kaod.org> wrote: > A set of SPI flash slaves is attached under the flash controllers of > the palmetto platform. "n25q256a" flash modules are used for the BMC > and "mx25l25635e" for the host. These types are common in the > OpenPower ecosystem. > > The segment addresses used for the memory mappings are the defaults > provided by the specs. They can be changed with the Segment Address > Register but this is not supported in the current implementation. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c > index d97c077565c3..6be911ed36d0 100644 > --- a/hw/ssi/aspeed_smc.c > +++ b/hw/ssi/aspeed_smc.c > @@ -98,13 +98,32 @@ > #define R_SPI_MISC_CRTL (0x10 / 4) > #define R_SPI_TIMINGS (0x14 / 4) > > +/* > + * Default segments mappings and size for each slave > + */ > +static const AspeedSegments aspeed_segments_legacy[] = { > + { 0x14000000, 32 * 1024 * 1024 }, > +}; > + > +static const AspeedSegments aspeed_segments_fmc[] = { > + { 0x20000000, 64 * 1024 * 1024 }, > + { 0x24000000, 32 * 1024 * 1024 }, > + { 0x26000000, 32 * 1024 * 1024 }, > + { 0x28000000, 32 * 1024 * 1024 }, > + { 0x2A000000, 32 * 1024 * 1024 } > +}; > + > +static const AspeedSegments aspeed_segments_spi[] = { > + { 0x30000000, 64 * 1024 * 1024 }, > +}; > + > static const AspeedSMCController controllers[] = { > { "aspeed.smc.smc", R_CONF, R_CE_CTRL, R_CTRL0, R_TIMINGS, > - CONF_ENABLE_W0, 5 }, > + CONF_ENABLE_W0, 5, aspeed_segments_legacy }, > { "aspeed.smc.fmc", R_CONF, R_CE_CTRL, R_CTRL0, R_TIMINGS, > - CONF_ENABLE_W0, 5 }, > + CONF_ENABLE_W0, 5, aspeed_segments_fmc }, > { "aspeed.smc.spi", R_SPI_CONF, 0xff, R_SPI_CTRL0, R_SPI_TIMINGS, > - SPI_CONF_ENABLE_W0, 1 }, > + SPI_CONF_ENABLE_W0, 1, aspeed_segments_spi }, > }; > > static bool aspeed_smc_is_ce_stop_active(AspeedSMCState *s, int cs) > @@ -217,6 +236,8 @@ static const MemoryRegionOps aspeed_smc_ops = { > .valid.unaligned = true, > }; > > +static const MemoryRegionOps aspeed_smc_flash_ops; > + > static void aspeed_smc_realize(DeviceState *dev, Error **errp) > { > SysBusDevice *sbd = SYS_BUS_DEVICE(dev); > @@ -254,6 +275,27 @@ static void aspeed_smc_realize(DeviceState *dev, Error **errp) > memory_region_init_io(&s->mmio, OBJECT(s), &aspeed_smc_ops, s, > s->ctrl->name, ASPEED_SMC_R_MAX * 4); > sysbus_init_mmio(sbd, &s->mmio); > + > + s->flashes = g_new0(AspeedSMCFlashState *, s->num_cs); > + > + for (i = 0; i < s->num_cs; ++i) { > + Object *obj = object_new(TYPE_ASPEED_SMC_FLASH); > + AspeedSMCFlashState *fl = ASPEED_SMC_FLASH(obj); > + char name[32]; > + > + s->flashes[i] = fl; > + > + snprintf(name, sizeof(name), "%s.%d", s->ctrl->name, i); > + > + fl->id = i; > + fl->controller = s; > + fl->size = s->ctrl->segments[i].size; > + > + memory_region_init_io(&fl->mmio, obj, &aspeed_smc_flash_ops, fl, name, > + fl->size); > + sysbus_init_mmio(SYS_BUS_DEVICE(fl), &fl->mmio); > + sysbus_mmio_map(SYS_BUS_DEVICE(fl), 0, s->ctrl->segments[i].addr); Device code shouldn't call sysbus_mmio_map() -- the system memory map is the board's responsibility. thanks -- PMM
On 06/23/2016 08:48 PM, Peter Maydell wrote: > On 23 June 2016 at 17:33, Cédric Le Goater <clg@kaod.org> wrote: >> A set of SPI flash slaves is attached under the flash controllers of >> the palmetto platform. "n25q256a" flash modules are used for the BMC >> and "mx25l25635e" for the host. These types are common in the >> OpenPower ecosystem. >> >> The segment addresses used for the memory mappings are the defaults >> provided by the specs. They can be changed with the Segment Address >> Register but this is not supported in the current implementation. >> >> Signed-off-by: Cédric Le Goater <clg@kaod.org> >> --- > >> diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c >> index d97c077565c3..6be911ed36d0 100644 >> --- a/hw/ssi/aspeed_smc.c >> +++ b/hw/ssi/aspeed_smc.c >> @@ -98,13 +98,32 @@ >> #define R_SPI_MISC_CRTL (0x10 / 4) >> #define R_SPI_TIMINGS (0x14 / 4) >> >> +/* >> + * Default segments mappings and size for each slave >> + */ >> +static const AspeedSegments aspeed_segments_legacy[] = { >> + { 0x14000000, 32 * 1024 * 1024 }, >> +}; >> + >> +static const AspeedSegments aspeed_segments_fmc[] = { >> + { 0x20000000, 64 * 1024 * 1024 }, >> + { 0x24000000, 32 * 1024 * 1024 }, >> + { 0x26000000, 32 * 1024 * 1024 }, >> + { 0x28000000, 32 * 1024 * 1024 }, >> + { 0x2A000000, 32 * 1024 * 1024 } >> +}; >> + >> +static const AspeedSegments aspeed_segments_spi[] = { >> + { 0x30000000, 64 * 1024 * 1024 }, >> +}; >> + >> static const AspeedSMCController controllers[] = { >> { "aspeed.smc.smc", R_CONF, R_CE_CTRL, R_CTRL0, R_TIMINGS, >> - CONF_ENABLE_W0, 5 }, >> + CONF_ENABLE_W0, 5, aspeed_segments_legacy }, >> { "aspeed.smc.fmc", R_CONF, R_CE_CTRL, R_CTRL0, R_TIMINGS, >> - CONF_ENABLE_W0, 5 }, >> + CONF_ENABLE_W0, 5, aspeed_segments_fmc }, >> { "aspeed.smc.spi", R_SPI_CONF, 0xff, R_SPI_CTRL0, R_SPI_TIMINGS, >> - SPI_CONF_ENABLE_W0, 1 }, >> + SPI_CONF_ENABLE_W0, 1, aspeed_segments_spi }, >> }; >> >> static bool aspeed_smc_is_ce_stop_active(AspeedSMCState *s, int cs) >> @@ -217,6 +236,8 @@ static const MemoryRegionOps aspeed_smc_ops = { >> .valid.unaligned = true, >> }; >> >> +static const MemoryRegionOps aspeed_smc_flash_ops; >> + >> static void aspeed_smc_realize(DeviceState *dev, Error **errp) >> { >> SysBusDevice *sbd = SYS_BUS_DEVICE(dev); >> @@ -254,6 +275,27 @@ static void aspeed_smc_realize(DeviceState *dev, Error **errp) >> memory_region_init_io(&s->mmio, OBJECT(s), &aspeed_smc_ops, s, >> s->ctrl->name, ASPEED_SMC_R_MAX * 4); >> sysbus_init_mmio(sbd, &s->mmio); >> + >> + s->flashes = g_new0(AspeedSMCFlashState *, s->num_cs); >> + >> + for (i = 0; i < s->num_cs; ++i) { >> + Object *obj = object_new(TYPE_ASPEED_SMC_FLASH); >> + AspeedSMCFlashState *fl = ASPEED_SMC_FLASH(obj); >> + char name[32]; >> + >> + s->flashes[i] = fl; >> + >> + snprintf(name, sizeof(name), "%s.%d", s->ctrl->name, i); >> + >> + fl->id = i; >> + fl->controller = s; >> + fl->size = s->ctrl->segments[i].size; >> + >> + memory_region_init_io(&fl->mmio, obj, &aspeed_smc_flash_ops, fl, name, >> + fl->size); >> + sysbus_init_mmio(SYS_BUS_DEVICE(fl), &fl->mmio); >> + sysbus_mmio_map(SYS_BUS_DEVICE(fl), 0, s->ctrl->segments[i].addr); > > Device code shouldn't call sysbus_mmio_map() -- the system memory map is > the board's responsibility. ok. It's here because it was easy to reuse the address segments[i].addr which should not change, even if is reconfigurable at run time by the guest. I will rethink the structures and find way. Thanks, C.
diff --git a/hw/arm/palmetto-bmc.c b/hw/arm/palmetto-bmc.c index b8eed21348d8..d4abf3ca61ab 100644 --- a/hw/arm/palmetto-bmc.c +++ b/hw/arm/palmetto-bmc.c @@ -18,6 +18,8 @@ #include "hw/arm/ast2400.h" #include "hw/boards.h" #include "qemu/log.h" +#include "sysemu/block-backend.h" +#include "sysemu/blockdev.h" static struct arm_boot_info palmetto_bmc_binfo = { .loader_start = AST2400_SDRAM_BASE, @@ -30,6 +32,29 @@ typedef struct PalmettoBMCState { MemoryRegion ram; } PalmettoBMCState; +static void palmetto_bmc_init_flashes(AspeedSMCState *s, const char *flashtype, + Error **errp) +{ + int i ; + + for (i = 0; i < s->num_cs; ++i) { + AspeedSMCFlashState *fl = s->flashes[i]; + DriveInfo *dinfo = drive_get_next(IF_MTD); + qemu_irq cs_line; + + /* SPI Flash module */ + fl->flash = ssi_create_slave_no_init(s->spi, flashtype); + if (dinfo) { + qdev_prop_set_drive(fl->flash, "drive", blk_by_legacy_dinfo(dinfo), + errp); + } + qdev_init_nofail(fl->flash); + + cs_line = qdev_get_gpio_in_named(fl->flash, SSI_GPIO_CS, 0); + sysbus_connect_irq(SYS_BUS_DEVICE(s), i + 1, cs_line); + } +} + static void palmetto_bmc_init(MachineState *machine) { PalmettoBMCState *bmc; @@ -49,6 +74,9 @@ static void palmetto_bmc_init(MachineState *machine) object_property_set_bool(OBJECT(&bmc->soc), true, "realized", &error_abort); + palmetto_bmc_init_flashes(&bmc->soc.smc, "n25q256a", &error_abort); + palmetto_bmc_init_flashes(&bmc->soc.spi, "mx25l25635e", &error_abort); + palmetto_bmc_binfo.kernel_filename = machine->kernel_filename; palmetto_bmc_binfo.initrd_filename = machine->initrd_filename; palmetto_bmc_binfo.kernel_cmdline = machine->kernel_cmdline; diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index d97c077565c3..6be911ed36d0 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -98,13 +98,32 @@ #define R_SPI_MISC_CRTL (0x10 / 4) #define R_SPI_TIMINGS (0x14 / 4) +/* + * Default segments mappings and size for each slave + */ +static const AspeedSegments aspeed_segments_legacy[] = { + { 0x14000000, 32 * 1024 * 1024 }, +}; + +static const AspeedSegments aspeed_segments_fmc[] = { + { 0x20000000, 64 * 1024 * 1024 }, + { 0x24000000, 32 * 1024 * 1024 }, + { 0x26000000, 32 * 1024 * 1024 }, + { 0x28000000, 32 * 1024 * 1024 }, + { 0x2A000000, 32 * 1024 * 1024 } +}; + +static const AspeedSegments aspeed_segments_spi[] = { + { 0x30000000, 64 * 1024 * 1024 }, +}; + static const AspeedSMCController controllers[] = { { "aspeed.smc.smc", R_CONF, R_CE_CTRL, R_CTRL0, R_TIMINGS, - CONF_ENABLE_W0, 5 }, + CONF_ENABLE_W0, 5, aspeed_segments_legacy }, { "aspeed.smc.fmc", R_CONF, R_CE_CTRL, R_CTRL0, R_TIMINGS, - CONF_ENABLE_W0, 5 }, + CONF_ENABLE_W0, 5, aspeed_segments_fmc }, { "aspeed.smc.spi", R_SPI_CONF, 0xff, R_SPI_CTRL0, R_SPI_TIMINGS, - SPI_CONF_ENABLE_W0, 1 }, + SPI_CONF_ENABLE_W0, 1, aspeed_segments_spi }, }; static bool aspeed_smc_is_ce_stop_active(AspeedSMCState *s, int cs) @@ -217,6 +236,8 @@ static const MemoryRegionOps aspeed_smc_ops = { .valid.unaligned = true, }; +static const MemoryRegionOps aspeed_smc_flash_ops; + static void aspeed_smc_realize(DeviceState *dev, Error **errp) { SysBusDevice *sbd = SYS_BUS_DEVICE(dev); @@ -254,6 +275,27 @@ static void aspeed_smc_realize(DeviceState *dev, Error **errp) memory_region_init_io(&s->mmio, OBJECT(s), &aspeed_smc_ops, s, s->ctrl->name, ASPEED_SMC_R_MAX * 4); sysbus_init_mmio(sbd, &s->mmio); + + s->flashes = g_new0(AspeedSMCFlashState *, s->num_cs); + + for (i = 0; i < s->num_cs; ++i) { + Object *obj = object_new(TYPE_ASPEED_SMC_FLASH); + AspeedSMCFlashState *fl = ASPEED_SMC_FLASH(obj); + char name[32]; + + s->flashes[i] = fl; + + snprintf(name, sizeof(name), "%s.%d", s->ctrl->name, i); + + fl->id = i; + fl->controller = s; + fl->size = s->ctrl->segments[i].size; + + memory_region_init_io(&fl->mmio, obj, &aspeed_smc_flash_ops, fl, name, + fl->size); + sysbus_init_mmio(SYS_BUS_DEVICE(fl), &fl->mmio); + sysbus_mmio_map(SYS_BUS_DEVICE(fl), 0, s->ctrl->segments[i].addr); + } } static const VMStateDescription vmstate_aspeed_smc = { diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h index abd0005b01c2..10b4083952cf 100644 --- a/include/hw/ssi/aspeed_smc.h +++ b/include/hw/ssi/aspeed_smc.h @@ -43,6 +43,11 @@ typedef struct AspeedSMCFlashState { #define ASPEED_SMC_FLASH(obj) \ OBJECT_CHECK(AspeedSMCFlashState, (obj), TYPE_ASPEED_SMC_FLASH) +typedef struct AspeedSegments { + hwaddr addr; + uint32_t size; +} AspeedSegments; + typedef struct AspeedSMCController { const char *name; uint8_t r_conf; @@ -51,6 +56,7 @@ typedef struct AspeedSMCController { uint8_t r_timings; uint8_t conf_enable_w0; uint8_t max_slaves; + const AspeedSegments *segments; } AspeedSMCController; #define TYPE_ASPEED_SMC "aspeed.smc" @@ -90,6 +96,8 @@ typedef struct AspeedSMCState { uint8_t r_ctrl0; uint8_t r_timings; uint8_t conf_enable_w0; + + AspeedSMCFlashState **flashes; } AspeedSMCState; #endif /* ASPEED_SMC_H */
A set of SPI flash slaves is attached under the flash controllers of the palmetto platform. "n25q256a" flash modules are used for the BMC and "mx25l25635e" for the host. These types are common in the OpenPower ecosystem. The segment addresses used for the memory mappings are the defaults provided by the specs. They can be changed with the Segment Address Register but this is not supported in the current implementation. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- Changes since v2 : - moved the initialization of the flash modules under the palmetto platform hw/arm/palmetto-bmc.c | 28 ++++++++++++++++++++++++++ hw/ssi/aspeed_smc.c | 48 ++++++++++++++++++++++++++++++++++++++++++--- include/hw/ssi/aspeed_smc.h | 8 ++++++++ 3 files changed, 81 insertions(+), 3 deletions(-)