ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

aspeed/smc: Use max number of CE instead of 'num_cs' 

The Aspeed SMC model uses the 'num_cs' field to allocate resources
fitting the number of devices of the machine. This is a small
optimization without real need in the controller. Simplify modelling
and use the max_peripherals field instead.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20220307071856.1410731-2-clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Cédric Le Goater 2022-03-08 09:18:11 +01:00
parent 05e6e40a86
commit dcacfa9451
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/ssi/aspeed_smc.c
View File

@ -693,7 +693,7 @@ static void aspeed_smc_reset(DeviceState *d)
} }
/* Unselect all peripherals */ /* Unselect all peripherals */
for (i = 0; i < s->num_cs; ++i) { for (i = 0; i < asc->max_peripherals; ++i) {
s->regs[s->r_ctrl0 + i] |= CTRL_CE_STOP_ACTIVE; s->regs[s->r_ctrl0 + i] |= CTRL_CE_STOP_ACTIVE;
qemu_set_irq(s->cs_lines[i], true); qemu_set_irq(s->cs_lines[i], true);
} }
@ -1042,7 +1042,7 @@ static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data,
addr < s->r_timings + asc->nregs_timings) || addr < s->r_timings + asc->nregs_timings) ||
addr == s->r_ce_ctrl) { addr == s->r_ce_ctrl) {
s->regs[addr] = value; s->regs[addr] = value;
} else if (addr >= s->r_ctrl0 && addr < s->r_ctrl0 + s->num_cs) { } else if (addr >= s->r_ctrl0 && addr < s->r_ctrl0 + asc->max_peripherals) {
int cs = addr - s->r_ctrl0; int cs = addr - s->r_ctrl0;
aspeed_smc_flash_update_ctrl(&s->flashes[cs], value); aspeed_smc_flash_update_ctrl(&s->flashes[cs], value);
} else if (addr >= R_SEG_ADDR0 && } else if (addr >= R_SEG_ADDR0 &&
@ -1139,9 +1139,9 @@ static void aspeed_smc_realize(DeviceState *dev, Error **errp)
s->spi = ssi_create_bus(dev, "spi"); s->spi = ssi_create_bus(dev, "spi");
/* Setup cs_lines for peripherals */ /* Setup cs_lines for peripherals */
s->cs_lines = g_new0(qemu_irq, s->num_cs); s->cs_lines = g_new0(qemu_irq, asc->max_peripherals);
for (i = 0; i < s->num_cs; ++i) { for (i = 0; i < asc->max_peripherals; ++i) {
sysbus_init_irq(sbd, &s->cs_lines[i]); sysbus_init_irq(sbd, &s->cs_lines[i]);
} }