mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aspeed/smc: Restore default AHB window mapping at reset

Browse Source 
The current model only restores the Segment Register values but leaves
the previous CS mapping behind. Introduce a helper setting the
register value and mapping the region at the requested address. Use
this helper when a Segment register is set and at reset.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-id: 20191119141211.25716-11-clg@kaod.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Cédric Le Goater 2019-11-19 15:12:04 +01:00 committed by Peter Maydell
parent 28c80f15fc
commit 673b1f8650
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/ssi/aspeed_smc.c
View File

@ -475,10 +475,26 @@ static bool aspeed_smc_flash_overlap(const AspeedSMCState *s,
return false; return false;
} }
static void aspeed_smc_flash_set_segment_region(AspeedSMCState *s, int cs,
uint64_t regval)
{
AspeedSMCFlash *fl = &s->flashes[cs];
AspeedSegments seg;
s->ctrl->reg_to_segment(s, regval, &seg);
memory_region_transaction_begin();
memory_region_set_size(&fl->mmio, seg.size);
memory_region_set_address(&fl->mmio, seg.addr - s->ctrl->flash_window_base);
memory_region_set_enabled(&fl->mmio, true);
memory_region_transaction_commit();
s->regs[R_SEG_ADDR0 + cs] = regval;
}
static void aspeed_smc_flash_set_segment(AspeedSMCState *s, int cs, static void aspeed_smc_flash_set_segment(AspeedSMCState *s, int cs,
uint64_t new) uint64_t new)
{ {
AspeedSMCFlash *fl = &s->flashes[cs];
AspeedSegments seg; AspeedSegments seg;
s->ctrl->reg_to_segment(s, new, &seg); s->ctrl->reg_to_segment(s, new, &seg);
@ -529,13 +545,7 @@ static void aspeed_smc_flash_set_segment(AspeedSMCState *s, int cs,
aspeed_smc_flash_overlap(s, &seg, cs); aspeed_smc_flash_overlap(s, &seg, cs);
/* All should be fine now to move the region */ /* All should be fine now to move the region */
memory_region_transaction_begin(); aspeed_smc_flash_set_segment_region(s, cs, new);
memory_region_set_size(&fl->mmio, seg.size);
memory_region_set_address(&fl->mmio, seg.addr - s->ctrl->flash_window_base);
memory_region_set_enabled(&fl->mmio, true);
memory_region_transaction_commit();
s->regs[R_SEG_ADDR0 + cs] = new;
} }
static uint64_t aspeed_smc_flash_default_read(void *opaque, hwaddr addr, static uint64_t aspeed_smc_flash_default_read(void *opaque, hwaddr addr,
@ -897,10 +907,10 @@ static void aspeed_smc_reset(DeviceState *d)
qemu_set_irq(s->cs_lines[i], true); qemu_set_irq(s->cs_lines[i], true);
} }
/* setup default segment register values for all */ /* setup the default segment register values and regions for all */
for (i = 0; i < s->ctrl->max_slaves; ++i) { for (i = 0; i < s->ctrl->max_slaves; ++i) {
s->regs[R_SEG_ADDR0 + i] = aspeed_smc_flash_set_segment_region(s, i,
s->ctrl->segment_to_reg(s, &s->ctrl->segments[i]); s->ctrl->segment_to_reg(s, &s->ctrl->segments[i]));
} }
/* HW strapping flash type for the AST2600 controllers */ /* HW strapping flash type for the AST2600 controllers */