Aspeed: machine extensions and fixes
cover Aspeed: machine extensions and fixes
Hello,
This series improves the current models of the Aspeed machines in QEMU and adds new ones. It also prepares ground for the models of the Aspeed AST2600 SoC by calculating the model typenames using the SoC name.
You will find patches for :
- DMA support for the SMC controller, now using address_space_stl/ldl_le
- GPIO v5 model from Rashmica
Thanks,
C.
Christian Svensson (1):
aspeed/smc: Calculate checksum on normal DMA
Cédric Le Goater (7):
aspeed: Remove unused SoC definitions
aspeed: Use consistent typenames
aspeed/smc: Add support for DMAs
aspeed/smc: Add DMA calibration settings aspeed/smc: Inject errors in DMA checksum aspeed/scu: Introduce per-SoC SCU types aspeed/scu: Introduce a aspeed_scu_get_apb_freq() routine
Rashmica Gupta (2):
hw/gpio: Add basic Aspeed GPIO model for AST2400 and AST2500
aspeed: add a GPIO controller to the SoC
include/hw/arm/aspeed_soc.h | 4 +- include/hw/gpio/aspeed_gpio.h | 100 ++++ include/hw/misc/aspeed_scu.h | 21 +- include/hw/ssi/aspeed_smc.h | 7 + hw/arm/aspeed.c | 2 + hw/arm/aspeed_soc.c | 63 ++- hw/gpio/aspeed_gpio.c | 884 ++++++++++++++++++++++++++++++++++ hw/misc/aspeed_scu.c | 102 ++-- hw/ssi/aspeed_smc.c | 335 ++++++++++++- hw/timer/aspeed_timer.c | 3 +- hw/gpio/Makefile.objs | 1 + 11 files changed, 1418 insertions(+), 104 deletions(-) create mode 100644 include/hw/gpio/aspeed_gpio.h create mode 100644 hw/gpio/aspeed_gpio.c
Signature · 1 line
2.21.0
PATCH 1/10 hw/gpio: Add basic Aspeed GPIO model for AST2400 and AST2500
From: Rashmica Gupta <[email protected]>
GPIO pins are arranged in groups of 8 pins labeled A,B,..,Y,Z,AA,AB,AC. (Note that the ast2400 controller only goes up to group AB). A set has four groups (except set AC which only has one) and is referred to by the groups it is composed of (eg ABCD,EFGH,...,YZAAAB). Each set is accessed and controlled by a bank of 14 registers.
These registers operate on a per pin level where each bit in the register corresponds to a pin, except for the command source registers. The command source registers operate on a per group level where bits 24, 16, 8 and 0 correspond to each group in the set.
eg. registers for set ABCD:
|D7...D0|C7...C0|B7...B0|A7...A0| <- GPIOs |31...24|23...16|15....8|7.....0| <- bit position
Note that there are a couple of groups that only have 4 pins.
There are two ways that this model deviates from the behaviour of the actual controller:
(1) The only control source driving the GPIO pins in the model is the ARM model (as there currently aren't models for the LPC or Coprocessor).
(2) None of the registers in the model are reset tolerant (needs integration with the watchdog).
[clg: fixed missing header files
made use of HWADDR_PRIx to fix compilation on windows ]
--- include/hw/gpio/aspeed_gpio.h | 100 ++++ hw/gpio/aspeed_gpio.c | 884 ++++++++++++++++++++++++++++++++++ hw/gpio/Makefile.objs | 1 + 3 files changed, 985 insertions(+) create mode 100644 include/hw/gpio/aspeed_gpio.h create mode 100644 hw/gpio/aspeed_gpio.c
include/hw/gpio/aspeed_gpio.h new file +100 -0
@@ -0,0 +1,100 @@ +/* +* ASPEED GPIO Controller +* +* Copyright (C) 2017-2018 IBM Corp. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +*/ + +#ifndef ASPEED_GPIO_H +#define ASPEED_GPIO_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_GPIO "aspeed.gpio" +#define ASPEED_GPIO (obj) OBJECT_CHECK(AspeedGPIOState, (obj), TYPE_ASPEED_GPIO) +#define ASPEED_GPIO_CLASS (klass) \ + OBJECT_CLASS_CHECK(AspeedGPIOClass, (klass), TYPE_ASPEED_GPIO) +#define ASPEED_GPIO_GET_CLASS (obj) \ + OBJECT_GET_CLASS(AspeedGPIOClass, (obj), TYPE_ASPEED_GPIO) + +#define ASPEED_GPIO_MAX_NR_SETS 8 +#define ASPEED_REGS_PER_BANK 14 +#define ASPEED_GPIO_MAX_NR_REGS (ASPEED_REGS_PER_BANK * ASPEED_GPIO_MAX_NR_SETS) +#define ASPEED_GPIO_NR_PINS 228 +#define ASPEED_GROUPS_PER_SET 4 +#define ASPEED_GPIO_NR_DEBOUNCE_REGS 3 +#define ASPEED_CHARS_PER_GROUP_LABEL 4 + +typedef struct GPIOSets GPIOSets ; + +typedef struct GPIOSetProperties { +uint32_t input; +uint32_t output; +char group_label[ASPEED_GROUPS_PER_SET ][ASPEED_CHARS_PER_GROUP_LABEL ]; +}GPIOSetProperties ; + +enum GPIORegType { + gpio_not_a_reg, + gpio_reg_data_value, + gpio_reg_direction, + gpio_reg_int_enable, + gpio_reg_int_sens_0, + gpio_reg_int_sens_1, + gpio_reg_int_sens_2, + gpio_reg_int_status, + gpio_reg_reset_tolerant, + gpio_reg_debounce_1, + gpio_reg_debounce_2, + gpio_reg_cmd_source_0, + gpio_reg_cmd_source_1, + gpio_reg_data_read, + gpio_reg_input_mask, +}; + +typedef struct AspeedGPIOReg { +uint16_t set_idx; +enum GPIORegType type; + }AspeedGPIOReg ; + +typedef struct AspeedGPIOClass { +SysBusDevice parent_obj; +const GPIOSetProperties *props; +uint32_t nr_gpio_pins; +uint32_t nr_gpio_sets; +uint32_t gap; +const AspeedGPIOReg *reg_table; +}AspeedGPIOClass ; + +typedef struct AspeedGPIOState { +/* <private> */ +SysBusDevice parent; + +/*< public >*/ +MemoryRegion iomem; +int pending; +qemu_irq irq; +qemu_irq gpios[ASPEED_GPIO_NR_PINS ]; + +/* Parallel GPIO Registers */ +uint32_t debounce_regs[ASPEED_GPIO_NR_DEBOUNCE_REGS ]; +struct GPIOSets { +uint32_t data_value;/* Reflects pin values */ +uint32_t data_read;/* Contains last value written to data value */ +uint32_t direction; +uint32_t int_enable; +uint32_t int_sens_0; +uint32_t int_sens_1; +uint32_t int_sens_2; +uint32_t int_status; +uint32_t reset_tol; +uint32_t cmd_source_0; +uint32_t cmd_source_1; +uint32_t debounce_1; +uint32_t debounce_2; +uint32_t input_mask; + } sets[ASPEED_GPIO_MAX_NR_SETS ]; +}AspeedGPIOState ; + +#endif /* _ASPEED_GPIO_H_ */
hw/gpio/aspeed_gpio.c new file +884 -0
884 lines not on this page · raw message
hw/gpio/Makefile.objs +1 -0
@@ -9,3 +9,4 @@ obj-$(CONFIG_OMAP) += omap_gpio.o obj-$(CONFIG_IMX) += imx_gpio.o obj-$(CONFIG_RASPI) += bcm2835_gpio.o obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o +obj-$(CONFIG_ASPEED_SOC) += aspeed_gpio.o
Signature · 1 line
2.21.0
PATCH 2/10 aspeed: add a GPIO controller to the SoC
In reply to Cédric Le GoaterFrom: Rashmica Gupta <[email protected]>
--- include/hw/arm/aspeed_soc.h | 3 +++ hw/arm/aspeed_soc.c | 17 +++++++++++++++++ 2 files changed, 20 insertions(+)
include/hw/arm/aspeed_soc.h +3 -0
@@ -23,6 +23,7 @@#include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h" +#include "hw/gpio/aspeed_gpio.h" #define ASPEED_SPIS_NUM 2#define ASPEED_WDTS_NUM 3
@@ -48,6 +49,7 @@ typedef struct AspeedSoCState {AspeedSDMCState sdmc;AspeedWDTState wdt[ASPEED_WDTS_NUM ];FTGMAC100State ftgmac100[ASPEED_MACS_NUM ]; +AspeedGPIOState gpio; } AspeedSoCState;#define TYPE_ASPEED_SOC "aspeed-soc"
@@ -61,6 +63,7 @@ typedef struct AspeedSoCInfo {int spis_num;const char *fmc_typename;const char **spi_typename; +const char *gpio_typename;int wdts_num;const int *irqmap;const hwaddr *memmap;
hw/arm/aspeed_soc.c +17 -0
@@ -125,6 +125,7 @@ static const AspeedSoCInfo aspeed_socs[] = { .spis_num = 1, .fmc_typename = "aspeed.smc.fmc", .spi_typename = aspeed_soc_ast2400_typenames, + .gpio_typename = "aspeed.gpio-ast2400", .wdts_num = 2, .irqmap = aspeed_soc_ast2400_irqmap, .memmap = aspeed_soc_ast2400_memmap,
@@ -137,6 +138,7 @@ static const AspeedSoCInfo aspeed_socs[] = { .spis_num = 1, .fmc_typename = "aspeed.smc.fmc", .spi_typename = aspeed_soc_ast2400_typenames, + .gpio_typename = "aspeed.gpio-ast2400", .wdts_num = 2, .irqmap = aspeed_soc_ast2400_irqmap, .memmap = aspeed_soc_ast2400_memmap,
@@ -149,6 +151,7 @@ static const AspeedSoCInfo aspeed_socs[] = { .spis_num = 1, .fmc_typename = "aspeed.smc.fmc", .spi_typename = aspeed_soc_ast2400_typenames, + .gpio_typename = "aspeed.gpio-ast2400", .wdts_num = 2, .irqmap = aspeed_soc_ast2400_irqmap, .memmap = aspeed_soc_ast2400_memmap,
@@ -161,6 +164,7 @@ static const AspeedSoCInfo aspeed_socs[] = { .spis_num = 2, .fmc_typename = "aspeed.smc.ast2500-fmc", .spi_typename = aspeed_soc_ast2500_typenames, + .gpio_typename = "aspeed.gpio-ast2500", .wdts_num = 3, .irqmap = aspeed_soc_ast2500_irqmap, .memmap = aspeed_soc_ast2500_memmap,
@@ -247,6 +251,9 @@ static void aspeed_soc_init(Object *obj)sysbus_init_child_obj (obj,"xdma" ,OBJECT (&s->xdma),sizeof (s->xdma),TYPE_ASPEED_XDMA ); + +sysbus_init_child_obj (obj,"gpio" ,OBJECT (&s->gpio),sizeof (s->gpio), + sc->info->gpio_typename); }static void aspeed_soc_realize (DeviceState *dev,Error **errp)
@@ -426,6 +433,16 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) sc->info->memmap[ASPEED_XDMA]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->xdma),0 ,aspeed_soc_get_irq (s,ASPEED_XDMA )); + +/* GPIO */ +object_property_set_bool (OBJECT (&s->gpio), true,"realized" , &err); +if (err) { +error_propagate (errp, err); +return ; + } +sysbus_mmio_map (SYS_BUS_DEVICE (&s->gpio),0 , sc->info->memmap[ASPEED_GPIO ]); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpio),0 , +aspeed_soc_get_irq (s,ASPEED_GPIO )); }static Property aspeed_soc_properties[] = {DEFINE_PROP_UINT32 ("num-cpus" , AspeedSoCState, num_cpus,0 ),
Signature · 1 line
2.21.0
PATCH 3/10 aspeed: Remove unused SoC definitions
In reply to Cédric Le GoaterThere are no QEMU Aspeed machines using the SoCs "ast2400-a0" or "ast2400".
--- hw/arm/aspeed_soc.c | 26 -------------------------- 1 file changed, 26 deletions(-)
hw/arm/aspeed_soc.c +0 -26
@@ -118,19 +118,6 @@ static const char *aspeed_soc_ast2500_typenames[] = {static const AspeedSoCInfo aspeed_socs[] = { { - .name ="ast2400-a0" , - .cpu_type =ARM_CPU_TYPE_NAME ("arm926" ), - .silicon_rev =AST2400_A0_SILICON_REV , - .sram_size =0x8000 , - .spis_num =1 , - .fmc_typename ="aspeed.smc.fmc" , - .spi_typename = aspeed_soc_ast2400_typenames, - .gpio_typename ="aspeed.gpio-ast2400" , - .wdts_num =2 , - .irqmap = aspeed_soc_ast2400_irqmap, - .memmap = aspeed_soc_ast2400_memmap, - .num_cpus =1 , - }, { .name ="ast2400-a1" , .cpu_type =ARM_CPU_TYPE_NAME ("arm926" ), .silicon_rev =AST2400_A1_SILICON_REV ,
@@ -143,19 +130,6 @@ static const AspeedSoCInfo aspeed_socs[] = { .irqmap = aspeed_soc_ast2400_irqmap, .memmap = aspeed_soc_ast2400_memmap, .num_cpus = 1, - }, { - .name = "ast2400", - .cpu_type = ARM_CPU_TYPE_NAME("arm926"), - .silicon_rev = AST2400_A0_SILICON_REV, - .sram_size = 0x8000, - .spis_num = 1, - .fmc_typename = "aspeed.smc.fmc", - .spi_typename = aspeed_soc_ast2400_typenames, - .gpio_typename = "aspeed.gpio-ast2400", - .wdts_num = 2, - .irqmap = aspeed_soc_ast2400_irqmap, - .memmap = aspeed_soc_ast2400_memmap, - .num_cpus = 1, }, { .name = "ast2500-a1", .cpu_type = ARM_CPU_TYPE_NAME("arm1176"),
Signature · 1 line
2.21.0
PATCH 4/10 aspeed: Use consistent typenames
In reply to Cédric Le GoaterImprove the naming of the different controller models to ease their generation when initializing the SoC. The rename of the SMC types is breaking migration compatibility.
--- include/hw/arm/aspeed_soc.h | 3 --- hw/arm/aspeed_soc.c | 25 ++++++++++++------------- hw/ssi/aspeed_smc.c | 12 ++++++------ 3 files changed, 18 insertions(+), 22 deletions(-)
include/hw/arm/aspeed_soc.h +0 -3
@@ -61,9 +61,6 @@ typedef struct AspeedSoCInfo {uint32_t silicon_rev;uint64_t sram_size;int spis_num; -const char *fmc_typename; -const char **spi_typename; -const char *gpio_typename;int wdts_num;const int *irqmap;const hwaddr *memmap;
hw/arm/aspeed_soc.c +12 -13
@@ -112,10 +112,6 @@ static const int aspeed_soc_ast2400_irqmap[] = {#define aspeed_soc_ast2500_irqmap aspeed_soc_ast2400_irqmap -static const char *aspeed_soc_ast2400_typenames[] = {"aspeed.smc.spi" }; -static const char *aspeed_soc_ast2500_typenames[] = { -"aspeed.smc.ast2500-spi1" ,"aspeed.smc.ast2500-spi2" }; -static const AspeedSoCInfo aspeed_socs[] = { { .name ="ast2400-a1" ,
@@ -123,9 +119,6 @@ static const AspeedSoCInfo aspeed_socs[] = { .silicon_rev = AST2400_A1_SILICON_REV, .sram_size = 0x8000, .spis_num = 1, - .fmc_typename = "aspeed.smc.fmc", - .spi_typename = aspeed_soc_ast2400_typenames, - .gpio_typename = "aspeed.gpio-ast2400", .wdts_num = 2, .irqmap = aspeed_soc_ast2400_irqmap, .memmap = aspeed_soc_ast2400_memmap,
@@ -136,9 +129,6 @@ static const AspeedSoCInfo aspeed_socs[] = { .silicon_rev = AST2500_A1_SILICON_REV, .sram_size = 0x9000, .spis_num = 2, - .fmc_typename = "aspeed.smc.ast2500-fmc", - .spi_typename = aspeed_soc_ast2500_typenames, - .gpio_typename = "aspeed.gpio-ast2500", .wdts_num = 3, .irqmap = aspeed_soc_ast2500_irqmap, .memmap = aspeed_soc_ast2500_memmap,
@@ -158,6 +148,12 @@ static void aspeed_soc_init(Object *obj)AspeedSoCState *s =ASPEED_SOC (obj);AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s);int i; +char socname[8 ]; +char typename[64 ]; + +if (sscanf (sc->info->name,"%7s" , socname) !=1 ) { +g_assert_not_reached (); + }for (i =0 ; i < sc->info->num_cpus; i++) { object_initialize_child(obj, "cpu[*]", OBJECT(&s->cpu[i]),
@@ -190,14 +186,16 @@ static void aspeed_soc_init(Object *obj)sysbus_init_child_obj (obj,"i2c" ,OBJECT (&s->i2c),sizeof (s->i2c),TYPE_ASPEED_I2C ); +snprintf (typename,sizeof (typename),"aspeed.fmc-%s" , socname);sysbus_init_child_obj (obj,"fmc" ,OBJECT (&s->fmc),sizeof (s->fmc), - sc->info->fmc_typename); + typename);object_property_add_alias (obj,"num-cs" ,OBJECT (&s->fmc),"num-cs" , &error_abort);for (i =0 ; i < sc->info->spis_num; i++) { +snprintf (typename,sizeof (typename),"aspeed.spi%d-%s" , i +1 , socname);sysbus_init_child_obj (obj,"spi[*]" ,OBJECT (&s->spi[i]), -sizeof (s->spi[i]), sc->info->spi_typename[i]); +sizeof (s->spi[i]), typename); } sysbus_init_child_obj(obj, "sdmc", OBJECT(&s->sdmc), sizeof(s->sdmc),
@@ -226,8 +224,9 @@ static void aspeed_soc_init(Object *obj)sysbus_init_child_obj (obj,"xdma" ,OBJECT (&s->xdma),sizeof (s->xdma),TYPE_ASPEED_XDMA ); +snprintf (typename,sizeof (typename),"aspeed.gpio-%s" , socname);sysbus_init_child_obj (obj,"gpio" ,OBJECT (&s->gpio),sizeof (s->gpio), - sc->info->gpio_typename); + typename); }static void aspeed_soc_realize (DeviceState *dev,Error **errp)
hw/ssi/aspeed_smc.c +6 -6
@@ -190,7 +190,7 @@ static const AspeedSegments aspeed_segments_ast2500_spi2[] = {static const AspeedSMCController controllers[] = { { - .name ="aspeed.smc.smc" , + .name ="aspeed.smc-ast2400" , .r_conf =R_CONF , .r_ce_ctrl =R_CE_CTRL , .r_ctrl0 =R_CTRL0 ,
@@ -203,7 +203,7 @@ static const AspeedSMCController controllers[] = { .has_dma = false, .nregs = ASPEED_SMC_R_SMC_MAX, }, { - .name = "aspeed.smc.fmc", + .name = "aspeed.fmc-ast2400", .r_conf = R_CONF, .r_ce_ctrl = R_CE_CTRL, .r_ctrl0 = R_CTRL0,
@@ -216,7 +216,7 @@ static const AspeedSMCController controllers[] = { .has_dma = true, .nregs = ASPEED_SMC_R_MAX, }, { - .name = "aspeed.smc.spi", + .name = "aspeed.spi1-ast2400", .r_conf = R_SPI_CONF, .r_ce_ctrl = 0xff, .r_ctrl0 = R_SPI_CTRL0,
@@ -229,7 +229,7 @@ static const AspeedSMCController controllers[] = { .has_dma = false, .nregs = ASPEED_SMC_R_SPI_MAX, }, { - .name = "aspeed.smc.ast2500-fmc", + .name = "aspeed.fmc-ast2500", .r_conf = R_CONF, .r_ce_ctrl = R_CE_CTRL, .r_ctrl0 = R_CTRL0,
@@ -242,7 +242,7 @@ static const AspeedSMCController controllers[] = { .has_dma = true, .nregs = ASPEED_SMC_R_MAX, }, { - .name = "aspeed.smc.ast2500-spi1", + .name = "aspeed.spi1-ast2500", .r_conf = R_CONF, .r_ce_ctrl = R_CE_CTRL, .r_ctrl0 = R_CTRL0,
@@ -255,7 +255,7 @@ static const AspeedSMCController controllers[] = { .has_dma = false, .nregs = ASPEED_SMC_R_MAX, }, { - .name = "aspeed.smc.ast2500-spi2", + .name = "aspeed.spi2-ast2500", .r_conf = R_CONF, .r_ce_ctrl = R_CE_CTRL, .r_ctrl0 = R_CTRL0,
Signature · 1 line
2.21.0
PATCH 5/10 aspeed/smc: Add support for DMAs
In reply to Cédric Le GoaterThe FMC controller on the Aspeed SoCs support DMA to access the flash modules. It can operate in a normal mode, to copy to or from the flash module mapping window, or in a checksum calculation mode, to evaluate the best clock settings for reads.
The model introduces two custom address spaces for DMAs: one for the AHB window of the FMC flash devices and one for the DRAM. The latter is populated using a "dram" link set from the machine with the RAM container region.
---
Changes since v2 (18/06/2019):
- usage of address_space_stl/ldl_le
include/hw/ssi/aspeed_smc.h | 6 + hw/arm/aspeed.c | 2 + hw/arm/aspeed_soc.c | 2 + hw/ssi/aspeed_smc.c | 222 +++++++++++++++++++++++++++++++++++- 4 files changed, 226 insertions(+), 6 deletions(-)
include/hw/ssi/aspeed_smc.h +6 -0
@@ -46,6 +46,8 @@ typedef struct AspeedSMCController {hwaddr flash_window_base;uint32_t flash_window_size;bool has_dma; +hwaddr dma_flash_mask; +hwaddr dma_dram_mask;uint32_t nregs; } AspeedSMCController;
@@ -101,6 +103,10 @@ typedef struct AspeedSMCState {/* for DMA support */ uint64_t sdram_base; +AddressSpace flash_as; +MemoryRegion *dram_mr; +AddressSpace dram_as; +AspeedSMCFlash *flashes;uint8_t snoop_index;
hw/arm/aspeed.c +2 -0
@@ -190,6 +190,8 @@ static void aspeed_board_init(MachineState *machine, &error_abort);object_property_set_int (OBJECT (&bmc->soc), machine->smp.cpus,"num-cpus" , &error_abort); +object_property_set_link (OBJECT (&bmc->soc),OBJECT (&bmc->ram_container), +"dram" , &error_abort);if (machine->kernel_filename) {/* * When booting with a -kernel command line there is no u-boot
hw/arm/aspeed_soc.c +2 -0
@@ -191,6 +191,8 @@ static void aspeed_soc_init(Object *obj) typename);object_property_add_alias (obj,"num-cs" ,OBJECT (&s->fmc),"num-cs" , &error_abort); +object_property_add_alias (obj,"dram" ,OBJECT (&s->fmc),"dram" , + &error_abort);for (i =0 ; i < sc->info->spis_num; i++) {snprintf (typename,sizeof (typename),"aspeed.spi%d-%s" , i +1 , socname);
hw/ssi/aspeed_smc.c +216 -6
303 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH 6/10 aspeed/smc: Add DMA calibration settings
In reply to Cédric Le GoaterWhen doing calibration, the SPI clock rate in the CE0 Control Register and the read delay cycles in the Read Timing Compensation Register are set using bit[11:4] of the DMA Control Register.
--- hw/ssi/aspeed_smc.c | 64 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-)
hw/ssi/aspeed_smc.c +63 -1
@@ -77,6 +77,10 @@#define CTRL_CMD_MASK 0xff#define CTRL_DUMMY_HIGH_SHIFT 14#define CTRL_AST2400_SPI_4BYTE (1 << 13) +#define CE_CTRL_CLOCK_FREQ_SHIFT 8 +#define CE_CTRL_CLOCK_FREQ_MASK 0xf +#define CE_CTRL_CLOCK_FREQ (div) \ + (((div) & CE_CTRL_CLOCK_FREQ_MASK) << CE_CTRL_CLOCK_FREQ_SHIFT)#define CTRL_DUMMY_LOW_SHIFT 6/* 2 bits [7:6] */ #define CTRL_CE_STOP_ACTIVE (1 << 2)#define CTRL_CMD_MODE_MASK 0x3
@@ -112,7 +116,7 @@#define DMA_CTRL_DELAY_SHIFT 8#define DMA_CTRL_FREQ_MASK 0xf#define DMA_CTRL_FREQ_SHIFT 4 -#define DMA_CTRL_MODE (1 << 3) +#define DMA_CTRL_CALIB (1 << 3)#define DMA_CTRL_CKSUM (1 << 2)#define DMA_CTRL_WRITE (1 << 1)#define DMA_CTRL_ENABLE (1 << 0)
@@ -811,6 +815,60 @@ static uint64_t aspeed_smc_read(void *opaque, hwaddr addr, unsigned int size) } } +static uint8_t aspeed_smc_hclk_divisor (uint8_t hclk_mask) +{ +/* HCLK/1 .. HCLK/16 */ +const uint8_t hclk_divisors[] = { +15 ,7 ,14 ,6 ,13 ,5 ,12 ,4 ,11 ,3 ,10 ,2 ,9 ,1 ,8 ,0 + }; +int i; + +for (i =0 ; i <ARRAY_SIZE (hclk_divisors); i++) { +if (hclk_mask == hclk_divisors[i]) { +return i +1 ; + } + } + +qemu_log_mask (LOG_GUEST_ERROR ,"invalid HCLK mask %x" , hclk_mask); +return 0 ; +} + +/* +* When doing calibration, the SPI clock rate in the CE0 Control +* Register and the read delay cycles in the Read Timing Compensation +* Register are set using bit[11:4] of the DMA Control Register. +*/ +static void aspeed_smc_dma_calibration (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 ; +uint8_t hclk_div =aspeed_smc_hclk_divisor (hclk_mask); +uint32_t hclk_shift = (hclk_div -1 ) <<2 ; +uint8_t cs; + +/* +* The Read Timing Compensation Register values apply to all CS on +* the SPI bus and only HCLK/1 - HCLK/5 can have tunable delays +*/ +if (hclk_div && hclk_div <6 ) { + s->regs[s->r_timings] &= ~(0xf << hclk_shift); + s->regs[s->r_timings] |= delay << hclk_shift; + } + +/* +* TODO: compute the CS from the DMA address and the segment +* registers. This is not really a problem for now because the +* Timing Register values apply to all CS and software uses CS0 to +* do calibration. +*/ + cs =0 ; + s->regs[s->r_ctrl0 + cs] &= + ~(CE_CTRL_CLOCK_FREQ_MASK <<CE_CTRL_CLOCK_FREQ_SHIFT ); + s->regs[s->r_ctrl0 + cs] |=CE_CTRL_CLOCK_FREQ (hclk_div); +} +/* * Accumulate the result of the reads to provide a checksum that will * be used to validate the read timing settings.
@@ -826,6 +884,10 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s)return ; } +if (s->regs[R_DMA_CTRL ] &DMA_CTRL_CALIB ) { +aspeed_smc_dma_calibration (s); + } +while (s->regs[R_DMA_LEN ]) { data =address_space_ldl_le (&s->flash_as, s->regs[R_DMA_FLASH_ADDR ],MEMTXATTRS_UNSPECIFIED , &result);
Signature · 1 line
2.21.0
PATCH 7/10 aspeed/smc: Inject errors in DMA checksum
In reply to Cédric Le GoaterEmulate 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.
--- include/hw/ssi/aspeed_smc.h | 1 + hw/ssi/aspeed_smc.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+)
include/hw/ssi/aspeed_smc.h +1 -0
@@ -88,6 +88,7 @@ typedef struct AspeedSMCState {uint32_t num_cs;qemu_irq *cs_lines; +bool inject_failure;SSIBus *spi;
hw/ssi/aspeed_smc.c +36 -0
@@ -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 *),
Signature · 1 line
2.21.0
PATCH 8/10 aspeed/smc: Calculate checksum on normal DMA
In reply to Cédric Le GoaterFrom: Christian Svensson <[email protected]>
This patch adds the missing checksum calculation on normal DMA transfer. According to the datasheet this is how the SMC should behave.
Verified on AST1250 that the hardware matches the behaviour.
--- hw/ssi/aspeed_smc.c | 1 + 1 file changed, 1 insertion(+)
hw/ssi/aspeed_smc.c +1 -0
@@ -989,6 +989,7 @@ static void aspeed_smc_dma_rw(AspeedSMCState *s) s->regs[R_DMA_FLASH_ADDR ] +=4 ; s->regs[R_DMA_DRAM_ADDR ] +=4 ; s->regs[R_DMA_LEN ] -=4 ; + s->regs[R_DMA_CHECKSUM ] += data; } }
Signature · 1 line
2.21.0
PATCH 9/10 aspeed/scu: Introduce per-SoC SCU types
In reply to Cédric Le Goaterand use a class AspeedSCUClass to define each SoC characteristics.
--- include/hw/misc/aspeed_scu.h | 15 +++++++ hw/arm/aspeed_soc.c | 3 +- hw/misc/aspeed_scu.c | 83 ++++++++++++++++++++---------------- 3 files changed, 64 insertions(+), 37 deletions(-)
include/hw/misc/aspeed_scu.h +15 -0
@@ -15,6 +15,8 @@#define TYPE_ASPEED_SCU "aspeed.scu"#define ASPEED_SCU (obj) OBJECT_CHECK(AspeedSCUState, (obj), TYPE_ASPEED_SCU) +#define TYPE_ASPEED_2400_SCU TYPE_ASPEED_SCU "-ast2400" +#define TYPE_ASPEED_2500_SCU TYPE_ASPEED_SCU "-ast2500"#define ASPEED_SCU_NR_REGS (0x1A8 >> 2)
@@ -45,6 +47,19 @@ typedef struct AspeedSCUState {extern bool is_supported_silicon_rev (uint32_t silicon_rev); +#define ASPEED_SCU_CLASS (klass) \ + OBJECT_CLASS_CHECK(AspeedSCUClass, (klass), TYPE_ASPEED_SCU) +#define ASPEED_SCU_GET_CLASS (obj) \ + OBJECT_GET_CLASS(AspeedSCUClass, (obj), TYPE_ASPEED_SCU) + +typedef struct AspeedSCUClass { +SysBusDeviceClass parent_class; + +const uint32_t *resets; +uint32_t (*calc_hpll)(AspeedSCUState *s); +uint32_t apb_divider; +}AspeedSCUClass ; +#define ASPEED_SCU_PROT_KEY 0x1688A8A8/*
hw/arm/aspeed_soc.c +2 -1
@@ -161,8 +161,9 @@ static void aspeed_soc_init(Object *obj) &error_abort, NULL); } +snprintf (typename,sizeof (typename),"aspeed.scu-%s" , socname);sysbus_init_child_obj (obj,"scu" ,OBJECT (&s->scu),sizeof (s->scu), -TYPE_ASPEED_SCU ); + typename);qdev_prop_set_uint32 (DEVICE (&s->scu),"silicon-rev" , sc->info->silicon_rev); object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu),
hw/misc/aspeed_scu.c +47 -36
127 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH 10/10 aspeed/scu: Introduce a aspeed_scu_get_apb_freq() routine
In reply to Cédric Le GoaterThe APB frequency can be calculated directly when needed from the HPLL_PARAM and CLK_SEL register values. This removes useless state in the model.
--- include/hw/misc/aspeed_scu.h | 8 +++----- hw/misc/aspeed_scu.c | 25 +++++++++---------------- hw/timer/aspeed_timer.c | 3 ++- 3 files changed, 14 insertions(+), 22 deletions(-)
include/hw/misc/aspeed_scu.h +3 -5
@@ -32,10 +32,6 @@ typedef struct AspeedSCUState {uint32_t hw_strap1;uint32_t hw_strap2;uint32_t hw_prot_key; - -uint32_t clkin; -uint32_t hpll; -uint32_t apb_freq; } AspeedSCUState;#define AST2400_A0_SILICON_REV 0x02000303U
@@ -56,12 +52,14 @@ typedef struct AspeedSCUClass {SysBusDeviceClass parent_class;const uint32_t *resets; -uint32_t (*calc_hpll)(AspeedSCUState *s); +uint32_t (*calc_hpll)(AspeedSCUState *s,uint32_t hpll_reg);uint32_t apb_divider; } AspeedSCUClass;#define ASPEED_SCU_PROT_KEY 0x1688A8A8 +uint32_t aspeed_scu_get_apb_freq (AspeedSCUState *s); +/* * Extracted from Aspeed SDK v00.03.21. Fixes and extra definitions * were added.
hw/misc/aspeed_scu.c +9 -16
@@ -164,11 +164,12 @@ static uint32_t aspeed_scu_get_random(void)return num; } -static void aspeed_scu_set_apb_freq (AspeedSCUState *s) +uint32_t aspeed_scu_get_apb_freq (AspeedSCUState *s) {AspeedSCUClass *asc =ASPEED_SCU_GET_CLASS (s); +uint32_t hpll = asc->calc_hpll (s, s->regs[HPLL_PARAM ]); - s->apb_freq = s->hpll / (SCU_CLK_GET_PCLK_DIV (s->regs[CLK_SEL ]) +1 ) +return hpll / (SCU_CLK_GET_PCLK_DIV (s->regs[CLK_SEL ]) +1 ) / asc->apb_divider; }
@@ -228,7 +229,6 @@ static void aspeed_scu_write(void *opaque, hwaddr offset, uint64_t data,return ;case CLK_SEL : s->regs[reg] = data; -aspeed_scu_set_apb_freq (s);break ;case HW_STRAP1 :if (ASPEED_IS_AST2500 (s->regs[SILICON_REV ])) {
@@ -290,11 +290,11 @@ static const uint32_t hpll_ast2400_freqs[][4] = { { 400, 375, 350, 425 }, /* 25MHz */ }; -static uint32_t aspeed_2400_scu_calc_hpll (AspeedSCUState *s) +static uint32_t aspeed_2400_scu_calc_hpll (AspeedSCUState *s,uint32_t hpll_reg) { -uint32_t hpll_reg = s->regs[HPLL_PARAM ];uint8_t freq_select;bool clk_25m_in; +uint32_t clkin =aspeed_scu_get_clkin (s);if (hpll_reg &SCU_AST2400_H_PLL_OFF ) {return 0 ;
@@ -311,7 +311,7 @@ static uint32_t aspeed_2400_scu_calc_hpll(AspeedSCUState *s) multiplier = (2 - od) * ((n +2 ) / (d +1 )); } -return s->clkin * multiplier; +return clkin * multiplier; }/* HW strapping */
@@ -321,10 +321,10 @@ static uint32_t aspeed_2400_scu_calc_hpll(AspeedSCUState *s)return hpll_ast2400_freqs[clk_25m_in][freq_select] *1000000 ; } -static uint32_t aspeed_2500_scu_calc_hpll (AspeedSCUState *s) +static uint32_t aspeed_2500_scu_calc_hpll (AspeedSCUState *s,uint32_t hpll_reg) { -uint32_t hpll_reg = s->regs[HPLL_PARAM ];uint32_t multiplier =1 ; +uint32_t clkin =aspeed_scu_get_clkin (s);if (hpll_reg &SCU_H_PLL_OFF ) {return 0 ;
@@ -338,7 +338,7 @@ static uint32_t aspeed_2500_scu_calc_hpll(AspeedSCUState *s) multiplier = ((m +1 ) / (n +1 )) / (p +1 ); } -return s->clkin * multiplier; +return clkin * multiplier; }static void aspeed_scu_reset (DeviceState *dev)
@@ -351,13 +351,6 @@ static void aspeed_scu_reset(DeviceState *dev) s->regs[HW_STRAP1 ] = s->hw_strap1; s->regs[HW_STRAP2 ] = s->hw_strap2; s->regs[PROT_KEY ] = s->hw_prot_key; - -/* -* All registers are set. Now compute the frequencies of the main clocks -*/ - s->clkin =aspeed_scu_get_clkin (s); - s->hpll = asc->calc_hpll (s); -aspeed_scu_set_apb_freq (s); }static uint32_t aspeed_silicon_revs[] = {
hw/timer/aspeed_timer.c +2 -1
@@ -93,7 +93,8 @@ static inline uint32_t calculate_rate(struct AspeedTimer *t) {AspeedTimerCtrlState *s =timer_to_ctrl (t); -return timer_external_clock (t) ?TIMER_CLOCK_EXT_HZ : s->scu->apb_freq; +return timer_external_clock (t) ?TIMER_CLOCK_EXT_HZ : +aspeed_scu_get_apb_freq (s->scu); }static inline uint32_t calculate_ticks (struct AspeedTimer *t,uint64_t now_ns)
Signature · 1 line
2.21.0
Peter Maydell
AppliedQuoted 29 lines · Cédric Le Goater
Hello,
This series improves the current models of the Aspeed machines in QEMU and adds new ones. It also prepares ground for the models of the Aspeed AST2600 SoC by calculating the model typenames using the SoC name.
You will find patches for :
- DMA support for the SMC controller, now using address_space_stl/ldl_le
- GPIO v5 model from RashmicaThanks,
C.
Christian Svensson (1):
aspeed/smc: Calculate checksum on normal DMACédric Le Goater (7):
aspeed: Remove unused SoC definitions
aspeed: Use consistent typenames
aspeed/smc: Add support for DMAs
aspeed/smc: Add DMA calibration settings aspeed/smc: Inject errors in DMA checksum aspeed/scu: Introduce per-SoC SCU types aspeed/scu: Introduce aaspeed_scu_get_apb_freq()routine
Quoted 3 lines
Rashmica Gupta (2):
hw/gpio: Add basic Aspeed GPIO model for AST2400 and AST2500
aspeed: add a GPIO controller to the SoC
Applied to target-arm.next, thanks.
-- PMM