[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 07/10] aspeed/smc: Inject errors in DMA checksum
From: |
Cédric Le Goater |
Subject: |
[Qemu-arm] [PATCH 07/10] aspeed/smc: Inject errors in DMA checksum |
Date: |
Wed, 4 Sep 2019 09:05:03 +0200 |
Emulate read errors in the DMA Checksum Register for high frequencies
and optimistic settings of the Read Timing Compensation Register. This
will help in tuning the SPI timing calibration algorithm. Errors are
only injected when the property "inject_failure" is set to true as
suggested by Philippe.
The values below are those to expect from the first flash device of
the FMC controller of a palmetto-bmc machine.
Cc: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Cédric Le Goater <address@hidden>
Reviewed-by: Joel Stanley <address@hidden>
---
include/hw/ssi/aspeed_smc.h | 1 +
hw/ssi/aspeed_smc.c | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h
index 32ce6916f6cc..5176ff6bf95f 100644
--- a/include/hw/ssi/aspeed_smc.h
+++ b/include/hw/ssi/aspeed_smc.h
@@ -88,6 +88,7 @@ typedef struct AspeedSMCState {
uint32_t num_cs;
qemu_irq *cs_lines;
+ bool inject_failure;
SSIBus *spi;
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index 7a0cd7607fd0..5c3436db5e8f 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -869,6 +869,36 @@ static void aspeed_smc_dma_calibration(AspeedSMCState *s)
s->regs[s->r_ctrl0 + cs] |= CE_CTRL_CLOCK_FREQ(hclk_div);
}
+/*
+ * Emulate read errors in the DMA Checksum Register for high
+ * frequencies and optimistic settings of the Read Timing Compensation
+ * Register. This will help in tuning the SPI timing calibration
+ * algorithm.
+ */
+static bool aspeed_smc_inject_read_failure(AspeedSMCState *s)
+{
+ uint8_t delay =
+ (s->regs[R_DMA_CTRL] >> DMA_CTRL_DELAY_SHIFT) & DMA_CTRL_DELAY_MASK;
+ uint8_t hclk_mask =
+ (s->regs[R_DMA_CTRL] >> DMA_CTRL_FREQ_SHIFT) & DMA_CTRL_FREQ_MASK;
+
+ /*
+ * Typical values of a palmetto-bmc machine.
+ */
+ switch (aspeed_smc_hclk_divisor(hclk_mask)) {
+ case 4 ... 16:
+ return false;
+ case 3: /* at least one HCLK cycle delay */
+ return (delay & 0x7) < 1;
+ case 2: /* at least two HCLK cycle delay */
+ return (delay & 0x7) < 2;
+ case 1: /* (> 100MHz) is above the max freq of the controller */
+ return true;
+ default:
+ g_assert_not_reached();
+ }
+}
+
/*
* Accumulate the result of the reads to provide a checksum that will
* be used to validate the read timing settings.
@@ -905,6 +935,11 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s)
s->regs[R_DMA_FLASH_ADDR] += 4;
s->regs[R_DMA_LEN] -= 4;
}
+
+ if (s->inject_failure && aspeed_smc_inject_read_failure(s)) {
+ s->regs[R_DMA_CHECKSUM] = 0xbadc0de;
+ }
+
}
static void aspeed_smc_dma_rw(AspeedSMCState *s)
@@ -1185,6 +1220,7 @@ static const VMStateDescription vmstate_aspeed_smc = {
static Property aspeed_smc_properties[] = {
DEFINE_PROP_UINT32("num-cs", AspeedSMCState, num_cs, 1),
+ DEFINE_PROP_BOOL("inject-failure", AspeedSMCState, inject_failure, false),
DEFINE_PROP_UINT64("sdram-base", AspeedSMCState, sdram_base, 0),
DEFINE_PROP_LINK("dram", AspeedSMCState, dram_mr,
TYPE_MEMORY_REGION, MemoryRegion *),
--
2.21.0
- [Qemu-arm] [PATCH 00/10] Aspeed: machine extensions and fixes, Cédric Le Goater, 2019/09/04
- [Qemu-arm] [PATCH 02/10] aspeed: add a GPIO controller to the SoC, Cédric Le Goater, 2019/09/04
- [Qemu-arm] [PATCH 03/10] aspeed: Remove unused SoC definitions, Cédric Le Goater, 2019/09/04
- [Qemu-arm] [PATCH 01/10] hw/gpio: Add basic Aspeed GPIO model for AST2400 and AST2500, Cédric Le Goater, 2019/09/04
- [Qemu-arm] [PATCH 04/10] aspeed: Use consistent typenames, Cédric Le Goater, 2019/09/04
- [Qemu-arm] [PATCH 05/10] aspeed/smc: Add support for DMAs, Cédric Le Goater, 2019/09/04
- [Qemu-arm] [PATCH 06/10] aspeed/smc: Add DMA calibration settings, Cédric Le Goater, 2019/09/04
- [Qemu-arm] [PATCH 07/10] aspeed/smc: Inject errors in DMA checksum,
Cédric Le Goater <=
- [Qemu-arm] [PATCH 08/10] aspeed/smc: Calculate checksum on normal DMA, Cédric Le Goater, 2019/09/04
- [Qemu-arm] [PATCH 09/10] aspeed/scu: Introduce per-SoC SCU types, Cédric Le Goater, 2019/09/04
- [Qemu-arm] [PATCH 10/10] aspeed/scu: Introduce a aspeed_scu_get_apb_freq() routine, Cédric Le Goater, 2019/09/04
- Re: [Qemu-arm] [PATCH 00/10] Aspeed: machine extensions and fixes, Peter Maydell, 2019/09/11