[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/11] aspeed: Rework aspeed_board_init_flashes() interface
From: |
Cédric Le Goater |
Subject: |
[PULL 03/11] aspeed: Rework aspeed_board_init_flashes() interface |
Date: |
Tue, 8 Mar 2022 13:21:41 +0100 |
Currently, the allocation of the flash devices uses the number of
slave selects configured in the SoC realize routine. It is simpler to
use directly the number of FMC devices defined in the machine class
and 1 for spi devices (which is what the SoC does in the back of the
machine).
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20220307071856.1410731-3-clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/arm/aspeed.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index b71bc2559baa..65588017659c 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -271,13 +271,12 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr,
size_t rom_size,
rom_add_blob_fixed("aspeed.boot_rom", storage, rom_size, addr);
}
-static void aspeed_board_init_flashes(AspeedSMCState *s,
- const char *flashtype,
- int unit0)
+static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype,
+ unsigned int count, int unit0)
{
int i ;
- for (i = 0; i < s->num_cs; ++i) {
+ for (i = 0; i < count; ++i) {
DriveInfo *dinfo = drive_get(IF_MTD, 0, unit0 + i);
qemu_irq cs_line;
DeviceState *dev;
@@ -373,10 +372,10 @@ static void aspeed_machine_init(MachineState *machine)
aspeed_board_init_flashes(&bmc->soc.fmc,
bmc->fmc_model ? bmc->fmc_model : amc->fmc_model,
- 0);
+ amc->num_cs, 0);
aspeed_board_init_flashes(&bmc->soc.spi[0],
bmc->spi_model ? bmc->spi_model : amc->spi_model,
- bmc->soc.fmc.num_cs);
+ 1, amc->num_cs);
/* Install first FMC flash content as a boot rom. */
if (drive0) {
--
2.34.1
- [PULL 00/11] aspeed queue, Cédric Le Goater, 2022/03/08
- [PULL 04/11] aspeed/smc: Remove 'num_cs' field, Cédric Le Goater, 2022/03/08
- [PULL 02/11] aspeed/smc: Use max number of CE instead of 'num_cs', Cédric Le Goater, 2022/03/08
- [PULL 11/11] hw: aspeed_gpio: Cleanup stray semicolon after switch, Cédric Le Goater, 2022/03/08
- [PULL 10/11] hw/arm/aspeed: add Bletchley machine type, Cédric Le Goater, 2022/03/08
- [PULL 09/11] hw/arm/aspeed: allow missing spi_model, Cédric Le Goater, 2022/03/08
- [PULL 03/11] aspeed: Rework aspeed_board_init_flashes() interface,
Cédric Le Goater <=
- [PULL 01/11] aspeed: Fix a potential memory leak bug in write_boot_rom(), Cédric Le Goater, 2022/03/08
- [PULL 07/11] aspeed/smc: Fix error log, Cédric Le Goater, 2022/03/08
- [PULL 05/11] aspeed/smc: Rename 'max_peripherals' to 'cs_num_max', Cédric Le Goater, 2022/03/08
- [PULL 06/11] aspeed/smc: Let the SSI core layer define the bus name, Cédric Le Goater, 2022/03/08
- [PULL 08/11] hw/block: m25p80: Add support for w25q01jvq, Cédric Le Goater, 2022/03/08
- Re: [PULL 00/11] aspeed queue, Peter Maydell, 2022/03/09