[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/17] aspeed/smc: Do not map disabled segment on the AST2600
From: |
Cédric Le Goater |
Subject: |
[PATCH 11/17] aspeed/smc: Do not map disabled segment on the AST2600 |
Date: |
Tue, 19 Nov 2019 15:12:05 +0100 |
The segments can be disabled on the AST2600 (zero register value).
CS0 is open by default but not the other CS. This is closing the
access to the flash device in user mode and forbids scanning.
In the model, check the segment size and disable the associated region
when the value is zero.
Fixes: bcaa8ddd081c ("aspeed/smc: Add AST2600 support")
Signed-off-by: Cédric Le Goater <address@hidden>
Reviewed-by: Joel Stanley <address@hidden>
Signed-off-by: Cédric Le Goater <address@hidden>
---
hw/ssi/aspeed_smc.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index 955ec21852ac..86cadbe4cc00 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -444,8 +444,13 @@ static void aspeed_2600_smc_reg_to_segment(const
AspeedSMCState *s,
uint32_t start_offset = (reg << 16) & AST2600_SEG_ADDR_MASK;
uint32_t end_offset = reg & AST2600_SEG_ADDR_MASK;
- seg->addr = s->ctrl->flash_window_base + start_offset;
- seg->size = end_offset + MiB - start_offset;
+ if (reg) {
+ seg->addr = s->ctrl->flash_window_base + start_offset;
+ seg->size = end_offset + MiB - start_offset;
+ } else {
+ seg->addr = s->ctrl->flash_window_base;
+ seg->size = 0;
+ }
}
static bool aspeed_smc_flash_overlap(const AspeedSMCState *s,
@@ -486,7 +491,7 @@ static void
aspeed_smc_flash_set_segment_region(AspeedSMCState *s, int cs,
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_set_enabled(&fl->mmio, !!seg.size);
memory_region_transaction_commit();
s->regs[R_SEG_ADDR0 + cs] = regval;
@@ -526,8 +531,9 @@ static void aspeed_smc_flash_set_segment(AspeedSMCState *s,
int cs,
}
/* Keep the segment in the overall flash window */
- if (seg.addr + seg.size <= s->ctrl->flash_window_base ||
- seg.addr > s->ctrl->flash_window_base + s->ctrl->flash_window_size) {
+ if (seg.size &&
+ (seg.addr + seg.size <= s->ctrl->flash_window_base ||
+ seg.addr > s->ctrl->flash_window_base + s->ctrl->flash_window_size)) {
qemu_log_mask(LOG_GUEST_ERROR, "%s: new segment for CS%d is invalid : "
"[ 0x%"HWADDR_PRIx" - 0x%"HWADDR_PRIx" ]\n",
s->ctrl->name, cs, seg.addr, seg.addr + seg.size);
--
2.21.0
- [PATCH 01/17] aspeed/i2c: Add support for pool buffer transfers, (continued)
- [PATCH 01/17] aspeed/i2c: Add support for pool buffer transfers, Cédric Le Goater, 2019/11/19
- [PATCH 02/17] aspeed/i2c: Check SRAM enablement on AST2500, Cédric Le Goater, 2019/11/19
- [PATCH 03/17] aspeed: Add a DRAM memory region at the SoC level, Cédric Le Goater, 2019/11/19
- [PATCH 04/17] aspeed/i2c: Add support for DMA transfers, Cédric Le Goater, 2019/11/19
- [PATCH 05/17] aspeed/i2c: Add trace events, Cédric Le Goater, 2019/11/19
- [PATCH 06/17] aspeed/sdmc: Make ast2600 default 1G, Cédric Le Goater, 2019/11/19
- [PATCH 07/17] aspeed/scu: Fix W1C behavior, Cédric Le Goater, 2019/11/19
- [PATCH 08/17] watchdog/aspeed: Improve watchdog timeout message, Cédric Le Goater, 2019/11/19
- [PATCH 09/17] watchdog/aspeed: Fix AST2600 frequency behaviour, Cédric Le Goater, 2019/11/19
- [PATCH 10/17] aspeed/smc: Restore default AHB window mapping at reset, Cédric Le Goater, 2019/11/19
- [PATCH 11/17] aspeed/smc: Do not map disabled segment on the AST2600,
Cédric Le Goater <=
- [PATCH 12/17] aspeed/smc: Add AST2600 timings registers, Cédric Le Goater, 2019/11/19
- [PATCH 13/17] aspeed: Remove AspeedBoardConfig array and use AspeedMachineClass, Cédric Le Goater, 2019/11/19
- [PATCH 14/17] aspeed: Add support for the tacoma-bmc board, Cédric Le Goater, 2019/11/19
- [PATCH 15/17] gpio: fix memory leak in aspeed_gpio_init(), Cédric Le Goater, 2019/11/19
- [PATCH 16/17] aspeed: Change the "scu" property definition, Cédric Le Goater, 2019/11/19
- [PATCH 17/17] aspeed: Change the "nic" property definition, Cédric Le Goater, 2019/11/19