[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/34] aspeed/smc: Restore default AHB window mapping at reset
From: |
Peter Maydell |
Subject: |
[PULL 12/34] aspeed/smc: Restore default AHB window mapping at reset |
Date: |
Mon, 16 Dec 2019 11:08:42 +0000 |
From: Cédric Le Goater <address@hidden>
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 <address@hidden>
Reviewed-by: Joel Stanley <address@hidden>
Signed-off-by: Cédric Le Goater <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/ssi/aspeed_smc.c | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index f0c7bbbad30..955ec21852a 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -475,10 +475,26 @@ static bool aspeed_smc_flash_overlap(const AspeedSMCState
*s,
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,
uint64_t new)
{
- AspeedSMCFlash *fl = &s->flashes[cs];
AspeedSegments 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);
/* All should be fine now to move the region */
- 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] = new;
+ aspeed_smc_flash_set_segment_region(s, cs, new);
}
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);
}
- /* 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) {
- s->regs[R_SEG_ADDR0 + i] =
- s->ctrl->segment_to_reg(s, &s->ctrl->segments[i]);
+ aspeed_smc_flash_set_segment_region(s, i,
+ s->ctrl->segment_to_reg(s, &s->ctrl->segments[i]));
}
/* HW strapping flash type for the AST2600 controllers */
--
2.20.1
- [PULL 00/34] target-arm queue, Peter Maydell, 2019/12/16
- [PULL 01/34] target/arm: Add support for cortex-m7 CPU, Peter Maydell, 2019/12/16
- [PULL 05/34] aspeed: Add a DRAM memory region at the SoC level, Peter Maydell, 2019/12/16
- [PULL 02/34] exynos4210_gic: Suppress gcc9 format-truncation warnings, Peter Maydell, 2019/12/16
- [PULL 04/34] aspeed/i2c: Check SRAM enablement on AST2500, Peter Maydell, 2019/12/16
- [PULL 03/34] aspeed/i2c: Add support for pool buffer transfers, Peter Maydell, 2019/12/16
- [PULL 06/34] aspeed/i2c: Add support for DMA transfers, Peter Maydell, 2019/12/16
- [PULL 08/34] aspeed/sdmc: Make ast2600 default 1G, Peter Maydell, 2019/12/16
- [PULL 09/34] aspeed/scu: Fix W1C behavior, Peter Maydell, 2019/12/16
- [PULL 07/34] aspeed/i2c: Add trace events, Peter Maydell, 2019/12/16
- [PULL 12/34] aspeed/smc: Restore default AHB window mapping at reset,
Peter Maydell <=
- [PULL 10/34] watchdog/aspeed: Improve watchdog timeout message, Peter Maydell, 2019/12/16
- [PULL 11/34] watchdog/aspeed: Fix AST2600 frequency behaviour, Peter Maydell, 2019/12/16
- [PULL 13/34] aspeed/smc: Do not map disabled segment on the AST2600, Peter Maydell, 2019/12/16
- [PULL 14/34] aspeed/smc: Add AST2600 timings registers, Peter Maydell, 2019/12/16
- [PULL 16/34] aspeed: Add support for the tacoma-bmc board, Peter Maydell, 2019/12/16
- [PULL 15/34] aspeed: Remove AspeedBoardConfig array and use AspeedMachineClass, Peter Maydell, 2019/12/16
- [PULL 17/34] gpio: fix memory leak in aspeed_gpio_init(), Peter Maydell, 2019/12/16
- [PULL 18/34] aspeed: Change the "scu" property definition, Peter Maydell, 2019/12/16
- [PULL 19/34] aspeed: Change the "nic" property definition, Peter Maydell, 2019/12/16
- [PULL 20/34] target/arm: Honor HCR_EL2.TID2 trapping requirements, Peter Maydell, 2019/12/16