Add AST2700 support
Subsystems (2)
PATCH v4 2/16 aspeed/sli: Add AST2700 support
In reply to Jamin Lin viaAST2700 SLI engine is designed to accelerate the
throughput between cross-die connections.
It have CPU_SLI at CPU die and IO_SLI at IO die.
Introduce dummy AST2700 SLI and SLIIO models.
--- hw/misc/aspeed_sli.c | 177 +++++++++++++++++++++++++++++++++++ hw/misc/meson.build | 3 +- hw/misc/trace-events | 7 ++ include/hw/misc/aspeed_sli.h | 27 ++++++ 4 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 hw/misc/aspeed_sli.c create mode 100644 include/hw/misc/aspeed_sli.h
hw/misc/aspeed_sli.c new file +177 -0
@@ -0,0 +1,177 @@ +/* +* ASPEED SLI Controller +* +* Copyright (C) 2024 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/error-report.h" +#include "hw/qdev-properties.h" +#include "hw/misc/aspeed_sli.h" +#include "qapi/error.h" +#include "migration/vmstate.h" +#include "trace.h" + +#define SLI_REGION_SIZE 0x500 +#define TO_REG (addr) ((addr) >> 2) + +static uint64_t aspeed_sli_read (void *opaque,hwaddr addr,unsigned int size) +{ +AspeedSLIState *s =ASPEED_SLI (opaque); +int reg =TO_REG (addr); + +if (reg >=ARRAY_SIZE (s->regs)) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds read at offset 0x%" HWADDR_PRIx"\n" , + __func__, addr); +return 0 ; + } + +trace_aspeed_sli_read (addr, size, s->regs[reg]); +return s->regs[reg]; +} + +static void aspeed_sli_write (void *opaque,hwaddr addr,uint64_t data, +unsigned int size) +{ +AspeedSLIState *s =ASPEED_SLI (opaque); +int reg =TO_REG (addr); + +if (reg >=ARRAY_SIZE (s->regs)) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx"\n" , + __func__, addr); +return ; + } + +trace_aspeed_sli_write (addr, size, data); + s->regs[reg] = data; +} + +static uint64_t aspeed_sliio_read (void *opaque,hwaddr addr,unsigned int size) +{ +AspeedSLIState *s =ASPEED_SLI (opaque); +int reg =TO_REG (addr); + +if (reg >=ARRAY_SIZE (s->regs)) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds read at offset 0x%" HWADDR_PRIx"\n" , + __func__, addr); +return 0 ; + } + +trace_aspeed_sliio_read (addr, size, s->regs[reg]); +return s->regs[reg]; +} + +static void aspeed_sliio_write (void *opaque,hwaddr addr,uint64_t data, +unsigned int size) +{ +AspeedSLIState *s =ASPEED_SLI (opaque); +int reg =TO_REG (addr); + +if (reg >=ARRAY_SIZE (s->regs)) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx"\n" , + __func__, addr); +return ; + } + +trace_aspeed_sliio_write (addr, size, data); + s->regs[reg] = data; +} + +static const MemoryRegionOps aspeed_sli_ops = { + .read = aspeed_sli_read, + .write = aspeed_sli_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =4 , + }, +}; + +static const MemoryRegionOps aspeed_sliio_ops = { + .read = aspeed_sliio_read, + .write = aspeed_sliio_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =4 , + }, +}; + +static void aspeed_sli_realize (DeviceState *dev,Error **errp) +{ +AspeedSLIState *s =ASPEED_SLI (dev); +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); + +memory_region_init_io (&s->iomem,OBJECT (s), &aspeed_sli_ops, s, +TYPE_ASPEED_SLI ,SLI_REGION_SIZE ); +sysbus_init_mmio (sbd, &s->iomem); +} + +static void aspeed_sliio_realize (DeviceState *dev,Error **errp) +{ +AspeedSLIState *s =ASPEED_SLI (dev); +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); + +memory_region_init_io (&s->iomem,OBJECT (s), &aspeed_sliio_ops, s, +TYPE_ASPEED_SLI ,SLI_REGION_SIZE ); +sysbus_init_mmio (sbd, &s->iomem); +} + +static void aspeed_sli_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->desc ="Aspeed SLI Controller" ; + dc->realize = aspeed_sli_realize; +} + +static const TypeInfo aspeed_sli_info = { + .name =TYPE_ASPEED_SLI , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (AspeedSLIState), + .class_init = aspeed_sli_class_init, + .abstract = true, +}; + +static void aspeed_2700_sli_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->desc ="AST2700 SLI Controller" ; +} + +static void aspeed_2700_sliio_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->desc ="AST2700 I/O SLI Controller" ; + dc->realize = aspeed_sliio_realize; +} + +static const TypeInfo aspeed_2700_sli_info = { + .name =TYPE_ASPEED_2700_SLI , + .parent =TYPE_ASPEED_SLI , + .class_init = aspeed_2700_sli_class_init, +}; + +static const TypeInfo aspeed_2700_sliio_info = { + .name =TYPE_ASPEED_2700_SLIIO , + .parent =TYPE_ASPEED_SLI , + .class_init = aspeed_2700_sliio_class_init, +}; + +static void aspeed_sli_register_types (void ) +{ +type_register_static (&aspeed_sli_info); +type_register_static (&aspeed_2700_sli_info); +type_register_static (&aspeed_2700_sliio_info); +} + +type_init (aspeed_sli_register_types);
hw/misc/meson.build +2 -1
@@ -136,7 +136,8 @@ system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_sbc.c', 'aspeed_sdmc.c', 'aspeed_xdma.c', - 'aspeed_peci.c')) + 'aspeed_peci.c', + 'aspeed_sli.c')) system_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c')) system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c'))
hw/misc/trace-events +7 -0
@@ -351,3 +351,10 @@ djmemc_write(int reg, uint64_t value, unsigned int size) "reg=0x%x value=0x%"PRI # iosb.c iosb_read(int reg, uint64_t value, unsigned int size) "reg=0x%x value=0x%"PRIx64" size=%u" iosb_write(int reg, uint64_t value, unsigned int size) "reg=0x%x value=0x%"PRIx64" size=%u" + +# aspeed_sli.c +aspeed_sli_write(uint64_t offset, unsigned int size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 +aspeed_sli_read(uint64_t offset, unsigned int size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 +aspeed_sliio_write(uint64_t offset, unsigned int size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 +aspeed_sliio_read(uint64_t offset, unsigned int size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 +
include/hw/misc/aspeed_sli.h new file +27 -0
@@ -0,0 +1,27 @@ +/* +* ASPEED SLI Controller +* +* Copyright (C) 2024 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef ASPEED_SLI_H +#define ASPEED_SLI_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_SLI "aspeed.sli" +#define TYPE_ASPEED_2700_SLI TYPE_ASPEED_SLI "-ast2700" +#define TYPE_ASPEED_2700_SLIIO TYPE_ASPEED_SLI "io" "-ast2700" +OBJECT_DECLARE_SIMPLE_TYPE(AspeedSLIState, ASPEED_SLI) + +#define ASPEED_SLI_NR_REGS (0x500 >> 2) + +struct AspeedSLIState { +SysBusDevice parent; +MemoryRegion iomem; + +uint32_t regs[ASPEED_SLI_NR_REGS ]; +}; + +#endif /* ASPEED_SLI_H */
Signature · 1 line
2.25.1
PATCH v4 3/16 aspeed/sdmc: remove redundant macros
In reply to Jamin Lin viaThese macros are no longer used for ASPEED SOCs, so removes them.
--- hw/misc/aspeed_sdmc.c | 15 --------------- 1 file changed, 15 deletions(-)
hw/misc/aspeed_sdmc.c +0 -15
@@ -76,10 +76,6 @@#define ASPEED_SDMC_VGA_32MB 0x2#define ASPEED_SDMC_VGA_64MB 0x3#define ASPEED_SDMC_DRAM_SIZE (x) (x & 0x3) -#define ASPEED_SDMC_DRAM_64MB 0x0 -#define ASPEED_SDMC_DRAM_128MB 0x1 -#define ASPEED_SDMC_DRAM_256MB 0x2 -#define ASPEED_SDMC_DRAM_512MB 0x3#define ASPEED_SDMC_READONLY_MASK \ (ASPEED_SDMC_RESERVED | ASPEED_SDMC_VGA_COMPAT | \
@@ -100,17 +96,6 @@#define ASPEED_SDMC_CACHE_ENABLE (1 << 10)/* differs from AST2400 */ #define ASPEED_SDMC_DRAM_TYPE (1 << 4)/* differs from AST2400 */ -/* DRAM size definitions differs */ -#define ASPEED_SDMC_AST2500_128MB 0x0 -#define ASPEED_SDMC_AST2500_256MB 0x1 -#define ASPEED_SDMC_AST2500_512MB 0x2 -#define ASPEED_SDMC_AST2500_1024MB 0x3 - -#define ASPEED_SDMC_AST2600_256MB 0x0 -#define ASPEED_SDMC_AST2600_512MB 0x1 -#define ASPEED_SDMC_AST2600_1024MB 0x2 -#define ASPEED_SDMC_AST2600_2048MB 0x3 -#define ASPEED_SDMC_AST2500_READONLY_MASK \ (ASPEED_SDMC_HW_VERSION(0xf) | ASPEED_SDMC_CACHE_INITIAL_DONE | \ ASPEED_SDMC_AST2500_RESERVED | ASPEED_SDMC_VGA_COMPAT | \
Signature · 1 line
2.25.1
PATCH v4 9/16 aspeed/smc: Add AST2700 support
In reply to Jamin Lin viaAST2700 fmc/spi controller's address decoding unit is 64KB and only bits [31:16] are used for decoding. Introduce seg_to_reg and reg_to_seg handlers for ast2700 fmc/spi controller.
In addition, adds ast2700 fmc, spi0, spi1, and spi2 class init handler.
--- hw/ssi/aspeed_smc.c | 222 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 220 insertions(+), 2 deletions(-)
hw/ssi/aspeed_smc.c +220 -2
@@ -185,7 +185,7 @@* 0: 4 bytes * 0x1FFFFFC: 32M bytes * -* DMA length is from 1 byte to 32MB (AST2600, AST10x0) +* DMA length is from 1 byte to 32MB (AST2600, AST10x0 and AST2700) * 0: 1 byte * 0x1FFFFFF: 32M bytes */
@@ -670,7 +670,7 @@ static const MemoryRegionOps aspeed_smc_flash_ops = { .endianness = DEVICE_LITTLE_ENDIAN, .valid = { .min_access_size = 1, - .max_access_size = 4, + .max_access_size = 8, }, };
@@ -1926,6 +1926,220 @@ static const TypeInfo aspeed_1030_spi2_info = { .class_init = aspeed_1030_spi2_class_init, }; +/* +* The FMC Segment Registers of the AST2700 have a 64KB unit. +* Only bits [31:16] are used for decoding. +*/ +#define AST2700_SEG_ADDR_MASK 0xffff0000 + +static uint32_t aspeed_2700_smc_segment_to_reg (const AspeedSMCState *s, +const AspeedSegments *seg) +{ +uint32_t reg =0 ; + +/* Disabled segments have a nil register */ +if (!seg->size) { +return 0 ; + } + + reg |= (seg->addr &AST2700_SEG_ADDR_MASK ) >>16 ;/* start offset */ + reg |= (seg->addr + seg->size -1 ) &AST2700_SEG_ADDR_MASK ;/* end offset */ +return reg; +} + +static void aspeed_2700_smc_reg_to_segment (const AspeedSMCState *s, +uint32_t reg,AspeedSegments *seg) +{ +uint32_t start_offset = (reg <<16 ) &AST2700_SEG_ADDR_MASK ; +uint32_t end_offset = reg &AST2700_SEG_ADDR_MASK ; +AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS (s); + +if (reg) { + seg->addr = asc->flash_window_base + start_offset; + seg->size = end_offset + (64 * KiB) - start_offset; + }else { + seg->addr = asc->flash_window_base; + seg->size =0 ; + } +} + +static const uint32_t aspeed_2700_fmc_resets[ASPEED_SMC_R_MAX ] = { + [R_CONF ] = (CONF_FLASH_TYPE_SPI <<CONF_FLASH_TYPE0 | +CONF_FLASH_TYPE_SPI <<CONF_FLASH_TYPE1 ), + [R_CE_CTRL ] =0x0000aa00 , + [R_CTRL0 ] =0x406b0641 , + [R_CTRL1 ] =0x00000400 , + [R_CTRL2 ] =0x00000400 , + [R_CTRL3 ] =0x00000400 , + [R_SEG_ADDR0 ] =0x08000000 , + [R_SEG_ADDR1 ] =0x10000800 , + [R_SEG_ADDR2 ] =0x00000000 , + [R_SEG_ADDR3 ] =0x00000000 , + [R_DUMMY_DATA ] =0x00010000 , + [R_DMA_DRAM_ADDR_HIGH ] =0x00000000 , + [R_TIMINGS ] =0x007b0000 , +}; + +static const AspeedSegments aspeed_2700_fmc_segments[] = { + {0x0 ,128 * MiB },/* start address is readonly */ + {128 * MiB,128 * MiB },/* default is disabled but needed for -kernel */ + {256 * MiB,128 * MiB },/* default is disabled but needed for -kernel */ + {0x0 ,0 },/* disabled */ +}; + +static void aspeed_2700_fmc_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedSMCClass *asc =ASPEED_SMC_CLASS (klass); + + dc->desc ="Aspeed 2700 FMC Controller" ; + asc->r_conf =R_CONF ; + asc->r_ce_ctrl =R_CE_CTRL ; + asc->r_ctrl0 =R_CTRL0 ; + asc->r_timings =R_TIMINGS ; + asc->nregs_timings =3 ; + asc->conf_enable_w0 =CONF_ENABLE_W0 ; + asc->cs_num_max =3 ; + asc->segments = aspeed_2700_fmc_segments; + asc->segment_addr_mask =0xffffffff ; + asc->resets = aspeed_2700_fmc_resets; + asc->flash_window_base =0x100000000 ; + asc->flash_window_size =1 * GiB; + asc->features =ASPEED_SMC_FEATURE_DMA | +ASPEED_SMC_FEATURE_DMA_DRAM_ADDR_HIGH ; + asc->dma_flash_mask =0x2FFFFFFC ; + asc->dma_dram_mask =0xFFFFFFFC ; + asc->dma_start_length =1 ; + asc->nregs =ASPEED_SMC_R_MAX ; + asc->segment_to_reg = aspeed_2700_smc_segment_to_reg; + asc->reg_to_segment = aspeed_2700_smc_reg_to_segment; + asc->dma_ctrl = aspeed_2600_smc_dma_ctrl; +} + +static const TypeInfo aspeed_2700_fmc_info = { + .name ="aspeed.fmc-ast2700" , + .parent =TYPE_ASPEED_SMC , + .class_init = aspeed_2700_fmc_class_init, +}; + +static const AspeedSegments aspeed_2700_spi0_segments[] = { + {0x0 ,128 * MiB },/* start address is readonly */ + {128 * MiB,128 * MiB },/* start address is readonly */ + {0x0 ,0 },/* disabled */ +}; + +static void aspeed_2700_spi0_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedSMCClass *asc =ASPEED_SMC_CLASS (klass); + + dc->desc ="Aspeed 2700 SPI0 Controller" ; + asc->r_conf =R_CONF ; + asc->r_ce_ctrl =R_CE_CTRL ; + asc->r_ctrl0 =R_CTRL0 ; + asc->r_timings =R_TIMINGS ; + asc->nregs_timings =2 ; + asc->conf_enable_w0 =CONF_ENABLE_W0 ; + asc->cs_num_max =2 ; + asc->segments = aspeed_2700_spi0_segments; + asc->segment_addr_mask =0xffffffff ; + asc->flash_window_base =0x180000000 ; + asc->flash_window_size =1 * GiB; + asc->features =ASPEED_SMC_FEATURE_DMA | +ASPEED_SMC_FEATURE_DMA_DRAM_ADDR_HIGH ; + asc->dma_flash_mask =0x2FFFFFFC ; + asc->dma_dram_mask =0xFFFFFFFC ; + asc->dma_start_length =1 ; + asc->nregs =ASPEED_SMC_R_MAX ; + asc->segment_to_reg = aspeed_2700_smc_segment_to_reg; + asc->reg_to_segment = aspeed_2700_smc_reg_to_segment; + asc->dma_ctrl = aspeed_2600_smc_dma_ctrl; +} + +static const TypeInfo aspeed_2700_spi0_info = { + .name ="aspeed.spi0-ast2700" , + .parent =TYPE_ASPEED_SMC , + .class_init = aspeed_2700_spi0_class_init, +}; + +static const AspeedSegments aspeed_2700_spi1_segments[] = { + {0x0 ,128 * MiB },/* start address is readonly */ + {0x0 ,0 },/* disabled */ +}; + +static void aspeed_2700_spi1_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedSMCClass *asc =ASPEED_SMC_CLASS (klass); + + dc->desc ="Aspeed 2700 SPI1 Controller" ; + asc->r_conf =R_CONF ; + asc->r_ce_ctrl =R_CE_CTRL ; + asc->r_ctrl0 =R_CTRL0 ; + asc->r_timings =R_TIMINGS ; + asc->nregs_timings =2 ; + asc->conf_enable_w0 =CONF_ENABLE_W0 ; + asc->cs_num_max =2 ; + asc->segments = aspeed_2700_spi1_segments; + asc->segment_addr_mask =0xffffffff ; + asc->flash_window_base =0x200000000 ; + asc->flash_window_size =1 * GiB; + asc->features =ASPEED_SMC_FEATURE_DMA | +ASPEED_SMC_FEATURE_DMA_DRAM_ADDR_HIGH ; + asc->dma_flash_mask =0x2FFFFFFC ; + asc->dma_dram_mask =0xFFFFFFFC ; + asc->dma_start_length =1 ; + asc->nregs =ASPEED_SMC_R_MAX ; + asc->segment_to_reg = aspeed_2700_smc_segment_to_reg; + asc->reg_to_segment = aspeed_2700_smc_reg_to_segment; + asc->dma_ctrl = aspeed_2600_smc_dma_ctrl; +} + +static const TypeInfo aspeed_2700_spi1_info = { + .name ="aspeed.spi1-ast2700" , + .parent =TYPE_ASPEED_SMC , + .class_init = aspeed_2700_spi1_class_init, +}; + +static const AspeedSegments aspeed_2700_spi2_segments[] = { + {0x0 ,128 * MiB },/* start address is readonly */ + {0x0 ,0 },/* disabled */ +}; + +static void aspeed_2700_spi2_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedSMCClass *asc =ASPEED_SMC_CLASS (klass); + + dc->desc ="Aspeed 2700 SPI2 Controller" ; + asc->r_conf =R_CONF ; + asc->r_ce_ctrl =R_CE_CTRL ; + asc->r_ctrl0 =R_CTRL0 ; + asc->r_timings =R_TIMINGS ; + asc->nregs_timings =2 ; + asc->conf_enable_w0 =CONF_ENABLE_W0 ; + asc->cs_num_max =2 ; + asc->segments = aspeed_2700_spi2_segments; + asc->segment_addr_mask =0xffffffff ; + asc->flash_window_base =0x280000000 ; + asc->flash_window_size =1 * GiB; + asc->features =ASPEED_SMC_FEATURE_DMA | +ASPEED_SMC_FEATURE_DMA_DRAM_ADDR_HIGH ; + asc->dma_flash_mask =0x0FFFFFFC ; + asc->dma_dram_mask =0xFFFFFFFC ; + asc->dma_start_length =1 ; + asc->nregs =ASPEED_SMC_R_MAX ; + asc->segment_to_reg = aspeed_2700_smc_segment_to_reg; + asc->reg_to_segment = aspeed_2700_smc_reg_to_segment; + asc->dma_ctrl = aspeed_2600_smc_dma_ctrl; +} + +static const TypeInfo aspeed_2700_spi2_info = { + .name ="aspeed.spi2-ast2700" , + .parent =TYPE_ASPEED_SMC , + .class_init = aspeed_2700_spi2_class_init, +}; +static void aspeed_smc_register_types (void ) {type_register_static (&aspeed_smc_flash_info);
@@ -1942,6 +2156,10 @@ static void aspeed_smc_register_types(void)type_register_static (&aspeed_1030_fmc_info);type_register_static (&aspeed_1030_spi1_info);type_register_static (&aspeed_1030_spi2_info); +type_register_static (&aspeed_2700_fmc_info); +type_register_static (&aspeed_2700_spi0_info); +type_register_static (&aspeed_2700_spi1_info); +type_register_static (&aspeed_2700_spi2_info); }type_init (aspeed_smc_register_types)
Signature · 1 line
2.25.1
PATCH v4 5/16 aspeed/sdmc: Add AST2700 support
In reply to Jamin Lin viaThe SDRAM memory controller(DRAMC) controls the access to external DDR4 and DDR5 SDRAM and power up to DDR4 and DDR5 PHY.
The DRAM memory controller of AST2700 is not backward compatible to previous chips such AST2600, AST2500 and AST2400.
Max memory is now 8GiB on the AST2700. Introduce new aspeed_2700_sdmc and class with read/write operation and reset handlers.
Define DRAMC necessary protected registers and
unprotected registers for AST2700 and increase
the register set to 0x1000.
Add unlocked property to change controller protected status.
--- hw/misc/aspeed_sdmc.c | 190 +++++++++++++++++++++++++++++++++- include/hw/misc/aspeed_sdmc.h | 5 +- 2 files changed, 193 insertions(+), 2 deletions(-)
hw/misc/aspeed_sdmc.c +189 -1
@@ -27,6 +27,7 @@#define PROT_SOFTLOCKED 0x00#define PROT_KEY_UNLOCK 0xFC600309 +#define PROT_2700_KEY_UNLOCK 0x1688A8A8#define PROT_KEY_HARDLOCK 0xDEADDEAD/* AST2600 */ /* Configuration Register */
@@ -54,6 +55,46 @@#define R_DRAM_TIME (0x8c / 4)#define R_ECC_ERR_INJECT (0xb4 / 4) +/* AST2700 Register */ +#define R_2700_PROT (0x00 / 4) +#define R_INT_STATUS (0x04 / 4) +#define R_INT_CLEAR (0x08 / 4) +#define R_INT_MASK (0x0c / 4) +#define R_MAIN_CONF (0x10 / 4) +#define R_MAIN_CONTROL (0x14 / 4) +#define R_MAIN_STATUS (0x18 / 4) +#define R_ERR_STATUS (0x1c / 4) +#define R_ECC_FAIL_STATUS (0x78 / 4) +#define R_ECC_FAIL_ADDR (0x7c / 4) +#define R_ECC_TESTING_CONTROL (0x80 / 4) +#define R_PROT_REGION_LOCK_STATUS (0x94 / 4) +#define R_TEST_FAIL_ADDR (0xd4 / 4) +#define R_TEST_FAIL_D0 (0xd8 / 4) +#define R_TEST_FAIL_D1 (0xdc / 4) +#define R_TEST_FAIL_D2 (0xe0 / 4) +#define R_TEST_FAIL_D3 (0xe4 / 4) +#define R_DBG_STATUS (0xf4 / 4) +#define R_PHY_INTERFACE_STATUS (0xf8 / 4) +#define R_GRAPHIC_MEM_BASE_ADDR (0x10c / 4) +#define R_PORT0_INTERFACE_MONITOR0 (0x240 / 4) +#define R_PORT0_INTERFACE_MONITOR1 (0x244 / 4) +#define R_PORT0_INTERFACE_MONITOR2 (0x248 / 4) +#define R_PORT1_INTERFACE_MONITOR0 (0x2c0 / 4) +#define R_PORT1_INTERFACE_MONITOR1 (0x2c4 / 4) +#define R_PORT1_INTERFACE_MONITOR2 (0x2c8 / 4) +#define R_PORT2_INTERFACE_MONITOR0 (0x340 / 4) +#define R_PORT2_INTERFACE_MONITOR1 (0x344 / 4) +#define R_PORT2_INTERFACE_MONITOR2 (0x348 / 4) +#define R_PORT3_INTERFACE_MONITOR0 (0x3c0 / 4) +#define R_PORT3_INTERFACE_MONITOR1 (0x3c4 / 4) +#define R_PORT3_INTERFACE_MONITOR2 (0x3c8 / 4) +#define R_PORT4_INTERFACE_MONITOR0 (0x440 / 4) +#define R_PORT4_INTERFACE_MONITOR1 (0x444 / 4) +#define R_PORT4_INTERFACE_MONITOR2 (0x448 / 4) +#define R_PORT5_INTERFACE_MONITOR0 (0x4c0 / 4) +#define R_PORT5_INTERFACE_MONITOR1 (0x4c4 / 4) +#define R_PORT5_INTERFACE_MONITOR2 (0x4c8 / 4) +/* * Configuration register Ox4 (for Aspeed AST2400 SOC) *
@@ -101,6 +142,19 @@ ASPEED_SDMC_AST2500_RESERVED | ASPEED_SDMC_VGA_COMPAT | \ ASPEED_SDMC_VGA_APERTURE(ASPEED_SDMC_VGA_64MB)) +/* +* Main Configuration register Ox10 (for Aspeed AST2700 SOC and higher) +* +*/ +#define ASPEED_SDMC_AST2700_RESERVED 0xFFFF2082/* 31:16, 13, 7, 1 */ +#define ASPEED_SDMC_AST2700_DATA_SCRAMBLE (1 << 8) +#define ASPEED_SDMC_AST2700_ECC_ENABLE (1 << 6) +#define ASPEED_SDMC_AST2700_PAGE_MATCHING_ENABLE (1 << 5) +#define ASPEED_SDMC_AST2700_DRAM_SIZE (x) ((x & 0x7) << 2) + +#define ASPEED_SDMC_AST2700_READONLY_MASK \ + (ASPEED_SDMC_AST2700_RESERVED) +static uint64_t aspeed_sdmc_read (void *opaque,hwaddr addr,unsigned size) {AspeedSDMCState *s =ASPEED_SDMC (opaque);
@@ -216,7 +270,7 @@ static void aspeed_sdmc_realize(DeviceState *dev, Error **errp)AspeedSDMCState *s =ASPEED_SDMC (dev);AspeedSDMCClass *asc =ASPEED_SDMC_GET_CLASS (s); -assert (asc->max_ram_size <4 * GiB);/* 32-bit address bus */ +assert (asc->max_ram_size <4 * GiB || asc->is_bus64bit); s->max_ram_size = asc->max_ram_size; memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_sdmc_ops, s,
@@ -236,6 +290,7 @@ static const VMStateDescription vmstate_aspeed_sdmc = {static Property aspeed_sdmc_properties[] = {DEFINE_PROP_UINT64 ("max-ram-size" , AspeedSDMCState, max_ram_size,0 ), +DEFINE_PROP_BOOL ("unlocked" , AspeedSDMCState, unlocked, false),DEFINE_PROP_END_OF_LIST (), };
@@ -500,12 +555,145 @@ static const TypeInfo aspeed_2600_sdmc_info = { .class_init = aspeed_2600_sdmc_class_init, }; +static void aspeed_2700_sdmc_reset (DeviceState *dev) +{ +AspeedSDMCState *s =ASPEED_SDMC (dev); +AspeedSDMCClass *asc =ASPEED_SDMC_GET_CLASS (s); + +memset (s->regs,0 ,sizeof (s->regs)); + +/* Set ram size bit and defaults values */ + s->regs[R_MAIN_CONF ] = asc->compute_conf (s,0 ); + +if (s->unlocked) { + s->regs[R_2700_PROT ] =PROT_UNLOCKED ; + } +} + +static uint32_t aspeed_2700_sdmc_compute_conf (AspeedSDMCState *s,uint32_t data) +{ +uint32_t fixed_conf =ASPEED_SDMC_AST2700_PAGE_MATCHING_ENABLE | +ASPEED_SDMC_AST2700_DRAM_SIZE (aspeed_sdmc_get_ram_bits (s)); + +/* Make sure readonly bits are kept */ + data &= ~ASPEED_SDMC_AST2700_READONLY_MASK ; + +return data | fixed_conf; +} + +static void aspeed_2700_sdmc_write (AspeedSDMCState *s,uint32_t reg, +uint32_t data) +{ +/* Unprotected registers */ +switch (reg) { +case R_INT_STATUS : +case R_INT_CLEAR : +case R_INT_MASK : +case R_MAIN_STATUS : +case R_ERR_STATUS : +case R_ECC_FAIL_STATUS : +case R_ECC_FAIL_ADDR : +case R_PROT_REGION_LOCK_STATUS : +case R_TEST_FAIL_ADDR : +case R_TEST_FAIL_D0 : +case R_TEST_FAIL_D1 : +case R_TEST_FAIL_D2 : +case R_TEST_FAIL_D3 : +case R_DBG_STATUS : +case R_PHY_INTERFACE_STATUS : +case R_GRAPHIC_MEM_BASE_ADDR : +case R_PORT0_INTERFACE_MONITOR0 : +case R_PORT0_INTERFACE_MONITOR1 : +case R_PORT0_INTERFACE_MONITOR2 : +case R_PORT1_INTERFACE_MONITOR0 : +case R_PORT1_INTERFACE_MONITOR1 : +case R_PORT1_INTERFACE_MONITOR2 : +case R_PORT2_INTERFACE_MONITOR0 : +case R_PORT2_INTERFACE_MONITOR1 : +case R_PORT2_INTERFACE_MONITOR2 : +case R_PORT3_INTERFACE_MONITOR0 : +case R_PORT3_INTERFACE_MONITOR1 : +case R_PORT3_INTERFACE_MONITOR2 : +case R_PORT4_INTERFACE_MONITOR0 : +case R_PORT4_INTERFACE_MONITOR1 : +case R_PORT4_INTERFACE_MONITOR2 : +case R_PORT5_INTERFACE_MONITOR0 : +case R_PORT5_INTERFACE_MONITOR1 : +case R_PORT5_INTERFACE_MONITOR2 : + s->regs[reg] = data; +return ; + } + +if (s->regs[R_2700_PROT ] ==PROT_HARDLOCKED ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: SDMC is locked until system reset!\n" , + __func__); +return ; + } + +if (reg !=R_2700_PROT && s->regs[R_2700_PROT ] ==PROT_SOFTLOCKED ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: SDMC is locked! (write to MCR%02x blocked)\n" , + __func__, reg *4 ); +return ; + } + +switch (reg) { +case R_2700_PROT : +if (data ==PROT_2700_KEY_UNLOCK ) { + data =PROT_UNLOCKED ; + }else if (data ==PROT_KEY_HARDLOCK ) { + data =PROT_HARDLOCKED ; + }else { + data =PROT_SOFTLOCKED ; + } +break ; +case R_MAIN_CONF : + data =aspeed_2700_sdmc_compute_conf (s, data); +break ; +case R_MAIN_STATUS : +/* Will never return 'busy'. */ + data &= ~PHY_BUSY_STATE ; +break ; +default : +break ; + } + + s->regs[reg] = data; +} + +static const uint64_t + aspeed_2700_ram_sizes[] = {256 * MiB,512 * MiB,1024 * MiB, +2048 * MiB,4096 * MiB,8192 * MiB,0 }; + +static void aspeed_2700_sdmc_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedSDMCClass *asc =ASPEED_SDMC_CLASS (klass); + + dc->desc ="ASPEED 2700 SDRAM Memory Controller" ; + dc->reset = aspeed_2700_sdmc_reset; + + asc->is_bus64bit = true; + asc->max_ram_size =8 * GiB; + asc->compute_conf = aspeed_2700_sdmc_compute_conf; + asc->write = aspeed_2700_sdmc_write; + asc->valid_ram_sizes = aspeed_2700_ram_sizes; +} + +static const TypeInfo aspeed_2700_sdmc_info = { + .name =TYPE_ASPEED_2700_SDMC , + .parent =TYPE_ASPEED_SDMC , + .class_init = aspeed_2700_sdmc_class_init, +}; +static void aspeed_sdmc_register_types (void ) {type_register_static (&aspeed_sdmc_info);type_register_static (&aspeed_2400_sdmc_info);type_register_static (&aspeed_2500_sdmc_info);type_register_static (&aspeed_2600_sdmc_info); +type_register_static (&aspeed_2700_sdmc_info); }type_init (aspeed_sdmc_register_types);
include/hw/misc/aspeed_sdmc.h +4 -1
@@ -17,6 +17,7 @@ OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC)#define TYPE_ASPEED_2400_SDMC TYPE_ASPEED_SDMC "-ast2400"#define TYPE_ASPEED_2500_SDMC TYPE_ASPEED_SDMC "-ast2500"#define TYPE_ASPEED_2600_SDMC TYPE_ASPEED_SDMC "-ast2600" +#define TYPE_ASPEED_2700_SDMC TYPE_ASPEED_SDMC "-ast2700"/* * SDMC has 174 documented registers. In addition the u-boot device tree
@@ -29,7 +30,7 @@ OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC)* time, and the other is in the DDR-PHY IP which is used during DDR-PHY * training. */ -#define ASPEED_SDMC_NR_REGS (0x500 >> 2) +#define ASPEED_SDMC_NR_REGS (0x1000 >> 2)struct AspeedSDMCState {/*< private >*/
@@ -41,6 +42,7 @@ struct AspeedSDMCState {uint32_t regs[ASPEED_SDMC_NR_REGS ];uint64_t ram_size;uint64_t max_ram_size; +bool unlocked; };
@@ -51,6 +53,7 @@ struct AspeedSDMCClass {const uint64_t *valid_ram_sizes;uint32_t (*compute_conf)(AspeedSDMCState *s,uint32_t data);void (*write)(AspeedSDMCState *s,uint32_t reg,uint32_t data); + bool is_bus64bit; };#endif /* ASPEED_SDMC_H */
Signature · 1 line
2.25.1
PATCH v4 13/16 aspeed: Add an AST2700 eval board
In reply to Jamin Lin viaAST2700 CPU is ARM Cortex-A35 which is 64 bits.
Add TARGET_AARCH64 to build this machine.
According to the design of ast2700, it has a bootmcu(riscv-32) which is used for executing SPL.
Then, CPUs(cortex-a35) execute u-boot, kernel and rofs.
Currently, qemu not support emulate two CPU architectures at the same machine. Therefore, qemu will only support to emulate CPU(cortex-a35) side for ast2700
--- hw/arm/aspeed.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
hw/arm/aspeed.c +32 -0
@@ -178,6 +178,12 @@ struct AspeedMachineState {#define AST2600_EVB_HW_STRAP1 0x000000C0#define AST2600_EVB_HW_STRAP2 0x00000003 +#ifdef TARGET_AARCH64 +/* AST2700 evb hardware value */ +#define AST2700_EVB_HW_STRAP1 0x000000C0 +#define AST2700_EVB_HW_STRAP2 0x00000003 +#endif +/* Tacoma hardware value */ #define TACOMA_BMC_HW_STRAP1 0x00000000#define TACOMA_BMC_HW_STRAP2 0x00000040
@@ -1588,6 +1594,26 @@ static void aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc,aspeed_machine_class_init_cpus_defaults (mc); } +#ifdef TARGET_AARCH64 +static void aspeed_machine_ast2700_evb_class_init (ObjectClass *oc,void *data) +{ +MachineClass *mc =MACHINE_CLASS (oc); +AspeedMachineClass *amc =ASPEED_MACHINE_CLASS (oc); + + mc->desc ="Aspeed AST2700 EVB (Cortex-A35)" ; + amc->soc_name ="ast2700-a0" ; + amc->hw_strap1 =AST2700_EVB_HW_STRAP1 ; + amc->hw_strap2 =AST2700_EVB_HW_STRAP2 ; + amc->fmc_model ="w25q01jvq" ; + amc->spi_model ="w25q512jv" ; + amc->num_cs =2 ; + amc->macs_mask =ASPEED_MAC0_ON |ASPEED_MAC1_ON |ASPEED_MAC2_ON ; + amc->uart_default =ASPEED_DEV_UART12 ; + mc->default_ram_size =1 * GiB; +aspeed_machine_class_init_cpus_defaults (mc); +} +#endif +static void aspeed_machine_qcom_dc_scm_v1_class_init (ObjectClass *oc,void *data) {
@@ -1711,6 +1737,12 @@ static const TypeInfo aspeed_machine_types[] = { .name = MACHINE_TYPE_NAME("ast1030-evb"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_minibmc_machine_ast1030_evb_class_init, +#ifdef TARGET_AARCH64 + }, { + .name = MACHINE_TYPE_NAME("ast2700-evb"), + .parent = TYPE_ASPEED_MACHINE, + .class_init = aspeed_machine_ast2700_evb_class_init, +#endif }, { .name = TYPE_ASPEED_MACHINE, .parent = TYPE_MACHINE,
Signature · 1 line
2.25.1
PATCH v4 11/16 aspeed/intc: Add AST2700 support
In reply to Jamin Lin viaAST2700 interrupt controller(INTC) provides hardware interrupt interfaces to interrupt of processors PSP, SSP and TSP. In INTC, each interrupt of INT 128 to INT136 combines 32 interrupts.
Introduce a new aspeed_intc class with instance_init and realize handlers.
So far, this model only supports GICINT128 to GICINT136.
It creates 9 GICINT or-gates to connect 32 interrupts sources from GICINT128 to GICINT136 as IRQ GPIO-OUTPUT pins.
Then, this model registers IRQ handler with its IRQ GPIO-INPUT pins which connect to GICINT or-gates. And creates 9 GICINT IRQ GPIO-OUTPUT pins which connect to GIC device with GIC IRQ 128 to 136.
If one interrupt source from GICINT128 to GICINT136
set irq, the OR-GATE irq callback function is called and set irq to INTC by OR-GATE GPIO-OUTPUT pins. Then, the INTC irq callback function is called and set irq to GIC by its GICINT IRQ GPIO-OUTPUT pins. Finally, the GIC irq callback function is called and set irq to CPUs and
CPUs execute Interrupt Service Routine (ISR).
Block diagram of GICINT132:
GICINT132
ETH1 +-----------+
+-------->+0 3|
ETH2 | 4|
+-------->+1 5|
ETH3 | 6|
+-------->+2 19| INTC GIC
UART0 | 20| +--------------------------+
+-------->+7 21| | | +--------------+
UART1 | 22| |orgate0 +----> output_pin0+----------->+GIC128 |
+-------->+8 23| | | | |
UART2 | 24| |orgate1 +----> output_pin1+----------->+GIC129 |
+-------->+9 25| | | | |
UART3 | 26| |orgate2 +----> output_pin2+----------->+GIC130 |
+--------->10 27| | | | |
UART5 | 28| |orgate3 +----> output_pin3+----------->+GIC131 |
+-------->+11 29| | | | |
UART6 | +----------->+orgate4 +----> output_pin4+----------->+GIC132 |
+-------->+12 30| | | | |
UART7 | 31| |orgate5 +----> output_pin5+----------->+GIC133 |
+-------->+13 | | | | |
UART8 | OR[0:31] | |orgate6 +----> output_pin6+----------->+GIC134 |
---------->14 | | | | |
UART9 | | |orgate7 +----> output_pin7+----------->+GIC135 |
--------->+15 | | | | |
UART10 | | |orgate8 +----> output_pin8+----------->+GIC136 |
--------->+16 | | | +--------------+
UART11 | | +--------------------------+
+-------->+17 |
UART12 | |
+--------->18 |
| |
| |
| |
+-----------+--- hw/intc/aspeed_intc.c | 355 ++++++++++++++++++++++++++++++++++ hw/intc/meson.build | 1 + hw/intc/trace-events | 6 + include/hw/intc/aspeed_intc.h | 46 +++++ 4 files changed, 408 insertions(+) create mode 100644 hw/intc/aspeed_intc.c create mode 100644 include/hw/intc/aspeed_intc.h
hw/intc/aspeed_intc.c new file +355 -0
@@ -0,0 +1,355 @@ +/* +* ASPEED INTC Controller +* +* Copyright (C) 2024 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "hw/intc/aspeed_intc.h" +#include "hw/irq.h" +#include "migration/vmstate.h" +#include "qemu/bitops.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "hw/intc/arm_gicv3.h" +#include "trace.h" +#include "hw/registerfields.h" +#include "qapi/error.h" +#include "hw/qdev-properties.h" + +/* INTC Registers */ +REG32(GICINT128_EN, 0x1000) +REG32(GICINT128_STATUS, 0x1004) +REG32(GICINT129_EN, 0x1100) +REG32(GICINT129_STATUS, 0x1104) +REG32(GICINT130_EN, 0x1200) +REG32(GICINT130_STATUS, 0x1204) +REG32(GICINT131_EN, 0x1300) +REG32(GICINT131_STATUS, 0x1304) +REG32(GICINT132_EN, 0x1400) +REG32(GICINT132_STATUS, 0x1404) +REG32(GICINT133_EN, 0x1500) +REG32(GICINT133_STATUS, 0x1504) +REG32(GICINT134_EN, 0x1600) +REG32(GICINT134_STATUS, 0x1604) +REG32(GICINT135_EN, 0x1700) +REG32(GICINT135_STATUS, 0x1704) +REG32(GICINT136_EN, 0x1800) +REG32(GICINT136_STATUS, 0x1804) + +#define GICINT_STATUS_BASE R_GICINT128_STATUS + +static void aspeed_intc_update (AspeedINTCState *s,int irq,int level) +{ +trace_aspeed_intc_update_irq (irq, level); +qemu_set_irq (s->output_pins[irq], level); +} + +/* +* The address of GICINT128 to GICINT136 are from 0x1000 to 0x1804. +* Utilize "address & 0x0f00" to get the irq and irq output pin index +* The value of irq should be 0 to num_ints. +* The irq 0 indicates GICINT128, irq 1 indicates GICINT129 and so on. +*/ +static void aspeed_intc_set_irq (void *opaque,int irq,int level) +{ +AspeedINTCState *s = (AspeedINTCState *)opaque; +AspeedINTCClass *aic =ASPEED_INTC_GET_CLASS (s); +uint32_t status_addr =GICINT_STATUS_BASE + ((0x100 * irq) >>2 ); +uint32_t enable = s->enable[irq]; +uint32_t select =0 ; +int i; + +if (irq > aic->num_ints) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: Invalid interrupt number: %d\n" , + __func__, irq); +return ; + } + +trace_aspeed_intc_set_irq (irq, level); + +if (!level) { +return ; + } + +for (i =0 ; i < aic->num_lines; i++) { +if (s->orgates[irq].levels[i]) { +if (enable &BIT (i)) { + select |=BIT (i); + } + } + } + +if (!select) { +return ; + } + +trace_aspeed_intc_debug ("select" , select); +trace_aspeed_intc_debug ("mask" , s->mask[irq]); +trace_aspeed_intc_debug ("status" , s->regs[status_addr]); +if (s->mask[irq] || s->regs[status_addr]) { +/* +* a. mask is not 0 means in ISR mode +* sources interrupt routine are executing. +* b. status register value is not 0 means previous +* source interrupt does not be executed, yet. +* +* save source interrupt to pending variable. +*/ + s->pending[irq] |= select; +trace_aspeed_intc_debug ("pending source interrupt" , s->pending[irq]); + }else { +/* +* notify firmware which source interrupt are coming +* by setting status register +*/ + s->regs[status_addr] = select; +trace_aspeed_intc_debug ("trigger source interrupt" , + s->regs[status_addr]); +aspeed_intc_update (s, irq,1 ); + } +} + +static uint64_t aspeed_intc_read (void *opaque,hwaddr offset,unsigned int size) +{ +AspeedINTCState *s =ASPEED_INTC (opaque); +uint32_t addr = offset >>2 ; +uint32_t value =0 ; + +if (addr >=ASPEED_INTC_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds read at offset 0x%" HWADDR_PRIx"\n" , + __func__, offset); +return 0 ; + } + + value = s->regs[addr]; +trace_aspeed_intc_read (offset, size, value); + +return value; +} + +static void aspeed_intc_write (void *opaque,hwaddr offset,uint64_t data, +unsigned size) +{ +AspeedINTCState *s =ASPEED_INTC (opaque); +uint32_t irq = (offset &0x0f00 ) >>8 ; +uint32_t addr = offset >>2 ; +uint32_t old_enable; +uint32_t change; + + +if (addr >=ASPEED_INTC_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx"\n" , + __func__, offset); +return ; + } + +trace_aspeed_intc_write (offset, size, data); + +switch (addr) { +case R_GICINT128_EN : +case R_GICINT129_EN : +case R_GICINT130_EN : +case R_GICINT131_EN : +case R_GICINT132_EN : +case R_GICINT133_EN : +case R_GICINT134_EN : +case R_GICINT135_EN : +case R_GICINT136_EN : +/* +* These registers are used for enable sources interrupt and +* mask and unmask source interrupt while executing source ISR. +*/ + +/* disable all source interrupt */ +if (!data && !s->enable[irq]) { + s->regs[addr] = data; +trace_aspeed_intc_debug ("disable all source interrupt" , irq); +return ; + } + + old_enable = s->enable[irq]; + s->enable[irq] |= data; + +/* enable new source interrupt */ +if (old_enable != s->enable[irq]) { +trace_aspeed_intc_debug ("enable new source interrupt" , + s->enable[irq]); + s->regs[addr] = data; +return ; + } + +/* mask and unmask source interrupt */ + change = s->regs[addr] ^ data; +trace_aspeed_intc_debug ("enable change bit" , change); +if (change & data) { + s->mask[irq] &= ~change; +trace_aspeed_intc_debug ("enable umask" , s->mask[irq]); + }else { + s->mask[irq] |= change; +trace_aspeed_intc_debug ("enable mask" , s->mask[irq]); + } + s->regs[addr] = data; +break ; +case R_GICINT128_STATUS : +case R_GICINT129_STATUS : +case R_GICINT130_STATUS : +case R_GICINT131_STATUS : +case R_GICINT132_STATUS : +case R_GICINT133_STATUS : +case R_GICINT134_STATUS : +case R_GICINT135_STATUS : +case R_GICINT136_STATUS : +/* clear status */ + s->regs[addr] &= ~data; + +/* +* These status registers are used for notify sources ISR are executed. +* If one source ISR is executed, it will clear one bit. +* If it clear all bits, it means to initialize this register status +* rather than sources ISR are executed. +*/ +if (data ==0xffffffff ) { +trace_aspeed_intc_debug ("clear all source interrupt status" , + s->regs[addr]); +return ; + } + +/* All source ISR execution are done */ +if (!s->regs[addr]) { +trace_aspeed_intc_debug ("all source ISR execution are done" , + s->regs[addr]); +if (s->pending[irq]) { +/* +* handle pending source interrupt +* notify firmware which source interrupt are pending +* by setting status register +*/ + s->regs[addr] = s->pending[irq]; + s->pending[irq] =0 ; +trace_aspeed_intc_debug ("trigger pending interrupt" , + s->regs[addr]); +aspeed_intc_update (s, irq,1 ); + }else { +/* clear irq */ +aspeed_intc_update (s, irq,0 ); + } + } +break ; +default : + s->regs[addr] = data; +break ; + } + +return ; +} + +static const MemoryRegionOps aspeed_intc_ops = { + .read = aspeed_intc_read, + .write = aspeed_intc_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =4 , + .max_access_size =4 , + } +}; + +static void aspeed_intc_instance_init (Object *obj) +{ +AspeedINTCState *s =ASPEED_INTC (obj); +AspeedINTCClass *aic =ASPEED_INTC_GET_CLASS (s); +int i; + +for (i =0 ; i < aic->num_ints; i++) { +object_initialize_child (obj,"intc-orgates[*]" , &s->orgates[i], +TYPE_OR_IRQ ); +object_property_set_int (OBJECT (&s->orgates[i]),"num-lines" , + aic->num_lines, &error_abort); + } + + s->num_ints = aic->num_ints; +} + +static void aspeed_intc_reset (DeviceState *dev) +{ +AspeedINTCState *s =ASPEED_INTC (dev); + +memset (s->regs,0 ,sizeof (s->regs)); +memset (s->enable,0 ,sizeof (s->enable)); +memset (s->mask,0 ,sizeof (s->mask)); +memset (s->pending,0 ,sizeof (s->pending)); +} + +static void aspeed_intc_realize (DeviceState *dev,Error **errp) +{ +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); +AspeedINTCState *s =ASPEED_INTC (dev); +AspeedINTCClass *aic =ASPEED_INTC_GET_CLASS (s); +int i; + +memory_region_init_io (&s->iomem,OBJECT (s), &aspeed_intc_ops, s, +TYPE_ASPEED_INTC ".regs" ,ASPEED_INTC_NR_REGS <<2 ); + +sysbus_init_mmio (sbd, &s->iomem); +qdev_init_gpio_in (dev, aspeed_intc_set_irq, aic->num_ints); + +for (i =0 ; i < aic->num_ints; i++) { +if (!qdev_realize (DEVICE (&s->orgates[i]),NULL , errp)) { +return ; + } +sysbus_init_irq (sbd, &s->output_pins[i]); + } +} + +static Property aspeed_intc_properties[] = { +DEFINE_PROP_UINT32 ("num-ints" , AspeedINTCState, num_ints,0 ), +DEFINE_PROP_END_OF_LIST (), +}; + +static void aspeed_intc_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->desc ="ASPEED INTC Controller" ; + dc->realize = aspeed_intc_realize; + dc->reset = aspeed_intc_reset; +device_class_set_props (dc, aspeed_intc_properties); + dc->vmsd =NULL ; +} + +static const TypeInfo aspeed_intc_info = { + .name =TYPE_ASPEED_INTC , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_init = aspeed_intc_instance_init, + .instance_size =sizeof (AspeedINTCState), + .class_init = aspeed_intc_class_init, + .abstract = true, +}; + +static void aspeed_2700_intc_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedINTCClass *aic =ASPEED_INTC_CLASS (klass); + + dc->desc ="ASPEED 2700 INTC Controller" ; + aic->num_lines =32 ; + aic->num_ints =9 ; +} + +static const TypeInfo aspeed_2700_intc_info = { + .name =TYPE_ASPEED_2700_INTC , + .parent =TYPE_ASPEED_INTC , + .class_init = aspeed_2700_intc_class_init, +}; + +static void aspeed_intc_register_types (void ) +{ +type_register_static (&aspeed_intc_info); +type_register_static (&aspeed_2700_intc_info); +} + +type_init (aspeed_intc_register_types);
hw/intc/meson.build +1 -0
@@ -14,6 +14,7 @@ system_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files( )) system_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinner-a10-pic.c')) system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c')) +system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_intc.c')) system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c')) system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c', 'exynos4210_combiner.c')) system_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c'))
hw/intc/trace-events +6 -0
@@ -79,6 +79,12 @@ aspeed_vic_update_fiq(int flags) "Raising FIQ: %d" aspeed_vic_update_irq(int flags) "Raising IRQ: %d" aspeed_vic_read(uint64_t offset, unsigned size, uint32_t value) "From 0x%" PRIx64 " of size %u: 0x%" PRIx32 aspeed_vic_write(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 +# aspeed_intc.c +aspeed_intc_read(uint64_t offset, unsigned size, uint32_t value) "From 0x%" PRIx64 " of size %u: 0x%" PRIx32 +aspeed_intc_write(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 +aspeed_intc_set_irq(int irq, int level) "Set IRQ %d: %d" +aspeed_intc_update_irq(int irq, int level) "Update IRQ: %d: %d" +aspeed_intc_debug(const char *str, uint32_t value) "%s: 0x%x" # arm_gic.c gic_enable_irq(int irq) "irq %d enabled"
include/hw/intc/aspeed_intc.h new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v4 1/16 aspeed/wdt: Add AST2700 support
In reply to Jamin Lin viaAST2700 wdt controller is similiar to AST2600's wdt, but
the AST2700 has 8 watchdogs, and they each have 0x80 of registers. Introduce ast2700 object class and increase the number of regs(offset) of ast2700 model.
--- hw/watchdog/wdt_aspeed.c | 24 ++++++++++++++++++++++++ include/hw/watchdog/wdt_aspeed.h | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-)
hw/watchdog/wdt_aspeed.c +24 -0
@@ -422,12 +422,36 @@ static const TypeInfo aspeed_1030_wdt_info = { .class_init = aspeed_1030_wdt_class_init, }; +static void aspeed_2700_wdt_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedWDTClass *awc =ASPEED_WDT_CLASS (klass); + + dc->desc ="ASPEED 2700 Watchdog Controller" ; + awc->iosize =0x80 ; + awc->ext_pulse_width_mask =0xfffff ;/* TODO */ + awc->reset_ctrl_reg =AST2600_SCU_RESET_CONTROL1 ; + awc->reset_pulse = aspeed_2500_wdt_reset_pulse; + awc->wdt_reload = aspeed_wdt_reload_1mhz; + awc->sanitize_ctrl = aspeed_2600_sanitize_ctrl; + awc->default_status =0x014FB180 ; + awc->default_reload_value =0x014FB180 ; +} + +static const TypeInfo aspeed_2700_wdt_info = { + .name =TYPE_ASPEED_2700_WDT , + .parent =TYPE_ASPEED_WDT , + .instance_size =sizeof (AspeedWDTState), + .class_init = aspeed_2700_wdt_class_init, +}; +static void wdt_aspeed_register_types (void ) {type_register_static (&aspeed_wdt_info);type_register_static (&aspeed_2400_wdt_info);type_register_static (&aspeed_2500_wdt_info);type_register_static (&aspeed_2600_wdt_info); +type_register_static (&aspeed_2700_wdt_info);type_register_static (&aspeed_1030_wdt_info); }
include/hw/watchdog/wdt_aspeed.h +2 -1
@@ -19,9 +19,10 @@ OBJECT_DECLARE_TYPE(AspeedWDTState, AspeedWDTClass, ASPEED_WDT)#define TYPE_ASPEED_2400_WDT TYPE_ASPEED_WDT "-ast2400"#define TYPE_ASPEED_2500_WDT TYPE_ASPEED_WDT "-ast2500"#define TYPE_ASPEED_2600_WDT TYPE_ASPEED_WDT "-ast2600" +#define TYPE_ASPEED_2700_WDT TYPE_ASPEED_WDT "-ast2700"#define TYPE_ASPEED_1030_WDT TYPE_ASPEED_WDT "-ast1030" -#define ASPEED_WDT_REGS_MAX (0x30 / 4) +#define ASPEED_WDT_REGS_MAX (0x80 / 4)struct AspeedWDTState {/*< private >*/
Signature · 1 line
2.25.1
PATCH v4 12/16 aspeed/soc: Add AST2700 support
In reply to Jamin Lin viaInitial definitions for a simple machine using an AST2700 SOC (Cortex-a35 CPU).
AST2700 SOC and its interrupt controller are too complex to handle in the common Aspeed SoC framework. We introduce a new ast2700 class with instance_init and realize handlers.
AST2700 is a 64 bits quad core cpus and support 8 watchdog. Update maximum ASPEED_CPUS_NUM to 4 and ASPEED_WDTS_NUM to 8. In addition, update AspeedSocState to support scuio, sli, sliio and intc.
Add TYPE_ASPEED27X0_SOC machine type.
The SDMC controller is unlocked at SPL stage.
At present, only supports to emulate booting
start from u-boot stage. Set SDMC controller
unlocked by default.
In INTC, each interrupt of INT 128 to INT 136 combines 32 interrupts. It connect GICINT IRQ GPIO-OUTPUT pins to GIC device with irq 128 to 136. And, if a device irq is 128 to 136, its irq GPIO-OUTPUT pin is connected to GICINT or-gates instead of GIC device.
--- hw/arm/aspeed_ast27x0.c | 563 ++++++++++++++++++++++++++++++++++++ hw/arm/meson.build | 1 + include/hw/arm/aspeed_soc.h | 26 +- 3 files changed, 588 insertions(+), 2 deletions(-) create mode 100644 hw/arm/aspeed_ast27x0.c
hw/arm/aspeed_ast27x0.c new file +563 -0
@@ -0,0 +1,563 @@ +/* +* ASPEED SoC 27x0 family +* +* Copyright (C) 2024 ASPEED Technology Inc. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +* +* Implementation extracted from the AST2600 and adapted for AST27x0. +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/misc/unimp.h" +#include "hw/arm/aspeed_soc.h" +#include "qemu/module.h" +#include "qemu/error-report.h" +#include "hw/i2c/aspeed_i2c.h" +#include "net/net.h" +#include "sysemu/sysemu.h" +#include "hw/intc/arm_gicv3.h" +#include "qapi/qmp/qlist.h" + +static const hwaddr aspeed_soc_ast2700_memmap[] = { + [ASPEED_DEV_SPI_BOOT ] =0x400000000 , + [ASPEED_DEV_SRAM ] =0x10000000 , + [ASPEED_DEV_SDMC ] =0x12C00000 , + [ASPEED_DEV_SCU ] =0x12C02000 , + [ASPEED_DEV_SCUIO ] =0x14C02000 , + [ASPEED_DEV_UART0 ] =0X14C33000 , + [ASPEED_DEV_UART1 ] =0X14C33100 , + [ASPEED_DEV_UART2 ] =0X14C33200 , + [ASPEED_DEV_UART3 ] =0X14C33300 , + [ASPEED_DEV_UART4 ] =0X12C1A000 , + [ASPEED_DEV_UART5 ] =0X14C33400 , + [ASPEED_DEV_UART6 ] =0X14C33500 , + [ASPEED_DEV_UART7 ] =0X14C33600 , + [ASPEED_DEV_UART8 ] =0X14C33700 , + [ASPEED_DEV_UART9 ] =0X14C33800 , + [ASPEED_DEV_UART10 ] =0X14C33900 , + [ASPEED_DEV_UART11 ] =0X14C33A00 , + [ASPEED_DEV_UART12 ] =0X14C33B00 , + [ASPEED_DEV_WDT ] =0x14C37000 , + [ASPEED_DEV_VUART ] =0X14C30000 , + [ASPEED_DEV_FMC ] =0x14000000 , + [ASPEED_DEV_SPI0 ] =0x14010000 , + [ASPEED_DEV_SPI1 ] =0x14020000 , + [ASPEED_DEV_SPI2 ] =0x14030000 , + [ASPEED_DEV_SDRAM ] =0x400000000 , + [ASPEED_DEV_MII1 ] =0x14040000 , + [ASPEED_DEV_MII2 ] =0x14040008 , + [ASPEED_DEV_MII3 ] =0x14040010 , + [ASPEED_DEV_ETH1 ] =0x14050000 , + [ASPEED_DEV_ETH2 ] =0x14060000 , + [ASPEED_DEV_ETH3 ] =0x14070000 , + [ASPEED_DEV_EMMC ] =0x12090000 , + [ASPEED_DEV_INTC ] =0x12100000 , + [ASPEED_DEV_SLI ] =0x12C17000 , + [ASPEED_DEV_SLIIO ] =0x14C1E000 , + [ASPEED_GIC_DIST ] =0x12200000 , + [ASPEED_GIC_REDIST ] =0x12280000 , +}; + +#define AST2700_MAX_IRQ 288 + +/* Shared Peripheral Interrupt values below are offset by -32 from datasheet */ +static const int aspeed_soc_ast2700_irqmap[] = { + [ASPEED_DEV_UART0 ] =132 , + [ASPEED_DEV_UART1 ] =132 , + [ASPEED_DEV_UART2 ] =132 , + [ASPEED_DEV_UART3 ] =132 , + [ASPEED_DEV_UART4 ] =8 , + [ASPEED_DEV_UART5 ] =132 , + [ASPEED_DEV_UART6 ] =132 , + [ASPEED_DEV_UART7 ] =132 , + [ASPEED_DEV_UART8 ] =132 , + [ASPEED_DEV_UART9 ] =132 , + [ASPEED_DEV_UART10 ] =132 , + [ASPEED_DEV_UART11 ] =132 , + [ASPEED_DEV_UART12 ] =132 , + [ASPEED_DEV_FMC ] =131 , + [ASPEED_DEV_SDMC ] =0 , + [ASPEED_DEV_SCU ] =12 , + [ASPEED_DEV_ADC ] =130 , + [ASPEED_DEV_XDMA ] =5 , + [ASPEED_DEV_EMMC ] =15 , + [ASPEED_DEV_GPIO ] =11 , + [ASPEED_DEV_GPIO_1_8V ] =130 , + [ASPEED_DEV_RTC ] =13 , + [ASPEED_DEV_TIMER1 ] =16 , + [ASPEED_DEV_TIMER2 ] =17 , + [ASPEED_DEV_TIMER3 ] =18 , + [ASPEED_DEV_TIMER4 ] =19 , + [ASPEED_DEV_TIMER5 ] =20 , + [ASPEED_DEV_TIMER6 ] =21 , + [ASPEED_DEV_TIMER7 ] =22 , + [ASPEED_DEV_TIMER8 ] =23 , + [ASPEED_DEV_WDT ] =131 , + [ASPEED_DEV_PWM ] =131 , + [ASPEED_DEV_LPC ] =128 , + [ASPEED_DEV_IBT ] =128 , + [ASPEED_DEV_I2C ] =130 , + [ASPEED_DEV_PECI ] =133 , + [ASPEED_DEV_ETH1 ] =132 , + [ASPEED_DEV_ETH2 ] =132 , + [ASPEED_DEV_ETH3 ] =132 , + [ASPEED_DEV_HACE ] =4 , + [ASPEED_DEV_KCS ] =128 , + [ASPEED_DEV_DP ] =28 , + [ASPEED_DEV_I3C ] =131 , +}; + +/* GICINT 128 */ +static const int aspeed_soc_ast2700_gic128_intcmap[] = { + [ASPEED_DEV_LPC ] =0 , + [ASPEED_DEV_IBT ] =2 , + [ASPEED_DEV_KCS ] =4 , +}; + +/* GICINT 130 */ +static const int aspeed_soc_ast2700_gic130_intcmap[] = { + [ASPEED_DEV_I2C ] =0 , + [ASPEED_DEV_ADC ] =16 , + [ASPEED_DEV_GPIO_1_8V ] =18 , +}; + +/* GICINT 131 */ +static const int aspeed_soc_ast2700_gic131_intcmap[] = { + [ASPEED_DEV_I3C ] =0 , + [ASPEED_DEV_WDT ] =16 , + [ASPEED_DEV_FMC ] =25 , + [ASPEED_DEV_PWM ] =29 , +}; + +/* GICINT 132 */ +static const int aspeed_soc_ast2700_gic132_intcmap[] = { + [ASPEED_DEV_ETH1 ] =0 , + [ASPEED_DEV_ETH2 ] =1 , + [ASPEED_DEV_ETH3 ] =2 , + [ASPEED_DEV_UART0 ] =7 , + [ASPEED_DEV_UART1 ] =8 , + [ASPEED_DEV_UART2 ] =9 , + [ASPEED_DEV_UART3 ] =10 , + [ASPEED_DEV_UART5 ] =11 , + [ASPEED_DEV_UART6 ] =12 , + [ASPEED_DEV_UART7 ] =13 , + [ASPEED_DEV_UART8 ] =14 , + [ASPEED_DEV_UART9 ] =15 , + [ASPEED_DEV_UART10 ] =16 , + [ASPEED_DEV_UART11 ] =17 , + [ASPEED_DEV_UART12 ] =18 , +}; + +/* GICINT 133 */ +static const int aspeed_soc_ast2700_gic133_intcmap[] = { + [ASPEED_DEV_PECI ] =4 , +}; + +/* GICINT 128 ~ 136 */ +struct gic_intc_irq_info { +int irq; +const int *ptr; +}; + +static const struct gic_intc_irq_info aspeed_soc_ast2700_gic_intcmap[] = { + {128 , aspeed_soc_ast2700_gic128_intcmap}, + {129 ,NULL }, + {130 , aspeed_soc_ast2700_gic130_intcmap}, + {131 , aspeed_soc_ast2700_gic131_intcmap}, + {132 , aspeed_soc_ast2700_gic132_intcmap}, + {133 , aspeed_soc_ast2700_gic133_intcmap}, + {134 ,NULL }, + {135 ,NULL }, + {136 ,NULL }, +}; + +static qemu_irq aspeed_soc_ast2700_get_irq (AspeedSoCState *s,int dev) +{ +Aspeed27x0SoCState *a =ASPEED27X0_SOC (s); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +int i; + +for (i =0 ; i <ARRAY_SIZE (aspeed_soc_ast2700_gic_intcmap); i++) { +if (sc->irqmap[dev] == aspeed_soc_ast2700_gic_intcmap[i].irq) { +assert (aspeed_soc_ast2700_gic_intcmap[i].ptr); +return qdev_get_gpio_in (DEVICE (&a->intc.orgates[i]), + aspeed_soc_ast2700_gic_intcmap[i].ptr[dev]); + } + } + +return qdev_get_gpio_in (a->intc.gic, sc->irqmap[dev]); +} + +static void aspeed_soc_ast2700_init (Object *obj) +{ +Aspeed27x0SoCState *a =ASPEED27X0_SOC (obj); +AspeedSoCState *s =ASPEED_SOC (obj); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +int i; +char socname[8 ]; +char typename[64 ]; + +if (sscanf (sc->name,"%7s" , socname) !=1 ) { +g_assert_not_reached (); + } + +for (i =0 ; i < sc->num_cpus; i++) { +object_initialize_child (obj,"cpu[*]" , &a->cpu[i], +aspeed_soc_cpu_type (sc)); + } + +object_initialize_child (obj,"scu" , &s->scu,TYPE_ASPEED_2700_SCU ); +qdev_prop_set_uint32 (DEVICE (&s->scu),"silicon-rev" , + sc->silicon_rev); +object_property_add_alias (obj,"hw-strap1" ,OBJECT (&s->scu), +"hw-strap1" ); +object_property_add_alias (obj,"hw-strap2" ,OBJECT (&s->scu), +"hw-strap2" ); +object_property_add_alias (obj,"hw-prot-key" ,OBJECT (&s->scu), +"hw-prot-key" ); + +object_initialize_child (obj,"scuio" , &s->scuio,TYPE_ASPEED_2700_SCUIO ); +qdev_prop_set_uint32 (DEVICE (&s->scuio),"silicon-rev" , + sc->silicon_rev); + +snprintf (typename,sizeof (typename),"aspeed.fmc-%s" , socname); +object_initialize_child (obj,"fmc" , &s->fmc, typename); + +for (i =0 ; i < sc->spis_num; i++) { +snprintf (typename,sizeof (typename),"aspeed.spi%d-%s" , i, socname); +object_initialize_child (obj,"spi[*]" , &s->spi[i], typename); + } + +snprintf (typename,sizeof (typename),"aspeed.sdmc-%s" , socname); +object_initialize_child (obj,"sdmc" , &s->sdmc, typename); +object_property_add_alias (obj,"ram-size" ,OBJECT (&s->sdmc), +"ram-size" ); + +for (i =0 ; i < sc->wdts_num; i++) { +snprintf (typename,sizeof (typename),"aspeed.wdt-%s" , socname); +object_initialize_child (obj,"wdt[*]" , &s->wdt[i], typename); + } + +for (i =0 ; i < sc->macs_num; i++) { +object_initialize_child (obj,"ftgmac100[*]" , &s->ftgmac100[i], +TYPE_FTGMAC100 ); + +object_initialize_child (obj,"mii[*]" , &s->mii[i],TYPE_ASPEED_MII ); + } + +for (i =0 ; i < sc->uarts_num; i++) { +object_initialize_child (obj,"uart[*]" , &s->uart[i],TYPE_SERIAL_MM ); + } + +object_initialize_child (obj,"sli" , &s->sli,TYPE_ASPEED_2700_SLI ); +object_initialize_child (obj,"sliio" , &s->sliio,TYPE_ASPEED_2700_SLIIO ); +object_initialize_child (obj,"intc" , &a->intc,TYPE_ASPEED_2700_INTC ); +} + +/* +* ASPEED ast2700 has 0x0 as cluster ID +* +* https://developer.arm.com/documentation/100236/0100/register-descriptions/aarch64-system-registers/multiprocessor-affinity-register--el1 +*/ +static uint64_t aspeed_calc_affinity (int cpu) +{ +return (0x0 <<ARM_AFF1_SHIFT ) | cpu; +} + +static bool aspeed_soc_ast2700_gic (DeviceState *dev,Error **errp) +{ +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +SysBusDevice *gicbusdev; +QList *redist_region_count; +int i; + + a->intc.gic =qdev_new (gicv3_class_name ()); +qdev_prop_set_uint32 (a->intc.gic,"revision" ,3 ); +qdev_prop_set_uint32 (a->intc.gic,"num-cpu" , sc->num_cpus); +qdev_prop_set_uint32 (a->intc.gic,"num-irq" ,AST2700_MAX_IRQ ); + + redist_region_count =qlist_new (); +qlist_append_int (redist_region_count, sc->num_cpus); +qdev_prop_set_array (a->intc.gic,"redist-region-count" , + redist_region_count); + + gicbusdev =SYS_BUS_DEVICE (a->intc.gic); +if (!sysbus_realize (gicbusdev, errp)) { +return false; + } +sysbus_mmio_map (gicbusdev,0 , sc->memmap[ASPEED_GIC_DIST ]); +sysbus_mmio_map (gicbusdev,1 , sc->memmap[ASPEED_GIC_REDIST ]); + +for (i =0 ; i < sc->num_cpus; i++) { +DeviceState *cpudev =DEVICE (qemu_get_cpu (i)); +int NUM_IRQS =256 ,ARCH_GIC_MAINT_IRQ =9 ,VIRTUAL_PMU_IRQ =7 ; +int ppibase =NUM_IRQS + i *GIC_INTERNAL +GIC_NR_SGIS ; + +const int timer_irq[] = { + [GTIMER_PHYS ] =14 , + [GTIMER_VIRT ] =11 , + [GTIMER_HYP ] =10 , + [GTIMER_SEC ] =13 , + }; +int j; + +for (j =0 ; j <ARRAY_SIZE (timer_irq); j++) { +qdev_connect_gpio_out (cpudev, j, +qdev_get_gpio_in (a->intc.gic, ppibase + timer_irq[j])); + } + +qemu_irq irq =qdev_get_gpio_in (a->intc.gic, + ppibase +ARCH_GIC_MAINT_IRQ ); +qdev_connect_gpio_out_named (cpudev,"gicv3-maintenance-interrupt" , +0 , irq); +qdev_connect_gpio_out_named (cpudev,"pmu-interrupt" ,0 , +qdev_get_gpio_in (a->intc.gic, ppibase +VIRTUAL_PMU_IRQ )); + +sysbus_connect_irq (gicbusdev, i,qdev_get_gpio_in (cpudev,ARM_CPU_IRQ )); +sysbus_connect_irq (gicbusdev, i + sc->num_cpus, +qdev_get_gpio_in (cpudev,ARM_CPU_FIQ )); +sysbus_connect_irq (gicbusdev, i +2 * sc->num_cpus, +qdev_get_gpio_in (cpudev,ARM_CPU_VIRQ )); +sysbus_connect_irq (gicbusdev, i +3 * sc->num_cpus, +qdev_get_gpio_in (cpudev,ARM_CPU_VFIQ )); + } + +return true; +} + +static void aspeed_soc_ast2700_realize (DeviceState *dev,Error **errp) +{ +int i; +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); + g_autofree char *sram_name = NULL; +uint32_t num_ints; + +/* Default boot region (SPI memory or ROMs) */ +memory_region_init (&s->spi_boot_container,OBJECT (s), +"aspeed.spi_boot_container" ,0x400000000 ); +memory_region_add_subregion (s->memory, sc->memmap[ASPEED_DEV_SPI_BOOT ], + &s->spi_boot_container); + +/* CPU */ +for (i =0 ; i < sc->num_cpus; i++) { +object_property_set_int (OBJECT (&a->cpu[i]),"mp-affinity" , +aspeed_calc_affinity (i), &error_abort); + +object_property_set_int (OBJECT (&a->cpu[i]),"cntfrq" ,1125000000 , + &error_abort); +object_property_set_link (OBJECT (&a->cpu[i]),"memory" , +OBJECT (s->memory), &error_abort); + +if (!qdev_realize (DEVICE (&a->cpu[i]),NULL , errp)) { +return ; + } + } + +/* GIC */ +if (!aspeed_soc_ast2700_gic (dev, errp)) { +return ; + } + +/* INTC */ +if (!sysbus_realize (SYS_BUS_DEVICE (&a->intc), errp)) { +return ; + } + +aspeed_mmio_map (s,SYS_BUS_DEVICE (&a->intc),0 , + sc->memmap[ASPEED_DEV_INTC ]); + +/* GICINT orgates -> INTC -> GIC */ + num_ints =object_property_get_int (OBJECT (&a->intc),"num-ints" , + &error_abort); +for (i =0 ; i < num_ints; i++) { +qdev_connect_gpio_out (DEVICE (&a->intc.orgates[i]),0 , +qdev_get_gpio_in (DEVICE (&a->intc), i)); +sysbus_connect_irq (SYS_BUS_DEVICE (&a->intc), i, +qdev_get_gpio_in (a->intc.gic, + aspeed_soc_ast2700_gic_intcmap[i].irq)); + } + +/* SRAM */ + sram_name =g_strdup_printf ("aspeed.sram.%d" ,CPU (&a->cpu[0 ])->cpu_index); +if (!memory_region_init_ram (&s->sram,OBJECT (s), sram_name, sc->sram_size, + errp)) { +return ; + } +memory_region_add_subregion (s->memory, + sc->memmap[ASPEED_DEV_SRAM ], &s->sram); + +/* SCU */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->scu), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->scu),0 , sc->memmap[ASPEED_DEV_SCU ]); + +/* SCU1 */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->scuio), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->scuio),0 , + sc->memmap[ASPEED_DEV_SCUIO ]); + +/* UART */ +if (!aspeed_soc_uart_realize (s, errp)) { +return ; + } + +/* FMC, The number of CS is set at the board level */ +object_property_set_int (OBJECT (&s->fmc),"dram-base" , + sc->memmap[ASPEED_DEV_SDRAM ], + &error_abort); +object_property_set_link (OBJECT (&s->fmc),"dram" ,OBJECT (s->dram_mr), + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->fmc), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->fmc),0 , sc->memmap[ASPEED_DEV_FMC ]); +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->fmc),1 , +ASPEED_SMC_GET_CLASS (&s->fmc)->flash_window_base); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->fmc),0 , +aspeed_soc_get_irq (s,ASPEED_DEV_FMC )); + +/* Set up an alias on the FMC CE0 region (boot default) */ +MemoryRegion *fmc0_mmio = &s->fmc.flashes[0 ].mmio; +memory_region_init_alias (&s->spi_boot,OBJECT (s),"aspeed.spi_boot" , + fmc0_mmio,0 ,memory_region_size (fmc0_mmio)); +memory_region_add_subregion (&s->spi_boot_container,0x0 , &s->spi_boot); + +/* SPI */ +for (i =0 ; i < sc->spis_num; i++) { +object_property_set_link (OBJECT (&s->spi[i]),"dram" , +OBJECT (s->dram_mr), &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->spi[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->spi[i]),0 , + sc->memmap[ASPEED_DEV_SPI0 + i]); +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->spi[i]),1 , +ASPEED_SMC_GET_CLASS (&s->spi[i])->flash_window_base); + } + +/* +* SDMC - SDRAM Memory Controller +* The SDMC controller is unlocked at SPL stage. +* At present, only supports to emulate booting +* start from u-boot stage. Set SDMC controller +* unlocked by default. It is a temporarily solution. +*/ +object_property_set_bool (OBJECT (&s->sdmc),"unlocked" , true, + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sdmc), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sdmc),0 , + sc->memmap[ASPEED_DEV_SDMC ]); + +/* RAM */ +if (!aspeed_soc_dram_init (s, errp)) { +return ; + } + +for (i =0 ; i < sc->macs_num; i++) { +object_property_set_bool (OBJECT (&s->ftgmac100[i]),"aspeed" , true, + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->ftgmac100[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->ftgmac100[i]),0 , + sc->memmap[ASPEED_DEV_ETH1 + i]); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->ftgmac100[i]),0 , +aspeed_soc_get_irq (s,ASPEED_DEV_ETH1 + i)); + +object_property_set_link (OBJECT (&s->mii[i]),"nic" , +OBJECT (&s->ftgmac100[i]), &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->mii[i]), errp)) { +return ; + } + +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->mii[i]),0 , + sc->memmap[ASPEED_DEV_MII1 + i]); + } + +/* Watch dog */ +for (i =0 ; i < sc->wdts_num; i++) { +AspeedWDTClass *awc =ASPEED_WDT_GET_CLASS (&s->wdt[i]); +hwaddr wdt_offset = sc->memmap[ASPEED_DEV_WDT ] + i * awc->iosize; + +object_property_set_link (OBJECT (&s->wdt[i]),"scu" ,OBJECT (&s->scu), + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->wdt[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->wdt[i]),0 , wdt_offset); + } + +/* SLI */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sli), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sli),0 , sc->memmap[ASPEED_DEV_SLI ]); + +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sliio), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sliio),0 , + sc->memmap[ASPEED_DEV_SLIIO ]); + +create_unimplemented_device ("ast2700.dpmcu" ,0x11000000 ,0x40000 ); +create_unimplemented_device ("ast2700.iomem0" ,0x12000000 ,0x01000000 ); +create_unimplemented_device ("ast2700.iomem1" ,0x14000000 ,0x01000000 ); +create_unimplemented_device ("ast2700.ltpi" ,0x30000000 ,0x1000000 ); +create_unimplemented_device ("ast2700.io" ,0x0 ,0x4000000 ); +} + +static void aspeed_soc_ast2700_class_init (ObjectClass *oc,void *data) +{ +static const char *const valid_cpu_types[] = { +ARM_CPU_TYPE_NAME ("cortex-a35" ), +NULL + }; +DeviceClass *dc =DEVICE_CLASS (oc); +AspeedSoCClass *sc =ASPEED_SOC_CLASS (oc); + +/* Reason: The Aspeed SoC can only be instantiated from a board */ + dc->user_creatable = false; + dc->realize = aspeed_soc_ast2700_realize; + + sc->name ="ast2700-a0" ; + sc->valid_cpu_types = valid_cpu_types; + sc->silicon_rev =AST2700_A0_SILICON_REV ; + sc->sram_size =0x20000 ; + sc->spis_num =3 ; + sc->wdts_num =8 ; + sc->macs_num =1 ; + sc->uarts_num =13 ; + sc->num_cpus =4 ; + sc->uarts_base =ASPEED_DEV_UART0 ; + sc->irqmap = aspeed_soc_ast2700_irqmap; + sc->memmap = aspeed_soc_ast2700_memmap; + sc->get_irq = aspeed_soc_ast2700_get_irq; +} + +static const TypeInfo aspeed_soc_ast27x0_types[] = { + { + .name =TYPE_ASPEED27X0_SOC , + .parent =TYPE_ASPEED_SOC , + .instance_size =sizeof (Aspeed27x0SoCState), + .abstract = true, + }, { + .name ="ast2700-a0" , + .parent =TYPE_ASPEED27X0_SOC , + .instance_init = aspeed_soc_ast2700_init, + .class_init = aspeed_soc_ast2700_class_init, + }, +}; + +DEFINE_TYPES (aspeed_soc_ast27x0_types)
hw/arm/meson.build +1 -0
@@ -46,6 +46,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_soc_common.c', 'aspeed_ast2400.c', 'aspeed_ast2600.c', + 'aspeed_ast27x0.c', 'aspeed_ast10x0.c', 'aspeed_eeprom.c', 'fby35.c'))
include/hw/arm/aspeed_soc.h +24 -2
@@ -15,6 +15,7 @@#include "hw/cpu/a15mpcore.h" #include "hw/arm/armv7m.h" #include "hw/intc/aspeed_vic.h" +#include "hw/intc/aspeed_intc.h" #include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/misc/aspeed_sdmc.h"
@@ -26,6 +27,7 @@#include "hw/ssi/aspeed_smc.h" #include "hw/misc/aspeed_hace.h" #include "hw/misc/aspeed_sbc.h" +#include "hw/misc/aspeed_sli.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h"
@@ -41,8 +43,8 @@#define ASPEED_SPIS_NUM 2#define ASPEED_EHCIS_NUM 2 -#define ASPEED_WDTS_NUM 4 -#define ASPEED_CPUS_NUM 2 +#define ASPEED_WDTS_NUM 8 +#define ASPEED_CPUS_NUM 4#define ASPEED_MACS_NUM 4#define ASPEED_UARTS_NUM 13#define ASPEED_JTAG_NUM 2
@@ -61,6 +63,7 @@ struct AspeedSoCState {AspeedI2CState i2c;AspeedI3CState i3c;AspeedSCUState scu; +AspeedSCUState scuio;AspeedHACEState hace;AspeedXDMAState xdma;AspeedADCState adc;
@@ -68,6 +71,8 @@ struct AspeedSoCState {AspeedSMCState spi[ASPEED_SPIS_NUM ];EHCISysBusState ehci[ASPEED_EHCIS_NUM ];AspeedSBCState sbc; +AspeedSLIState sli; +AspeedSLIState sliio;MemoryRegion secsram;UnimplementedDeviceState sbc_unimplemented;AspeedSDMCState sdmc;
@@ -117,6 +122,16 @@ struct Aspeed2600SoCState {#define TYPE_ASPEED2600_SOC "aspeed2600-soc" OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2600SoCState, ASPEED2600_SOC) +struct Aspeed27x0SoCState { +AspeedSoCState parent; + +ARMCPU cpu[ASPEED_CPUS_NUM ]; +AspeedINTCState intc; +}; + +#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" +OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) +struct Aspeed10x0SoCState {AspeedSoCState parent;
@@ -168,11 +183,13 @@ enum {ASPEED_DEV_UART13 ,ASPEED_DEV_VUART ,ASPEED_DEV_FMC , +ASPEED_DEV_SPI0 ,ASPEED_DEV_SPI1 ,ASPEED_DEV_SPI2 ,ASPEED_DEV_EHCI1 ,ASPEED_DEV_EHCI2 ,ASPEED_DEV_VIC , +ASPEED_DEV_INTC ,ASPEED_DEV_SDMC ,ASPEED_DEV_SCU , ASPEED_DEV_ADC,
@@ -222,6 +239,11 @@ enum {ASPEED_DEV_JTAG1 ,ASPEED_DEV_FSI1 ,ASPEED_DEV_FSI2 , +ASPEED_DEV_SCUIO , +ASPEED_DEV_SLI , +ASPEED_DEV_SLIIO , +ASPEED_GIC_DIST , + ASPEED_GIC_REDIST, };qemu_irq aspeed_soc_get_irq (AspeedSoCState *s,int dev);
Signature · 1 line
2.25.1
PATCH v4 8/16 aspeed/smc: support 64 bits dma dram address
In reply to Jamin Lin viaAST2700 support the maximum dram size is 8GiB and has a "DMA DRAM Side Address High Part(0x7C)" register to support 64 bits dma dram address. Add helper routines functions to compute the dma dram address, new features and update trace-event to support 64 bits dram address.
--- hw/ssi/aspeed_smc.c | 52 +++++++++++++++++++++++++++++++------ hw/ssi/trace-events | 2 +- include/hw/ssi/aspeed_smc.h | 1 + 3 files changed, 46 insertions(+), 9 deletions(-)
hw/ssi/aspeed_smc.c +44 -8
@@ -132,6 +132,9 @@#define FMC_WDT2_CTRL_BOOT_SOURCE BIT(4)/* O: primary 1: alternate */ #define FMC_WDT2_CTRL_EN BIT(0) +/* DMA DRAM Side Address High Part (AST2700) */ +#define R_DMA_DRAM_ADDR_HIGH (0x7c / 4) +/* DMA Control/Status Register */ #define R_DMA_CTRL (0x80 / 4)#define DMA_CTRL_REQUEST (1 << 31)
@@ -187,6 +190,7 @@* 0x1FFFFFF: 32M bytes */ #define DMA_DRAM_ADDR (asc, val) ((val) & (asc)->dma_dram_mask) +#define DMA_DRAM_ADDR_HIGH (val) ((val) & 0xf)#define DMA_FLASH_ADDR (asc, val) ((val) & (asc)->dma_flash_mask)#define DMA_LENGTH (val) ((val) & 0x01FFFFFF)
@@ -207,6 +211,7 @@ static const AspeedSegments aspeed_2500_spi2_segments[];#define ASPEED_SMC_FEATURE_DMA 0x1#define ASPEED_SMC_FEATURE_DMA_GRANT 0x2#define ASPEED_SMC_FEATURE_WDT_CONTROL 0x4 +#define ASPEED_SMC_FEATURE_DMA_DRAM_ADDR_HIGH 0x08static inline bool aspeed_smc_has_dma (const AspeedSMCClass *asc) {
@@ -218,6 +223,11 @@ static inline bool aspeed_smc_has_wdt_control(const AspeedSMCClass *asc)return !!(asc->features &ASPEED_SMC_FEATURE_WDT_CONTROL ); } +static inline bool aspeed_smc_has_dma64 (const AspeedSMCClass *asc) +{ +return !!(asc->features &ASPEED_SMC_FEATURE_DMA_DRAM_ADDR_HIGH ); +} +#define aspeed_smc_error (fmt, ...) \ qemu_log_mask(LOG_GUEST_ERROR, "%s: " fmt "\n", __func__, ## __VA_ARGS__)
@@ -747,6 +757,8 @@ static uint64_t aspeed_smc_read(void *opaque, hwaddr addr, unsigned int size) (aspeed_smc_has_dma (asc) && addr ==R_DMA_CTRL ) || (aspeed_smc_has_dma (asc) && addr ==R_DMA_FLASH_ADDR ) || (aspeed_smc_has_dma (asc) && addr ==R_DMA_DRAM_ADDR ) || + (aspeed_smc_has_dma (asc) &&aspeed_smc_has_dma64 (asc) && + addr ==R_DMA_DRAM_ADDR_HIGH ) || (aspeed_smc_has_dma (asc) && addr ==R_DMA_LEN ) || (aspeed_smc_has_dma(asc) && addr == R_DMA_CHECKSUM) || (addr >= R_SEG_ADDR0 &&
@@ -847,6 +859,12 @@ static bool aspeed_smc_inject_read_failure(AspeedSMCState *s) } } +static uint64_t aspeed_smc_dma_dram_addr (AspeedSMCState *s) +{ +return s->regs[R_DMA_DRAM_ADDR ] | + ((uint64_t ) s->regs[R_DMA_DRAM_ADDR_HIGH ] <<32 ); +} +static uint32_t aspeed_smc_dma_len (AspeedSMCState *s) {AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS (s);
@@ -903,24 +921,34 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s)static void aspeed_smc_dma_rw (AspeedSMCState *s) { +AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS (s); +uint64_t dma_dram_offset; +uint64_t dma_dram_addr;MemTxResult result;uint32_t dma_len;uint32_t data; dma_len =aspeed_smc_dma_len (s); + dma_dram_addr =aspeed_smc_dma_dram_addr (s); + +if (aspeed_smc_has_dma64 (asc)) { + dma_dram_offset = dma_dram_addr - s->dram_base; + }else { + dma_dram_offset = dma_dram_addr; + }trace_aspeed_smc_dma_rw (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ?"write" :"read" , s->regs[R_DMA_FLASH_ADDR ], - s->regs[R_DMA_DRAM_ADDR ], + dma_dram_offset, dma_len);while (dma_len) {if (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ) { - data =address_space_ldl_le (&s->dram_as, s->regs[R_DMA_DRAM_ADDR ], + data =address_space_ldl_le (&s->dram_as, dma_dram_offset,MEMTXATTRS_UNSPECIFIED , &result);if (result !=MEMTX_OK ) { -aspeed_smc_error ("DRAM read failed @%08x" , - s->regs[R_DMA_DRAM_ADDR ]); +aspeed_smc_error ("DRAM read failed @%" PRIx64, + dma_dram_offset);return ; }
@@ -940,11 +968,11 @@ static void aspeed_smc_dma_rw(AspeedSMCState *s)return ; } -address_space_stl_le (&s->dram_as, s->regs[R_DMA_DRAM_ADDR ], +address_space_stl_le (&s->dram_as, dma_dram_offset, data,MEMTXATTRS_UNSPECIFIED , &result);if (result !=MEMTX_OK ) { -aspeed_smc_error ("DRAM write failed @%08x" , - s->regs[R_DMA_DRAM_ADDR ]); +aspeed_smc_error ("DRAM write failed @%" PRIx64, + dma_dram_offset);return ; } }
@@ -953,8 +981,12 @@ static void aspeed_smc_dma_rw(AspeedSMCState *s)* When the DMA is on-going, the DMA registers are updated * with the current working addresses and length. */ + dma_dram_offset +=4 ; + dma_dram_addr +=4 ; + + s->regs[R_DMA_DRAM_ADDR_HIGH ] = dma_dram_addr >>32 ; + s->regs[R_DMA_DRAM_ADDR ] = dma_dram_addr &0xffffffff ; s->regs[R_DMA_FLASH_ADDR ] +=4 ; - s->regs[R_DMA_DRAM_ADDR ] +=4 ; dma_len -=4 ; s->regs[R_DMA_LEN ] = dma_len; s->regs[R_DMA_CHECKSUM ] += data;
@@ -1107,6 +1139,9 @@ static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data, }else if (aspeed_smc_has_dma (asc) && addr ==R_DMA_LEN &&aspeed_smc_dma_granted (s)) { s->regs[addr] =DMA_LENGTH (value); + }else if (aspeed_smc_has_dma (asc) &&aspeed_smc_has_dma64 (asc) && + addr ==R_DMA_DRAM_ADDR_HIGH ) { + s->regs[addr] =DMA_DRAM_ADDR_HIGH (value); }else {qemu_log_mask (LOG_UNIMP ,"%s: not implemented: 0x%" HWADDR_PRIx"\n" , __func__, addr);
@@ -1239,6 +1274,7 @@ static const VMStateDescription vmstate_aspeed_smc = {static Property aspeed_smc_properties[] = {DEFINE_PROP_BOOL ("inject-failure" , AspeedSMCState, inject_failure, false), +DEFINE_PROP_UINT64 ("dram-base" , AspeedSMCState, dram_base,0 ),DEFINE_PROP_LINK ("dram" , AspeedSMCState, dram_mr, TYPE_MEMORY_REGION, MemoryRegion *),DEFINE_PROP_END_OF_LIST (),
hw/ssi/trace-events +1 -1
@@ -6,7 +6,7 @@ aspeed_smc_do_snoop(int cs, int index, int dummies, int data) "CS%d index:0x%x d aspeed_smc_flash_write(int cs, uint64_t addr, uint32_t size, uint64_t data, int mode) "CS%d @0x%" PRIx64 " size %u: 0x%" PRIx64" mode:%d" aspeed_smc_read(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size %u: 0x%" PRIx64 aspeed_smc_dma_checksum(uint32_t addr, uint32_t data) "0x%08x: 0x%08x" -aspeed_smc_dma_rw(const char *dir, uint32_t flash_addr, uint32_t dram_addr, uint32_t size) "%s flash:@0x%08x dram:@0x%08x size:0x%08x" +aspeed_smc_dma_rw(const char *dir, uint32_t flash_addr, uint64_t dram_addr, uint32_t size) "%s flash:@0x%08x dram:@0x%" PRIx64 " size:0x%08x" aspeed_smc_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size %u: 0x%" PRIx64 aspeed_smc_flash_select(int cs, const char *prefix) "CS%d %sselect"
include/hw/ssi/aspeed_smc.h +1 -0
@@ -76,6 +76,7 @@ struct AspeedSMCState {AddressSpace flash_as;MemoryRegion *dram_mr;AddressSpace dram_as; +uint64_t dram_base;AspeedSMCFlash flashes[ASPEED_SMC_CS_MAX ];
Signature · 1 line
2.25.1
v4 cover Add AST2700 support
Changes from v1:
The patch series supports WDT, SDMC, SMC, SCU, SLI and INTC for AST2700 SoC.
Changes from v2:
- replace is_aarch64 with is_bus64bit for sdmc patch review.
- fix incorrect dram size for AST2700
Changes from v3:
- Add AST2700 Evaluation board in ASPEED document
- Add avocado test cases for AST2700 Evaluation board
- Fix reviewers review issues and add reviewers suggestions
- Implement INTC model GICINT 128 to GICINT136 for AST2700
Changes from v4:
- support 64 bits dma dram address associated with review issues
- support dma start length and 1 byte length unit associated with review issues
- refactor intc model to fix serial console stuck issue and associated with review issues
Test Version:
https://github.com/qemu/qemu/commit/0c2a3807483b4ebe360cfa475dbfc9dfd2f6d16d
Test steps:
1. Download the latest openbmc image for AST2700 from AspeedTech-BMC/openbmc repository, https://github.com/AspeedTech-BMC/openbmc/releases/tag/v09.01
2. untar ast2700-default-obmc.tar.gz
``` tar -xf ast2700-default-obmc.tar.gz ```
3. Run and the contents of scripts as following IMGDIR=ast2700-default
UBOOT_SIZE=$(stat --format=%s -L ${IMGDIR}/u-boot-nodtb.bin) UBOOT_DTB_ADDR=$((0x400000000 + ${UBOOT_SIZE}))
qemu-system-aarch64 -M ast2700-evb -nographic\
-device loader,addr=0x400000000,file=${IMGDIR}/u-boot-nodtb.bin,force-raw=on\
-device loader,addr=${UBOOT_DTB_ADDR},file=${IMGDIR}/u-boot.dtb,force-raw=on\
-device loader,addr=0x430000000,file=${IMGDIR}/bl31.bin,force-raw=on\
-device loader,addr=0x430080000,file=${IMGDIR}/optee/tee-raw.bin,force-raw=on\
-device loader,addr=0x430000000,cpu-num=0\
-device loader,addr=0x430000000,cpu-num=1\
-device loader,addr=0x430000000,cpu-num=2\
-device loader,addr=0x430000000,cpu-num=3\
-smp 4\
-drive file=${IMGDIR}/image-bmc,format=raw,if=mtd\
-serial mon:stdio\
-snapshot
Jamin Lin (16):
aspeed/wdt: Add AST2700 support
aspeed/sli: Add AST2700 support
aspeed/sdmc: remove redundant macros
aspeed/sdmc: fix coding style
aspeed/sdmc: Add AST2700 support
aspeed/smc: correct device description aspeed/smc: support dma start length and 1 byte length unit aspeed/smc: support 64 bits dma dram address aspeed/smc: Add AST2700 support
aspeed/scu: Add AST2700 support
aspeed/intc: Add AST2700 support
aspeed/soc: Add AST2700 support
aspeed: Add an AST2700 eval board
aspeed/soc: fix incorrect dram size for AST2700 test/avocado/machine_aspeed.py: Add AST2700 test case docs:aspeed: Add AST2700 Evaluation board
docs/system/arm/aspeed.rst | 39 +- hw/arm/aspeed.c | 32 ++ hw/arm/aspeed_ast27x0.c | 655 +++++++++++++++++++++++++++++++ hw/arm/meson.build | 1 + hw/intc/aspeed_intc.c | 355 +++++++++++++++++ hw/intc/meson.build | 1 + hw/intc/trace-events | 6 + hw/misc/aspeed_scu.c | 306 ++++++++++++++- hw/misc/aspeed_sdmc.c | 216 +++++++++- hw/misc/aspeed_sli.c | 177 +++++++++ hw/misc/meson.build | 3 +- hw/misc/trace-events | 11 + hw/ssi/aspeed_smc.c | 321 ++++++++++++++- hw/ssi/trace-events | 2 +- hw/watchdog/wdt_aspeed.c | 24 ++ include/hw/arm/aspeed_soc.h | 27 +- include/hw/intc/aspeed_intc.h | 46 +++ include/hw/misc/aspeed_scu.h | 47 ++- include/hw/misc/aspeed_sdmc.h | 5 +- include/hw/misc/aspeed_sli.h | 27 ++ include/hw/ssi/aspeed_smc.h | 2 + include/hw/watchdog/wdt_aspeed.h | 3 +- tests/avocado/machine_aspeed.py | 62 +++ 23 files changed, 2312 insertions(+), 56 deletions(-) create mode 100644 hw/arm/aspeed_ast27x0.c create mode 100644 hw/intc/aspeed_intc.c create mode 100644 hw/misc/aspeed_sli.c create mode 100644 include/hw/intc/aspeed_intc.h create mode 100644 include/hw/misc/aspeed_sli.h
Signature · 1 line
2.25.1
PATCH v4 7/16 aspeed/smc: support dma start length and 1 byte length unit
DMA length is from 1 byte to 32MB for AST2600 and AST10x0 and DMA length is from 4 bytes to 32MB for AST2500.
In other words, if "R_DMA_LEN" is 0, it should move at least 1 byte data for AST2600 and AST10x0 and 4 bytes data for AST2500. To support all ASPEED SOCs, adds dma_start_length parameter to store the start length, add helper routines function to compute the dma length and update DMA_LENGTH mask to "1FFFFFF" to support dma 1 byte length unit for AST2600 and AST1030.
Currently, only supports dma length 4 bytes aligned.
--- hw/ssi/aspeed_smc.c | 43 ++++++++++++++++++++++++++++++------- include/hw/ssi/aspeed_smc.h | 1 + 2 files changed, 36 insertions(+), 8 deletions(-)
hw/ssi/aspeed_smc.c +35 -8
@@ -178,13 +178,17 @@* DMA flash addresses should be 4 bytes aligned and the valid address * range is 0x20000000 - 0x2FFFFFFF. * -* DMA length is from 4 bytes to 32MB +* DMA length is from 4 bytes to 32MB (AST2500) * 0: 4 bytes -* 0x7FFFFF: 32M bytes +* 0x1FFFFFC: 32M bytes +* +* DMA length is from 1 byte to 32MB (AST2600, AST10x0) +* 0: 1 byte +* 0x1FFFFFF: 32M bytes */ #define DMA_DRAM_ADDR (asc, val) ((val) & (asc)->dma_dram_mask)#define DMA_FLASH_ADDR (asc, val) ((val) & (asc)->dma_flash_mask) -#define DMA_LENGTH (val) ((val) & 0x01FFFFFC) +#define DMA_LENGTH (val) ((val) & 0x01FFFFFF)/* Flash opcodes. */ #define SPI_OP_READ 0x03/* Read data bytes (low frequency) */
@@ -843,6 +847,13 @@ static bool aspeed_smc_inject_read_failure(AspeedSMCState *s) } } +static uint32_t aspeed_smc_dma_len (AspeedSMCState *s) +{ +AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS (s); + +return QEMU_ALIGN_UP (s->regs[R_DMA_LEN ] + asc->dma_start_length,4 ); +} +/* * Accumulate the result of the reads to provide a checksum that will * be used to validate the read timing settings.
@@ -850,6 +861,7 @@ static bool aspeed_smc_inject_read_failure(AspeedSMCState *s)static void aspeed_smc_dma_checksum (AspeedSMCState *s) {MemTxResult result; +uint32_t dma_len;uint32_t data;if (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ) {
@@ -861,7 +873,9 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s)aspeed_smc_dma_calibration (s); } -while (s->regs[R_DMA_LEN ]) { + dma_len =aspeed_smc_dma_len (s); + +while (dma_len) { data =address_space_ldl_le (&s->flash_as, s->regs[R_DMA_FLASH_ADDR ],MEMTXATTRS_UNSPECIFIED , &result);if (result !=MEMTX_OK ) {
@@ -877,7 +891,8 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s)*/ s->regs[R_DMA_CHECKSUM ] += data; s->regs[R_DMA_FLASH_ADDR ] +=4 ; - s->regs[R_DMA_LEN ] -=4 ; + dma_len -=4 ; + s->regs[R_DMA_LEN ] = dma_len; }if (s->inject_failure &&aspeed_smc_inject_read_failure (s)) {
@@ -889,14 +904,17 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s)static void aspeed_smc_dma_rw (AspeedSMCState *s) {MemTxResult result; +uint32_t dma_len;uint32_t data; + dma_len =aspeed_smc_dma_len (s); +trace_aspeed_smc_dma_rw (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ?"write" :"read" , s->regs[R_DMA_FLASH_ADDR ], s->regs[R_DMA_DRAM_ADDR ], - s->regs[R_DMA_LEN ]); -while (s->regs[R_DMA_LEN ]) { + dma_len); +while (dma_len) {if (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ) { data =address_space_ldl_le (&s->dram_as, s->regs[R_DMA_DRAM_ADDR ],MEMTXATTRS_UNSPECIFIED , &result);
@@ -937,7 +955,8 @@ 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 ; + dma_len -=4 ; + s->regs[R_DMA_LEN ] = dma_len; s->regs[R_DMA_CHECKSUM ] += data; } }
@@ -1381,6 +1400,7 @@ static void aspeed_2400_fmc_class_init(ObjectClass *klass, void *data) asc->features =ASPEED_SMC_FEATURE_DMA ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x1FFFFFFC ; + asc->dma_start_length =4 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_smc_segment_to_reg; asc->reg_to_segment = aspeed_smc_reg_to_segment;
@@ -1464,6 +1484,7 @@ static void aspeed_2500_fmc_class_init(ObjectClass *klass, void *data) asc->features =ASPEED_SMC_FEATURE_DMA ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x3FFFFFFC ; + asc->dma_start_length =4 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_smc_segment_to_reg; asc->reg_to_segment = aspeed_smc_reg_to_segment;
@@ -1620,6 +1641,7 @@ static void aspeed_2600_fmc_class_init(ObjectClass *klass, void *data)ASPEED_SMC_FEATURE_WDT_CONTROL ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x3FFFFFFC ; + asc->dma_start_length =1 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_2600_smc_segment_to_reg; asc->reg_to_segment = aspeed_2600_smc_reg_to_segment;
@@ -1658,6 +1680,7 @@ static void aspeed_2600_spi1_class_init(ObjectClass *klass, void *data)ASPEED_SMC_FEATURE_DMA_GRANT ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x3FFFFFFC ; + asc->dma_start_length =1 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_2600_smc_segment_to_reg; asc->reg_to_segment = aspeed_2600_smc_reg_to_segment;
@@ -1697,6 +1720,7 @@ static void aspeed_2600_spi2_class_init(ObjectClass *klass, void *data)ASPEED_SMC_FEATURE_DMA_GRANT ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x3FFFFFFC ; + asc->dma_start_length =1 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_2600_smc_segment_to_reg; asc->reg_to_segment = aspeed_2600_smc_reg_to_segment;
@@ -1778,6 +1802,7 @@ static void aspeed_1030_fmc_class_init(ObjectClass *klass, void *data) asc->features =ASPEED_SMC_FEATURE_DMA ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x000BFFFC ; + asc->dma_start_length =1 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_1030_smc_segment_to_reg; asc->reg_to_segment = aspeed_1030_smc_reg_to_segment;
@@ -1815,6 +1840,7 @@ static void aspeed_1030_spi1_class_init(ObjectClass *klass, void *data) asc->features =ASPEED_SMC_FEATURE_DMA ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x000BFFFC ; + asc->dma_start_length =1 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_2600_smc_segment_to_reg; asc->reg_to_segment = aspeed_2600_smc_reg_to_segment;
@@ -1851,6 +1877,7 @@ static void aspeed_1030_spi2_class_init(ObjectClass *klass, void *data) asc->features =ASPEED_SMC_FEATURE_DMA ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x000BFFFC ; + asc->dma_start_length =1 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_2600_smc_segment_to_reg; asc->reg_to_segment = aspeed_2600_smc_reg_to_segment;
include/hw/ssi/aspeed_smc.h +1 -0
@@ -106,6 +106,7 @@ struct AspeedSMCClass {uint32_t features;hwaddr dma_flash_mask;hwaddr dma_dram_mask; +uint32_t dma_start_length;uint32_t nregs;uint32_t (*segment_to_reg)(const AspeedSMCState *s,const AspeedSegments *seg);
Signature · 1 line
2.25.1
PATCH v4 14/16 aspeed/soc: fix incorrect dram size for AST2700
In reply to Jamin Lin viaAST2700 dram size calculation is not back compatible AST2600. According to the DDR capacity hardware behavior,
if users write the data to address which is beyond the ram size, it would write the data to address 0.
For example:
a. sdram base address "0x4 00000000"
b. sdram size is 1 GiB
The available address range is from "0x4 00000000" to "0x4 40000000". If users write 0xdeadbeef to address "0x6 00000000",
the value of DRAM address 0 (base address 0x4 00000000) should be 0xdeadbeef.
Add aspeed_soc_ast2700_dram_init to calculate the dram size and add memory I/O whose address range is from max_ram_size - ram_size to max_ram_size and its read/write handler to emulate DDR capacity hardware behavior.
--- hw/arm/aspeed_ast27x0.c | 94 ++++++++++++++++++++++++++++++++++++- include/hw/arm/aspeed_soc.h | 1 + 2 files changed, 94 insertions(+), 1 deletion(-)
hw/arm/aspeed_ast27x0.c +93 -1
@@ -20,6 +20,7 @@#include "sysemu/sysemu.h" #include "hw/intc/arm_gicv3.h" #include "qapi/qmp/qlist.h" +#include "qemu/log.h" static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_SPI_BOOT ] =0x400000000 ,
@@ -191,6 +192,97 @@ static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)return qdev_get_gpio_in (a->intc.gic, sc->irqmap[dev]); } +static uint64_t aspeed_ram_capacity_read (void *opaque,hwaddr addr, +unsigned int size) +{ +qemu_log_mask (LOG_GUEST_ERROR , +"%s: read @%" PRIx64" out of ram size\n" , + __func__, addr); +return 0 ; +} + +static void aspeed_ram_capacity_write (void *opaque,hwaddr addr,uint64_t data, +unsigned int size) +{ +AspeedSoCState *s =ASPEED_SOC (opaque); +uint32_t test_pattern =0xdeadbeef ; +bool invalid_pattern = true; +uint32_t *ram_ptr; +int sz; + + ram_ptr =memory_region_get_ram_ptr (s->dram_mr); + +/* +* Emulate ddr capacity hardware behavior. +* If writes the test_pattern to address which is beyond the ram size, +* it would write the test_pattern to address 0. +*/ +for (sz =4 ; sz >0 ; sz--) { + test_pattern = (test_pattern <<4 ) + sz; +if (data == test_pattern) { + ram_ptr[0 ] = test_pattern; + invalid_pattern = false; +break ; + } + } + +if (invalid_pattern) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: write invalid pattern @%" PRIx64 +" to addr @%" HWADDR_PRIx"]\n" , + __func__, data, addr); + } +} + +static const MemoryRegionOps aspeed_ram_capacity_ops = { + .read = aspeed_ram_capacity_read, + .write = aspeed_ram_capacity_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =8 , + }, +}; + +/* +* SDMC should be realized first to get correct RAM size and max size +* values +*/ +static bool aspeed_soc_ast2700_dram_init (DeviceState *dev,Error **errp) +{ +ram_addr_t ram_size, max_ram_size; +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); + + ram_size =object_property_get_uint (OBJECT (&s->sdmc),"ram-size" , + &error_abort); + max_ram_size =object_property_get_uint (OBJECT (&s->sdmc),"max-ram-size" , + &error_abort); + +memory_region_init (&s->dram_container,OBJECT (s),"ram-container" , + ram_size); +memory_region_add_subregion (&s->dram_container,0 , s->dram_mr); + +/* +* Add a memory region beyond the RAM region to emulate +* ddr capacity hardware behavior. +*/ +if (ram_size < max_ram_size) { +memory_region_init_io (&a->dram_empty,OBJECT (s), + &aspeed_ram_capacity_ops, s, +"ram-empty" , max_ram_size - ram_size); + +memory_region_add_subregion (s->memory, + sc->memmap[ASPEED_DEV_SDRAM ] + ram_size, + &a->dram_empty); + } + +memory_region_add_subregion (s->memory, + sc->memmap[ASPEED_DEV_SDRAM ], &s->dram_container); +return true; +} +static void aspeed_soc_ast2700_init (Object *obj) {Aspeed27x0SoCState *a =ASPEED27X0_SOC (obj);
@@ -461,7 +553,7 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp) sc->memmap[ASPEED_DEV_SDMC]);/* RAM */ -if (!aspeed_soc_dram_init (s, errp)) { +if (!aspeed_soc_ast2700_dram_init (dev, errp)) {return ; }
include/hw/arm/aspeed_soc.h +1 -0
@@ -127,6 +127,7 @@ struct Aspeed27x0SoCState {ARMCPU cpu[ASPEED_CPUS_NUM ];AspeedINTCState intc; +MemoryRegion dram_empty; };#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc"
Signature · 1 line
2.25.1
PATCH v4 16/16 docs:aspeed: Add AST2700 Evaluation board
In reply to Jamin Lin viaAdd AST2700 Evaluation board and its boot command.
--- docs/system/arm/aspeed.rst | 39 ++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-)
docs/system/arm/aspeed.rst +35 -4
@@ -1,11 +1,12 @@ -Aspeed family boards (``*-bmc``, ``ast2500-evb``, ``ast2600-evb``) -================================================================== +Aspeed family boards (``*-bmc``, ``ast2500-evb``, ``ast2600-evb``, ``ast2700-evb``) +=================================================================================== The QEMU Aspeed machines model BMCs of various OpenPOWER systems and Aspeed evaluation boards. They are based on different releases of the Aspeed SoC : the AST2400 integrating an ARM926EJ-S CPU (400MHz), the -AST2500 with an ARM1176JZS CPU (800MHz) and more recently the AST2600 -with dual cores ARM Cortex-A7 CPUs (1.2GHz). +AST2500 with an ARM1176JZS CPU (800MHz), the AST2600 +with dual cores ARM Cortex-A7 CPUs (1.2GHz) and more recently the AST2700 +with quad cores ARM Cortex-A35 64 bits CPUs (1.6GHz) The SoC comes with RAM, Gigabit ethernet, USB, SD/MMC, USB, SPI, I2C, etc.
@@ -38,6 +39,10 @@ AST2600 SoC based machines : - ``qcom-dc-scm-v1-bmc`` Qualcomm DC-SCM V1 BMC - ``qcom-firework-bmc`` Qualcomm Firework BMC +AST2700 SoC based machines : + +- ``ast2700-evb`` Aspeed AST2700 Evaluation board (Cortex-A35) + Supported devices -----------------
@@ -66,6 +71,7 @@ Supported devices * eMMC Boot Controller (dummy) * PECI Controller (minimal) * I3C Controller + * Internal Bridge Controller (SLI dummy) Missing devices
@@ -95,6 +101,10 @@ or directly from the OpenBMC GitHub release repository : https://github.com/openbmc/openbmc/releases +or directly from the ASPEED Forked OpenBMC GitHub release repository : + + https://github.com/AspeedTech-BMC/openbmc/releases + To boot a kernel directly from a Linux build tree: .. code-block:: bash
@@ -164,6 +174,27 @@ under Linux), use : -M ast2500-evb,bmc-console=uart3 + +Boot the AST2700 machine from the flash image, use an MTD drive : + +.. code-block:: bash + + IMGDIR=ast2700-default + UBOOT_SIZE=$(stat --format=%s -L ${IMGDIR}/u-boot-nodtb.bin) + + $ qemu-system-aarch64 -M ast2700-evb \ + -device loader,force-raw=on,addr=0x400000000,file=${IMGDIR}/u-boot-nodtb.bin \ + -device loader,force-raw=on,addr=$((0x400000000 + ${UBOOT_SIZE})),file=${IMGDIR}/u-boot.dtb \ + -device loader,force-raw=on,addr=0x430000000,file=${IMGDIR}/bl31.bin \ + -device loader,force-raw=on,addr=0x430080000,file=${IMGDIR}/optee/tee-raw.bin \ + -device loader,cpu-num=0,addr=0x430000000 \ + -device loader,cpu-num=1,addr=0x430000000 \ + -device loader,cpu-num=2,addr=0x430000000 \ + -device loader,cpu-num=3,addr=0x430000000 \ + -smp 4 \ + -drive file=${IMGDIR}/image-bmc,format=raw,if=mtd \ + -nographic + Aspeed minibmc family boards (``ast1030-evb``) ==================================================================
Signature · 1 line
2.25.1
PATCH v4 4/16 aspeed/sdmc: fix coding style
In reply to Jamin Lin viaFix coding style issues from checkpatch.pl
Test command:scripts/checkpatch.pl --no-tree -f hw/misc/aspeed_sdmc.c
--- hw/misc/aspeed_sdmc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
hw/misc/aspeed_sdmc.c +7 -4
@@ -296,7 +296,8 @@ static void aspeed_2400_sdmc_write(AspeedSDMCState *s, uint32_t reg, uint32_t data) {if (reg ==R_PROT ) { - s->regs[reg] = (data ==PROT_KEY_UNLOCK ) ?PROT_UNLOCKED :PROT_SOFTLOCKED ; + s->regs[reg] = + (data ==PROT_KEY_UNLOCK ) ?PROT_UNLOCKED :PROT_SOFTLOCKED ;return ; }
@@ -354,7 +355,8 @@ static void aspeed_2500_sdmc_write(AspeedSDMCState *s, uint32_t reg, uint32_t data) {if (reg ==R_PROT ) { - s->regs[reg] = (data ==PROT_KEY_UNLOCK ) ?PROT_UNLOCKED :PROT_SOFTLOCKED ; + s->regs[reg] = + (data ==PROT_KEY_UNLOCK ) ?PROT_UNLOCKED :PROT_SOFTLOCKED ;return ; }
@@ -434,8 +436,9 @@ static void aspeed_2600_sdmc_write(AspeedSDMCState *s, uint32_t reg, }if (s->regs[R_PROT ] ==PROT_HARDLOCKED ) { -qemu_log_mask (LOG_GUEST_ERROR ,"%s: SDMC is locked until system reset!\n" , - __func__); +qemu_log_mask (LOG_GUEST_ERROR , +"%s: SDMC is locked until system reset!\n" , + __func__);return ; }
Signature · 1 line
2.25.1
PATCH v4 10/16 aspeed/scu: Add AST2700 support
In reply to Jamin Lin viaAST2700 have two SCU controllers which are SCU and SCUIO.
Both SCU and SCUIO registers are not compatible previous SOCs , introduces new registers and adds ast2700 scu, sucio class init handler.
The pclk divider selection of SCUIO is defined in SCUIO280[20:18] and the pclk divider selection of SCU is defined in SCU280[25:23]. Both of them are not compatible AST2600 SOCs, adds a get_apb_freq function and trace-event for AST2700 SCU and SCUIO.
--- hw/misc/aspeed_scu.c | 306 ++++++++++++++++++++++++++++++++++- hw/misc/trace-events | 4 + include/hw/misc/aspeed_scu.h | 47 +++++- 3 files changed, 351 insertions(+), 6 deletions(-)
hw/misc/aspeed_scu.c +305 -1
@@ -134,6 +134,48 @@#define AST2600_CLK TO_REG(0x40) +#define AST2700_SILICON_REV TO_REG(0x00) +#define AST2700_HW_STRAP1 TO_REG(0x10) +#define AST2700_HW_STRAP1_CLR TO_REG(0x14) +#define AST2700_HW_STRAP1_LOCK TO_REG(0x20) +#define AST2700_HW_STRAP1_SEC1 TO_REG(0x24) +#define AST2700_HW_STRAP1_SEC2 TO_REG(0x28) +#define AST2700_HW_STRAP1_SEC3 TO_REG(0x2C) + +#define AST2700_SCU_CLK_SEL_1 TO_REG(0x280) +#define AST2700_SCU_HPLL_PARAM TO_REG(0x300) +#define AST2700_SCU_HPLL_EXT_PARAM TO_REG(0x304) +#define AST2700_SCU_DPLL_PARAM TO_REG(0x308) +#define AST2700_SCU_DPLL_EXT_PARAM TO_REG(0x30c) +#define AST2700_SCU_MPLL_PARAM TO_REG(0x310) +#define AST2700_SCU_MPLL_EXT_PARAM TO_REG(0x314) +#define AST2700_SCU_D1CLK_PARAM TO_REG(0x320) +#define AST2700_SCU_D2CLK_PARAM TO_REG(0x330) +#define AST2700_SCU_CRT1CLK_PARAM TO_REG(0x340) +#define AST2700_SCU_CRT2CLK_PARAM TO_REG(0x350) +#define AST2700_SCU_MPHYCLK_PARAM TO_REG(0x360) +#define AST2700_SCU_FREQ_CNTR TO_REG(0x3b0) +#define AST2700_SCU_CPU_SCRATCH_0 TO_REG(0x780) +#define AST2700_SCU_CPU_SCRATCH_1 TO_REG(0x784) + +#define AST2700_SCUIO_CLK_STOP_CTL_1 TO_REG(0x240) +#define AST2700_SCUIO_CLK_STOP_CLR_1 TO_REG(0x244) +#define AST2700_SCUIO_CLK_STOP_CTL_2 TO_REG(0x260) +#define AST2700_SCUIO_CLK_STOP_CLR_2 TO_REG(0x264) +#define AST2700_SCUIO_CLK_SEL_1 TO_REG(0x280) +#define AST2700_SCUIO_CLK_SEL_2 TO_REG(0x284) +#define AST2700_SCUIO_HPLL_PARAM TO_REG(0x300) +#define AST2700_SCUIO_HPLL_EXT_PARAM TO_REG(0x304) +#define AST2700_SCUIO_APLL_PARAM TO_REG(0x310) +#define AST2700_SCUIO_APLL_EXT_PARAM TO_REG(0x314) +#define AST2700_SCUIO_DPLL_PARAM TO_REG(0x320) +#define AST2700_SCUIO_DPLL_EXT_PARAM TO_REG(0x324) +#define AST2700_SCUIO_DPLL_PARAM_READ TO_REG(0x328) +#define AST2700_SCUIO_DPLL_EXT_PARAM_READ TO_REG(0x32c) +#define AST2700_SCUIO_UARTCLK_GEN TO_REG(0x330) +#define AST2700_SCUIO_HUARTCLK_GEN TO_REG(0x334) +#define AST2700_SCUIO_CLK_DUTY_MEAS_RST TO_REG(0x388) +#define SCU_IO_REGION_SIZE 0x1000static const uint32_t ast2400_a0_resets[ASPEED_SCU_NR_REGS ] = {
@@ -244,6 +286,25 @@ static uint32_t aspeed_1030_scu_get_apb_freq(AspeedSCUState *s) / asc->apb_divider; } +static uint32_t aspeed_2700_scu_get_apb_freq (AspeedSCUState *s) +{ +AspeedSCUClass *asc =ASPEED_SCU_GET_CLASS (s); +uint32_t hpll = asc->calc_hpll (s, s->regs[AST2700_SCU_HPLL_PARAM ]); + +return hpll / (SCU_CLK_GET_PCLK_DIV (s->regs[AST2700_SCU_CLK_SEL_1 ]) +1 ) + / asc->apb_divider; +} + +static uint32_t aspeed_2700_scuio_get_apb_freq (AspeedSCUState *s) +{ +AspeedSCUClass *asc =ASPEED_SCU_GET_CLASS (s); +uint32_t hpll = asc->calc_hpll (s, s->regs[AST2700_SCUIO_HPLL_PARAM ]); + +return hpll / + (SCUIO_AST2700_CLK_GET_PCLK_DIV (s->regs[AST2700_SCUIO_CLK_SEL_1 ]) +1 ) + / asc->apb_divider; +} +static uint64_t aspeed_scu_read (void *opaque,hwaddr offset,unsigned size) {AspeedSCUState *s =ASPEED_SCU (opaque);
@@ -258,7 +319,8 @@ static uint64_t aspeed_scu_read(void *opaque, hwaddr offset, unsigned size)switch (reg) {case RNG_DATA : -/* On hardware, RNG_DATA works regardless of +/* +* On hardware, RNG_DATA works regardless of * the state of the enable bit in RNG_CTRL */ s->regs[RNG_DATA ] =aspeed_scu_get_random ();
@@ -494,6 +556,9 @@ static uint32_t aspeed_silicon_revs[] = {AST2600_A3_SILICON_REV ,AST1030_A0_SILICON_REV ,AST1030_A1_SILICON_REV , +AST2700_A0_SILICON_REV , +AST2720_A0_SILICON_REV , + AST2750_A0_SILICON_REV, };bool is_supported_silicon_rev (uint32_t silicon_rev)
@@ -783,6 +848,243 @@ static const TypeInfo aspeed_2600_scu_info = { .class_init = aspeed_2600_scu_class_init, }; +static uint64_t aspeed_ast2700_scu_read (void *opaque,hwaddr offset, +unsigned size) +{ +AspeedSCUState *s =ASPEED_SCU (opaque); +int reg =TO_REG (offset); + +if (reg >=ASPEED_AST2700_SCU_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds read at offset 0x%" HWADDR_PRIx"\n" , + __func__, offset); +return 0 ; + } + +switch (reg) { +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Unhandled read at offset 0x%" HWADDR_PRIx"\n" , + __func__, offset); + } + +trace_aspeed_ast2700_scu_read (offset, size, s->regs[reg]); +return s->regs[reg]; +} + +static void aspeed_ast2700_scu_write (void *opaque,hwaddr offset, +uint64_t data64,unsigned size) +{ +AspeedSCUState *s =ASPEED_SCU (opaque); +int reg =TO_REG (offset); +/* Truncate here so bitwise operations below behave as expected */ +uint32_t data = data64; + +if (reg >=ASPEED_AST2700_SCU_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx"\n" , + __func__, offset); +return ; + } + +trace_aspeed_ast2700_scu_write (offset, size, data); + +switch (reg) { +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Unhandeled write at offset 0x%" HWADDR_PRIx"\n" , + __func__, offset); +break ; + } + + s->regs[reg] = data; +} + +static const MemoryRegionOps aspeed_ast2700_scu_ops = { + .read = aspeed_ast2700_scu_read, + .write = aspeed_ast2700_scu_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid.min_access_size =1 , + .valid.max_access_size =8 , + .valid.unaligned = false, +}; + +static const uint32_t ast2700_a0_resets[ASPEED_AST2700_SCU_NR_REGS ] = { + [AST2700_SILICON_REV ] =AST2700_A0_SILICON_REV , + [AST2700_HW_STRAP1 ] =0x00000800 , + [AST2700_HW_STRAP1_CLR ] =0xFFF0FFF0 , + [AST2700_HW_STRAP1_LOCK ] =0x00000FFF , + [AST2700_HW_STRAP1_SEC1 ] =0x000000FF , + [AST2700_HW_STRAP1_SEC2 ] =0x00000000 , + [AST2700_HW_STRAP1_SEC3 ] =0x1000408F , + [AST2700_SCU_HPLL_PARAM ] =0x0000009f , + [AST2700_SCU_HPLL_EXT_PARAM ] =0x8000004f , + [AST2700_SCU_DPLL_PARAM ] =0x0080009f , + [AST2700_SCU_DPLL_EXT_PARAM ] =0x8000004f , + [AST2700_SCU_MPLL_PARAM ] =0x00000040 , + [AST2700_SCU_MPLL_EXT_PARAM ] =0x80000000 , + [AST2700_SCU_D1CLK_PARAM ] =0x00050002 , + [AST2700_SCU_D2CLK_PARAM ] =0x00050002 , + [AST2700_SCU_CRT1CLK_PARAM ] =0x00050002 , + [AST2700_SCU_CRT2CLK_PARAM ] =0x00050002 , + [AST2700_SCU_MPHYCLK_PARAM ] =0x0000004c , + [AST2700_SCU_FREQ_CNTR ] =0x000375eb , + [AST2700_SCU_CPU_SCRATCH_0 ] =0x00000000 , + [AST2700_SCU_CPU_SCRATCH_1 ] =0x00000004 , +}; + +static void aspeed_ast2700_scu_reset (DeviceState *dev) +{ +AspeedSCUState *s =ASPEED_SCU (dev); +AspeedSCUClass *asc =ASPEED_SCU_GET_CLASS (dev); + +memcpy (s->regs, asc->resets, asc->nr_regs *4 ); +} + +static void aspeed_2700_scu_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedSCUClass *asc =ASPEED_SCU_CLASS (klass); + + dc->desc ="ASPEED 2700 System Control Unit" ; + dc->reset = aspeed_ast2700_scu_reset; + asc->resets = ast2700_a0_resets; + asc->calc_hpll = aspeed_2600_scu_calc_hpll; + asc->get_apb = aspeed_2700_scu_get_apb_freq; + asc->apb_divider =4 ; + asc->nr_regs =ASPEED_AST2700_SCU_NR_REGS ; + asc->clkin_25Mhz = true; + asc->ops = &aspeed_ast2700_scu_ops; +} + +static uint64_t aspeed_ast2700_scuio_read (void *opaque,hwaddr offset, +unsigned size) +{ +AspeedSCUState *s =ASPEED_SCU (opaque); +int reg =TO_REG (offset); +if (reg >=ASPEED_AST2700_SCU_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds read at offset 0x%" HWADDR_PRIx"\n" , + __func__, offset); +return 0 ; + } + +switch (reg) { +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Unhandled read at offset 0x%" HWADDR_PRIx"\n" , + __func__, offset); + } + +trace_aspeed_ast2700_scuio_read (offset, size, s->regs[reg]); +return s->regs[reg]; +} + +static void aspeed_ast2700_scuio_write (void *opaque,hwaddr offset, +uint64_t data64,unsigned size) +{ +AspeedSCUState *s =ASPEED_SCU (opaque); +int reg =TO_REG (offset); +/* Truncate here so bitwise operations below behave as expected */ +uint32_t data = data64; +bool updated = false; + +if (reg >=ASPEED_AST2700_SCU_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx"\n" , + __func__, offset); +return ; + } + +trace_aspeed_ast2700_scuio_write (offset, size, data); + +switch (reg) { +case AST2700_SCUIO_CLK_STOP_CTL_1 : +case AST2700_SCUIO_CLK_STOP_CTL_2 : + s->regs[reg] |= data; + updated = true; +break ; +case AST2700_SCUIO_CLK_STOP_CLR_1 : +case AST2700_SCUIO_CLK_STOP_CLR_2 : + s->regs[reg -1 ] ^= data; + updated = true; +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Unhandeled write at offset 0x%" HWADDR_PRIx"\n" , + __func__, offset); +break ; + } + +if (!updated) { + s->regs[reg] = data; + } +} + +static const MemoryRegionOps aspeed_ast2700_scuio_ops = { + .read = aspeed_ast2700_scuio_read, + .write = aspeed_ast2700_scuio_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid.min_access_size =1 , + .valid.max_access_size =8 , + .valid.unaligned = false, +}; + +static const uint32_t ast2700_a0_resets_io[ASPEED_AST2700_SCU_NR_REGS ] = { + [AST2700_SILICON_REV ] =0x06000003 , + [AST2700_HW_STRAP1 ] =0x00000504 , + [AST2700_HW_STRAP1_CLR ] =0xFFF0FFF0 , + [AST2700_HW_STRAP1_LOCK ] =0x00000FFF , + [AST2700_HW_STRAP1_SEC1 ] =0x000000FF , + [AST2700_HW_STRAP1_SEC2 ] =0x00000000 , + [AST2700_HW_STRAP1_SEC3 ] =0x1000408F , + [AST2700_SCUIO_CLK_STOP_CTL_1 ] =0xffff8400 , + [AST2700_SCUIO_CLK_STOP_CTL_2 ] =0x00005f30 , + [AST2700_SCUIO_CLK_SEL_1 ] =0x86900000 , + [AST2700_SCUIO_CLK_SEL_2 ] =0x00400000 , + [AST2700_SCUIO_HPLL_PARAM ] =0x10000027 , + [AST2700_SCUIO_HPLL_EXT_PARAM ] =0x80000014 , + [AST2700_SCUIO_APLL_PARAM ] =0x1000001f , + [AST2700_SCUIO_APLL_EXT_PARAM ] =0x8000000f , + [AST2700_SCUIO_DPLL_PARAM ] =0x106e42ce , + [AST2700_SCUIO_DPLL_EXT_PARAM ] =0x80000167 , + [AST2700_SCUIO_DPLL_PARAM_READ ] =0x106e42ce , + [AST2700_SCUIO_DPLL_EXT_PARAM_READ ] =0x80000167 , + [AST2700_SCUIO_UARTCLK_GEN ] =0x00014506 , + [AST2700_SCUIO_HUARTCLK_GEN ] =0x000145c0 , + [AST2700_SCUIO_CLK_DUTY_MEAS_RST ] =0x0c9100d2 , +}; + +static void aspeed_2700_scuio_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedSCUClass *asc =ASPEED_SCU_CLASS (klass); + + dc->desc ="ASPEED 2700 System Control Unit I/O" ; + dc->reset = aspeed_ast2700_scu_reset; + asc->resets = ast2700_a0_resets_io; + asc->calc_hpll = aspeed_2600_scu_calc_hpll; + asc->get_apb = aspeed_2700_scuio_get_apb_freq; + asc->apb_divider =2 ; + asc->nr_regs =ASPEED_AST2700_SCU_NR_REGS ; + asc->clkin_25Mhz = true; + asc->ops = &aspeed_ast2700_scuio_ops; +} + +static const TypeInfo aspeed_2700_scu_info = { + .name =TYPE_ASPEED_2700_SCU , + .parent =TYPE_ASPEED_SCU , + .instance_size =sizeof (AspeedSCUState), + .class_init = aspeed_2700_scu_class_init, +}; + +static const TypeInfo aspeed_2700_scuio_info = { + .name =TYPE_ASPEED_2700_SCUIO , + .parent =TYPE_ASPEED_SCU , + .instance_size =sizeof (AspeedSCUState), + .class_init = aspeed_2700_scuio_class_init, +}; +static const uint32_t ast1030_a1_resets[ASPEED_AST2600_SCU_NR_REGS ] = { [AST2600_SYS_RST_CTRL ] =0xFFC3FED8 , [AST2600_SYS_RST_CTRL2 ] =0x09FFFFFC ,
@@ -841,6 +1143,8 @@ static void aspeed_scu_register_types(void)type_register_static (&aspeed_2500_scu_info);type_register_static (&aspeed_2600_scu_info);type_register_static (&aspeed_1030_scu_info); +type_register_static (&aspeed_2700_scu_info); +type_register_static (&aspeed_2700_scuio_info); }type_init (aspeed_scu_register_types);
hw/misc/trace-events +4 -0
@@ -93,6 +93,10 @@ slavio_led_mem_readw(uint32_t ret) "Read diagnostic LED 0x%04x" # aspeed_scu.c aspeed_scu_write(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 aspeed_scu_read(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 +aspeed_ast2700_scu_write(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 +aspeed_ast2700_scu_read(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 +aspeed_ast2700_scuio_write(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 +aspeed_ast2700_scuio_read(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 # mps2-scc.c mps2_scc_read(uint64_t offset, uint64_t data, unsigned size) "MPS2 SCC read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
include/hw/misc/aspeed_scu.h +42 -5
97 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v4 15/16 test/avocado/machine_aspeed.py: Add AST2700 test case
In reply to Jamin Lin viaAdd a test case to test Aspeed OpenBMC SDK v09.01 on AST2700 board.
It loads u-boot-nodtb.bin, u-boot.dtb, tfa and optee-os images to dram first which base address is 0x400000000. Then, boot and launch 4 cpu cores.
```
qemu-system-aarch64 -machine ast2700-evb
-device loader,force-raw=on,addr=0x400000000,file=workdir/u-boot-nodtb.bin \
-device loader,force-raw=on,addr=uboot_dtb_load_addr,file=workdir/u-boot.dtb\
-device loader,force-raw=on,addr=0x430000000,file=workdir/bl31.bin\
-device loader,force-raw=on,addr=0x430080000,file=workdir/optee/tee-raw.bin\
-device loader,cpu-num=0,addr=0x430000000 \
-device loader,cpu-num=1,addr=0x430000000 \
-device loader,cpu-num=2,addr=0x430000000 \
-device loader,cpu-num=3,addr=0x430000000 \
-smp 4 \
-drive file=workdir/image-bmc,format=raw,if=mtd
```A test image is downloaded from the ASPEED Forked OpenBMC GitHub release repository :
https://github.com/AspeedTech-BMC/openbmc/releases/
--- tests/avocado/machine_aspeed.py | 62 +++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+)
tests/avocado/machine_aspeed.py +62 -0
@@ -311,6 +311,17 @@ def do_test_arm_aspeed_sdk_start(self, image): self, 'boot', '## Loading kernel from FIT Image') self.wait_for_console_pattern('Starting kernel ...') + def do_test_aarch64_aspeed_sdk_start(self, image): + self.vm.set_console() + self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw') + + self.vm.launch() + + self.wait_for_console_pattern('U-Boot 2023.10') + self.wait_for_console_pattern('## Loading kernel from FIT Image') + self.wait_for_console_pattern('Starting kernel ...') + self.wait_for_console_pattern("systemd[1]: Hostname set to") + @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab') def test_arm_ast2500_evb_sdk(self):
@@ -375,3 +386,54 @@ def test_arm_ast2600_evb_sdk(self): 'i2c i2c-5: new_device: Instantiated device ds1307 at 0x32'); year = time.strftime("%Y") self.ssh_command_output_contains('/sbin/hwclock -f /dev/rtc1', year); + + def test_aarch64_ast2700_evb_sdk_v09_01(self): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=machine:ast2700-evb + """ + + image_url = ('https://github.com/AspeedTech-BMC/openbmc/releases/' + 'download/v09.01/ast2700-default-obmc.tar.gz') + image_hash = 'b1cc0fd73c7650d34c9c8459a243f52a91e9e27144b8608b2645ab19461d1e07' + image_path = self.fetch_asset(image_url, asset_hash=image_hash, + algorithm='sha256') + archive.extract(image_path, self.workdir) + + num_cpu = 4 + image_dir = self.workdir + '/ast2700-default/' + uboot_size = os.path.getsize(image_dir + 'u-boot-nodtb.bin') + uboot_dtb_load_addr = hex(0x400000000 + uboot_size) + + load_images_list = [ + { + 'addr': '0x400000000', + 'file': image_dir + 'u-boot-nodtb.bin' + }, + { + 'addr': str(uboot_dtb_load_addr), + 'file': image_dir + 'u-boot.dtb' + }, + { + 'addr': '0x430000000', + 'file': image_dir + 'bl31.bin' + }, + { + 'addr': '0x430080000', + 'file': image_dir + 'optee/tee-raw.bin' + } + ] + + for load_image in load_images_list: + addr = load_image['addr'] + file = load_image['file'] + self.vm.add_args('-device', + f'loader,force-raw=on,addr={addr},file={file}') + + for i in range(num_cpu): + self.vm.add_args('-device', + f'loader,addr=0x430000000,cpu-num={i}') + + self.vm.add_args('-smp', str(num_cpu)) + self.do_test_aarch64_aspeed_sdk_start(image_dir + 'image-bmc') +
Signature · 1 line
2.25.1
PATCH v4 6/16 aspeed/smc: correct device description
In reply to Jamin Lin via--- hw/ssi/aspeed_smc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/ssi/aspeed_smc.c +3 -3
@@ -1448,7 +1448,7 @@ static void aspeed_2500_fmc_class_init(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (klass);AspeedSMCClass *asc =ASPEED_SMC_CLASS (klass); - dc->desc ="Aspeed 2600 FMC Controller" ; + dc->desc ="Aspeed 2500 FMC Controller" ; asc->r_conf =R_CONF ; asc->r_ce_ctrl =R_CE_CTRL ; asc->r_ctrl0 =R_CTRL0 ;
@@ -1486,7 +1486,7 @@ static void aspeed_2500_spi1_class_init(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (klass);AspeedSMCClass *asc =ASPEED_SMC_CLASS (klass); - dc->desc ="Aspeed 2600 SPI1 Controller" ; + dc->desc ="Aspeed 2500 SPI1 Controller" ; asc->r_conf =R_CONF ; asc->r_ce_ctrl =R_CE_CTRL ; asc->r_ctrl0 =R_CTRL0 ;
@@ -1521,7 +1521,7 @@ static void aspeed_2500_spi2_class_init(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (klass);AspeedSMCClass *asc =ASPEED_SMC_CLASS (klass); - dc->desc ="Aspeed 2600 SPI2 Controller" ; + dc->desc ="Aspeed 2500 SPI2 Controller" ; asc->r_conf =R_CONF ; asc->r_ce_ctrl =R_CE_CTRL ; asc->r_ctrl0 =R_CTRL0 ;
Signature · 1 line
2.25.1
Re: [PATCH v4 05/16] aspeed/sdmc: Add AST2700 support
In reply to Jamin Lin viaHi Jamin,
Quoted 38 lines · Jamin Lin
The SDRAM memory controller(DRAMC) controls the access to external DDR4 and DDR5 SDRAM and power up to DDR4 and DDR5 PHY.
The DRAM memory controller of AST2700 is not backward compatible to previous chips such AST2600, AST2500 and AST2400.
Max memory is now 8GiB on the AST2700. Introduce new
aspeed_2700_sdmcand class with read/write operation and reset handlers.Define DRAMC necessary protected registers and
unprotected registers for AST2700 and increase
the register set to0x1000.Add unlocked property to change controller protected status.
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>--- hw/misc/aspeed_sdmc.c | 190 +++++++++++++++++++++++++++++++++- include/hw/misc/aspeed_sdmc.h | 5 +- 2 files changed, 193 insertions(+), 2 deletions(-)include/hw/misc/aspeed_sdmc.h +1
-0@@ -17,6 +17,7 @@ OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC)#define TYPE_ASPEED_2400_SDMC TYPE_ASPEED_SDMC "-ast2400"#define TYPE_ASPEED_2500_SDMC TYPE_ASPEED_SDMC "-ast2500"#define TYPE_ASPEED_2600_SDMC TYPE_ASPEED_SDMC "-ast2600" +#define TYPE_ASPEED_2700_SDMC TYPE_ASPEED_SDMC "-ast2700"/* * SDMC has 174 documented registers. In addition the u-boot device tree
include/hw/misc/aspeed_sdmc.h OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC) · line 33
Quoted 5 lines
include/hw/misc/aspeed_sdmc.h +1
-1@@ -29,7 +30,7 @@ OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC)* time, and the other is in the DDR-PHY IP which is used during DDR-PHY * training. */ -#define ASPEED_SDMC_NR_REGS (0x500 >> 2) +#define ASPEED_SDMC_NR_REGS (0x1000 >> 2)
This change breaks the migration stream.
Quoted 8 lines
include/hw/misc/aspeed_sdmc.h +1
-0struct AspeedSDMCState {/*< private >*/ @@ -41,6 +42,7 @@ struct AspeedSDMCState {uint32_t regs[ASPEED_SDMC_NR_REGS ];uint64_t ram_size;uint64_t max_ram_size; +bool unlocked; };
Re: [PATCH v4 05/16] aspeed/sdmc: Add AST2700 support
Quoted 39 lines · Philippe Mathieu-Daudé
Hi Jamin,
Quoted 36 lines · Jamin Lin
The SDRAM memory controller(DRAMC) controls the access to external DDR4 and DDR5 SDRAM and power up to DDR4 and DDR5 PHY.
The DRAM memory controller of AST2700 is not backward compatible to previous chips such AST2600, AST2500 and AST2400.
Max memory is now 8GiB on the AST2700. Introduce new
aspeed_2700_sdmcand class with read/write operation and reset handlers.Define DRAMC necessary protected registers and
unprotected registers for AST2700 and increase
the register set to0x1000.Add unlocked property to change controller protected status.
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>---
hw/misc/aspeed_sdmc.c | 190 +++++++++++++++++++++++++++++++++-include/hw/misc/aspeed_sdmc.h| 5 +-2 files changed, 193 insertions(+), 2 deletions(-)include/hw/misc/aspeed_sdmc.h +1
-0@@ -17,6 +17,7 @@ OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC) #define TYPE_ASPEED_2400_SDMC TYPE_ASPEED_SDMC "-ast2400" #define TYPE_ASPEED_2500_SDMC TYPE_ASPEED_SDMC "-ast2500" #define TYPE_ASPEED_2600_SDMC TYPE_ASPEED_SDMC "-ast2600" +#define TYPE_ASPEED_2700_SDMC TYPE_ASPEED_SDMC "-ast2700" /** SDMC has 174 documented registers. In addition the u-boot device tree
Quoted 8 lines
include/hw/misc/aspeed_sdmc.h OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC) · line 33
Quoted 6 lines
include/hw/misc/aspeed_sdmc.h +1
-1@@ -29,7 +30,7 @@ OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC)* time, and the other is in the DDR-PHY IP which is used during DDR-PHY * training. */ -#define ASPEED_SDMC_NR_REGS (0x500 >> 2) +#define ASPEED_SDMC_NR_REGS (0x1000 >> 2)This change breaks the migration stream.
Do you mean migration compat ? We never cared much about that for the Aspeed machines.
Thanks,
C.
Quoted 10 lines
Quoted 9 lines
include/hw/misc/aspeed_sdmc.h +1
-0struct AspeedSDMCState { /*< private >*/@@ -41,6 +42,7 @@ struct AspeedSDMCState { uint32_t regs[ASPEED_SDMC_NR_REGS]; uint64_t ram_size; uint64_t max_ram_size; + bool unlocked; };
Re: [PATCH v4 05/16] aspeed/sdmc: Add AST2700 support
Quoted 51 lines · Cédric Le Goater
Quoted 41 lines · Philippe Mathieu-Daudé
Hi Jamin,
Quoted 38 lines · Jamin Lin
The SDRAM memory controller(DRAMC) controls the access to external DDR4 and DDR5 SDRAM and power up to DDR4 and DDR5 PHY.
The DRAM memory controller of AST2700 is not backward compatible to previous chips such AST2600, AST2500 and AST2400.
Max memory is now 8GiB on the AST2700. Introduce new
aspeed_2700_sdmcand class with read/write operation and reset handlers.Define DRAMC necessary protected registers and
unprotected registers for AST2700 and increase
the register set to0x1000.Add unlocked property to change controller protected status.
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>---
hw/misc/aspeed_sdmc.c | 190 +++++++++++++++++++++++++++++++++-include/hw/misc/aspeed_sdmc.h| 5 +-2 files changed, 193 insertions(+), 2 deletions(-)include/hw/misc/aspeed_sdmc.h +1
-0@@ -17,6 +17,7 @@ OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC) #define TYPE_ASPEED_2400_SDMC TYPE_ASPEED_SDMC "-ast2400" #define TYPE_ASPEED_2500_SDMC TYPE_ASPEED_SDMC "-ast2500" #define TYPE_ASPEED_2600_SDMC TYPE_ASPEED_SDMC "-ast2600" +#define TYPE_ASPEED_2700_SDMC TYPE_ASPEED_SDMC "-ast2700" /** SDMC has 174 documented registers. In addition the u-boot device tree @@ -29,7 +30,7 @@ OBJECT_DECLARE_TYPE(AspeedSDMCState,Quoted 8 lines
include/hw/misc/aspeed_sdmc.h OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC) · line 33
Quoted 6 lines
include/hw/misc/aspeed_sdmc.h +1
-1AspeedSDMCClass, ASPEED_SDMC) * time, and the other is in the DDR-PHY IP which is used during DDR-PHY * training. */ -#define ASPEED_SDMC_NR_REGS (0x500 >> 2) +#define ASPEED_SDMC_NR_REGS (0x1000 >> 2)This change breaks the migration stream.
Quoted 2 lines
Do you mean migration compat ? We never cared much about that for the Aspeed machines.
So let's just remove the VMSTATE to reduce code burden?
Otherwise incrementing the vmstate.version is enough.
Regards,
Phil.
Re: [PATCH v4 08/16] aspeed/smc: support 64 bits dma dram address
In reply to Jamin Lin viaQuoted 9 lines · Jamin Lin
AST2700 support the maximum dram size is 8GiB and has a "DMA DRAM Side Address High Part(0x7C)" register to support 64 bits dma dram address. Add helper routines functions to compute the dma dram address, new features and update trace-event to support 64 bits dram address.
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>
I will move the addition of the "dram-base" property to another patch. See :
https://patchew.org/QEMU/[email protected]/
(Please review)
Else,
Thanks,
C.
Quoted 181 lines
--- hw/ssi/aspeed_smc.c | 52 +++++++++++++++++++++++++++++++------ hw/ssi/trace-events | 2 +- include/hw/ssi/aspeed_smc.h | 1 + 3 files changed, 46 insertions(+), 9 deletions(-)hw/ssi/aspeed_smc.c +44
-8@@ -132,6 +132,9 @@#define FMC_WDT2_CTRL_BOOT_SOURCE BIT(4)/* O: primary 1: alternate */ #define FMC_WDT2_CTRL_EN BIT(0) +/* DMA DRAM Side Address High Part (AST2700) */ +#define R_DMA_DRAM_ADDR_HIGH (0x7c / 4) +/* DMA Control/Status Register */ #define R_DMA_CTRL (0x80 / 4)#define DMA_CTRL_REQUEST (1 << 31)@@ -187,6 +190,7 @@* 0x1FFFFFF: 32M bytes */ #define DMA_DRAM_ADDR (asc, val) ((val) & (asc)->dma_dram_mask) +#define DMA_DRAM_ADDR_HIGH (val) ((val) & 0xf)#define DMA_FLASH_ADDR (asc, val) ((val) & (asc)->dma_flash_mask)#define DMA_LENGTH (val) ((val) & 0x01FFFFFF)@@ -207,6 +211,7 @@ static const AspeedSegments aspeed_2500_spi2_segments[];#define ASPEED_SMC_FEATURE_DMA 0x1#define ASPEED_SMC_FEATURE_DMA_GRANT 0x2#define ASPEED_SMC_FEATURE_WDT_CONTROL 0x4 +#define ASPEED_SMC_FEATURE_DMA_DRAM_ADDR_HIGH 0x08static inline bool aspeed_smc_has_dma (const AspeedSMCClass *asc) {@@ -218,6 +223,11 @@ static inline bool aspeed_smc_has_wdt_control(const AspeedSMCClass *asc)return !!(asc->features &ASPEED_SMC_FEATURE_WDT_CONTROL ); } +static inline bool aspeed_smc_has_dma64 (const AspeedSMCClass *asc) +{ +return !!(asc->features &ASPEED_SMC_FEATURE_DMA_DRAM_ADDR_HIGH ); +} +#define aspeed_smc_error (fmt, ...) \ qemu_log_mask(LOG_GUEST_ERROR, "%s: " fmt "\n", __func__, ## __VA_ARGS__)@@ -747,6 +757,8 @@ static uint64_t aspeed_smc_read(void *opaque, hwaddr addr, unsigned int size) (aspeed_smc_has_dma (asc) && addr ==R_DMA_CTRL ) || (aspeed_smc_has_dma (asc) && addr ==R_DMA_FLASH_ADDR ) || (aspeed_smc_has_dma (asc) && addr ==R_DMA_DRAM_ADDR ) || + (aspeed_smc_has_dma (asc) &&aspeed_smc_has_dma64 (asc) && + addr ==R_DMA_DRAM_ADDR_HIGH ) || (aspeed_smc_has_dma (asc) && addr ==R_DMA_LEN ) || (aspeed_smc_has_dma(asc) && addr == R_DMA_CHECKSUM) || (addr >= R_SEG_ADDR0 &&@@ -847,6 +859,12 @@ static bool aspeed_smc_inject_read_failure(AspeedSMCState *s) } } +static uint64_t aspeed_smc_dma_dram_addr (AspeedSMCState *s) +{ +return s->regs[R_DMA_DRAM_ADDR ] | + ((uint64_t ) s->regs[R_DMA_DRAM_ADDR_HIGH ] <<32 ); +} +static uint32_t aspeed_smc_dma_len (AspeedSMCState *s) {AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS (s);@@ -903,24 +921,34 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s)static void aspeed_smc_dma_rw (AspeedSMCState *s) { +AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS (s); +uint64_t dma_dram_offset; +uint64_t dma_dram_addr;MemTxResult result;uint32_t dma_len;uint32_t data; dma_len =aspeed_smc_dma_len (s); + dma_dram_addr =aspeed_smc_dma_dram_addr (s); + +if (aspeed_smc_has_dma64 (asc)) { + dma_dram_offset = dma_dram_addr - s->dram_base; + }else { + dma_dram_offset = dma_dram_addr; + }trace_aspeed_smc_dma_rw (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ?"write" :"read" , s->regs[R_DMA_FLASH_ADDR ], - s->regs[R_DMA_DRAM_ADDR ], + dma_dram_offset, dma_len);while (dma_len) {if (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ) { - data =address_space_ldl_le (&s->dram_as, s->regs[R_DMA_DRAM_ADDR ], + data =address_space_ldl_le (&s->dram_as, dma_dram_offset,MEMTXATTRS_UNSPECIFIED , &result);if (result !=MEMTX_OK ) { -aspeed_smc_error ("DRAM read failed @%08x" , - s->regs[R_DMA_DRAM_ADDR ]); +aspeed_smc_error ("DRAM read failed @%" PRIx64, + dma_dram_offset);return ; }@@ -940,11 +968,11 @@ static void aspeed_smc_dma_rw(AspeedSMCState *s)return ; } -address_space_stl_le (&s->dram_as, s->regs[R_DMA_DRAM_ADDR ], +address_space_stl_le (&s->dram_as, dma_dram_offset, data,MEMTXATTRS_UNSPECIFIED , &result);if (result !=MEMTX_OK ) { -aspeed_smc_error ("DRAM write failed @%08x" , - s->regs[R_DMA_DRAM_ADDR ]); +aspeed_smc_error ("DRAM write failed @%" PRIx64, + dma_dram_offset);return ; } }@@ -953,8 +981,12 @@ static void aspeed_smc_dma_rw(AspeedSMCState *s)* When the DMA is on-going, the DMA registers are updated * with the current working addresses and length. */ + dma_dram_offset +=4 ; + dma_dram_addr +=4 ; + + s->regs[R_DMA_DRAM_ADDR_HIGH ] = dma_dram_addr >>32 ; + s->regs[R_DMA_DRAM_ADDR ] = dma_dram_addr &0xffffffff ; s->regs[R_DMA_FLASH_ADDR ] +=4 ; - s->regs[R_DMA_DRAM_ADDR ] +=4 ; dma_len -=4 ; s->regs[R_DMA_LEN ] = dma_len; s->regs[R_DMA_CHECKSUM ] += data;@@ -1107,6 +1139,9 @@ static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data, }else if (aspeed_smc_has_dma (asc) && addr ==R_DMA_LEN &&aspeed_smc_dma_granted (s)) { s->regs[addr] =DMA_LENGTH (value); + }else if (aspeed_smc_has_dma (asc) &&aspeed_smc_has_dma64 (asc) && + addr ==R_DMA_DRAM_ADDR_HIGH ) { + s->regs[addr] =DMA_DRAM_ADDR_HIGH (value); }else {qemu_log_mask (LOG_UNIMP ,"%s: not implemented: 0x%" HWADDR_PRIx"\n" , __func__, addr);@@ -1239,6 +1274,7 @@ static const VMStateDescription vmstate_aspeed_smc = {static Property aspeed_smc_properties[] = {DEFINE_PROP_BOOL ("inject-failure" , AspeedSMCState, inject_failure, false), +DEFINE_PROP_UINT64 ("dram-base" , AspeedSMCState, dram_base,0 ),DEFINE_PROP_LINK ("dram" , AspeedSMCState, dram_mr, TYPE_MEMORY_REGION, MemoryRegion *),DEFINE_PROP_END_OF_LIST (),hw/ssi/trace-events +1
-1@@ -6,7 +6,7 @@ aspeed_smc_do_snoop(int cs, int index, int dummies, int data) "CS%d index:0x%x d aspeed_smc_flash_write(int cs, uint64_t addr, uint32_t size, uint64_t data, int mode) "CS%d @0x%" PRIx64 " size %u: 0x%" PRIx64" mode:%d" aspeed_smc_read(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size %u: 0x%" PRIx64 aspeed_smc_dma_checksum(uint32_t addr, uint32_t data) "0x%08x: 0x%08x" -aspeed_smc_dma_rw(const char *dir, uint32_t flash_addr, uint32_t dram_addr, uint32_t size) "%s flash:@0x%08x dram:@0x%08x size:0x%08x" +aspeed_smc_dma_rw(const char *dir, uint32_t flash_addr, uint64_t dram_addr, uint32_t size) "%s flash:@0x%08x dram:@0x%" PRIx64 " size:0x%08x" aspeed_smc_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size %u: 0x%" PRIx64 aspeed_smc_flash_select(int cs, const char *prefix) "CS%d %sselect"include/hw/ssi/aspeed_smc.h +1
-0@@ -76,6 +76,7 @@ struct AspeedSMCState {AddressSpace flash_as;MemoryRegion *dram_mr;AddressSpace dram_as; +uint64_t dram_base;AspeedSMCFlash flashes[ASPEED_SMC_CS_MAX ];
Re: [PATCH v4 07/16] aspeed/smc: support dma start length and 1 byte length unit
In reply to Jamin Lin viaQuoted 11 lines · Jamin Lin
DMA length is from 1 byte to 32MB for AST2600 and AST10x0 and DMA length is from 4 bytes to 32MB for AST2500.
In other words, if "
R_DMA_LEN" is 0, it should move at least 1 byte data for AST2600 and AST10x0 and 4 bytes data for AST2500. To support all ASPEED SOCs, addsdma_start_lengthparameter to store the start length, add helper routines function to compute the dma length and updateDMA_LENGTHmask to "1FFFFFF" to support dma 1 byte length unit for AST2600 and AST1030.
Currently, only supports dma length 4 bytes aligned.
Quoted 2 lines
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>
Thanks,
C.
Quoted 179 lines
--- hw/ssi/aspeed_smc.c | 43 ++++++++++++++++++++++++++++++------- include/hw/ssi/aspeed_smc.h | 1 + 2 files changed, 36 insertions(+), 8 deletions(-)hw/ssi/aspeed_smc.c +35
-8@@ -178,13 +178,17 @@* DMA flash addresses should be 4 bytes aligned and the valid address * range is 0x20000000 - 0x2FFFFFFF. * -* DMA length is from 4 bytes to 32MB +* DMA length is from 4 bytes to 32MB (AST2500) * 0: 4 bytes -* 0x7FFFFF: 32M bytes +* 0x1FFFFFC: 32M bytes +* +* DMA length is from 1 byte to 32MB (AST2600, AST10x0) +* 0: 1 byte +* 0x1FFFFFF: 32M bytes */ #define DMA_DRAM_ADDR (asc, val) ((val) & (asc)->dma_dram_mask)#define DMA_FLASH_ADDR (asc, val) ((val) & (asc)->dma_flash_mask) -#define DMA_LENGTH (val) ((val) & 0x01FFFFFC) +#define DMA_LENGTH (val) ((val) & 0x01FFFFFF)/* Flash opcodes. */ #define SPI_OP_READ 0x03/* Read data bytes (low frequency) */ @@ -843,6 +847,13 @@ static bool aspeed_smc_inject_read_failure(AspeedSMCState *s) } } +static uint32_t aspeed_smc_dma_len (AspeedSMCState *s) +{ +AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS (s); + +return QEMU_ALIGN_UP (s->regs[R_DMA_LEN ] + asc->dma_start_length,4 ); +} +/* * Accumulate the result of the reads to provide a checksum that will * be used to validate the read timing settings. @@ -850,6 +861,7 @@ static bool aspeed_smc_inject_read_failure(AspeedSMCState *s)static void aspeed_smc_dma_checksum (AspeedSMCState *s) {MemTxResult result; +uint32_t dma_len;uint32_t data;if (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ) {@@ -861,7 +873,9 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s)aspeed_smc_dma_calibration (s); } -while (s->regs[R_DMA_LEN ]) { + dma_len =aspeed_smc_dma_len (s); + +while (dma_len) { data =address_space_ldl_le (&s->flash_as, s->regs[R_DMA_FLASH_ADDR ],MEMTXATTRS_UNSPECIFIED , &result);if (result !=MEMTX_OK ) {@@ -877,7 +891,8 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s)*/ s->regs[R_DMA_CHECKSUM ] += data; s->regs[R_DMA_FLASH_ADDR ] +=4 ; - s->regs[R_DMA_LEN ] -=4 ; + dma_len -=4 ; + s->regs[R_DMA_LEN ] = dma_len; }if (s->inject_failure &&aspeed_smc_inject_read_failure (s)) {@@ -889,14 +904,17 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s)static void aspeed_smc_dma_rw (AspeedSMCState *s) {MemTxResult result; +uint32_t dma_len;uint32_t data; + dma_len =aspeed_smc_dma_len (s); +trace_aspeed_smc_dma_rw (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ?"write" :"read" , s->regs[R_DMA_FLASH_ADDR ], s->regs[R_DMA_DRAM_ADDR ], - s->regs[R_DMA_LEN ]); -while (s->regs[R_DMA_LEN ]) { + dma_len); +while (dma_len) {if (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ) { data =address_space_ldl_le (&s->dram_as, s->regs[R_DMA_DRAM_ADDR ],MEMTXATTRS_UNSPECIFIED , &result);@@ -937,7 +955,8 @@ 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 ; + dma_len -=4 ; + s->regs[R_DMA_LEN ] = dma_len; s->regs[R_DMA_CHECKSUM ] += data; } }@@ -1381,6 +1400,7 @@ static void aspeed_2400_fmc_class_init(ObjectClass *klass, void *data) asc->features =ASPEED_SMC_FEATURE_DMA ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x1FFFFFFC ; + asc->dma_start_length =4 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_smc_segment_to_reg; asc->reg_to_segment = aspeed_smc_reg_to_segment;@@ -1464,6 +1484,7 @@ static void aspeed_2500_fmc_class_init(ObjectClass *klass, void *data) asc->features =ASPEED_SMC_FEATURE_DMA ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x3FFFFFFC ; + asc->dma_start_length =4 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_smc_segment_to_reg; asc->reg_to_segment = aspeed_smc_reg_to_segment;@@ -1620,6 +1641,7 @@ static void aspeed_2600_fmc_class_init(ObjectClass *klass, void *data)ASPEED_SMC_FEATURE_WDT_CONTROL ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x3FFFFFFC ; + asc->dma_start_length =1 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_2600_smc_segment_to_reg; asc->reg_to_segment = aspeed_2600_smc_reg_to_segment;@@ -1658,6 +1680,7 @@ static void aspeed_2600_spi1_class_init(ObjectClass *klass, void *data)ASPEED_SMC_FEATURE_DMA_GRANT ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x3FFFFFFC ; + asc->dma_start_length =1 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_2600_smc_segment_to_reg; asc->reg_to_segment = aspeed_2600_smc_reg_to_segment;@@ -1697,6 +1720,7 @@ static void aspeed_2600_spi2_class_init(ObjectClass *klass, void *data)ASPEED_SMC_FEATURE_DMA_GRANT ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x3FFFFFFC ; + asc->dma_start_length =1 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_2600_smc_segment_to_reg; asc->reg_to_segment = aspeed_2600_smc_reg_to_segment;@@ -1778,6 +1802,7 @@ static void aspeed_1030_fmc_class_init(ObjectClass *klass, void *data) asc->features =ASPEED_SMC_FEATURE_DMA ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x000BFFFC ; + asc->dma_start_length =1 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_1030_smc_segment_to_reg; asc->reg_to_segment = aspeed_1030_smc_reg_to_segment;@@ -1815,6 +1840,7 @@ static void aspeed_1030_spi1_class_init(ObjectClass *klass, void *data) asc->features =ASPEED_SMC_FEATURE_DMA ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x000BFFFC ; + asc->dma_start_length =1 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_2600_smc_segment_to_reg; asc->reg_to_segment = aspeed_2600_smc_reg_to_segment;@@ -1851,6 +1877,7 @@ static void aspeed_1030_spi2_class_init(ObjectClass *klass, void *data) asc->features =ASPEED_SMC_FEATURE_DMA ; asc->dma_flash_mask =0x0FFFFFFC ; asc->dma_dram_mask =0x000BFFFC ; + asc->dma_start_length =1 ; asc->nregs =ASPEED_SMC_R_MAX ; asc->segment_to_reg = aspeed_2600_smc_segment_to_reg; asc->reg_to_segment = aspeed_2600_smc_reg_to_segment;include/hw/ssi/aspeed_smc.h +1
-0@@ -106,6 +106,7 @@ struct AspeedSMCClass {uint32_t features;hwaddr dma_flash_mask;hwaddr dma_dram_mask; +uint32_t dma_start_length;uint32_t nregs;uint32_t (*segment_to_reg)(const AspeedSMCState *s,const AspeedSegments *seg);
Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 support
In reply to Jamin Lin viaHi,
Quoted 26 lines · Jamin Lin
AST2700 fmc/spi controller's address decoding unit is 64KB and only bits [31:16] are used for decoding. Introduce
seg_to_regandreg_to_seghandlers for ast2700 fmc/spi controller.
In addition, adds ast2700 fmc, spi0, spi1, and spi2 class init handler.Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>--- hw/ssi/aspeed_smc.c | 222 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 220 insertions(+), 2 deletions(-)hw/ssi/aspeed_smc.c +1
-1@@ -185,7 +185,7 @@* 0: 4 bytes * 0x1FFFFFC: 32M bytes * -* DMA length is from 1 byte to 32MB (AST2600, AST10x0) +* DMA length is from 1 byte to 32MB (AST2600, AST10x0 and AST2700) * 0: 1 byte * 0x1FFFFFF: 32M bytes */
hw/ssi/aspeed_smc.c static const MemoryRegionOps aspeed_smc_flash_ops = { · line 673
Quoted 5 lines
hw/ssi/aspeed_smc.c +1
-1@@ -670,7 +670,7 @@ static const MemoryRegionOps aspeed_smc_flash_ops = { .endianness = DEVICE_LITTLE_ENDIAN, .valid = { .min_access_size = 1, - .max_access_size = 4, + .max_access_size = 8,
Is this a bugfix? If so, please use a separate patch. Otherwise please mention why it is OK to widen access for AST2600 & AST10x0.
Thanks,
Phil.
Quoted 2 lines
hw/ssi/aspeed_smc.c +0
-0}, };
Re: [PATCH v4 08/16] aspeed/smc: support 64 bits dma dram address
In reply to Jamin Lin viaHi Jamin,
Quoted 33 lines · Jamin Lin
AST2700 support the maximum dram size is 8GiB and has a "DMA DRAM Side Address High Part(0x7C)" register to support 64 bits dma dram address. Add helper routines functions to compute the dma dram address, new features and update trace-event to support 64 bits dram address.
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>--- hw/ssi/aspeed_smc.c | 52 +++++++++++++++++++++++++++++++------ hw/ssi/trace-events | 2 +- include/hw/ssi/aspeed_smc.h | 1 + 3 files changed, 46 insertions(+), 9 deletions(-)hw/ssi/aspeed_smc.c +9
-0+static uint64_t aspeed_smc_dma_dram_addr (AspeedSMCState *s) +{ +return s->regs[R_DMA_DRAM_ADDR ] | + ((uint64_t ) s->regs[R_DMA_DRAM_ADDR_HIGH ] <<32 ); +} +static uint32_t aspeed_smc_dma_len (AspeedSMCState *s) {AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS (s);@@ -903,24 +921,34 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s)static void aspeed_smc_dma_rw (AspeedSMCState *s) { +AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS (s); +uint64_t dma_dram_offset; +uint64_t dma_dram_addr;MemTxResult result;
hw/ssi/aspeed_smc.c static void aspeed_smc_dma_checksum(AspeedSMCState *s) · line 937
Quoted 10 lines
hw/ssi/aspeed_smc.c +6
-0uint32_t dma_len;uint32_t data; dma_len =aspeed_smc_dma_len (s); + dma_dram_addr =aspeed_smc_dma_dram_addr (s); + +if (aspeed_smc_has_dma64 (asc)) { + dma_dram_offset = dma_dram_addr - s->dram_base; + }else { + dma_dram_offset = dma_dram_addr;
Here s->dram_base is 0x0. Do we really need to check aspeed_smc_has_dma64?
Review static void aspeed_smc_dma_checksum(AspeedSMCState *s) · line 938
Quoted 1 line
(quoted diff) +1
-0+ }
Maybe simplify improving aspeed_smc_dma_dram_addr() as:
static uint64_t aspeed_smc_dma_dram_addr(AspeedSMCState *s)
{
return (s->regs[R_DMA_DRAM_ADDR]
| ((uint64_t) s->regs[R_DMA_DRAM_ADDR_HIGH] << 32))
- s->dram_base;
}Then no need for dma_dram_offset, dma_dram_addr is enough.
Quoted 67 lines
hw/ssi/aspeed_smc.c +16
-8trace_aspeed_smc_dma_rw (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ?"write" :"read" , s->regs[R_DMA_FLASH_ADDR ], - s->regs[R_DMA_DRAM_ADDR ], + dma_dram_offset, dma_len);while (dma_len) {if (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ) { - data =address_space_ldl_le (&s->dram_as, s->regs[R_DMA_DRAM_ADDR ], + data =address_space_ldl_le (&s->dram_as, dma_dram_offset,MEMTXATTRS_UNSPECIFIED , &result);if (result !=MEMTX_OK ) { -aspeed_smc_error ("DRAM read failed @%08x" , - s->regs[R_DMA_DRAM_ADDR ]); +aspeed_smc_error ("DRAM read failed @%" PRIx64, + dma_dram_offset);return ; }@@ -940,11 +968,11 @@ static void aspeed_smc_dma_rw(AspeedSMCState *s)return ; } -address_space_stl_le (&s->dram_as, s->regs[R_DMA_DRAM_ADDR ], +address_space_stl_le (&s->dram_as, dma_dram_offset, data,MEMTXATTRS_UNSPECIFIED , &result);if (result !=MEMTX_OK ) { -aspeed_smc_error ("DRAM write failed @%08x" , - s->regs[R_DMA_DRAM_ADDR ]); +aspeed_smc_error ("DRAM write failed @%" PRIx64, + dma_dram_offset);return ; } }@@ -953,8 +981,12 @@ static void aspeed_smc_dma_rw(AspeedSMCState *s)* When the DMA is on-going, the DMA registers are updated * with the current working addresses and length. */ + dma_dram_offset +=4 ; + dma_dram_addr +=4 ; + + s->regs[R_DMA_DRAM_ADDR_HIGH ] = dma_dram_addr >>32 ; + s->regs[R_DMA_DRAM_ADDR ] = dma_dram_addr &0xffffffff ; s->regs[R_DMA_FLASH_ADDR ] +=4 ; - s->regs[R_DMA_DRAM_ADDR ] +=4 ; dma_len -=4 ; s->regs[R_DMA_LEN ] = dma_len; s->regs[R_DMA_CHECKSUM ] += data;@@ -1107,6 +1139,9 @@ static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data, }else if (aspeed_smc_has_dma (asc) && addr ==R_DMA_LEN &&aspeed_smc_dma_granted (s)) { s->regs[addr] =DMA_LENGTH (value); + }else if (aspeed_smc_has_dma (asc) &&aspeed_smc_has_dma64 (asc) && + addr ==R_DMA_DRAM_ADDR_HIGH ) { + s->regs[addr] =DMA_DRAM_ADDR_HIGH (value); }else {qemu_log_mask (LOG_UNIMP ,"%s: not implemented: 0x%" HWADDR_PRIx"\n" , __func__, addr);@@ -1239,6 +1274,7 @@ static const VMStateDescription vmstate_aspeed_smc = {static Property aspeed_smc_properties[] = {DEFINE_PROP_BOOL ("inject-failure" , AspeedSMCState, inject_failure, false), +DEFINE_PROP_UINT64 ("dram-base" , AspeedSMCState, dram_base,0 ),DEFINE_PROP_LINK ("dram" , AspeedSMCState, dram_mr, TYPE_MEMORY_REGION, MemoryRegion *),DEFINE_PROP_END_OF_LIST (),
RE: [PATCH v4 05/16] aspeed/sdmc: Add AST2700 support
In reply to Philippe Mathieu-DaudéHi Philippe, Cedric
Quoted 57 lines · Cédric Le Goater
Quoted 29 lines · Philippe Mathieu-Daudé
Quoted 28 lines
Hi Jamin,
Quoted 23 lines · Jamin Lin
The SDRAM memory controller(DRAMC) controls the access to external DDR4 and DDR5 SDRAM and power up to DDR4 and DDR5 PHY.
The DRAM memory controller of AST2700 is not backward compatible to previous chips such AST2600, AST2500 and AST2400.
Max memory is now 8GiB on the AST2700. Introduce new
aspeed_2700_sdmcand class with read/write operation and reset handlers.Define DRAMC necessary protected registers and unprotected registers for AST2700 and increase the register set to
0x1000.Add unlocked property to change controller protected status.
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>---
hw/misc/aspeed_sdmc.c | 190
+++++++++++++++++++++++++++++++++-
include/hw/misc/aspeed_sdmc.h| 5 +-2 files changed, 193 insertions(+), 2 deletions(-)Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
(quoted diff) +0
-0
b/include/hw/misc/aspeed_sdmc.hindexec2d59a14f..61c979583a100644include/hw/misc/aspeed_sdmc.h +0
-0@@ -17,6 +17,7 @@ OBJECT_DECLARE_TYPE(AspeedSDMCState,Quoted 8 lines
Quoted 8 lines
include/hw/misc/aspeed_sdmc.h +1
-0AspeedSDMCClass, ASPEED_SDMC) #define TYPE_ASPEED_2400_SDMC TYPE_ASPEED_SDMC "-ast2400" #define TYPE_ASPEED_2500_SDMC TYPE_ASPEED_SDMC "-ast2500" #define TYPE_ASPEED_2600_SDMC TYPE_ASPEED_SDMC "-ast2600" +#define TYPE_ASPEED_2700_SDMC TYPE_ASPEED_SDMC "-ast2700" /** SDMC has 174 documented registers. In addition the u-boot device tree @@ -29,7 +30,7 @@
OBJECT_DECLARE_TYPE(AspeedSDMCState,
Quoted 10 lines
Quoted 9 lines
include/hw/misc/aspeed_sdmc.h OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC) · line 33
Quoted 7 lines
AspeedSDMCClass,
ASPEED_SDMC)
* time, and the other is in the DDR-PHY IP which is used during DDR-PHY
* training.
*/include/hw/misc/aspeed_sdmc.h +1
-1-#define ASPEED_SDMC_NR_REGS (0x500 >> 2) +#define ASPEED_SDMC_NR_REGS (0x1000 >> 2)This change breaks the migration stream.
Quoted 2 lines
Do you mean migration compat ? We never cared much about that for the Aspeed machines.
Quoted 7 lines
So let's just remove the VMSTATE to reduce code burden?
Otherwise incrementing the vmstate.version is enough.
Regards,
Phil.
If you both okay, I will remove it.
Do I need to create a new patch or just update in this patch? Thanks-Jamin
RE: [PATCH v4 08/16] aspeed/smc: support 64 bits dma dram address
In reply to Cédric Le GoaterHi Cedric,
Quoted 8 lines · Jamin Lin
Quoted 1 line
AST2700 support the maximum dram size is 8GiB and has a "DMA DRAM
Side
Quoted 5 lines
Address High Part(0x7C)"
register to support 64 bits dma dram address.
Add helper routines functions to compute the dma dram address, new features and update trace-event to support 64 bits dram address.
Quoted 8 lines
Quoted 2 lines
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>I will move the addition of the "dram-base" property to another patch. See :
https://patchew.org/QEMU/[email protected]/(Please review)
Review done.
If I need to resend v5 patch series, I will remove "dram-base property" from this patch. Thanks for your help, Jamin
Quoted 222 lines
Else,
Reviewed-by Cédric Le Goater <[email protected]>Thanks,
C.
Quoted 2 lines
--- hw/ssi/aspeed_smc.c | 52+++++++++++++++++++++++++++++++------
hw/ssi/aspeed_smc.c line 132
Quoted 10 lines
hw/ssi/trace-events | 2 +- include/hw/ssi/aspeed_smc.h | 1 + 3 files changed, 46 insertions(+), 9 deletions(-)hw/ssi/aspeed_smc.c index renamed from hw/ssi/aspeed_smc.c +0
-0
ffb13a12e8..df0c63469c100644hw/ssi/aspeed_smc.c +0
-0@@ -132,6 +132,9 @@#define FMC_WDT2_CTRL_BOOT_SOURCE BIT(4)/* O: primary 1: alternate */
hw/ssi/aspeed_smc.c static const AspeedSegments
Quoted 17 lines
hw/ssi/aspeed_smc.c +4
-0#define FMC_WDT2_CTRL_EN BIT(0) +/* DMA DRAM Side Address High Part (AST2700) */ +#define R_DMA_DRAM_ADDR_HIGH (0x7c / 4) +/* DMA Control/Status Register */ #define R_DMA_CTRL (0x80 / 4)#define DMA_CTRL_REQUEST (1 << 31)@@ -187,6 +190,7 @@* 0x1FFFFFF: 32M bytes */ #define DMA_DRAM_ADDR (asc, val) ((val) & (asc)->dma_dram_mask) +#define DMA_DRAM_ADDR_HIGH (val) ((val) & 0xf)#define DMA_FLASH_ADDR (asc, val) ((val) & (asc)->dma_flash_mask)#define DMA_LENGTH (val) ((val) & 0x01FFFFFF)@@ -207,6 +211,7 @@ static const AspeedSegmentsaspeed_2500_spi2_segments[];
hw/ssi/aspeed_smc.c static inline bool
Quoted 8 lines
hw/ssi/aspeed_smc.c +1
-0#define ASPEED_SMC_FEATURE_DMA 0x1#define ASPEED_SMC_FEATURE_DMA_GRANT 0x2#define ASPEED_SMC_FEATURE_WDT_CONTROL 0x4 +#define ASPEED_SMC_FEATURE_DMA_DRAM_ADDR_HIGH 0x08static inline bool aspeed_smc_has_dma (const AspeedSMCClass *asc) {@@ -218,6 +223,11 @@ static inline bool
aspeed_smc_has_wdt_control(const AspeedSMCClass *asc)hw/ssi/aspeed_smc.c static inline bool aspeed_smc_has_wdt_control(const AspeedSMCClass *asc)
Quoted 5 lines
hw/ssi/aspeed_smc.c +2
-0return !!(asc->features &ASPEED_SMC_FEATURE_WDT_CONTROL ); } +static inline bool aspeed_smc_has_dma64 (const AspeedSMCClass *asc) { + return !!(asc->features &
ASPEED_SMC_FEATURE_DMA_DRAM_ADDR_HIGH);hw/ssi/aspeed_smc.c static inline bool aspeed_smc_has_wdt_control(const AspeedSMCClass *asc)
Quoted 3 lines
hw/ssi/aspeed_smc.c +2
-0+} +#define aspeed_smc_error (fmt, ...)\
hw/ssi/aspeed_smc.c static uint64_t aspeed_smc_read(void *opaque,
Quoted 4 lines
hw/ssi/aspeed_smc.c +0
-0qemu_log_mask(LOG_GUEST_ERROR, "%s: " fmt "\n", __func__, ## __VA_ARGS__)@@ -747,6 +757,8 @@ static uint64_t aspeed_smc_read(void *opaque,hwaddr addr, unsigned int size)
hw/ssi/aspeed_smc.c static uint64_t aspeed_smc_read(void *opaque, · line 758
Quoted 2 lines
hw/ssi/aspeed_smc.c +0
-0(aspeed_smc_has_dma (asc) && addr ==R_DMA_CTRL ) || (aspeed_smc_has_dma (asc) && addr ==R_DMA_FLASH_ADDR )|| > (aspeed_smc_has_dma(asc) && addr == R_DMA_DRAM_ADDR) || > + (aspeed_smc_has_dma(asc) && aspeed_smc_has_dma64(asc)&&
hw/ssi/aspeed_smc.c static uint64_t aspeed_smc_read(void *opaque, hwaddr addr, unsigned int size)
Quoted 3 lines
hw/ssi/aspeed_smc.c +1
-0+ addr == R_DMA_DRAM_ADDR_HIGH) || (aspeed_smc_has_dma (asc) && addr ==R_DMA_LEN ) || (aspeed_smc_has_dma (asc) && addr ==R_DMA_CHECKSUM )|| > (addr >= R_SEG_ADDR0 &&hw/ssi/aspeed_smc.c static bool
Quoted 1 line
hw/ssi/aspeed_smc.c +0
-0@@ -847,6 +859,12 @@ static bool
aspeed_smc_inject_read_failure(AspeedSMCState *s)Quoted 21 lines
hw/ssi/aspeed_smc.c +8
-0} } +static uint64_t aspeed_smc_dma_dram_addr (AspeedSMCState *s) { +return s->regs[R_DMA_DRAM_ADDR ] | + ((uint64_t ) s->regs[R_DMA_DRAM_ADDR_HIGH ] <<32 ); } +static uint32_t aspeed_smc_dma_len (AspeedSMCState *s) { AspeedSMCClass *asc = ASPEED_SMC_GET_CLASS(s); @@ -903,24 +921,34 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s) static voidaspeed_smc_dma_rw (AspeedSMCState *s) { +AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS (s); +uint64_t dma_dram_offset; +uint64_t dma_dram_addr;MemTxResult result;uint32_t dma_len;uint32_t data;hw/ssi/aspeed_smc.c static void aspeed_smc_dma_checksum(AspeedSMCState *s)
Quoted 10 lines
hw/ssi/aspeed_smc.c +7
-0dma_len =aspeed_smc_dma_len (s); + dma_dram_addr =aspeed_smc_dma_dram_addr (s); + +if (aspeed_smc_has_dma64 (asc)) { + dma_dram_offset = dma_dram_addr - s->dram_base; + }else { + dma_dram_offset = dma_dram_addr; + } trace_aspeed_smc_dma_rw(s->regs[R_DMA_CTRL] &
DMA_CTRL_WRITE?hw/ssi/aspeed_smc.c static void aspeed_smc_dma_checksum(AspeedSMCState *s)
Quoted 8 lines
"write" : "read", s->regs[R_DMA_FLASH_ADDR],hw/ssi/aspeed_smc.c +1
-2- s->regs[R_DMA_DRAM_ADDR ], + dma_dram_offset, dma_len);while (dma_len) {if (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ) { - data = address_space_ldl_le(&s->dram_as,s->regs[R_DMA_DRAM_ADDR],
Quoted 1 line
+ data = address_space_ldl_le(&s->dram_as,
dma_dram_offset,Quoted 1 line
MEMTXATTRS_UNSPECIFIED, &result);hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState
Quoted 9 lines
if (result != MEMTX_OK) {hw/ssi/aspeed_smc.c +2
-2-aspeed_smc_error ("DRAM read failed @%08x" , - s->regs[R_DMA_DRAM_ADDR ]); +aspeed_smc_error ("DRAM read failed @%" PRIx64, + dma_dram_offset);return ; }@@ -940,11 +968,11 @@ static void aspeed_smc_dma_rw(AspeedSMCState*s)
hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState · line 943
Quoted 4 lines
hw/ssi/aspeed_smc.c +0
-1return ; } - address_space_stl_le(&s->dram_as,s->regs[R_DMA_DRAM_ADDR],
hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState · line 972
Quoted 2 lines
hw/ssi/aspeed_smc.c +1
-0+ address_space_stl_le(&s->dram_as, dma_dram_offset, data,
MEMTXATTRS_UNSPECIFIED, &result);hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState
Quoted 9 lines
hw/ssi/aspeed_smc.c +2
-2if (result !=MEMTX_OK ) { -aspeed_smc_error ("DRAM write failed @%08x" , - s->regs[R_DMA_DRAM_ADDR ]); +aspeed_smc_error ("DRAM write failed @%" PRIx64, + dma_dram_offset);return ; } }@@ -953,8 +981,12 @@ static void aspeed_smc_dma_rw(AspeedSMCState*s)
hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState *s)
Quoted 13 lines
hw/ssi/aspeed_smc.c +5
-1* When the DMA is on-going, the DMA registers are updated * with the current working addresses and length. */ + dma_dram_offset +=4 ; + dma_dram_addr +=4 ; + + s->regs[R_DMA_DRAM_ADDR_HIGH ] = dma_dram_addr >>32 ; + s->regs[R_DMA_DRAM_ADDR ] = dma_dram_addr &0xffffffff ; s->regs[R_DMA_FLASH_ADDR ] +=4 ; - s->regs[R_DMA_DRAM_ADDR ] +=4 ; dma_len -=4 ; s->regs[R_DMA_LEN ] = dma_len; s->regs[R_DMA_CHECKSUM] += data; @@ -1107,6 +1139,9@@
Quoted 5 lines
static void aspeed_smc_write(void *opaque, hwaddr addr,
uint64_tdata,} else if (aspeed_smc_has_dma(asc) && addr == R_DMA_LEN && aspeed_smc_dma_granted(s)) { s->regs[addr] = DMA_LENGTH(value);+ } else if (
aspeed_smc_has_dma(asc)&&aspeed_smc_has_dma64(asc)&&
hw/ssi/aspeed_smc.c static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data,
Quoted 4 lines
hw/ssi/aspeed_smc.c +2
-0+ addr == R_DMA_DRAM_ADDR_HIGH) { + s->regs[addr] = DMA_DRAM_ADDR_HIGH(value); } else { qemu_log_mask(LOG_UNIMP, "%s: not implemented: 0x%"
HWADDR_PRIx"\n",Quoted 1 line
__func__, addr); @@ -1239,6 +1274,7 @@static
hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int
Quoted 14 lines
const VMStateDescription
vmstate_aspeed_smc= {static Property aspeed_smc_properties[] = {
DEFINE_PROP_BOOL("inject-failure", AspeedSMCState,inject_failure, false),hw/ssi/aspeed_smc.c +1
-0+DEFINE_PROP_UINT64 ("dram-base" , AspeedSMCState, dram_base,0 ),DEFINE_PROP_LINK ("dram" , AspeedSMCState, dram_mr, TYPE_MEMORY_REGION, MemoryRegion *), DEFINE_PROP_END_OF_LIST(),hw/ssi/trace-events index renamed from hw/ssi/trace-events +0
-0
2d5bd2b83d..7b5ad6a939100644hw/ssi/trace-events +0
-0@@ -6,7 +6,7 @@ aspeed_smc_do_snoop(int cs, int index, int dummies, intdata) "CS%d index:0x%x d
hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int · line 6
Quoted 1 line
hw/ssi/trace-events +0
-0aspeed_smc_flash_write(int cs, uint64_t addr, uint32_t size, uint64_tdata, int mode) "CS%d @0x%" PRIx64 " size %u: 0x%" PRIx64" mode:%d"
hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int · line 7
Quoted 1 line
hw/ssi/trace-events +0
-0aspeed_smc_read(uint64_t addr, uint32_t size, uint64_t data) "@0x%"PRIx64 " size %u: 0x%" PRIx64
hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int · line 8
Quoted 1 line
hw/ssi/trace-events +0
-0aspeed_smc_dma_checksum(uint32_t addr, uint32_t data) "0x%08x:0x%08x"
hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int · line 9
Quoted 1 line
hw/ssi/trace-events +0
-1-aspeed_smc_dma_rw(const char *dir, uint32_t flash_addr, uint32_t
dram_addr,uint32_tsize) "%s flash:@0x%08x dram:@0x%08x size:0x%08x"hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int · line 9
Quoted 1 line
hw/ssi/trace-events +1
-0+aspeed_smc_dma_rw(const char *dir, uint32_t flash_addr, uint64_t
dram_addr,uint32_tsize) "%s flash:@0x%08x dram:@0x%" PRIx64 " size:0x%08x"hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int · line 10
Quoted 1 line
hw/ssi/trace-events +0
-0aspeed_smc_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%"PRIx64 " size %u: 0x%" PRIx64
Quoted 14 lines
hw/ssi/trace-events +0
-0aspeed_smc_flash_select(int cs, const char *prefix) "CS%d %sselect"include/hw/ssi/aspeed_smc.h +1
-0@@ -76,6 +76,7 @@ struct AspeedSMCState {AddressSpace flash_as;MemoryRegion *dram_mr;AddressSpace dram_as; +uint64_t dram_base;AspeedSMCFlash flashes[ASPEED_SMC_CS_MAX ];
RE: [PATCH v4 08/16] aspeed/smc: support 64 bits dma dram address
In reply to Philippe Mathieu-DaudéHi Philippe,
Quoted 38 lines
Hi Jamin,
Quoted 1 line · Jamin Lin
AST2700 support the maximum dram size is 8GiB and has a "DMA DRAM
Side
Quoted 9 lines
Address High Part(0x7C)"
register to support 64 bits dma dram address.
Add helper routines functions to compute the dma dram address, new features and update trace-event to support 64 bits dram address.Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>--- hw/ssi/aspeed_smc.c | 52+++++++++++++++++++++++++++++++------
Quoted 23 lines
hw/ssi/trace-events | 2 +- include/hw/ssi/aspeed_smc.h | 1 + 3 files changed, 46 insertions(+), 9 deletions(-)hw/ssi/aspeed_smc.c +8
-0+static uint64_t aspeed_smc_dma_dram_addr (AspeedSMCState *s) { +return s->regs[R_DMA_DRAM_ADDR ] | + ((uint64_t ) s->regs[R_DMA_DRAM_ADDR_HIGH ] <<32 ); } +static uint32_t aspeed_smc_dma_len (AspeedSMCState *s) { AspeedSMCClass *asc = ASPEED_SMC_GET_CLASS(s); @@ -903,24 +921,34 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s) static voidaspeed_smc_dma_rw (AspeedSMCState *s) { +AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS (s); +uint64_t dma_dram_offset; +uint64_t dma_dram_addr;MemTxResult result;uint32_t dma_len;uint32_t data;
Quoted 11 lines
hw/ssi/aspeed_smc.c static void aspeed_smc_dma_checksum(AspeedSMCState *s) · line 937
Quoted 7 lines
dma_len = aspeed_smc_dma_len(s);hw/ssi/aspeed_smc.c +6
-0+ dma_dram_addr =aspeed_smc_dma_dram_addr (s); + +if (aspeed_smc_has_dma64 (asc)) { + dma_dram_offset = dma_dram_addr - s->dram_base; + }else { + dma_dram_offset = dma_dram_addr;Here
s->dram_baseis0x0. Do we really need to checkaspeed_smc_has_dma64?
Yes, it is required to check aspeed_smc_has_dma64 to support dram 64bit address. s->dram_base has been changed to "0x4 00000000".
Thanks-Jamin
Quoted 93 lines
Quoted 1 line
+ }
Maybe simplify improving
aspeed_smc_dma_dram_addr()as:static uint64_t aspeed_smc_dma_dram_addr(AspeedSMCState *s) { return (s->regs[R_DMA_DRAM_ADDR] | ((uint64_t) s->regs[R_DMA_DRAM_ADDR_HIGH] << 32)) - s->dram_base; }Then no need for
dma_dram_offset,dma_dram_addris enough.Quoted 2 lines
trace_aspeed_smc_dma_rw(s->regs[R_DMA_CTRL] &
DMA_CTRL_WRITE?hw/ssi/aspeed_smc.c static void aspeed_smc_dma_checksum(AspeedSMCState *s)
Quoted 8 lines
"write" : "read", s->regs[R_DMA_FLASH_ADDR],hw/ssi/aspeed_smc.c +1
-2- s->regs[R_DMA_DRAM_ADDR ], + dma_dram_offset, dma_len);while (dma_len) {if (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ) { - data = address_space_ldl_le(&s->dram_as,s->regs[R_DMA_DRAM_ADDR],
Quoted 1 line
+ data = address_space_ldl_le(&s->dram_as,
dma_dram_offset,Quoted 1 line
MEMTXATTRS_UNSPECIFIED, &result);hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState
Quoted 9 lines
if (result != MEMTX_OK) {hw/ssi/aspeed_smc.c +2
-2-aspeed_smc_error ("DRAM read failed @%08x" , - s->regs[R_DMA_DRAM_ADDR ]); +aspeed_smc_error ("DRAM read failed @%" PRIx64, + dma_dram_offset);return ; }@@ -940,11 +968,11 @@ static void aspeed_smc_dma_rw(AspeedSMCState*s)
Review static void aspeed_smc_dma_rw(AspeedSMCState · line 943
Quoted 4 lines
(quoted diff) +0
-1return; } - address_space_stl_le(&s->dram_as,s->regs[R_DMA_DRAM_ADDR],
Review static void aspeed_smc_dma_rw(AspeedSMCState · line 972
Quoted 2 lines
(quoted diff) +1
-0+ address_space_stl_le(&s->dram_as, dma_dram_offset, data,
MEMTXATTRS_UNSPECIFIED, &result);hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState
Quoted 9 lines
hw/ssi/aspeed_smc.c +2
-2if (result !=MEMTX_OK ) { -aspeed_smc_error ("DRAM write failed @%08x" , - s->regs[R_DMA_DRAM_ADDR ]); +aspeed_smc_error ("DRAM write failed @%" PRIx64, + dma_dram_offset);return ; } }@@ -953,8 +981,12 @@ static void aspeed_smc_dma_rw(AspeedSMCState*s)
hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState *s)
Quoted 13 lines
hw/ssi/aspeed_smc.c +5
-1* When the DMA is on-going, the DMA registers are updated * with the current working addresses and length. */ + dma_dram_offset +=4 ; + dma_dram_addr +=4 ; + + s->regs[R_DMA_DRAM_ADDR_HIGH ] = dma_dram_addr >>32 ; + s->regs[R_DMA_DRAM_ADDR ] = dma_dram_addr &0xffffffff ; s->regs[R_DMA_FLASH_ADDR ] +=4 ; - s->regs[R_DMA_DRAM_ADDR ] +=4 ; dma_len -=4 ; s->regs[R_DMA_LEN ] = dma_len; s->regs[R_DMA_CHECKSUM] += data; @@ -1107,6 +1139,9@@
Quoted 5 lines
static void aspeed_smc_write(void *opaque, hwaddr addr,
uint64_tdata,} else if (aspeed_smc_has_dma(asc) && addr == R_DMA_LEN && aspeed_smc_dma_granted(s)) { s->regs[addr] = DMA_LENGTH(value);+ } else if (
aspeed_smc_has_dma(asc)&&aspeed_smc_has_dma64(asc)&&
hw/ssi/aspeed_smc.c static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data,
Quoted 4 lines
hw/ssi/aspeed_smc.c +2
-0+ addr == R_DMA_DRAM_ADDR_HIGH) { + s->regs[addr] = DMA_DRAM_ADDR_HIGH(value); } else { qemu_log_mask(LOG_UNIMP, "%s: not implemented: 0x%"
HWADDR_PRIx"\n",Quoted 1 line
__func__, addr); @@ -1239,6 +1274,7 @@static
Quoted 9 lines
const VMStateDescription
vmstate_aspeed_smc= {static Property aspeed_smc_properties[] = {
DEFINE_PROP_BOOL("inject-failure", AspeedSMCState,inject_failure, false),
+DEFINE_PROP_UINT64("dram-base", AspeedSMCState, dram_base, 0),
DEFINE_PROP_LINK("dram", AspeedSMCState,dram_mr,
TYPE_MEMORY_REGION, MemoryRegion *),
DEFINE_PROP_END_OF_LIST(),
Re: [PATCH v4 05/16] aspeed/sdmc: Add AST2700 support
In reply to Jamin LinQuoted 61 lines · Jamin Lin
Hi Philippe, Cedric
Quoted 59 lines · Cédric Le Goater
Quoted 29 lines · Philippe Mathieu-Daudé
Quoted 28 lines
Hi Jamin,
Quoted 23 lines · Jamin Lin
The SDRAM memory controller(DRAMC) controls the access to external DDR4 and DDR5 SDRAM and power up to DDR4 and DDR5 PHY.
The DRAM memory controller of AST2700 is not backward compatible to previous chips such AST2600, AST2500 and AST2400.
Max memory is now 8GiB on the AST2700. Introduce new
aspeed_2700_sdmcand class with read/write operation and reset handlers.Define DRAMC necessary protected registers and unprotected registers for AST2700 and increase the register set to
0x1000.Add unlocked property to change controller protected status.
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>--- hw/misc/aspeed_sdmc.c | 190 +++++++++++++++++++++++++++++++++- include/hw/misc/aspeed_sdmc.h | 5 +- 2 files changed, 193 insertions(+), 2 deletions(-)Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
(quoted diff) +0
-0
b/include/hw/misc/aspeed_sdmc.hindexec2d59a14f..61c979583a100644include/hw/misc/aspeed_sdmc.h +0
-0@@ -17,6 +17,7 @@ OBJECT_DECLARE_TYPE(AspeedSDMCState,Quoted 8 lines
Quoted 8 lines
include/hw/misc/aspeed_sdmc.h +1
-0AspeedSDMCClass, ASPEED_SDMC) #define TYPE_ASPEED_2400_SDMC TYPE_ASPEED_SDMC "-ast2400" #define TYPE_ASPEED_2500_SDMC TYPE_ASPEED_SDMC "-ast2500" #define TYPE_ASPEED_2600_SDMC TYPE_ASPEED_SDMC "-ast2600" +#define TYPE_ASPEED_2700_SDMC TYPE_ASPEED_SDMC "-ast2700" /** SDMC has 174 documented registers. In addition the u-boot device tree @@ -29,7 +30,7 @@
OBJECT_DECLARE_TYPE(AspeedSDMCState,
Quoted 10 lines
Quoted 9 lines
include/hw/misc/aspeed_sdmc.h OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC) · line 33
Quoted 7 lines
AspeedSDMCClass,
ASPEED_SDMC)
* time, and the other is in the DDR-PHY IP which is used during
DDR-PHY
* training.
*/include/hw/misc/aspeed_sdmc.h +1
-1-#define ASPEED_SDMC_NR_REGS (0x500 >> 2) +#define ASPEED_SDMC_NR_REGS (0x1000 >> 2)This change breaks the migration stream.
Quoted 2 lines
Do you mean migration compat ? We never cared much about that for the Aspeed machines.
So let's just remove the VMSTATE to reduce code burden?
Quoted 7 lines
Quoted 5 lines
Otherwise incrementing the vmstate.version is enough.
Regards,
Phil.
If you both okay, I will remove it.
Do I need to create a new patch or just update in this patch?
I don't think this is necessary to do so now. Possibly, increase the version number in the vmstate when resending a v5.
Also, all Aspeed models should be addressed and that's beyond the scope of this series.
Thanks,
C.
Re: [PATCH v4 08/16] aspeed/smc: support 64 bits dma dram address
In reply to Jamin LinQuoted 13 lines · Jamin Lin
Hi Cedric,
Quoted 11 lines · Jamin Lin
Quoted 1 line
AST2700 support the maximum dram size is 8GiB and has a "DMA DRAM
Side
Quoted 7 lines
Address High Part(0x7C)"
register to support 64 bits dma dram address.
Add helper routines functions to compute the dma dram address, new features and update trace-event to support 64 bits dram address.Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>
Quoted 7 lines
Quoted 5 lines
I will move the addition of the "dram-base" property to another patch. See :
https://patchew.org/QEMU/[email protected]/(Please review)
Review done.
If I need to resend v5 patch series, I will remove "dram-base property" from this patch.
ok. Wait a bit before resending though. We are not done with v4 yet !
Thanks,
C.
Quoted 226 lines
Thanks for your help, Jamin
Quoted 222 lines
Else,
Reviewed-by Cédric Le Goater <[email protected]>Thanks,
C.
Quoted 2 lines
--- hw/ssi/aspeed_smc.c | 52+++++++++++++++++++++++++++++++------
hw/ssi/aspeed_smc.c line 132
Quoted 10 lines
hw/ssi/trace-events | 2 +- include/hw/ssi/aspeed_smc.h | 1 + 3 files changed, 46 insertions(+), 9 deletions(-)hw/ssi/aspeed_smc.c index renamed from hw/ssi/aspeed_smc.c +0
-0
ffb13a12e8..df0c63469c100644hw/ssi/aspeed_smc.c +0
-0@@ -132,6 +132,9 @@#define FMC_WDT2_CTRL_BOOT_SOURCE BIT(4)/* O: primary 1: alternate */
hw/ssi/aspeed_smc.c static const AspeedSegments
Quoted 17 lines
hw/ssi/aspeed_smc.c +4
-0#define FMC_WDT2_CTRL_EN BIT(0) +/* DMA DRAM Side Address High Part (AST2700) */ +#define R_DMA_DRAM_ADDR_HIGH (0x7c / 4) +/* DMA Control/Status Register */ #define R_DMA_CTRL (0x80 / 4)#define DMA_CTRL_REQUEST (1 << 31)@@ -187,6 +190,7 @@* 0x1FFFFFF: 32M bytes */ #define DMA_DRAM_ADDR (asc, val) ((val) & (asc)->dma_dram_mask) +#define DMA_DRAM_ADDR_HIGH (val) ((val) & 0xf)#define DMA_FLASH_ADDR (asc, val) ((val) & (asc)->dma_flash_mask)#define DMA_LENGTH (val) ((val) & 0x01FFFFFF)@@ -207,6 +211,7 @@ static const AspeedSegmentsaspeed_2500_spi2_segments[];
hw/ssi/aspeed_smc.c static inline bool
Quoted 8 lines
hw/ssi/aspeed_smc.c +1
-0#define ASPEED_SMC_FEATURE_DMA 0x1#define ASPEED_SMC_FEATURE_DMA_GRANT 0x2#define ASPEED_SMC_FEATURE_WDT_CONTROL 0x4 +#define ASPEED_SMC_FEATURE_DMA_DRAM_ADDR_HIGH 0x08static inline bool aspeed_smc_has_dma (const AspeedSMCClass *asc) {@@ -218,6 +223,11 @@ static inline bool
aspeed_smc_has_wdt_control(const AspeedSMCClass *asc)hw/ssi/aspeed_smc.c static inline bool aspeed_smc_has_wdt_control(const AspeedSMCClass *asc)
Quoted 5 lines
hw/ssi/aspeed_smc.c +2
-0return !!(asc->features &ASPEED_SMC_FEATURE_WDT_CONTROL ); } +static inline bool aspeed_smc_has_dma64 (const AspeedSMCClass *asc) { + return !!(asc->features &
ASPEED_SMC_FEATURE_DMA_DRAM_ADDR_HIGH);hw/ssi/aspeed_smc.c static inline bool aspeed_smc_has_wdt_control(const AspeedSMCClass *asc)
Quoted 3 lines
hw/ssi/aspeed_smc.c +2
-0+} +#define aspeed_smc_error (fmt, ...)\
hw/ssi/aspeed_smc.c static uint64_t aspeed_smc_read(void *opaque,
Quoted 4 lines
hw/ssi/aspeed_smc.c +0
-0qemu_log_mask(LOG_GUEST_ERROR, "%s: " fmt "\n", __func__, ## __VA_ARGS__)@@ -747,6 +757,8 @@ static uint64_t aspeed_smc_read(void *opaque,hwaddr addr, unsigned int size)
hw/ssi/aspeed_smc.c static uint64_t aspeed_smc_read(void *opaque, · line 758
Quoted 2 lines
hw/ssi/aspeed_smc.c +0
-0(aspeed_smc_has_dma (asc) && addr ==R_DMA_CTRL ) || (aspeed_smc_has_dma (asc) && addr ==R_DMA_FLASH_ADDR )|| > (aspeed_smc_has_dma(asc) && addr == R_DMA_DRAM_ADDR) || > + (aspeed_smc_has_dma(asc) && aspeed_smc_has_dma64(asc)&&
hw/ssi/aspeed_smc.c static uint64_t aspeed_smc_read(void *opaque, hwaddr addr, unsigned int size)
Quoted 3 lines
hw/ssi/aspeed_smc.c +1
-0+ addr == R_DMA_DRAM_ADDR_HIGH) || (aspeed_smc_has_dma (asc) && addr ==R_DMA_LEN ) || (aspeed_smc_has_dma (asc) && addr ==R_DMA_CHECKSUM )|| > (addr >= R_SEG_ADDR0 &&hw/ssi/aspeed_smc.c static bool
Quoted 1 line
hw/ssi/aspeed_smc.c +0
-0@@ -847,6 +859,12 @@ static bool
aspeed_smc_inject_read_failure(AspeedSMCState *s)Quoted 21 lines
hw/ssi/aspeed_smc.c +8
-0} } +static uint64_t aspeed_smc_dma_dram_addr (AspeedSMCState *s) { +return s->regs[R_DMA_DRAM_ADDR ] | + ((uint64_t ) s->regs[R_DMA_DRAM_ADDR_HIGH ] <<32 ); } +static uint32_t aspeed_smc_dma_len (AspeedSMCState *s) { AspeedSMCClass *asc = ASPEED_SMC_GET_CLASS(s); @@ -903,24 +921,34 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s) static voidaspeed_smc_dma_rw (AspeedSMCState *s) { +AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS (s); +uint64_t dma_dram_offset; +uint64_t dma_dram_addr;MemTxResult result;uint32_t dma_len;uint32_t data;hw/ssi/aspeed_smc.c static void aspeed_smc_dma_checksum(AspeedSMCState *s)
Quoted 10 lines
hw/ssi/aspeed_smc.c +7
-0dma_len =aspeed_smc_dma_len (s); + dma_dram_addr =aspeed_smc_dma_dram_addr (s); + +if (aspeed_smc_has_dma64 (asc)) { + dma_dram_offset = dma_dram_addr - s->dram_base; + }else { + dma_dram_offset = dma_dram_addr; + } trace_aspeed_smc_dma_rw(s->regs[R_DMA_CTRL] &
DMA_CTRL_WRITE?hw/ssi/aspeed_smc.c static void aspeed_smc_dma_checksum(AspeedSMCState *s)
Quoted 8 lines
"write" : "read", s->regs[R_DMA_FLASH_ADDR],hw/ssi/aspeed_smc.c +1
-2- s->regs[R_DMA_DRAM_ADDR ], + dma_dram_offset, dma_len);while (dma_len) {if (s->regs[R_DMA_CTRL ] &DMA_CTRL_WRITE ) { - data = address_space_ldl_le(&s->dram_as,s->regs[R_DMA_DRAM_ADDR],
Quoted 1 line
+ data = address_space_ldl_le(&s->dram_as,
dma_dram_offset,Quoted 1 line
MEMTXATTRS_UNSPECIFIED, &result);hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState
Quoted 9 lines
if (result != MEMTX_OK) {hw/ssi/aspeed_smc.c +2
-2-aspeed_smc_error ("DRAM read failed @%08x" , - s->regs[R_DMA_DRAM_ADDR ]); +aspeed_smc_error ("DRAM read failed @%" PRIx64, + dma_dram_offset);return ; }@@ -940,11 +968,11 @@ static void aspeed_smc_dma_rw(AspeedSMCState*s)
hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState · line 943
Quoted 4 lines
hw/ssi/aspeed_smc.c +0
-1return ; } - address_space_stl_le(&s->dram_as,s->regs[R_DMA_DRAM_ADDR],
hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState · line 972
Quoted 2 lines
hw/ssi/aspeed_smc.c +1
-0+ address_space_stl_le(&s->dram_as, dma_dram_offset, data,
MEMTXATTRS_UNSPECIFIED, &result);hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState
Quoted 9 lines
hw/ssi/aspeed_smc.c +2
-2if (result !=MEMTX_OK ) { -aspeed_smc_error ("DRAM write failed @%08x" , - s->regs[R_DMA_DRAM_ADDR ]); +aspeed_smc_error ("DRAM write failed @%" PRIx64, + dma_dram_offset);return ; } }@@ -953,8 +981,12 @@ static void aspeed_smc_dma_rw(AspeedSMCState*s)
hw/ssi/aspeed_smc.c static void aspeed_smc_dma_rw(AspeedSMCState *s)
Quoted 13 lines
hw/ssi/aspeed_smc.c +5
-1* When the DMA is on-going, the DMA registers are updated * with the current working addresses and length. */ + dma_dram_offset +=4 ; + dma_dram_addr +=4 ; + + s->regs[R_DMA_DRAM_ADDR_HIGH ] = dma_dram_addr >>32 ; + s->regs[R_DMA_DRAM_ADDR ] = dma_dram_addr &0xffffffff ; s->regs[R_DMA_FLASH_ADDR ] +=4 ; - s->regs[R_DMA_DRAM_ADDR ] +=4 ; dma_len -=4 ; s->regs[R_DMA_LEN ] = dma_len; s->regs[R_DMA_CHECKSUM] += data; @@ -1107,6 +1139,9@@
Quoted 5 lines
static void aspeed_smc_write(void *opaque, hwaddr addr,
uint64_tdata,} else if (aspeed_smc_has_dma(asc) && addr == R_DMA_LEN && aspeed_smc_dma_granted(s)) { s->regs[addr] = DMA_LENGTH(value);+ } else if (
aspeed_smc_has_dma(asc)&&aspeed_smc_has_dma64(asc)&&
hw/ssi/aspeed_smc.c static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data,
Quoted 4 lines
hw/ssi/aspeed_smc.c +2
-0+ addr == R_DMA_DRAM_ADDR_HIGH) { + s->regs[addr] = DMA_DRAM_ADDR_HIGH(value); } else { qemu_log_mask(LOG_UNIMP, "%s: not implemented: 0x%"
HWADDR_PRIx"\n",Quoted 1 line
__func__, addr); @@ -1239,6 +1274,7 @@static
hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int
Quoted 14 lines
const VMStateDescription
vmstate_aspeed_smc= {static Property aspeed_smc_properties[] = { DEFINE_PROP_BOOL("inject-failure", AspeedSMCState,
inject_failure, false),hw/ssi/aspeed_smc.c +1
-0+DEFINE_PROP_UINT64 ("dram-base" , AspeedSMCState, dram_base,0 ),DEFINE_PROP_LINK ("dram" , AspeedSMCState, dram_mr, TYPE_MEMORY_REGION, MemoryRegion *), DEFINE_PROP_END_OF_LIST(),hw/ssi/trace-events index renamed from hw/ssi/trace-events +0
-0
2d5bd2b83d..7b5ad6a939100644hw/ssi/trace-events +0
-0@@ -6,7 +6,7 @@ aspeed_smc_do_snoop(int cs, int index, int dummies, intdata) "CS%d index:0x%x d
hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int · line 6
Quoted 1 line
hw/ssi/trace-events +0
-0aspeed_smc_flash_write(int cs, uint64_t addr, uint32_t size, uint64_tdata, int mode) "CS%d @0x%" PRIx64 " size %u: 0x%" PRIx64" mode:%d"
hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int · line 7
Quoted 1 line
hw/ssi/trace-events +0
-0aspeed_smc_read(uint64_t addr, uint32_t size, uint64_t data) "@0x%"PRIx64 " size %u: 0x%" PRIx64
hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int · line 8
Quoted 1 line
hw/ssi/trace-events +0
-0aspeed_smc_dma_checksum(uint32_t addr, uint32_t data) "0x%08x:0x%08x"
hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int · line 9
Quoted 1 line
hw/ssi/trace-events +0
-1-aspeed_smc_dma_rw(const char *dir, uint32_t flash_addr, uint32_t
dram_addr,uint32_tsize) "%s flash:@0x%08x dram:@0x%08x size:0x%08x"hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int · line 9
Quoted 1 line
hw/ssi/trace-events +1
-0+aspeed_smc_dma_rw(const char *dir, uint32_t flash_addr, uint64_t
dram_addr,uint32_tsize) "%s flash:@0x%08x dram:@0x%" PRIx64 " size:0x%08x"hw/ssi/trace-events aspeed_smc_do_snoop(int cs, int index, int dummies, int · line 10
Quoted 1 line
hw/ssi/trace-events +0
-0aspeed_smc_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%"PRIx64 " size %u: 0x%" PRIx64
Quoted 14 lines
hw/ssi/trace-events +0
-0aspeed_smc_flash_select(int cs, const char *prefix) "CS%d %sselect"include/hw/ssi/aspeed_smc.h +1
-0@@ -76,6 +76,7 @@ struct AspeedSMCState {AddressSpace flash_as;MemoryRegion *dram_mr;AddressSpace dram_as; +uint64_t dram_base;AspeedSMCFlash flashes[ASPEED_SMC_CS_MAX ];
Re: [SPAM] Re: [PATCH v4 08/16] aspeed/smc: support 64 bits dma dram address
In reply to Philippe Mathieu-DaudéQuoted 39 lines · Philippe Mathieu-Daudé
Hi Jamin,
Quoted 36 lines · Jamin Lin
AST2700 support the maximum dram size is 8GiB and has a "DMA DRAM Side Address High Part(0x7C)" register to support 64 bits dma dram address. Add helper routines functions to compute the dma dram address, new features and update trace-event to support 64 bits dram address.
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>---
hw/ssi/aspeed_smc.c | 52 +++++++++++++++++++++++++++++++------ hw/ssi/trace-events | 2 +-include/hw/ssi/aspeed_smc.h| 1 +3 files changed, 46 insertions(+), 9 deletions(-)hw/ssi/aspeed_smc.c +6
-0+static uint64_t aspeed_smc_dma_dram_addr (AspeedSMCState *s) +{ + return s->regs[R_DMA_DRAM_ADDR] | + ((uint64_t) s->regs[R_DMA_DRAM_ADDR_HIGH] << 32); +} +static
uint32_taspeed_smc_dma_len(AspeedSMCState *s){
AspeedSMCClass *asc =ASPEED_SMC_GET_CLASS(s);hw/ssi/aspeed_smc.c +4
-0@@ -903,24 +921,34 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s) static void aspeed_smc_dma_rw(AspeedSMCState *s) { + AspeedSMCClass *asc = ASPEED_SMC_GET_CLASS(s); + uint64_t dma_dram_offset; + uint64_t dma_dram_addr; MemTxResult result; uint32_t dma_len; uint32_t data; dma_len = aspeed_smc_dma_len(s); + dma_dram_addr = aspeed_smc_dma_dram_addr(s);
Quoted 8 lines
hw/ssi/aspeed_smc.c static void aspeed_smc_dma_checksum(AspeedSMCState *s) · line 937
Quoted 5 lines
hw/ssi/aspeed_smc.c +5
-0+ + if (aspeed_smc_has_dma64(asc)) { + dma_dram_offset = dma_dram_addr - s->dram_base; + } else { + dma_dram_offset = dma_dram_addr;Here
s->dram_baseis0x0. Do we really need to checkaspeed_smc_has_dma64?
You are right, it could be done as your proposal below. However, we should add a comment regarding some values :
R_DMA_DRAM_ADDR_HIGH and s->dram_base are only set on the AST2700 SoC and zero on other Aspeed SoCs.
Quoted 4 lines
Review static void aspeed_smc_dma_checksum(AspeedSMCState *s) · line 936
Quoted 1 line
(quoted diff) +1
-0+ }Maybe simplify improving
aspeed_smc_dma_dram_addr()as:
Quoted 8 lines
static
uint64_taspeed_smc_dma_dram_addr(AspeedSMCState *s){
return (s->regs[R_DMA_DRAM_ADDR]
| ((uint64_t) s->regs[R_DMA_DRAM_ADDR_HIGH] << 32))
-s->dram_base;
}Then no need for
dma_dram_offset,dma_dram_addris enough.
we need both, dma_dram_offset for the transaction and dma_dram_addr to update the R_DMA_DRAM_ADDR_HIGH reg. A bit cumbersome, I agree.
Thanks,
C.
Quoted 65 lines
Quoted 64 lines
trace_aspeed_smc_dma_rw(s->regs[R_DMA_CTRL] &
DMA_CTRL_WRITE? "write" : "read", s->regs[R_DMA_FLASH_ADDR],
- s->regs[R_DMA_DRAM_ADDR],
+dma_dram_offset,
dma_len);
while (dma_len) {
if (s->regs[R_DMA_CTRL] &DMA_CTRL_WRITE) {
- data = address_space_ldl_le(&s->dram_as, s->regs[R_DMA_DRAM_ADDR], + data =address_space_ldl_le(&s->dram_as, dma_dram_offset, MEMTXATTRS_UNSPECIFIED, &result); if (result !=MEMTX_OK) {
- aspeed_smc_error("DRAM read failed @%08x",
- s->regs[R_DMA_DRAM_ADDR]);
+ aspeed_smc_error("DRAM read failed @%" PRIx64,
+dma_dram_offset);
return;
}hw/ssi/aspeed_smc.c +12
-4@@ -940,11 +968,11 @@ static void aspeed_smc_dma_rw(AspeedSMCState *s) return; } - address_space_stl_le(&s->dram_as, s->regs[R_DMA_DRAM_ADDR], + address_space_stl_le(&s->dram_as, dma_dram_offset, data, MEMTXATTRS_UNSPECIFIED, &result); if (result != MEMTX_OK) { - aspeed_smc_error("DRAM write failed @%08x", - s->regs[R_DMA_DRAM_ADDR]); + aspeed_smc_error("DRAM write failed @%" PRIx64, + dma_dram_offset); return; } }@@ -953,8 +981,12 @@ static void aspeed_smc_dma_rw(AspeedSMCState *s)* When the DMA is on-going, the DMA registers are updated * with the current working addresses and length. */ + dma_dram_offset += 4; + dma_dram_addr += 4; + + s->regs[R_DMA_DRAM_ADDR_HIGH] = dma_dram_addr >> 32; + s->regs[R_DMA_DRAM_ADDR] = dma_dram_addr & 0xffffffff; s->regs[R_DMA_FLASH_ADDR] += 4; - s->regs[R_DMA_DRAM_ADDR] += 4; dma_len -= 4; s->regs[R_DMA_LEN] = dma_len; s->regs[R_DMA_CHECKSUM] += data;@@ -1107,6 +1139,9 @@ static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data, } else if (aspeed_smc_has_dma(asc) && addr == R_DMA_LEN && aspeed_smc_dma_granted(s)) { s->regs[addr] = DMA_LENGTH(value); + } else if (aspeed_smc_has_dma(asc) && aspeed_smc_has_dma64(asc) && + addr == R_DMA_DRAM_ADDR_HIGH) { + s->regs[addr] = DMA_DRAM_ADDR_HIGH(value); } else { qemu_log_mask(LOG_UNIMP, "%s: not implemented: 0x%" HWADDR_PRIx "\n", __func__, addr);@@ -1239,6 +1274,7 @@ static const VMStateDescription vmstate_aspeed_smc = { static Property aspeed_smc_properties[] = { DEFINE_PROP_BOOL("inject-failure", AspeedSMCState, inject_failure, false), + DEFINE_PROP_UINT64("dram-base", AspeedSMCState, dram_base, 0), DEFINE_PROP_LINK("dram", AspeedSMCState, dram_mr, TYPE_MEMORY_REGION, MemoryRegion *), DEFINE_PROP_END_OF_LIST(),
Re: [SPAM] Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 support
In reply to Philippe Mathieu-DaudéQuoted 29 lines · Philippe Mathieu-Daudé
Hi,
Quoted 26 lines · Jamin Lin
AST2700 fmc/spi controller's address decoding unit is 64KB and only bits [31:16] are used for decoding. Introduce
seg_to_regandreg_to_seghandlers for ast2700 fmc/spi controller.
In addition, adds ast2700 fmc, spi0, spi1, and spi2 class init handler.Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>---
hw/ssi/aspeed_smc.c| 222 +++++++++++++++++++++++++++++++++++++++++++-1 file changed, 220 insertions(+), 2 deletions(-)hw/ssi/aspeed_smc.c +1
-1@@ -185,7 +185,7 @@* 0: 4 bytes * 0x1FFFFFC: 32M bytes * -* DMA length is from 1 byte to 32MB (AST2600, AST10x0) +* DMA length is from 1 byte to 32MB (AST2600, AST10x0 and AST2700) * 0: 1 byte * 0x1FFFFFF: 32M bytes */ @@ -670,7 +670,7 @@ static const MemoryRegionOps aspeed_smc_flash_ops = {
Quoted 8 lines
hw/ssi/aspeed_smc.c static const MemoryRegionOps aspeed_smc_flash_ops = { · line 673
Quoted 5 lines
hw/ssi/aspeed_smc.c +1
-1.endianness = DEVICE_LITTLE_ENDIAN, .valid = { .min_access_size = 1, - .max_access_size = 4, + .max_access_size = 8,Is this a bugfix? If so, please use a separate patch. Otherwise please mention why it is OK to widen access for AST2600 & AST10x0.
Ah I missed that. I wonder how we could set different access width tough on the model ?
Should we allocate a MemoryRegionOps in the realize() handler and set the width depending on the SoC ?
Thanks,
C.
Re: [PATCH v4 12/16] aspeed/soc: Add AST2700 support
In reply to Jamin Lin viaQuoted 306 lines · Jamin Lin
Initial definitions for a simple machine using an AST2700 SOC (Cortex-a35 CPU).
AST2700 SOC and its interrupt controller are too complex to handle in the common Aspeed SoC framework. We introduce a new ast2700 class with
instance_initand realize handlers.AST2700 is a 64 bits quad core cpus and support 8 watchdog. Update maximum
ASPEED_CPUS_NUMto 4 andASPEED_WDTS_NUMto 8. In addition, update AspeedSocState to support scuio, sli, sliio and intc.Add
TYPE_ASPEED27X0_SOCmachine type.The SDMC controller is unlocked at SPL stage.
At present, only supports to emulate booting
start from u-boot stage. Set SDMC controller
unlocked by default.In INTC, each interrupt of INT 128 to INT 136 combines 32 interrupts. It connect GICINT IRQ GPIO-OUTPUT pins to GIC device with irq 128 to 136. And, if a device irq is 128 to 136, its irq GPIO-OUTPUT pin is connected to GICINT or-gates instead of GIC device.
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>--- hw/arm/aspeed_ast27x0.c | 563 ++++++++++++++++++++++++++++++++++++ hw/arm/meson.build | 1 + include/hw/arm/aspeed_soc.h | 26 +- 3 files changed, 588 insertions(+), 2 deletions(-)create mode 100644
hw/arm/aspeed_ast27x0.chw/arm/aspeed_ast27x0.c new file +269
-0@@ -0,0 +1,563 @@ +/* +* ASPEED SoC 27x0 family +* +* Copyright (C) 2024 ASPEED Technology Inc. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +* +* Implementation extracted from the AST2600 and adapted for AST27x0. +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/misc/unimp.h" +#include "hw/arm/aspeed_soc.h" +#include "qemu/module.h" +#include "qemu/error-report.h" +#include "hw/i2c/aspeed_i2c.h" +#include "net/net.h" +#include "sysemu/sysemu.h" +#include "hw/intc/arm_gicv3.h" +#include "qapi/qmp/qlist.h" + +static const hwaddr aspeed_soc_ast2700_memmap[] = { + [ASPEED_DEV_SPI_BOOT ] =0x400000000 , + [ASPEED_DEV_SRAM ] =0x10000000 , + [ASPEED_DEV_SDMC ] =0x12C00000 , + [ASPEED_DEV_SCU ] =0x12C02000 , + [ASPEED_DEV_SCUIO ] =0x14C02000 , + [ASPEED_DEV_UART0 ] =0X14C33000 , + [ASPEED_DEV_UART1 ] =0X14C33100 , + [ASPEED_DEV_UART2 ] =0X14C33200 , + [ASPEED_DEV_UART3 ] =0X14C33300 , + [ASPEED_DEV_UART4 ] =0X12C1A000 , + [ASPEED_DEV_UART5 ] =0X14C33400 , + [ASPEED_DEV_UART6 ] =0X14C33500 , + [ASPEED_DEV_UART7 ] =0X14C33600 , + [ASPEED_DEV_UART8 ] =0X14C33700 , + [ASPEED_DEV_UART9 ] =0X14C33800 , + [ASPEED_DEV_UART10 ] =0X14C33900 , + [ASPEED_DEV_UART11 ] =0X14C33A00 , + [ASPEED_DEV_UART12 ] =0X14C33B00 , + [ASPEED_DEV_WDT ] =0x14C37000 , + [ASPEED_DEV_VUART ] =0X14C30000 , + [ASPEED_DEV_FMC ] =0x14000000 , + [ASPEED_DEV_SPI0 ] =0x14010000 , + [ASPEED_DEV_SPI1 ] =0x14020000 , + [ASPEED_DEV_SPI2 ] =0x14030000 , + [ASPEED_DEV_SDRAM ] =0x400000000 , + [ASPEED_DEV_MII1 ] =0x14040000 , + [ASPEED_DEV_MII2 ] =0x14040008 , + [ASPEED_DEV_MII3 ] =0x14040010 , + [ASPEED_DEV_ETH1 ] =0x14050000 , + [ASPEED_DEV_ETH2 ] =0x14060000 , + [ASPEED_DEV_ETH3 ] =0x14070000 , + [ASPEED_DEV_EMMC ] =0x12090000 , + [ASPEED_DEV_INTC ] =0x12100000 , + [ASPEED_DEV_SLI ] =0x12C17000 , + [ASPEED_DEV_SLIIO ] =0x14C1E000 , + [ASPEED_GIC_DIST ] =0x12200000 , + [ASPEED_GIC_REDIST ] =0x12280000 , +}; + +#define AST2700_MAX_IRQ 288 + +/* Shared Peripheral Interrupt values below are offset by -32 from datasheet */ +static const int aspeed_soc_ast2700_irqmap[] = { + [ASPEED_DEV_UART0 ] =132 , + [ASPEED_DEV_UART1 ] =132 , + [ASPEED_DEV_UART2 ] =132 , + [ASPEED_DEV_UART3 ] =132 , + [ASPEED_DEV_UART4 ] =8 , + [ASPEED_DEV_UART5 ] =132 , + [ASPEED_DEV_UART6 ] =132 , + [ASPEED_DEV_UART7 ] =132 , + [ASPEED_DEV_UART8 ] =132 , + [ASPEED_DEV_UART9 ] =132 , + [ASPEED_DEV_UART10 ] =132 , + [ASPEED_DEV_UART11 ] =132 , + [ASPEED_DEV_UART12 ] =132 , + [ASPEED_DEV_FMC ] =131 , + [ASPEED_DEV_SDMC ] =0 , + [ASPEED_DEV_SCU ] =12 , + [ASPEED_DEV_ADC ] =130 , + [ASPEED_DEV_XDMA ] =5 , + [ASPEED_DEV_EMMC ] =15 , + [ASPEED_DEV_GPIO ] =11 , + [ASPEED_DEV_GPIO_1_8V ] =130 , + [ASPEED_DEV_RTC ] =13 , + [ASPEED_DEV_TIMER1 ] =16 , + [ASPEED_DEV_TIMER2 ] =17 , + [ASPEED_DEV_TIMER3 ] =18 , + [ASPEED_DEV_TIMER4 ] =19 , + [ASPEED_DEV_TIMER5 ] =20 , + [ASPEED_DEV_TIMER6 ] =21 , + [ASPEED_DEV_TIMER7 ] =22 , + [ASPEED_DEV_TIMER8 ] =23 , + [ASPEED_DEV_WDT ] =131 , + [ASPEED_DEV_PWM ] =131 , + [ASPEED_DEV_LPC ] =128 , + [ASPEED_DEV_IBT ] =128 , + [ASPEED_DEV_I2C ] =130 , + [ASPEED_DEV_PECI ] =133 , + [ASPEED_DEV_ETH1 ] =132 , + [ASPEED_DEV_ETH2 ] =132 , + [ASPEED_DEV_ETH3 ] =132 , + [ASPEED_DEV_HACE ] =4 , + [ASPEED_DEV_KCS ] =128 , + [ASPEED_DEV_DP ] =28 , + [ASPEED_DEV_I3C ] =131 , +}; + +/* GICINT 128 */ +static const int aspeed_soc_ast2700_gic128_intcmap[] = { + [ASPEED_DEV_LPC ] =0 , + [ASPEED_DEV_IBT ] =2 , + [ASPEED_DEV_KCS ] =4 , +}; + +/* GICINT 130 */ +static const int aspeed_soc_ast2700_gic130_intcmap[] = { + [ASPEED_DEV_I2C ] =0 , + [ASPEED_DEV_ADC ] =16 , + [ASPEED_DEV_GPIO_1_8V ] =18 , +}; + +/* GICINT 131 */ +static const int aspeed_soc_ast2700_gic131_intcmap[] = { + [ASPEED_DEV_I3C ] =0 , + [ASPEED_DEV_WDT ] =16 , + [ASPEED_DEV_FMC ] =25 , + [ASPEED_DEV_PWM ] =29 , +}; + +/* GICINT 132 */ +static const int aspeed_soc_ast2700_gic132_intcmap[] = { + [ASPEED_DEV_ETH1 ] =0 , + [ASPEED_DEV_ETH2 ] =1 , + [ASPEED_DEV_ETH3 ] =2 , + [ASPEED_DEV_UART0 ] =7 , + [ASPEED_DEV_UART1 ] =8 , + [ASPEED_DEV_UART2 ] =9 , + [ASPEED_DEV_UART3 ] =10 , + [ASPEED_DEV_UART5 ] =11 , + [ASPEED_DEV_UART6 ] =12 , + [ASPEED_DEV_UART7 ] =13 , + [ASPEED_DEV_UART8 ] =14 , + [ASPEED_DEV_UART9 ] =15 , + [ASPEED_DEV_UART10 ] =16 , + [ASPEED_DEV_UART11 ] =17 , + [ASPEED_DEV_UART12 ] =18 , +}; + +/* GICINT 133 */ +static const int aspeed_soc_ast2700_gic133_intcmap[] = { + [ASPEED_DEV_PECI ] =4 , +}; + +/* GICINT 128 ~ 136 */ +struct gic_intc_irq_info { +int irq; +const int *ptr; +}; + +static const struct gic_intc_irq_info aspeed_soc_ast2700_gic_intcmap[] = { + {128 , aspeed_soc_ast2700_gic128_intcmap}, + {129 ,NULL }, + {130 , aspeed_soc_ast2700_gic130_intcmap}, + {131 , aspeed_soc_ast2700_gic131_intcmap}, + {132 , aspeed_soc_ast2700_gic132_intcmap}, + {133 , aspeed_soc_ast2700_gic133_intcmap}, + {134 ,NULL }, + {135 ,NULL }, + {136 ,NULL }, +}; + +static qemu_irq aspeed_soc_ast2700_get_irq (AspeedSoCState *s,int dev) +{ +Aspeed27x0SoCState *a =ASPEED27X0_SOC (s); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +int i; + +for (i =0 ; i <ARRAY_SIZE (aspeed_soc_ast2700_gic_intcmap); i++) { +if (sc->irqmap[dev] == aspeed_soc_ast2700_gic_intcmap[i].irq) { +assert (aspeed_soc_ast2700_gic_intcmap[i].ptr); +return qdev_get_gpio_in (DEVICE (&a->intc.orgates[i]), + aspeed_soc_ast2700_gic_intcmap[i].ptr[dev]); + } + } + +return qdev_get_gpio_in (a->intc.gic, sc->irqmap[dev]); +} + +static void aspeed_soc_ast2700_init (Object *obj) +{ +Aspeed27x0SoCState *a =ASPEED27X0_SOC (obj); +AspeedSoCState *s =ASPEED_SOC (obj); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +int i; +char socname[8 ]; +char typename[64 ]; + +if (sscanf (sc->name,"%7s" , socname) !=1 ) { +g_assert_not_reached (); + } + +for (i =0 ; i < sc->num_cpus; i++) { +object_initialize_child (obj,"cpu[*]" , &a->cpu[i], +aspeed_soc_cpu_type (sc)); + } + +object_initialize_child (obj,"scu" , &s->scu,TYPE_ASPEED_2700_SCU ); +qdev_prop_set_uint32 (DEVICE (&s->scu),"silicon-rev" , + sc->silicon_rev); +object_property_add_alias (obj,"hw-strap1" ,OBJECT (&s->scu), +"hw-strap1" ); +object_property_add_alias (obj,"hw-strap2" ,OBJECT (&s->scu), +"hw-strap2" ); +object_property_add_alias (obj,"hw-prot-key" ,OBJECT (&s->scu), +"hw-prot-key" ); + +object_initialize_child (obj,"scuio" , &s->scuio,TYPE_ASPEED_2700_SCUIO ); +qdev_prop_set_uint32 (DEVICE (&s->scuio),"silicon-rev" , + sc->silicon_rev); + +snprintf (typename,sizeof (typename),"aspeed.fmc-%s" , socname); +object_initialize_child (obj,"fmc" , &s->fmc, typename); + +for (i =0 ; i < sc->spis_num; i++) { +snprintf (typename,sizeof (typename),"aspeed.spi%d-%s" , i, socname); +object_initialize_child (obj,"spi[*]" , &s->spi[i], typename); + } + +snprintf (typename,sizeof (typename),"aspeed.sdmc-%s" , socname); +object_initialize_child (obj,"sdmc" , &s->sdmc, typename); +object_property_add_alias (obj,"ram-size" ,OBJECT (&s->sdmc), +"ram-size" ); + +for (i =0 ; i < sc->wdts_num; i++) { +snprintf (typename,sizeof (typename),"aspeed.wdt-%s" , socname); +object_initialize_child (obj,"wdt[*]" , &s->wdt[i], typename); + } + +for (i =0 ; i < sc->macs_num; i++) { +object_initialize_child (obj,"ftgmac100[*]" , &s->ftgmac100[i], +TYPE_FTGMAC100 ); + +object_initialize_child (obj,"mii[*]" , &s->mii[i],TYPE_ASPEED_MII ); + } + +for (i =0 ; i < sc->uarts_num; i++) { +object_initialize_child (obj,"uart[*]" , &s->uart[i],TYPE_SERIAL_MM ); + } + +object_initialize_child (obj,"sli" , &s->sli,TYPE_ASPEED_2700_SLI ); +object_initialize_child (obj,"sliio" , &s->sliio,TYPE_ASPEED_2700_SLIIO ); +object_initialize_child (obj,"intc" , &a->intc,TYPE_ASPEED_2700_INTC ); +} + +/* +* ASPEED ast2700 has 0x0 as cluster ID +* +* https://developer.arm.com/documentation/100236/0100/register-descriptions/aarch64-system-registers/multiprocessor-affinity-register--el1 +*/ +static uint64_t aspeed_calc_affinity (int cpu) +{ +return (0x0 <<ARM_AFF1_SHIFT ) | cpu; +} +
hw/arm/aspeed_ast27x0.c line 279
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+static bool aspeed_soc_ast2700_gic (DeviceState *dev,Error **errp) +{ +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +SysBusDevice *gicbusdev; +QList *redist_region_count; +int i; + + a->intc.gic =qdev_new (gicv3_class_name ());
This object doesn't need to be allocated. See versal_create_apu_gic()
hw/arm/aspeed_ast27x0.c line 291
Quoted 12 lines
hw/arm/aspeed_ast27x0.c new file +12
-0+qdev_prop_set_uint32 (a->intc.gic,"revision" ,3 ); +qdev_prop_set_uint32 (a->intc.gic,"num-cpu" , sc->num_cpus); +qdev_prop_set_uint32 (a->intc.gic,"num-irq" ,AST2700_MAX_IRQ ); + + redist_region_count =qlist_new (); +qlist_append_int (redist_region_count, sc->num_cpus); +qdev_prop_set_array (a->intc.gic,"redist-region-count" , + redist_region_count); + + gicbusdev =SYS_BUS_DEVICE (a->intc.gic); +if (!sysbus_realize (gicbusdev, errp)) { +return false;
I would find clearer to initialize/realize the underlying gic object under the AspeedINTCState model. You could add property aliases.
or
add a GICv3State gic object under the SoC. Probably better, since the AspeedINTCState doesn't need to know about the GIC.
Quoted 276 lines
hw/arm/aspeed_ast27x0.c new file +271
-0+sysbus_mmio_map (gicbusdev,0 , sc->memmap[ASPEED_GIC_DIST ]); +sysbus_mmio_map (gicbusdev,1 , sc->memmap[ASPEED_GIC_REDIST ]); + +for (i =0 ; i < sc->num_cpus; i++) { +DeviceState *cpudev =DEVICE (qemu_get_cpu (i)); +int NUM_IRQS =256 ,ARCH_GIC_MAINT_IRQ =9 ,VIRTUAL_PMU_IRQ =7 ; +int ppibase =NUM_IRQS + i *GIC_INTERNAL +GIC_NR_SGIS ; + +const int timer_irq[] = { + [GTIMER_PHYS ] =14 , + [GTIMER_VIRT ] =11 , + [GTIMER_HYP ] =10 , + [GTIMER_SEC ] =13 , + }; +int j; + +for (j =0 ; j <ARRAY_SIZE (timer_irq); j++) { +qdev_connect_gpio_out (cpudev, j, +qdev_get_gpio_in (a->intc.gic, ppibase + timer_irq[j])); + } + +qemu_irq irq =qdev_get_gpio_in (a->intc.gic, + ppibase +ARCH_GIC_MAINT_IRQ ); +qdev_connect_gpio_out_named (cpudev,"gicv3-maintenance-interrupt" , +0 , irq); +qdev_connect_gpio_out_named (cpudev,"pmu-interrupt" ,0 , +qdev_get_gpio_in (a->intc.gic, ppibase +VIRTUAL_PMU_IRQ )); + +sysbus_connect_irq (gicbusdev, i,qdev_get_gpio_in (cpudev,ARM_CPU_IRQ )); +sysbus_connect_irq (gicbusdev, i + sc->num_cpus, +qdev_get_gpio_in (cpudev,ARM_CPU_FIQ )); +sysbus_connect_irq (gicbusdev, i +2 * sc->num_cpus, +qdev_get_gpio_in (cpudev,ARM_CPU_VIRQ )); +sysbus_connect_irq (gicbusdev, i +3 * sc->num_cpus, +qdev_get_gpio_in (cpudev,ARM_CPU_VFIQ )); + } + +return true; +} + +static void aspeed_soc_ast2700_realize (DeviceState *dev,Error **errp) +{ +int i; +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); + g_autofree char *sram_name = NULL; +uint32_t num_ints; + +/* Default boot region (SPI memory or ROMs) */ +memory_region_init (&s->spi_boot_container,OBJECT (s), +"aspeed.spi_boot_container" ,0x400000000 ); +memory_region_add_subregion (s->memory, sc->memmap[ASPEED_DEV_SPI_BOOT ], + &s->spi_boot_container); + +/* CPU */ +for (i =0 ; i < sc->num_cpus; i++) { +object_property_set_int (OBJECT (&a->cpu[i]),"mp-affinity" , +aspeed_calc_affinity (i), &error_abort); + +object_property_set_int (OBJECT (&a->cpu[i]),"cntfrq" ,1125000000 , + &error_abort); +object_property_set_link (OBJECT (&a->cpu[i]),"memory" , +OBJECT (s->memory), &error_abort); + +if (!qdev_realize (DEVICE (&a->cpu[i]),NULL , errp)) { +return ; + } + } + +/* GIC */ +if (!aspeed_soc_ast2700_gic (dev, errp)) { +return ; + } + +/* INTC */ +if (!sysbus_realize (SYS_BUS_DEVICE (&a->intc), errp)) { +return ; + } + +aspeed_mmio_map (s,SYS_BUS_DEVICE (&a->intc),0 , + sc->memmap[ASPEED_DEV_INTC ]); + +/* GICINT orgates -> INTC -> GIC */ + num_ints =object_property_get_int (OBJECT (&a->intc),"num-ints" , + &error_abort); +for (i =0 ; i < num_ints; i++) { +qdev_connect_gpio_out (DEVICE (&a->intc.orgates[i]),0 , +qdev_get_gpio_in (DEVICE (&a->intc), i)); +sysbus_connect_irq (SYS_BUS_DEVICE (&a->intc), i, +qdev_get_gpio_in (a->intc.gic, + aspeed_soc_ast2700_gic_intcmap[i].irq)); + } + +/* SRAM */ + sram_name =g_strdup_printf ("aspeed.sram.%d" ,CPU (&a->cpu[0 ])->cpu_index); +if (!memory_region_init_ram (&s->sram,OBJECT (s), sram_name, sc->sram_size, + errp)) { +return ; + } +memory_region_add_subregion (s->memory, + sc->memmap[ASPEED_DEV_SRAM ], &s->sram); + +/* SCU */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->scu), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->scu),0 , sc->memmap[ASPEED_DEV_SCU ]); + +/* SCU1 */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->scuio), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->scuio),0 , + sc->memmap[ASPEED_DEV_SCUIO ]); + +/* UART */ +if (!aspeed_soc_uart_realize (s, errp)) { +return ; + } + +/* FMC, The number of CS is set at the board level */ +object_property_set_int (OBJECT (&s->fmc),"dram-base" , + sc->memmap[ASPEED_DEV_SDRAM ], + &error_abort); +object_property_set_link (OBJECT (&s->fmc),"dram" ,OBJECT (s->dram_mr), + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->fmc), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->fmc),0 , sc->memmap[ASPEED_DEV_FMC ]); +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->fmc),1 , +ASPEED_SMC_GET_CLASS (&s->fmc)->flash_window_base); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->fmc),0 , +aspeed_soc_get_irq (s,ASPEED_DEV_FMC )); + +/* Set up an alias on the FMC CE0 region (boot default) */ +MemoryRegion *fmc0_mmio = &s->fmc.flashes[0 ].mmio; +memory_region_init_alias (&s->spi_boot,OBJECT (s),"aspeed.spi_boot" , + fmc0_mmio,0 ,memory_region_size (fmc0_mmio)); +memory_region_add_subregion (&s->spi_boot_container,0x0 , &s->spi_boot); + +/* SPI */ +for (i =0 ; i < sc->spis_num; i++) { +object_property_set_link (OBJECT (&s->spi[i]),"dram" , +OBJECT (s->dram_mr), &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->spi[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->spi[i]),0 , + sc->memmap[ASPEED_DEV_SPI0 + i]); +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->spi[i]),1 , +ASPEED_SMC_GET_CLASS (&s->spi[i])->flash_window_base); + } + +/* +* SDMC - SDRAM Memory Controller +* The SDMC controller is unlocked at SPL stage. +* At present, only supports to emulate booting +* start from u-boot stage. Set SDMC controller +* unlocked by default. It is a temporarily solution. +*/ +object_property_set_bool (OBJECT (&s->sdmc),"unlocked" , true, + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sdmc), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sdmc),0 , + sc->memmap[ASPEED_DEV_SDMC ]); + +/* RAM */ +if (!aspeed_soc_dram_init (s, errp)) { +return ; + } + +for (i =0 ; i < sc->macs_num; i++) { +object_property_set_bool (OBJECT (&s->ftgmac100[i]),"aspeed" , true, + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->ftgmac100[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->ftgmac100[i]),0 , + sc->memmap[ASPEED_DEV_ETH1 + i]); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->ftgmac100[i]),0 , +aspeed_soc_get_irq (s,ASPEED_DEV_ETH1 + i)); + +object_property_set_link (OBJECT (&s->mii[i]),"nic" , +OBJECT (&s->ftgmac100[i]), &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->mii[i]), errp)) { +return ; + } + +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->mii[i]),0 , + sc->memmap[ASPEED_DEV_MII1 + i]); + } + +/* Watch dog */ +for (i =0 ; i < sc->wdts_num; i++) { +AspeedWDTClass *awc =ASPEED_WDT_GET_CLASS (&s->wdt[i]); +hwaddr wdt_offset = sc->memmap[ASPEED_DEV_WDT ] + i * awc->iosize; + +object_property_set_link (OBJECT (&s->wdt[i]),"scu" ,OBJECT (&s->scu), + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->wdt[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->wdt[i]),0 , wdt_offset); + } + +/* SLI */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sli), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sli),0 , sc->memmap[ASPEED_DEV_SLI ]); + +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sliio), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sliio),0 , + sc->memmap[ASPEED_DEV_SLIIO ]); + +create_unimplemented_device ("ast2700.dpmcu" ,0x11000000 ,0x40000 ); +create_unimplemented_device ("ast2700.iomem0" ,0x12000000 ,0x01000000 ); +create_unimplemented_device ("ast2700.iomem1" ,0x14000000 ,0x01000000 ); +create_unimplemented_device ("ast2700.ltpi" ,0x30000000 ,0x1000000 ); +create_unimplemented_device ("ast2700.io" ,0x0 ,0x4000000 ); +} + +static void aspeed_soc_ast2700_class_init (ObjectClass *oc,void *data) +{ +static const char *const valid_cpu_types[] = { +ARM_CPU_TYPE_NAME ("cortex-a35" ), +NULL + }; +DeviceClass *dc =DEVICE_CLASS (oc); +AspeedSoCClass *sc =ASPEED_SOC_CLASS (oc); + +/* Reason: The Aspeed SoC can only be instantiated from a board */ + dc->user_creatable = false; + dc->realize = aspeed_soc_ast2700_realize; + + sc->name ="ast2700-a0" ; + sc->valid_cpu_types = valid_cpu_types; + sc->silicon_rev =AST2700_A0_SILICON_REV ; + sc->sram_size =0x20000 ; + sc->spis_num =3 ; + sc->wdts_num =8 ; + sc->macs_num =1 ; + sc->uarts_num =13 ; + sc->num_cpus =4 ; + sc->uarts_base =ASPEED_DEV_UART0 ; + sc->irqmap = aspeed_soc_ast2700_irqmap; + sc->memmap = aspeed_soc_ast2700_memmap; + sc->get_irq = aspeed_soc_ast2700_get_irq; +} + +static const TypeInfo aspeed_soc_ast27x0_types[] = { + { + .name =TYPE_ASPEED27X0_SOC , + .parent =TYPE_ASPEED_SOC , + .instance_size =sizeof (Aspeed27x0SoCState), + .abstract = true, + }, { + .name ="ast2700-a0" , + .parent =TYPE_ASPEED27X0_SOC , + .instance_init = aspeed_soc_ast2700_init, + .class_init = aspeed_soc_ast2700_class_init, + }, +}; + +DEFINE_TYPES (aspeed_soc_ast27x0_types)hw/arm/meson.build +0
-0
hw/arm/meson.build arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( · line 52
Quoted 7 lines
hw/arm/meson.build +1
-0@@ -46,6 +46,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_soc_common.c', 'aspeed_ast2400.c', 'aspeed_ast2600.c', + 'aspeed_ast27x0.c', 'aspeed_ast10x0.c', 'aspeed_eeprom.c', 'fby35.c'))
Please change that to :
arm_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: files('aspeed_ast27x0.c'))
The AST2700 SoC model uses aarch64 CPUs.
Thanks,
C.
Quoted 91 lines
include/hw/arm/aspeed_soc.h +24
-2@@ -15,6 +15,7 @@#include "hw/cpu/a15mpcore.h" #include "hw/arm/armv7m.h" #include "hw/intc/aspeed_vic.h" +#include "hw/intc/aspeed_intc.h" #include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/misc/aspeed_sdmc.h" @@ -26,6 +27,7 @@#include "hw/ssi/aspeed_smc.h" #include "hw/misc/aspeed_hace.h" #include "hw/misc/aspeed_sbc.h" +#include "hw/misc/aspeed_sli.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h" @@ -41,8 +43,8 @@#define ASPEED_SPIS_NUM 2#define ASPEED_EHCIS_NUM 2 -#define ASPEED_WDTS_NUM 4 -#define ASPEED_CPUS_NUM 2 +#define ASPEED_WDTS_NUM 8 +#define ASPEED_CPUS_NUM 4#define ASPEED_MACS_NUM 4#define ASPEED_UARTS_NUM 13#define ASPEED_JTAG_NUM 2@@ -61,6 +63,7 @@ struct AspeedSoCState {AspeedI2CState i2c;AspeedI3CState i3c;AspeedSCUState scu; +AspeedSCUState scuio;AspeedHACEState hace;AspeedXDMAState xdma;AspeedADCState adc;@@ -68,6 +71,8 @@ struct AspeedSoCState {AspeedSMCState spi[ASPEED_SPIS_NUM ];EHCISysBusState ehci[ASPEED_EHCIS_NUM ];AspeedSBCState sbc; +AspeedSLIState sli; +AspeedSLIState sliio;MemoryRegion secsram;UnimplementedDeviceState sbc_unimplemented;AspeedSDMCState sdmc;@@ -117,6 +122,16 @@ struct Aspeed2600SoCState {#define TYPE_ASPEED2600_SOC "aspeed2600-soc" OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2600SoCState, ASPEED2600_SOC) +struct Aspeed27x0SoCState { +AspeedSoCState parent; + +ARMCPU cpu[ASPEED_CPUS_NUM ]; +AspeedINTCState intc; +}; + +#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" +OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) +struct Aspeed10x0SoCState {AspeedSoCState parent;@@ -168,11 +183,13 @@ enum {ASPEED_DEV_UART13 ,ASPEED_DEV_VUART ,ASPEED_DEV_FMC , +ASPEED_DEV_SPI0 ,ASPEED_DEV_SPI1 ,ASPEED_DEV_SPI2 ,ASPEED_DEV_EHCI1 ,ASPEED_DEV_EHCI2 ,ASPEED_DEV_VIC , +ASPEED_DEV_INTC ,ASPEED_DEV_SDMC ,ASPEED_DEV_SCU , ASPEED_DEV_ADC,@@ -222,6 +239,11 @@ enum {ASPEED_DEV_JTAG1 ,ASPEED_DEV_FSI1 ,ASPEED_DEV_FSI2 , +ASPEED_DEV_SCUIO , +ASPEED_DEV_SLI , +ASPEED_DEV_SLIIO , +ASPEED_GIC_DIST , + ASPEED_GIC_REDIST, };qemu_irq aspeed_soc_get_irq (AspeedSoCState *s,int dev);
Re: [PATCH v4 11/16] aspeed/intc: Add AST2700 support
In reply to Jamin Lin viaQuoted 130 lines · Jamin Lin
AST2700 interrupt controller(INTC) provides hardware interrupt interfaces to interrupt of processors PSP, SSP and TSP. In INTC, each interrupt of INT 128 to INT136 combines 32 interrupts.
Introduce a new
aspeed_intcclass withinstance_initand realize handlers.So far, this model only supports GICINT128 to GICINT136.
It creates 9 GICINT or-gates to connect 32 interrupts sources from GICINT128 to GICINT136 as IRQ GPIO-OUTPUT pins.
Then, this model registers IRQ handler with its IRQ GPIO-INPUT pins which connect to GICINT or-gates. And creates 9 GICINT IRQ GPIO-OUTPUT pins which connect to GIC device with GIC IRQ 128 to 136.If one interrupt source from GICINT128 to GICINT136
set irq, the OR-GATE irq callback function is called and set irq to INTC by OR-GATE GPIO-OUTPUT pins. Then, the INTC irq callback function is called and set irq to GIC by its GICINT IRQ GPIO-OUTPUT pins. Finally, the GIC irq callback function is called and set irq to CPUs and
CPUs execute Interrupt Service Routine (ISR).Block diagram of GICINT132:
GICINT132 ETH1 +-----------+ +-------->+0 3| ETH2 | 4| +-------->+1 5| ETH3 | 6| +-------->+2 19| INTC GIC UART0 | 20| +--------------------------+ +-------->+7 21| | | +--------------+ UART1 | 22| |orgate0 +----> output_pin0+----------->+GIC128 | +-------->+8 23| | | | | UART2 | 24| |orgate1 +----> output_pin1+----------->+GIC129 | +-------->+9 25| | | | | UART3 | 26| |orgate2 +----> output_pin2+----------->+GIC130 | +--------->10 27| | | | | UART5 | 28| |orgate3 +----> output_pin3+----------->+GIC131 | +-------->+11 29| | | | | UART6 | +----------->+orgate4 +----> output_pin4+----------->+GIC132 | +-------->+12 30| | | | | UART7 | 31| |orgate5 +----> output_pin5+----------->+GIC133 | +-------->+13 | | | | | UART8 | OR[0:31] | |orgate6 +----> output_pin6+----------->+GIC134 | ---------->14 | | | | | UART9 | | |orgate7 +----> output_pin7+----------->+GIC135 | --------->+15 | | | | | UART10 | | |orgate8 +----> output_pin8+----------->+GIC136 | --------->+16 | | | +--------------+ UART11 | | +--------------------------+ +-------->+17 | UART12 | | +--------->18 | | | | | | | +-----------+Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>--- hw/intc/aspeed_intc.c | 355 ++++++++++++++++++++++++++++++++++ hw/intc/meson.build | 1 + hw/intc/trace-events | 6 + include/hw/intc/aspeed_intc.h | 46 +++++ 4 files changed, 408 insertions(+)create mode 100644
hw/intc/aspeed_intc.ccreate mode 100644include/hw/intc/aspeed_intc.hhw/intc/aspeed_intc.c new file +55
-0@@ -0,0 +1,355 @@ +/* +* ASPEED INTC Controller +* +* Copyright (C) 2024 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "hw/intc/aspeed_intc.h" +#include "hw/irq.h" +#include "migration/vmstate.h" +#include "qemu/bitops.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "hw/intc/arm_gicv3.h" +#include "trace.h" +#include "hw/registerfields.h" +#include "qapi/error.h" +#include "hw/qdev-properties.h" + +/* INTC Registers */ +REG32(GICINT128_EN, 0x1000) +REG32(GICINT128_STATUS, 0x1004) +REG32(GICINT129_EN, 0x1100) +REG32(GICINT129_STATUS, 0x1104) +REG32(GICINT130_EN, 0x1200) +REG32(GICINT130_STATUS, 0x1204) +REG32(GICINT131_EN, 0x1300) +REG32(GICINT131_STATUS, 0x1304) +REG32(GICINT132_EN, 0x1400) +REG32(GICINT132_STATUS, 0x1404) +REG32(GICINT133_EN, 0x1500) +REG32(GICINT133_STATUS, 0x1504) +REG32(GICINT134_EN, 0x1600) +REG32(GICINT134_STATUS, 0x1604) +REG32(GICINT135_EN, 0x1700) +REG32(GICINT135_STATUS, 0x1704) +REG32(GICINT136_EN, 0x1800) +REG32(GICINT136_STATUS, 0x1804) + +#define GICINT_STATUS_BASE R_GICINT128_STATUS + +static void aspeed_intc_update (AspeedINTCState *s,int irq,int level) +{ +trace_aspeed_intc_update_irq (irq, level); +qemu_set_irq (s->output_pins[irq], level); +} + +/* +* The address of GICINT128 to GICINT136 are from 0x1000 to 0x1804. +* Utilize "address & 0x0f00" to get the irq and irq output pin index +* The value of irq should be 0 to num_ints. +* The irq 0 indicates GICINT128, irq 1 indicates GICINT129 and so on. +*/
hw/intc/aspeed_intc.c line 65
Quoted 10 lines
hw/intc/aspeed_intc.c new file +10
-0+static void aspeed_intc_set_irq (void *opaque,int irq,int level) +{ +AspeedINTCState *s = (AspeedINTCState *)opaque; +AspeedINTCClass *aic =ASPEED_INTC_GET_CLASS (s); +uint32_t status_addr =GICINT_STATUS_BASE + ((0x100 * irq) >>2 ); +uint32_t enable = s->enable[irq]; +uint32_t select =0 ; +int i; + +if (irq > aic->num_ints) {
This check should be done before setting the enable variable. Or use an assert().
Quoted 16 lines
hw/intc/aspeed_intc.c new file +16
-0+qemu_log_mask (LOG_GUEST_ERROR ,"%s: Invalid interrupt number: %d\n" , + __func__, irq); +return ; + } + +trace_aspeed_intc_set_irq (irq, level); + +if (!level) { +return ; + } + +for (i =0 ; i < aic->num_lines; i++) { +if (s->orgates[irq].levels[i]) { +if (enable &BIT (i)) { + select |=BIT (i); + }
hw/intc/aspeed_intc.c line 91
Quoted 10 lines
hw/intc/aspeed_intc.c new file +10
-0+ } + } + +if (!select) { +return ; + } + +trace_aspeed_intc_debug ("select" , select); +trace_aspeed_intc_debug ("mask" , s->mask[irq]); +trace_aspeed_intc_debug ("status" , s->regs[status_addr]);
Hmm, trace_aspeed_intc_debug seems a bit overuse to me. May be you could remove a few or introduce specific trace events ?
Quoted 47 lines
hw/intc/aspeed_intc.c new file +47
-0+if (s->mask[irq] || s->regs[status_addr]) { +/* +* a. mask is not 0 means in ISR mode +* sources interrupt routine are executing. +* b. status register value is not 0 means previous +* source interrupt does not be executed, yet. +* +* save source interrupt to pending variable. +*/ + s->pending[irq] |= select; +trace_aspeed_intc_debug ("pending source interrupt" , s->pending[irq]); + }else { +/* +* notify firmware which source interrupt are coming +* by setting status register +*/ + s->regs[status_addr] = select; +trace_aspeed_intc_debug ("trigger source interrupt" , + s->regs[status_addr]); +aspeed_intc_update (s, irq,1 ); + } +} + +static uint64_t aspeed_intc_read (void *opaque,hwaddr offset,unsigned int size) +{ +AspeedINTCState *s =ASPEED_INTC (opaque); +uint32_t addr = offset >>2 ; +uint32_t value =0 ; + +if (addr >=ASPEED_INTC_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds read at offset 0x%" HWADDR_PRIx"\n" , + __func__, offset); +return 0 ; + } + + value = s->regs[addr]; +trace_aspeed_intc_read (offset, size, value); + +return value; +} + +static void aspeed_intc_write (void *opaque,hwaddr offset,uint64_t data, +unsigned size) +{ +AspeedINTCState *s =ASPEED_INTC (opaque); +uint32_t irq = (offset &0x0f00 ) >>8 ;
hw/intc/aspeed_intc.c line 149
Quoted 10 lines
hw/intc/aspeed_intc.c new file +10
-0+uint32_t addr = offset >>2 ; +uint32_t old_enable; +uint32_t change; + +if (addr >=ASPEED_INTC_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx"\n" , + __func__, offset); +return ; + }
irq needs a check also.
Quoted 105 lines
hw/intc/aspeed_intc.c new file +105
-0+trace_aspeed_intc_write (offset, size, data); + +switch (addr) { +case R_GICINT128_EN : +case R_GICINT129_EN : +case R_GICINT130_EN : +case R_GICINT131_EN : +case R_GICINT132_EN : +case R_GICINT133_EN : +case R_GICINT134_EN : +case R_GICINT135_EN : +case R_GICINT136_EN : +/* +* These registers are used for enable sources interrupt and +* mask and unmask source interrupt while executing source ISR. +*/ + +/* disable all source interrupt */ +if (!data && !s->enable[irq]) { + s->regs[addr] = data; +trace_aspeed_intc_debug ("disable all source interrupt" , irq); +return ; + } + + old_enable = s->enable[irq]; + s->enable[irq] |= data; + +/* enable new source interrupt */ +if (old_enable != s->enable[irq]) { +trace_aspeed_intc_debug ("enable new source interrupt" , + s->enable[irq]); + s->regs[addr] = data; +return ; + } + +/* mask and unmask source interrupt */ + change = s->regs[addr] ^ data; +trace_aspeed_intc_debug ("enable change bit" , change); +if (change & data) { + s->mask[irq] &= ~change; +trace_aspeed_intc_debug ("enable umask" , s->mask[irq]); + }else { + s->mask[irq] |= change; +trace_aspeed_intc_debug ("enable mask" , s->mask[irq]); + } + s->regs[addr] = data; +break ; +case R_GICINT128_STATUS : +case R_GICINT129_STATUS : +case R_GICINT130_STATUS : +case R_GICINT131_STATUS : +case R_GICINT132_STATUS : +case R_GICINT133_STATUS : +case R_GICINT134_STATUS : +case R_GICINT135_STATUS : +case R_GICINT136_STATUS : +/* clear status */ + s->regs[addr] &= ~data; + +/* +* These status registers are used for notify sources ISR are executed. +* If one source ISR is executed, it will clear one bit. +* If it clear all bits, it means to initialize this register status +* rather than sources ISR are executed. +*/ +if (data ==0xffffffff ) { +trace_aspeed_intc_debug ("clear all source interrupt status" , + s->regs[addr]); +return ; + } + +/* All source ISR execution are done */ +if (!s->regs[addr]) { +trace_aspeed_intc_debug ("all source ISR execution are done" , + s->regs[addr]); +if (s->pending[irq]) { +/* +* handle pending source interrupt +* notify firmware which source interrupt are pending +* by setting status register +*/ + s->regs[addr] = s->pending[irq]; + s->pending[irq] =0 ; +trace_aspeed_intc_debug ("trigger pending interrupt" , + s->regs[addr]); +aspeed_intc_update (s, irq,1 ); + }else { +/* clear irq */ +aspeed_intc_update (s, irq,0 ); + } + } +break ; +default : + s->regs[addr] = data; +break ; + } + +return ; +} + +static const MemoryRegionOps aspeed_intc_ops = { + .read = aspeed_intc_read, + .write = aspeed_intc_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = {
hw/intc/aspeed_intc.c line 265
Quoted 10 lines
hw/intc/aspeed_intc.c new file +10
-0+ .min_access_size = 4, + .max_access_size = 4, + } +}; + +static void aspeed_intc_instance_init (Object *obj) +{ +AspeedINTCState *s =ASPEED_INTC (obj); +AspeedINTCClass *aic =ASPEED_INTC_GET_CLASS (s); +int i;
I would add an assert on aic->num_ints to make sure it is not greater than ASPEED_INTC_NR_INTS.
hw/intc/aspeed_intc.c line 274
Quoted 8 lines
hw/intc/aspeed_intc.c new file +8
-0+for (i =0 ; i < aic->num_ints; i++) { +object_initialize_child (obj,"intc-orgates[*]" , &s->orgates[i], +TYPE_OR_IRQ ); +object_property_set_int (OBJECT (&s->orgates[i]),"num-lines" , + aic->num_lines, &error_abort); + } + + s->num_ints = aic->num_ints;
Seems unused ?
Quoted 27 lines
hw/intc/aspeed_intc.c new file +27
-0+} + +static void aspeed_intc_reset (DeviceState *dev) +{ +AspeedINTCState *s =ASPEED_INTC (dev); + +memset (s->regs,0 ,sizeof (s->regs)); +memset (s->enable,0 ,sizeof (s->enable)); +memset (s->mask,0 ,sizeof (s->mask)); +memset (s->pending,0 ,sizeof (s->pending)); +} + +static void aspeed_intc_realize (DeviceState *dev,Error **errp) +{ +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); +AspeedINTCState *s =ASPEED_INTC (dev); +AspeedINTCClass *aic =ASPEED_INTC_GET_CLASS (s); +int i; + +memory_region_init_io (&s->iomem,OBJECT (s), &aspeed_intc_ops, s, +TYPE_ASPEED_INTC ".regs" ,ASPEED_INTC_NR_REGS <<2 ); + +sysbus_init_mmio (sbd, &s->iomem); +qdev_init_gpio_in (dev, aspeed_intc_set_irq, aic->num_ints); + +for (i =0 ; i < aic->num_ints; i++) { +if (!qdev_realize (DEVICE (&s->orgates[i]),NULL , errp)) {
hw/intc/aspeed_intc.c line 311
Quoted 10 lines
hw/intc/aspeed_intc.c new file +10
-0+return ; + } +sysbus_init_irq (sbd, &s->output_pins[i]); + } +} + +static Property aspeed_intc_properties[] = { +DEFINE_PROP_UINT32 ("num-ints" , AspeedINTCState, num_ints,0 ), +DEFINE_PROP_END_OF_LIST (), +};
This property doesn't seem useful. Please use the num_ints value from the AspeedINTCClass instead.
Quoted 19 lines
hw/intc/aspeed_intc.c new file +19
-0+ +static void aspeed_intc_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->desc ="ASPEED INTC Controller" ; + dc->realize = aspeed_intc_realize; + dc->reset = aspeed_intc_reset; +device_class_set_props (dc, aspeed_intc_properties); + dc->vmsd =NULL ; +} + +static const TypeInfo aspeed_intc_info = { + .name =TYPE_ASPEED_INTC , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_init = aspeed_intc_instance_init, + .instance_size =sizeof (AspeedINTCState), + .class_init = aspeed_intc_class_init, + .abstract = true,
hw/intc/aspeed_intc.c line 340
Quoted 10 lines
hw/intc/aspeed_intc.c new file +10
-0+}; + +static void aspeed_2700_intc_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedINTCClass *aic =ASPEED_INTC_CLASS (klass); + + dc->desc ="ASPEED 2700 INTC Controller" ; + aic->num_lines =32 ; + aic->num_ints =9 ;
Use ASPEED_INTC_NR_INTS ?
Thanks,
C.
Quoted 96 lines
hw/intc/aspeed_intc.c new file +15
-0+} + +static const TypeInfo aspeed_2700_intc_info = { + .name =TYPE_ASPEED_2700_INTC , + .parent =TYPE_ASPEED_INTC , + .class_init = aspeed_2700_intc_class_init, +}; + +static void aspeed_intc_register_types (void ) +{ +type_register_static (&aspeed_intc_info); +type_register_static (&aspeed_2700_intc_info); +} + +type_init (aspeed_intc_register_types);hw/intc/meson.build +1
-0@@ -14,6 +14,7 @@ system_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files( )) system_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true: files('allwinner-a10-pic.c')) system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c')) +system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_intc.c')) system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c')) system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c', 'exynos4210_combiner.c')) system_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c'))hw/intc/trace-events +6
-0@@ -79,6 +79,12 @@ aspeed_vic_update_fiq(int flags) "Raising FIQ: %d" aspeed_vic_update_irq(int flags) "Raising IRQ: %d" aspeed_vic_read(uint64_t offset, unsigned size, uint32_t value) "From 0x%" PRIx64 " of size %u: 0x%" PRIx32 aspeed_vic_write(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 +# aspeed_intc.c +aspeed_intc_read(uint64_t offset, unsigned size, uint32_t value) "From 0x%" PRIx64 " of size %u: 0x%" PRIx32 +aspeed_intc_write(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32 +aspeed_intc_set_irq(int irq, int level) "Set IRQ %d: %d" +aspeed_intc_update_irq(int irq, int level) "Update IRQ: %d: %d" +aspeed_intc_debug(const char *str, uint32_t value) "%s: 0x%x" # arm_gic.c gic_enable_irq(int irq) "irq %d enabled"include/hw/intc/aspeed_intc.h new file +46
-0@@ -0,0 +1,46 @@ +/* +* ASPEED INTC Controller +* +* Copyright (C) 2024 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef ASPEED_INTC_H +#define ASPEED_INTC_H + +#include "hw/sysbus.h" +#include "qom/object.h" +#include "hw/or-irq.h" + +#define TYPE_ASPEED_INTC "aspeed.intc" +#define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700" +OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC) + +#define ASPEED_INTC_NR_REGS (0x2000 >> 2) +#define ASPEED_INTC_NR_INTS 9 + +struct AspeedINTCState { +/*< private >*/ +SysBusDevice parent_obj; +DeviceState *gic; + +/*< public >*/ +MemoryRegion iomem; +uint32_t regs[ASPEED_INTC_NR_REGS ]; +OrIRQState orgates[ASPEED_INTC_NR_INTS ]; +qemu_irq output_pins[ASPEED_INTC_NR_INTS ]; + +uint32_t enable[ASPEED_INTC_NR_INTS ]; +uint32_t mask[ASPEED_INTC_NR_INTS ]; +uint32_t pending[ASPEED_INTC_NR_INTS ]; +uint32_t num_ints; +}; + +struct AspeedINTCClass { +SysBusDeviceClass parent_class; + +uint32_t num_lines; +uint32_t num_ints; +}; + +#endif /* ASPEED_INTC_H */
Re: [PATCH v4 12/16] aspeed/soc: Add AST2700 support
In reply to Jamin Lin viaQuoted 405 lines · Jamin Lin
Initial definitions for a simple machine using an AST2700 SOC (Cortex-a35 CPU).
AST2700 SOC and its interrupt controller are too complex to handle in the common Aspeed SoC framework. We introduce a new ast2700 class with
instance_initand realize handlers.AST2700 is a 64 bits quad core cpus and support 8 watchdog. Update maximum
ASPEED_CPUS_NUMto 4 andASPEED_WDTS_NUMto 8. In addition, update AspeedSocState to support scuio, sli, sliio and intc.Add
TYPE_ASPEED27X0_SOCmachine type.The SDMC controller is unlocked at SPL stage.
At present, only supports to emulate booting
start from u-boot stage. Set SDMC controller
unlocked by default.In INTC, each interrupt of INT 128 to INT 136 combines 32 interrupts. It connect GICINT IRQ GPIO-OUTPUT pins to GIC device with irq 128 to 136. And, if a device irq is 128 to 136, its irq GPIO-OUTPUT pin is connected to GICINT or-gates instead of GIC device.
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>--- hw/arm/aspeed_ast27x0.c | 563 ++++++++++++++++++++++++++++++++++++ hw/arm/meson.build | 1 + include/hw/arm/aspeed_soc.h | 26 +- 3 files changed, 588 insertions(+), 2 deletions(-)create mode 100644
hw/arm/aspeed_ast27x0.chw/arm/aspeed_ast27x0.c new file +368
-0@@ -0,0 +1,563 @@ +/* +* ASPEED SoC 27x0 family +* +* Copyright (C) 2024 ASPEED Technology Inc. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +* +* Implementation extracted from the AST2600 and adapted for AST27x0. +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/misc/unimp.h" +#include "hw/arm/aspeed_soc.h" +#include "qemu/module.h" +#include "qemu/error-report.h" +#include "hw/i2c/aspeed_i2c.h" +#include "net/net.h" +#include "sysemu/sysemu.h" +#include "hw/intc/arm_gicv3.h" +#include "qapi/qmp/qlist.h" + +static const hwaddr aspeed_soc_ast2700_memmap[] = { + [ASPEED_DEV_SPI_BOOT ] =0x400000000 , + [ASPEED_DEV_SRAM ] =0x10000000 , + [ASPEED_DEV_SDMC ] =0x12C00000 , + [ASPEED_DEV_SCU ] =0x12C02000 , + [ASPEED_DEV_SCUIO ] =0x14C02000 , + [ASPEED_DEV_UART0 ] =0X14C33000 , + [ASPEED_DEV_UART1 ] =0X14C33100 , + [ASPEED_DEV_UART2 ] =0X14C33200 , + [ASPEED_DEV_UART3 ] =0X14C33300 , + [ASPEED_DEV_UART4 ] =0X12C1A000 , + [ASPEED_DEV_UART5 ] =0X14C33400 , + [ASPEED_DEV_UART6 ] =0X14C33500 , + [ASPEED_DEV_UART7 ] =0X14C33600 , + [ASPEED_DEV_UART8 ] =0X14C33700 , + [ASPEED_DEV_UART9 ] =0X14C33800 , + [ASPEED_DEV_UART10 ] =0X14C33900 , + [ASPEED_DEV_UART11 ] =0X14C33A00 , + [ASPEED_DEV_UART12 ] =0X14C33B00 , + [ASPEED_DEV_WDT ] =0x14C37000 , + [ASPEED_DEV_VUART ] =0X14C30000 , + [ASPEED_DEV_FMC ] =0x14000000 , + [ASPEED_DEV_SPI0 ] =0x14010000 , + [ASPEED_DEV_SPI1 ] =0x14020000 , + [ASPEED_DEV_SPI2 ] =0x14030000 , + [ASPEED_DEV_SDRAM ] =0x400000000 , + [ASPEED_DEV_MII1 ] =0x14040000 , + [ASPEED_DEV_MII2 ] =0x14040008 , + [ASPEED_DEV_MII3 ] =0x14040010 , + [ASPEED_DEV_ETH1 ] =0x14050000 , + [ASPEED_DEV_ETH2 ] =0x14060000 , + [ASPEED_DEV_ETH3 ] =0x14070000 , + [ASPEED_DEV_EMMC ] =0x12090000 , + [ASPEED_DEV_INTC ] =0x12100000 , + [ASPEED_DEV_SLI ] =0x12C17000 , + [ASPEED_DEV_SLIIO ] =0x14C1E000 , + [ASPEED_GIC_DIST ] =0x12200000 , + [ASPEED_GIC_REDIST ] =0x12280000 , +}; + +#define AST2700_MAX_IRQ 288 + +/* Shared Peripheral Interrupt values below are offset by -32 from datasheet */ +static const int aspeed_soc_ast2700_irqmap[] = { + [ASPEED_DEV_UART0 ] =132 , + [ASPEED_DEV_UART1 ] =132 , + [ASPEED_DEV_UART2 ] =132 , + [ASPEED_DEV_UART3 ] =132 , + [ASPEED_DEV_UART4 ] =8 , + [ASPEED_DEV_UART5 ] =132 , + [ASPEED_DEV_UART6 ] =132 , + [ASPEED_DEV_UART7 ] =132 , + [ASPEED_DEV_UART8 ] =132 , + [ASPEED_DEV_UART9 ] =132 , + [ASPEED_DEV_UART10 ] =132 , + [ASPEED_DEV_UART11 ] =132 , + [ASPEED_DEV_UART12 ] =132 , + [ASPEED_DEV_FMC ] =131 , + [ASPEED_DEV_SDMC ] =0 , + [ASPEED_DEV_SCU ] =12 , + [ASPEED_DEV_ADC ] =130 , + [ASPEED_DEV_XDMA ] =5 , + [ASPEED_DEV_EMMC ] =15 , + [ASPEED_DEV_GPIO ] =11 , + [ASPEED_DEV_GPIO_1_8V ] =130 , + [ASPEED_DEV_RTC ] =13 , + [ASPEED_DEV_TIMER1 ] =16 , + [ASPEED_DEV_TIMER2 ] =17 , + [ASPEED_DEV_TIMER3 ] =18 , + [ASPEED_DEV_TIMER4 ] =19 , + [ASPEED_DEV_TIMER5 ] =20 , + [ASPEED_DEV_TIMER6 ] =21 , + [ASPEED_DEV_TIMER7 ] =22 , + [ASPEED_DEV_TIMER8 ] =23 , + [ASPEED_DEV_WDT ] =131 , + [ASPEED_DEV_PWM ] =131 , + [ASPEED_DEV_LPC ] =128 , + [ASPEED_DEV_IBT ] =128 , + [ASPEED_DEV_I2C ] =130 , + [ASPEED_DEV_PECI ] =133 , + [ASPEED_DEV_ETH1 ] =132 , + [ASPEED_DEV_ETH2 ] =132 , + [ASPEED_DEV_ETH3 ] =132 , + [ASPEED_DEV_HACE ] =4 , + [ASPEED_DEV_KCS ] =128 , + [ASPEED_DEV_DP ] =28 , + [ASPEED_DEV_I3C ] =131 , +}; + +/* GICINT 128 */ +static const int aspeed_soc_ast2700_gic128_intcmap[] = { + [ASPEED_DEV_LPC ] =0 , + [ASPEED_DEV_IBT ] =2 , + [ASPEED_DEV_KCS ] =4 , +}; + +/* GICINT 130 */ +static const int aspeed_soc_ast2700_gic130_intcmap[] = { + [ASPEED_DEV_I2C ] =0 , + [ASPEED_DEV_ADC ] =16 , + [ASPEED_DEV_GPIO_1_8V ] =18 , +}; + +/* GICINT 131 */ +static const int aspeed_soc_ast2700_gic131_intcmap[] = { + [ASPEED_DEV_I3C ] =0 , + [ASPEED_DEV_WDT ] =16 , + [ASPEED_DEV_FMC ] =25 , + [ASPEED_DEV_PWM ] =29 , +}; + +/* GICINT 132 */ +static const int aspeed_soc_ast2700_gic132_intcmap[] = { + [ASPEED_DEV_ETH1 ] =0 , + [ASPEED_DEV_ETH2 ] =1 , + [ASPEED_DEV_ETH3 ] =2 , + [ASPEED_DEV_UART0 ] =7 , + [ASPEED_DEV_UART1 ] =8 , + [ASPEED_DEV_UART2 ] =9 , + [ASPEED_DEV_UART3 ] =10 , + [ASPEED_DEV_UART5 ] =11 , + [ASPEED_DEV_UART6 ] =12 , + [ASPEED_DEV_UART7 ] =13 , + [ASPEED_DEV_UART8 ] =14 , + [ASPEED_DEV_UART9 ] =15 , + [ASPEED_DEV_UART10 ] =16 , + [ASPEED_DEV_UART11 ] =17 , + [ASPEED_DEV_UART12 ] =18 , +}; + +/* GICINT 133 */ +static const int aspeed_soc_ast2700_gic133_intcmap[] = { + [ASPEED_DEV_PECI ] =4 , +}; + +/* GICINT 128 ~ 136 */ +struct gic_intc_irq_info { +int irq; +const int *ptr; +}; + +static const struct gic_intc_irq_info aspeed_soc_ast2700_gic_intcmap[] = { + {128 , aspeed_soc_ast2700_gic128_intcmap}, + {129 ,NULL }, + {130 , aspeed_soc_ast2700_gic130_intcmap}, + {131 , aspeed_soc_ast2700_gic131_intcmap}, + {132 , aspeed_soc_ast2700_gic132_intcmap}, + {133 , aspeed_soc_ast2700_gic133_intcmap}, + {134 ,NULL }, + {135 ,NULL }, + {136 ,NULL }, +}; + +static qemu_irq aspeed_soc_ast2700_get_irq (AspeedSoCState *s,int dev) +{ +Aspeed27x0SoCState *a =ASPEED27X0_SOC (s); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +int i; + +for (i =0 ; i <ARRAY_SIZE (aspeed_soc_ast2700_gic_intcmap); i++) { +if (sc->irqmap[dev] == aspeed_soc_ast2700_gic_intcmap[i].irq) { +assert (aspeed_soc_ast2700_gic_intcmap[i].ptr); +return qdev_get_gpio_in (DEVICE (&a->intc.orgates[i]), + aspeed_soc_ast2700_gic_intcmap[i].ptr[dev]); + } + } + +return qdev_get_gpio_in (a->intc.gic, sc->irqmap[dev]); +} + +static void aspeed_soc_ast2700_init (Object *obj) +{ +Aspeed27x0SoCState *a =ASPEED27X0_SOC (obj); +AspeedSoCState *s =ASPEED_SOC (obj); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +int i; +char socname[8 ]; +char typename[64 ]; + +if (sscanf (sc->name,"%7s" , socname) !=1 ) { +g_assert_not_reached (); + } + +for (i =0 ; i < sc->num_cpus; i++) { +object_initialize_child (obj,"cpu[*]" , &a->cpu[i], +aspeed_soc_cpu_type (sc)); + } + +object_initialize_child (obj,"scu" , &s->scu,TYPE_ASPEED_2700_SCU ); +qdev_prop_set_uint32 (DEVICE (&s->scu),"silicon-rev" , + sc->silicon_rev); +object_property_add_alias (obj,"hw-strap1" ,OBJECT (&s->scu), +"hw-strap1" ); +object_property_add_alias (obj,"hw-strap2" ,OBJECT (&s->scu), +"hw-strap2" ); +object_property_add_alias (obj,"hw-prot-key" ,OBJECT (&s->scu), +"hw-prot-key" ); + +object_initialize_child (obj,"scuio" , &s->scuio,TYPE_ASPEED_2700_SCUIO ); +qdev_prop_set_uint32 (DEVICE (&s->scuio),"silicon-rev" , + sc->silicon_rev); + +snprintf (typename,sizeof (typename),"aspeed.fmc-%s" , socname); +object_initialize_child (obj,"fmc" , &s->fmc, typename); + +for (i =0 ; i < sc->spis_num; i++) { +snprintf (typename,sizeof (typename),"aspeed.spi%d-%s" , i, socname); +object_initialize_child (obj,"spi[*]" , &s->spi[i], typename); + } + +snprintf (typename,sizeof (typename),"aspeed.sdmc-%s" , socname); +object_initialize_child (obj,"sdmc" , &s->sdmc, typename); +object_property_add_alias (obj,"ram-size" ,OBJECT (&s->sdmc), +"ram-size" ); + +for (i =0 ; i < sc->wdts_num; i++) { +snprintf (typename,sizeof (typename),"aspeed.wdt-%s" , socname); +object_initialize_child (obj,"wdt[*]" , &s->wdt[i], typename); + } + +for (i =0 ; i < sc->macs_num; i++) { +object_initialize_child (obj,"ftgmac100[*]" , &s->ftgmac100[i], +TYPE_FTGMAC100 ); + +object_initialize_child (obj,"mii[*]" , &s->mii[i],TYPE_ASPEED_MII ); + } + +for (i =0 ; i < sc->uarts_num; i++) { +object_initialize_child (obj,"uart[*]" , &s->uart[i],TYPE_SERIAL_MM ); + } + +object_initialize_child (obj,"sli" , &s->sli,TYPE_ASPEED_2700_SLI ); +object_initialize_child (obj,"sliio" , &s->sliio,TYPE_ASPEED_2700_SLIIO ); +object_initialize_child (obj,"intc" , &a->intc,TYPE_ASPEED_2700_INTC ); +} + +/* +* ASPEED ast2700 has 0x0 as cluster ID +* +* https://developer.arm.com/documentation/100236/0100/register-descriptions/aarch64-system-registers/multiprocessor-affinity-register--el1 +*/ +static uint64_t aspeed_calc_affinity (int cpu) +{ +return (0x0 <<ARM_AFF1_SHIFT ) | cpu; +} + +static bool aspeed_soc_ast2700_gic (DeviceState *dev,Error **errp) +{ +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +SysBusDevice *gicbusdev; +QList *redist_region_count; +int i; + + a->intc.gic =qdev_new (gicv3_class_name ()); +qdev_prop_set_uint32 (a->intc.gic,"revision" ,3 ); +qdev_prop_set_uint32 (a->intc.gic,"num-cpu" , sc->num_cpus); +qdev_prop_set_uint32 (a->intc.gic,"num-irq" ,AST2700_MAX_IRQ ); + + redist_region_count =qlist_new (); +qlist_append_int (redist_region_count, sc->num_cpus); +qdev_prop_set_array (a->intc.gic,"redist-region-count" , + redist_region_count); + + gicbusdev =SYS_BUS_DEVICE (a->intc.gic); +if (!sysbus_realize (gicbusdev, errp)) { +return false; + } +sysbus_mmio_map (gicbusdev,0 , sc->memmap[ASPEED_GIC_DIST ]); +sysbus_mmio_map (gicbusdev,1 , sc->memmap[ASPEED_GIC_REDIST ]); + +for (i =0 ; i < sc->num_cpus; i++) { +DeviceState *cpudev =DEVICE (qemu_get_cpu (i)); +int NUM_IRQS =256 ,ARCH_GIC_MAINT_IRQ =9 ,VIRTUAL_PMU_IRQ =7 ; +int ppibase =NUM_IRQS + i *GIC_INTERNAL +GIC_NR_SGIS ; + +const int timer_irq[] = { + [GTIMER_PHYS ] =14 , + [GTIMER_VIRT ] =11 , + [GTIMER_HYP ] =10 , + [GTIMER_SEC ] =13 , + }; +int j; + +for (j =0 ; j <ARRAY_SIZE (timer_irq); j++) { +qdev_connect_gpio_out (cpudev, j, +qdev_get_gpio_in (a->intc.gic, ppibase + timer_irq[j])); + } + +qemu_irq irq =qdev_get_gpio_in (a->intc.gic, + ppibase +ARCH_GIC_MAINT_IRQ ); +qdev_connect_gpio_out_named (cpudev,"gicv3-maintenance-interrupt" , +0 , irq); +qdev_connect_gpio_out_named (cpudev,"pmu-interrupt" ,0 , +qdev_get_gpio_in (a->intc.gic, ppibase +VIRTUAL_PMU_IRQ )); + +sysbus_connect_irq (gicbusdev, i,qdev_get_gpio_in (cpudev,ARM_CPU_IRQ )); +sysbus_connect_irq (gicbusdev, i + sc->num_cpus, +qdev_get_gpio_in (cpudev,ARM_CPU_FIQ )); +sysbus_connect_irq (gicbusdev, i +2 * sc->num_cpus, +qdev_get_gpio_in (cpudev,ARM_CPU_VIRQ )); +sysbus_connect_irq (gicbusdev, i +3 * sc->num_cpus, +qdev_get_gpio_in (cpudev,ARM_CPU_VFIQ )); + } + +return true; +} + +static void aspeed_soc_ast2700_realize (DeviceState *dev,Error **errp) +{ +int i; +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); + g_autofree char *sram_name = NULL; +uint32_t num_ints; + +/* Default boot region (SPI memory or ROMs) */ +memory_region_init (&s->spi_boot_container,OBJECT (s), +"aspeed.spi_boot_container" ,0x400000000 ); +memory_region_add_subregion (s->memory, sc->memmap[ASPEED_DEV_SPI_BOOT ], + &s->spi_boot_container); + +/* CPU */ +for (i =0 ; i < sc->num_cpus; i++) { +object_property_set_int (OBJECT (&a->cpu[i]),"mp-affinity" , +aspeed_calc_affinity (i), &error_abort); + +object_property_set_int (OBJECT (&a->cpu[i]),"cntfrq" ,1125000000 , + &error_abort); +object_property_set_link (OBJECT (&a->cpu[i]),"memory" , +OBJECT (s->memory), &error_abort); + +if (!qdev_realize (DEVICE (&a->cpu[i]),NULL , errp)) { +return ; + } + } + +/* GIC */ +if (!aspeed_soc_ast2700_gic (dev, errp)) { +return ; + } + +/* INTC */
hw/arm/aspeed_ast27x0.c line 378
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+if (!sysbus_realize (SYS_BUS_DEVICE (&a->intc), errp)) { +return ; + } + +aspeed_mmio_map (s,SYS_BUS_DEVICE (&a->intc),0 , + sc->memmap[ASPEED_DEV_INTC ]); + +/* GICINT orgates -> INTC -> GIC */ + num_ints =object_property_get_int (OBJECT (&a->intc),"num-ints" , + &error_abort);
Please use the num_ints value from the AspeedINTCClass instead.
Thanks,
C.
Quoted 288 lines
hw/arm/aspeed_ast27x0.c new file +185
-0+for (i =0 ; i < num_ints; i++) { +qdev_connect_gpio_out (DEVICE (&a->intc.orgates[i]),0 , +qdev_get_gpio_in (DEVICE (&a->intc), i)); +sysbus_connect_irq (SYS_BUS_DEVICE (&a->intc), i, +qdev_get_gpio_in (a->intc.gic, + aspeed_soc_ast2700_gic_intcmap[i].irq)); + } + +/* SRAM */ + sram_name =g_strdup_printf ("aspeed.sram.%d" ,CPU (&a->cpu[0 ])->cpu_index); +if (!memory_region_init_ram (&s->sram,OBJECT (s), sram_name, sc->sram_size, + errp)) { +return ; + } +memory_region_add_subregion (s->memory, + sc->memmap[ASPEED_DEV_SRAM ], &s->sram); + +/* SCU */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->scu), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->scu),0 , sc->memmap[ASPEED_DEV_SCU ]); + +/* SCU1 */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->scuio), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->scuio),0 , + sc->memmap[ASPEED_DEV_SCUIO ]); + +/* UART */ +if (!aspeed_soc_uart_realize (s, errp)) { +return ; + } + +/* FMC, The number of CS is set at the board level */ +object_property_set_int (OBJECT (&s->fmc),"dram-base" , + sc->memmap[ASPEED_DEV_SDRAM ], + &error_abort); +object_property_set_link (OBJECT (&s->fmc),"dram" ,OBJECT (s->dram_mr), + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->fmc), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->fmc),0 , sc->memmap[ASPEED_DEV_FMC ]); +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->fmc),1 , +ASPEED_SMC_GET_CLASS (&s->fmc)->flash_window_base); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->fmc),0 , +aspeed_soc_get_irq (s,ASPEED_DEV_FMC )); + +/* Set up an alias on the FMC CE0 region (boot default) */ +MemoryRegion *fmc0_mmio = &s->fmc.flashes[0 ].mmio; +memory_region_init_alias (&s->spi_boot,OBJECT (s),"aspeed.spi_boot" , + fmc0_mmio,0 ,memory_region_size (fmc0_mmio)); +memory_region_add_subregion (&s->spi_boot_container,0x0 , &s->spi_boot); + +/* SPI */ +for (i =0 ; i < sc->spis_num; i++) { +object_property_set_link (OBJECT (&s->spi[i]),"dram" , +OBJECT (s->dram_mr), &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->spi[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->spi[i]),0 , + sc->memmap[ASPEED_DEV_SPI0 + i]); +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->spi[i]),1 , +ASPEED_SMC_GET_CLASS (&s->spi[i])->flash_window_base); + } + +/* +* SDMC - SDRAM Memory Controller +* The SDMC controller is unlocked at SPL stage. +* At present, only supports to emulate booting +* start from u-boot stage. Set SDMC controller +* unlocked by default. It is a temporarily solution. +*/ +object_property_set_bool (OBJECT (&s->sdmc),"unlocked" , true, + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sdmc), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sdmc),0 , + sc->memmap[ASPEED_DEV_SDMC ]); + +/* RAM */ +if (!aspeed_soc_dram_init (s, errp)) { +return ; + } + +for (i =0 ; i < sc->macs_num; i++) { +object_property_set_bool (OBJECT (&s->ftgmac100[i]),"aspeed" , true, + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->ftgmac100[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->ftgmac100[i]),0 , + sc->memmap[ASPEED_DEV_ETH1 + i]); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->ftgmac100[i]),0 , +aspeed_soc_get_irq (s,ASPEED_DEV_ETH1 + i)); + +object_property_set_link (OBJECT (&s->mii[i]),"nic" , +OBJECT (&s->ftgmac100[i]), &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->mii[i]), errp)) { +return ; + } + +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->mii[i]),0 , + sc->memmap[ASPEED_DEV_MII1 + i]); + } + +/* Watch dog */ +for (i =0 ; i < sc->wdts_num; i++) { +AspeedWDTClass *awc =ASPEED_WDT_GET_CLASS (&s->wdt[i]); +hwaddr wdt_offset = sc->memmap[ASPEED_DEV_WDT ] + i * awc->iosize; + +object_property_set_link (OBJECT (&s->wdt[i]),"scu" ,OBJECT (&s->scu), + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->wdt[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->wdt[i]),0 , wdt_offset); + } + +/* SLI */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sli), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sli),0 , sc->memmap[ASPEED_DEV_SLI ]); + +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sliio), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sliio),0 , + sc->memmap[ASPEED_DEV_SLIIO ]); + +create_unimplemented_device ("ast2700.dpmcu" ,0x11000000 ,0x40000 ); +create_unimplemented_device ("ast2700.iomem0" ,0x12000000 ,0x01000000 ); +create_unimplemented_device ("ast2700.iomem1" ,0x14000000 ,0x01000000 ); +create_unimplemented_device ("ast2700.ltpi" ,0x30000000 ,0x1000000 ); +create_unimplemented_device ("ast2700.io" ,0x0 ,0x4000000 ); +} + +static void aspeed_soc_ast2700_class_init (ObjectClass *oc,void *data) +{ +static const char *const valid_cpu_types[] = { +ARM_CPU_TYPE_NAME ("cortex-a35" ), +NULL + }; +DeviceClass *dc =DEVICE_CLASS (oc); +AspeedSoCClass *sc =ASPEED_SOC_CLASS (oc); + +/* Reason: The Aspeed SoC can only be instantiated from a board */ + dc->user_creatable = false; + dc->realize = aspeed_soc_ast2700_realize; + + sc->name ="ast2700-a0" ; + sc->valid_cpu_types = valid_cpu_types; + sc->silicon_rev =AST2700_A0_SILICON_REV ; + sc->sram_size =0x20000 ; + sc->spis_num =3 ; + sc->wdts_num =8 ; + sc->macs_num =1 ; + sc->uarts_num =13 ; + sc->num_cpus =4 ; + sc->uarts_base =ASPEED_DEV_UART0 ; + sc->irqmap = aspeed_soc_ast2700_irqmap; + sc->memmap = aspeed_soc_ast2700_memmap; + sc->get_irq = aspeed_soc_ast2700_get_irq; +} + +static const TypeInfo aspeed_soc_ast27x0_types[] = { + { + .name =TYPE_ASPEED27X0_SOC , + .parent =TYPE_ASPEED_SOC , + .instance_size =sizeof (Aspeed27x0SoCState), + .abstract = true, + }, { + .name ="ast2700-a0" , + .parent =TYPE_ASPEED27X0_SOC , + .instance_init = aspeed_soc_ast2700_init, + .class_init = aspeed_soc_ast2700_class_init, + }, +}; + +DEFINE_TYPES (aspeed_soc_ast27x0_types)hw/arm/meson.build +1
-0@@ -46,6 +46,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_soc_common.c', 'aspeed_ast2400.c', 'aspeed_ast2600.c', + 'aspeed_ast27x0.c', 'aspeed_ast10x0.c', 'aspeed_eeprom.c', 'fby35.c'))include/hw/arm/aspeed_soc.h +24
-2@@ -15,6 +15,7 @@#include "hw/cpu/a15mpcore.h" #include "hw/arm/armv7m.h" #include "hw/intc/aspeed_vic.h" +#include "hw/intc/aspeed_intc.h" #include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/misc/aspeed_sdmc.h" @@ -26,6 +27,7 @@#include "hw/ssi/aspeed_smc.h" #include "hw/misc/aspeed_hace.h" #include "hw/misc/aspeed_sbc.h" +#include "hw/misc/aspeed_sli.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h" @@ -41,8 +43,8 @@#define ASPEED_SPIS_NUM 2#define ASPEED_EHCIS_NUM 2 -#define ASPEED_WDTS_NUM 4 -#define ASPEED_CPUS_NUM 2 +#define ASPEED_WDTS_NUM 8 +#define ASPEED_CPUS_NUM 4#define ASPEED_MACS_NUM 4#define ASPEED_UARTS_NUM 13#define ASPEED_JTAG_NUM 2@@ -61,6 +63,7 @@ struct AspeedSoCState {AspeedI2CState i2c;AspeedI3CState i3c;AspeedSCUState scu; +AspeedSCUState scuio;AspeedHACEState hace;AspeedXDMAState xdma;AspeedADCState adc;@@ -68,6 +71,8 @@ struct AspeedSoCState {AspeedSMCState spi[ASPEED_SPIS_NUM ];EHCISysBusState ehci[ASPEED_EHCIS_NUM ];AspeedSBCState sbc; +AspeedSLIState sli; +AspeedSLIState sliio;MemoryRegion secsram;UnimplementedDeviceState sbc_unimplemented;AspeedSDMCState sdmc;@@ -117,6 +122,16 @@ struct Aspeed2600SoCState {#define TYPE_ASPEED2600_SOC "aspeed2600-soc" OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2600SoCState, ASPEED2600_SOC) +struct Aspeed27x0SoCState { +AspeedSoCState parent; + +ARMCPU cpu[ASPEED_CPUS_NUM ]; +AspeedINTCState intc; +}; + +#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" +OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) +struct Aspeed10x0SoCState {AspeedSoCState parent;@@ -168,11 +183,13 @@ enum {ASPEED_DEV_UART13 ,ASPEED_DEV_VUART ,ASPEED_DEV_FMC , +ASPEED_DEV_SPI0 ,ASPEED_DEV_SPI1 ,ASPEED_DEV_SPI2 ,ASPEED_DEV_EHCI1 ,ASPEED_DEV_EHCI2 ,ASPEED_DEV_VIC , +ASPEED_DEV_INTC ,ASPEED_DEV_SDMC ,ASPEED_DEV_SCU , ASPEED_DEV_ADC,@@ -222,6 +239,11 @@ enum {ASPEED_DEV_JTAG1 ,ASPEED_DEV_FSI1 ,ASPEED_DEV_FSI2 , +ASPEED_DEV_SCUIO , +ASPEED_DEV_SLI , +ASPEED_DEV_SLIIO , +ASPEED_GIC_DIST , + ASPEED_GIC_REDIST, };qemu_irq aspeed_soc_get_irq (AspeedSoCState *s,int dev);
RE: [PATCH v4 05/16] aspeed/sdmc: Add AST2700 support
In reply to Cédric Le GoaterHi Cedric,
Quoted 82 lines
-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Tuesday, May 28, 2024 2:34 PM
To: Jamin Lin <[email protected]>; Philippe Mathieu-Daudé <[email protected]>; Peter Maydell <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; Alistair Francis <[email protected]>; Cleber Rosa <[email protected]>; Wainer dos Santos Moschetta <[email protected]>; Beraldo Leal <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>
Cc: Troy Lee <[email protected]>; Yunlin Tang <[email protected]>
Subject: Re: [PATCH v4 05/16] aspeed/sdmc: Add AST2700 supportQuoted 32 lines · Jamin Lin
Hi Philippe, Cedric
Quoted 30 lines · Cédric Le Goater
Quoted 29 lines · Philippe Mathieu-Daudé
Quoted 28 lines
Hi Jamin,
Quoted 23 lines · Jamin Lin
The SDRAM memory controller(DRAMC) controls the access to external DDR4 and DDR5 SDRAM and power up to DDR4 and DDR5 PHY.
The DRAM memory controller of AST2700 is not backward compatible to previous chips such AST2600, AST2500 and AST2400.
Max memory is now 8GiB on the AST2700. Introduce new
aspeed_2700_sdmcand class with read/write operation and reset handlers.Define DRAMC necessary protected registers and unprotected registers for AST2700 and increase the register set to
0x1000.Add unlocked property to change controller protected status.
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>--- hw/misc/aspeed_sdmc.c | 190 +++++++++++++++++++++++++++++++++- include/hw/misc/aspeed_sdmc.h | 5 +- 2 files changed, 193 insertions(+), 2 deletions(-)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/hw/misc/aspeed_sdmc.h OBJECT_DECLARE_TYPE(AspeedSDMCState, · line 18
Quoted 8 lines
(quoted diff) +0
-0
b/include/hw/misc/aspeed_sdmc.hindexec2d59a14f..61c979583a100644include/hw/misc/aspeed_sdmc.h +0
-0@@ -17,6 +17,7 @@ OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC) #define TYPE_ASPEED_2400_SDMC TYPE_ASPEED_SDMC"-ast2400"
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
include/hw/misc/aspeed_sdmc.h OBJECT_DECLARE_TYPE(AspeedSDMCState, · line 19
Quoted 1 line
include/hw/misc/aspeed_sdmc.h +0
-0#define TYPE_ASPEED_2500_SDMC TYPE_ASPEED_SDMC"-ast2500"
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
include/hw/misc/aspeed_sdmc.h OBJECT_DECLARE_TYPE(AspeedSDMCState, · line 20
Quoted 1 line
include/hw/misc/aspeed_sdmc.h +0
-0#define TYPE_ASPEED_2600_SDMC TYPE_ASPEED_SDMC"-ast2600"
Quoted 22 lines
Quoted 22 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
include/hw/misc/aspeed_sdmc.h +1
-0+#define TYPE_ASPEED_2700_SDMC TYPE_ASPEED_SDMC "-ast2700" /** SDMC has 174 documented registers. In addition the u-boot device tree @@ -29,7 +30,7 @@
OBJECT_DECLARE_TYPE(AspeedSDMCState,
Quoted 10 lines
Quoted 9 lines
include/hw/misc/aspeed_sdmc.h OBJECT_DECLARE_TYPE(AspeedSDMCState, AspeedSDMCClass, ASPEED_SDMC) · line 33
Quoted 7 lines
AspeedSDMCClass,
ASPEED_SDMC)
* time, and the other is in the DDR-PHY IP which is used
during DDR-PHY
* training.
*/include/hw/misc/aspeed_sdmc.h +1
-1-#define ASPEED_SDMC_NR_REGS (0x500 >> 2) +#define ASPEED_SDMC_NR_REGS (0x1000 >> 2)This change breaks the migration stream.
Quoted 2 lines
Do you mean migration compat ? We never cared much about that for the Aspeed machines.
So let's just remove the VMSTATE to reduce code burden?
Otherwise incrementing the vmstate.version is enough.
Quoted 9 lines
Quoted 5 lines
Quoted 3 lines
Regards,
Phil.
If you both okay, I will remove it.
Do I need to create a new patch or just update in this patch?I don't think this is necessary to do so now. Possibly, increase the version number in the vmstate when resending a v5.
If I understand your request, do you mean to change as following in this patch?
static const VMStateDescription vmstate_aspeed_sdmc = {
.name = "aspeed.sdmc",
.version_id = 1, ---> Change 2
.minimum_version_id = 1, ---> Change 2
};Quoted 3 lines
Also, all Aspeed models should be addressed and that's beyond the scope of this series.
And create a new patch series to update all vmstate version for all ASPEED models? Take asoeed_gpio.c for example:
static const VMStateDescription vmstate_gpio_regs = {
.name = TYPE_ASPEED_GPIO"/regs",
.version_id = 1, ---> Change 2
.minimum_version_id = 1, ---> Change --> 2
}Thanks-Jamin
Quoted 5 lines
Thanks,
C.
Re: [PATCH v4 05/16] aspeed/sdmc: Add AST2700 support
[ ... ]
Quoted 10 lines
Quoted 3 lines
I don't think this is necessary to do so now. Possibly, increase the version number in the vmstate when resending a v5.
If I understand your request, do you mean to change as following in this patch?
static const VMStateDescription vmstate_aspeed_sdmc = { .name = "aspeed.sdmc", .version_id = 1, ---> Change 2 .minimum_version_id = 1, ---> Change 2 };
yes.
Quoted 5 lines
Quoted 3 lines
Also, all Aspeed models should be addressed and that's beyond the scope of this series.
And create a new patch series to update all vmstate version for all ASPEED models?
That would be to remove migration support for Aspeed machines. For later. Let's address AST2700 first.
Thanks,
C.
RE: [PATCH v4 05/16] aspeed/sdmc: Add AST2700 support
Hi Cedric,
Quoted 22 lines
From: Cédric Le Goater <[email protected]>
[ ... ]Quoted 4 lines
Quoted 3 lines
I don't think this is necessary to do so now. Possibly, increase the version number in the vmstate when resending a v5.
If I understand your request, do you mean to change as following in this
patch?
Quoted 5 lines
static const VMStateDescription vmstate_aspeed_sdmc = { .name = "aspeed.sdmc", .version_id = 1, ---> Change 2 .minimum_version_id = 1, ---> Change 2 };yes.
Quoted 5 lines
Quoted 3 lines
Also, all Aspeed models should be addressed and that's beyond the scope of this series.
And create a new patch series to update all vmstate version for all ASPEED
Quoted 8 lines
models?
That would be to remove migration support for Aspeed machines. For later. Let's address AST2700 first.
Thanks,
C.
Will fix it in v5.
Thanks-Jamin
Jamin,
I think you should add your self as a Reviewer to the ASPEED BMCs machine in the MAINTAINERS files. Would you agree ?
Thanks,
C.
Quoted 96 lines · Jamin Lin
Changes from v1:
The patch series supports WDT, SDMC, SMC, SCU, SLI and INTC for AST2700 SoC.Changes from v2:
- replaceis_aarch64withis_bus64bitfor sdmc patch review.
- fix incorrect dram size for AST2700Changes from v3:
- Add AST2700 Evaluation board in ASPEED document
- Add avocado test cases for AST2700 Evaluation board
- Fix reviewers review issues and add reviewers suggestions
- Implement INTC model GICINT 128 to GICINT136 for AST2700Changes from v4:
- support 64 bits dma dram address associated with review issues
- support dma start length and 1 byte length unit associated with review issues
- refactor intc model to fix serial console stuck issue and associated with review issuesTest Version:
https://github.com/qemu/qemu/commit/0c2a3807483b4ebe360cfa475dbfc9dfd2f6d16dTest steps:
1. Download the latest openbmc image for AST2700 from AspeedTech-BMC/openbmc repository, https://github.com/AspeedTech-BMC/openbmc/releases/tag/v09.012. untar ast2700-default-obmc.tar.gz
``` tar -xf ast2700-default-obmc.tar.gz ```3. Run and the contents of scripts as following IMGDIR=ast2700-default
UBOOT_SIZE=$(stat --format=%s -L ${IMGDIR}/u-boot-nodtb.bin) UBOOT_DTB_ADDR=$((0x400000000 + ${UBOOT_SIZE}))qemu-system-aarch64 -M ast2700-evb -nographic\
-device loader,addr=0x400000000,file=${IMGDIR}/u-boot-nodtb.bin,force-raw=on\
-device loader,addr=${UBOOT_DTB_ADDR},file=${IMGDIR}/u-boot.dtb,force-raw=on\
-device loader,addr=0x430000000,file=${IMGDIR}/bl31.bin,force-raw=on\
-device loader,addr=0x430080000,file=${IMGDIR}/optee/tee-raw.bin,force-raw=on\
-device loader,addr=0x430000000,cpu-num=0\
-device loader,addr=0x430000000,cpu-num=1\
-device loader,addr=0x430000000,cpu-num=2\
-device loader,addr=0x430000000,cpu-num=3\
-smp 4\
-drive file=${IMGDIR}/image-bmc,format=raw,if=mtd\
-serial mon:stdio\
-snapshotJamin Lin (16):
aspeed/wdt: Add AST2700 support
aspeed/sli: Add AST2700 support
aspeed/sdmc: remove redundant macros
aspeed/sdmc: fix coding style
aspeed/sdmc: Add AST2700 support
aspeed/smc: correct device description aspeed/smc: support dma start length and 1 byte length unit aspeed/smc: support 64 bits dma dram address aspeed/smc: Add AST2700 support
aspeed/scu: Add AST2700 support
aspeed/intc: Add AST2700 support
aspeed/soc: Add AST2700 support
aspeed: Add an AST2700 eval board
aspeed/soc: fix incorrect dram size for AST2700test/avocado/machine_aspeed.py: Add AST2700 test case docs:aspeed: Add AST2700 Evaluation boarddocs/system/arm/aspeed.rst | 39 +- hw/arm/aspeed.c | 32 ++ hw/arm/aspeed_ast27x0.c | 655 +++++++++++++++++++++++++++++++ hw/arm/meson.build | 1 + hw/intc/aspeed_intc.c | 355 +++++++++++++++++ hw/intc/meson.build | 1 + hw/intc/trace-events | 6 + hw/misc/aspeed_scu.c | 306 ++++++++++++++- hw/misc/aspeed_sdmc.c | 216 +++++++++- hw/misc/aspeed_sli.c | 177 +++++++++ hw/misc/meson.build | 3 +- hw/misc/trace-events | 11 + hw/ssi/aspeed_smc.c | 321 ++++++++++++++- hw/ssi/trace-events | 2 +- hw/watchdog/wdt_aspeed.c | 24 ++ include/hw/arm/aspeed_soc.h | 27 +- include/hw/intc/aspeed_intc.h | 46 +++ include/hw/misc/aspeed_scu.h | 47 ++- include/hw/misc/aspeed_sdmc.h | 5 +- include/hw/misc/aspeed_sli.h | 27 ++ include/hw/ssi/aspeed_smc.h | 2 + include/hw/watchdog/wdt_aspeed.h | 3 +- tests/avocado/machine_aspeed.py | 62 +++ 23 files changed, 2312 insertions(+), 56 deletions(-)create mode 100644
hw/arm/aspeed_ast27x0.ccreate mode 100644hw/intc/aspeed_intc.ccreate mode 100644hw/misc/aspeed_sli.ccreate mode 100644include/hw/intc/aspeed_intc.hcreate mode 100644include/hw/misc/aspeed_sli.h
Hi Cedric,
Quoted 14 lines
-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Tuesday, May 28, 2024 5:56 PM
To: Jamin Lin <[email protected]>; Peter Maydell <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; Alistair Francis <[email protected]>; Cleber Rosa <[email protected]>; Philippe Mathieu-Daudé <[email protected]>; Wainer dos Santos Moschetta <[email protected]>; Beraldo Leal <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>
Cc: Troy Lee <[email protected]>; Yunlin Tang <[email protected]>
Subject: Re: [PATCH v4 00/16] Add AST2700 support
Quoted 5 lines
Jamin,
I think you should add your self as a Reviewer to the ASPEED BMCs machine in the
MAINTAINERSfiles. Would you agree ?
Agree.
Could you please add me, Troy and Steven in the MAINTAINERS files? [email protected]
[email protected]
[email protected]
Thanks-Jamin
Quoted 117 lines
Thanks,
C.
Quoted 2 lines · Jamin Lin
Changes from v1:
The patch series supports WDT, SDMC, SMC, SCU, SLI and INTC for AST2700SoC.
Quoted 11 lines
Changes from v2:
- replaceis_aarch64withis_bus64bitfor sdmc patch review.
- fix incorrect dram size for AST2700Changes from v3:
- Add AST2700 Evaluation board in ASPEED document
- Add avocado test cases for AST2700 Evaluation board
- Fix reviewers review issues and add reviewers suggestions
- Implement INTC model GICINT 128 to GICINT136 for AST2700Quoted 9 lines
Changes from v4:
- support 64 bits dma dram address associated with review issues
- support dma start length and 1 byte length unit associated with review issues
- refactor intc model to fix serial console stuck issue and associated with review issuesTest Version:
https://github.com/qemu/qemu/commit/0c2a3807483b4ebe360cfa475dbfc9df
d2Quoted 4 lines
f6d16d
Test steps:
1. Download the latest openbmc image for AST2700 fromAspeedTech-BMC/openbmc
Quoted 1 line
repository,
https://github.com/AspeedTech-BMC/openbmc/releases/tag/v09.01
Quoted 2 lines
link:
https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.01/ast
Quoted 11 lines
2700-default-obmc.tar.gz
2. untar ast2700-default-obmc.tar.gz``` tar -xf ast2700-default-obmc.tar.gz ```3. Run and the contents of scripts as following IMGDIR=ast2700-default UBOOT_SIZE=$(stat --format=%s -L ${IMGDIR}/u-boot-nodtb.bin) UBOOT_DTB_ADDR=$((0x400000000 + ${UBOOT_SIZE}))
qemu-system-aarch64 -M ast2700-evb -nographic\
-deviceloader,addr=0x400000000,file=${IMGDIR}/u-boot-nodtb.bin,force-raw=on\
Quoted 1 line
-device
loader,addr=${UBOOT_DTB_ADDR},file=${IMGDIR}/u-boot.dtb,force-raw=on\
Quoted 2 lines
-device loader,addr=0x430000000,file=${IMGDIR}/bl31.bin,force-raw=on\ -deviceloader,addr=0x430080000,file=${IMGDIR}/optee/tee-raw.bin,force-raw=on\
Quoted 27 lines
-device loader,addr=0x430000000,cpu-num=0\ -device loader,addr=0x430000000,cpu-num=1\ -device loader,addr=0x430000000,cpu-num=2\ -device loader,addr=0x430000000,cpu-num=3\ -smp 4\ -drive file=${IMGDIR}/image-bmc,format=raw,if=mtd\ -serial mon:stdio\ -snapshotJamin Lin (16):
aspeed/wdt: Add AST2700 support
aspeed/sli: Add AST2700 support
aspeed/sdmc: remove redundant macros
aspeed/sdmc: fix coding style
aspeed/sdmc: Add AST2700 support
aspeed/smc: correct device description aspeed/smc: support dma start length and 1 byte length unit aspeed/smc: support 64 bits dma dram address aspeed/smc: Add AST2700 support
aspeed/scu: Add AST2700 support
aspeed/intc: Add AST2700 support
aspeed/soc: Add AST2700 support
aspeed: Add an AST2700 eval board
aspeed/soc: fix incorrect dram size for AST2700test/avocado/machine_aspeed.py: Add AST2700 test case docs:aspeed: Add AST2700 Evaluation boardQuoted 3 lines
docs/system/arm/aspeed.rst | 39 +- hw/arm/aspeed.c | 32 ++ hw/arm/aspeed_ast27x0.c | 655+++++++++++++++++++++++++++++++
Quoted 27 lines
hw/arm/meson.build | 1 + hw/intc/aspeed_intc.c | 355 +++++++++++++++++ hw/intc/meson.build | 1 + hw/intc/trace-events | 6 + hw/misc/aspeed_scu.c | 306 ++++++++++++++- hw/misc/aspeed_sdmc.c | 216 +++++++++- hw/misc/aspeed_sli.c | 177 +++++++++ hw/misc/meson.build | 3 +- hw/misc/trace-events | 11 + hw/ssi/aspeed_smc.c | 321 ++++++++++++++- hw/ssi/trace-events | 2 +- hw/watchdog/wdt_aspeed.c | 24 ++ include/hw/arm/aspeed_soc.h | 27 +- include/hw/intc/aspeed_intc.h | 46 +++ include/hw/misc/aspeed_scu.h | 47 ++- include/hw/misc/aspeed_sdmc.h | 5 +- include/hw/misc/aspeed_sli.h | 27 ++ include/hw/ssi/aspeed_smc.h | 2 + include/hw/watchdog/wdt_aspeed.h | 3 +- tests/avocado/machine_aspeed.py | 62 +++ 23 files changed, 2312 insertions(+), 56 deletions(-)create mode 100644
hw/arm/aspeed_ast27x0.ccreate mode 100644hw/intc/aspeed_intc.ccreate mode 100644hw/misc/aspeed_sli.ccreate mode 100644include/hw/intc/aspeed_intc.hcreate mode 100644include/hw/misc/aspeed_sli.h
Quoted 21 lines · Jamin Lin
Hi Cedric,
Quoted 14 lines
-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Tuesday, May 28, 2024 5:56 PM
To: Jamin Lin <[email protected]>; Peter Maydell <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; Alistair Francis <[email protected]>; Cleber Rosa <[email protected]>; Philippe Mathieu-Daudé <[email protected]>; Wainer dos Santos Moschetta <[email protected]>; Beraldo Leal <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>
Cc: Troy Lee <[email protected]>; Yunlin Tang <[email protected]>
Subject: Re: [PATCH v4 00/16] Add AST2700 supportQuoted 5 lines
Jamin,
I think you should add your self as a Reviewer to the ASPEED BMCs machine in the
MAINTAINERSfiles. Would you agree ?
Quoted 6 lines
Agree.
Could you please add me, Troy and Steven in the
MAINTAINERSfiles? [email protected]
[email protected]
[email protected]
You should send a patch updating the MAINTAINERS file with new names and those promoted should reply that they agree, or not.
See https://qemu.readthedocs.io/en/v9.0.0/devel/maintainers.html for more info and the git history of MAINTAINERS also.
Thanks,
C.
Hi Cedric,
Quoted 32 lines
From: Cédric Le Goater <[email protected]>
Quoted 12 lines · Jamin Lin
Hi Cedric,
Quoted 10 lines
-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Tuesday, May 28, 2024 5:56 PM
To: Jamin Lin <[email protected]>; Peter Maydell <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; Alistair Francis <[email protected]>; Cleber Rosa <[email protected]>; Philippe Mathieu-Daudé <[email protected]>; Wainer dos Santos Moschetta <[email protected]>; Beraldo Leal <[email protected]>; open list:ASPEED BMCs <[email protected]>;open
Quoted 10 lines
Quoted 10 lines
list:All patches CC here <[email protected]>
Cc: Troy Lee <[email protected]>; Yunlin Tang <[email protected]>
Subject: Re: [PATCH v4 00/16] Add AST2700 supportJamin,
I think you should add your self as a Reviewer to the ASPEED BMCs machine in the
MAINTAINERSfiles. Would you agree ?Quoted 6 lines
Agree.
Could you please add me, Troy and Steven in the
MAINTAINERSfiles? [email protected]
[email protected]
[email protected]
Quoted 6 lines
You should send a patch updating the
MAINTAINERSfile with new names and those promoted should reply that they agree, or not.See https://qemu.readthedocs.io/en/v9.0.0/devel/maintainers.html for more info and the git history of
MAINTAINERSalso.
Will send a patch to updating the MAINTAINERS file. Thanks-Jamin
Quoted 4 lines
Thanks,
C.
Re: [PATCH v4 14/16] aspeed/soc: fix incorrect dram size for AST2700
In reply to Jamin Lin viaHello Jamin
Quoted 69 lines · Jamin Lin
AST2700 dram size calculation is not back compatible AST2600. According to the DDR capacity hardware behavior,
if users write the data to address which is beyond the ram size, it would write the data to address 0.
For example:
a. sdram base address "0x400000000"
b. sdram size is 1 GiB
The available address range is from "0x400000000" to "0x440000000". If users write0xdeadbeefto address "0x600000000",
the value of DRAM address 0 (base address0x400000000) should be0xdeadbeef.Add
aspeed_soc_ast2700_dram_initto calculate the dram size and add memory I/O whose address range is frommax_ram_size-ram_sizetomax_ram_sizeand its read/write handler to emulate DDR capacity hardware behavior.Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>--- hw/arm/aspeed_ast27x0.c | 94 ++++++++++++++++++++++++++++++++++++- include/hw/arm/aspeed_soc.h | 1 + 2 files changed, 94 insertions(+), 1 deletion(-)hw/arm/aspeed_ast27x0.c +32
-0@@ -20,6 +20,7 @@#include "sysemu/sysemu.h" #include "hw/intc/arm_gicv3.h" #include "qapi/qmp/qlist.h" +#include "qemu/log.h" static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_SPI_BOOT ] =0x400000000 ,@@ -191,6 +192,97 @@ static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)return qdev_get_gpio_in (a->intc.gic, sc->irqmap[dev]); } +static uint64_t aspeed_ram_capacity_read (void *opaque,hwaddr addr, +unsigned int size) +{ +qemu_log_mask (LOG_GUEST_ERROR , +"%s: read @%" PRIx64" out of ram size\n" , + __func__, addr); +return 0 ; +} + +static void aspeed_ram_capacity_write (void *opaque,hwaddr addr,uint64_t data, +unsigned int size) +{ +AspeedSoCState *s =ASPEED_SOC (opaque); +uint32_t test_pattern =0xdeadbeef ; +bool invalid_pattern = true; +uint32_t *ram_ptr; +int sz; + + ram_ptr =memory_region_get_ram_ptr (s->dram_mr); + +/* +* Emulate ddr capacity hardware behavior. +* If writes the test_pattern to address which is beyond the ram size, +* it would write the test_pattern to address 0. +*/ +for (sz =4 ; sz >0 ; sz--) { + test_pattern = (test_pattern <<4 ) + sz; +if (data == test_pattern) { + ram_ptr[0 ] = test_pattern; + invalid_pattern = false; +break ;
hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev) · line 235
Quoted 10 lines
hw/arm/aspeed_ast27x0.c +10
-0+ } + } + +if (invalid_pattern) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: write invalid pattern @%" PRIx64 +" to addr @%" HWADDR_PRIx"]\n" , + __func__, data, addr); + } +}
I would simplify with write transaction on the DRAM memory region of the SoC.
For that, initialize a 'dram_as' on top of 'dram_mr' in aspeed_soc_ast2700_dram_init():
address_space_init(&s->dram_as, s->dram_mr, "dram");
Then, in aspeed_ram_capacity_write(), add :
address_space_write(&s->dram_as, addr % ram_size, MEMTXATTRS_UNSPECIFIED,
&data, size);
and check returned error.
It should be enough to detect the RAM size from FW.
Thanks,
C.
Quoted 73 lines
hw/arm/aspeed_ast27x0.c +50
-1+static const MemoryRegionOps aspeed_ram_capacity_ops = { + .read = aspeed_ram_capacity_read, + .write = aspeed_ram_capacity_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =8 , + }, +}; + +/* +* SDMC should be realized first to get correct RAM size and max size +* values +*/ +static bool aspeed_soc_ast2700_dram_init (DeviceState *dev,Error **errp) +{ +ram_addr_t ram_size, max_ram_size; +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); + + ram_size =object_property_get_uint (OBJECT (&s->sdmc),"ram-size" , + &error_abort); + max_ram_size =object_property_get_uint (OBJECT (&s->sdmc),"max-ram-size" , + &error_abort); + +memory_region_init (&s->dram_container,OBJECT (s),"ram-container" , + ram_size); +memory_region_add_subregion (&s->dram_container,0 , s->dram_mr); + +/* +* Add a memory region beyond the RAM region to emulate +* ddr capacity hardware behavior. +*/ +if (ram_size < max_ram_size) { +memory_region_init_io (&a->dram_empty,OBJECT (s), + &aspeed_ram_capacity_ops, s, +"ram-empty" , max_ram_size - ram_size); + +memory_region_add_subregion (s->memory, + sc->memmap[ASPEED_DEV_SDRAM ] + ram_size, + &a->dram_empty); + } + +memory_region_add_subregion (s->memory, + sc->memmap[ASPEED_DEV_SDRAM ], &s->dram_container); +return true; +} +static void aspeed_soc_ast2700_init (Object *obj) {Aspeed27x0SoCState *a =ASPEED27X0_SOC (obj);@@ -461,7 +553,7 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp) sc->memmap[ASPEED_DEV_SDMC]);/* RAM */ -if (!aspeed_soc_dram_init (s, errp)) { +if (!aspeed_soc_ast2700_dram_init (dev, errp)) {return ; }include/hw/arm/aspeed_soc.h +1
-0@@ -127,6 +127,7 @@ struct Aspeed27x0SoCState {ARMCPU cpu[ASPEED_CPUS_NUM ];AspeedINTCState intc; +MemoryRegion dram_empty; };#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc"
RE: [PATCH v4 14/16] aspeed/soc: fix incorrect dram size for AST2700
Hi Cedric,
Quoted 104 lines
From: Cédric Le Goater <[email protected]>>
Hello JaminQuoted 11 lines · Jamin Lin
AST2700 dram size calculation is not back compatible AST2600. According to the DDR capacity hardware behavior, if users write the data to address which is beyond the ram size, it would write the data to address 0.
For example:
a. sdram base address "0x400000000"
b. sdram size is 1 GiB
The available address range is from "0x400000000" to "0x440000000". If users write0xdeadbeefto address "0x600000000", the value of DRAM address 0 (base address0x400000000) should be0xdeadbeef.Quoted 3 lines
Add
aspeed_soc_ast2700_dram_initto calculate the dram size and add memory I/O whose address range is frommax_ram_size-ram_sizetomax_ram_sizeand its read/write handler to emulate DDR capacity hardwarebehavior.
Quoted 5 lines
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>--- hw/arm/aspeed_ast27x0.c | 94++++++++++++++++++++++++++++++++++++-
Quoted 8 lines
include/hw/arm/aspeed_soc.h | 1 + 2 files changed, 94 insertions(+), 1 deletion(-)hw/arm/aspeed_ast27x0.c index renamed from hw/arm/aspeed_ast27x0.c +0
-0
a3a03fc1ca..19380087fa100644hw/arm/aspeed_ast27x0.c line 26
Quoted 7 lines
hw/arm/aspeed_ast27x0.c +1
-0@@ -20,6 +20,7 @@#include "sysemu/sysemu.h" #include "hw/intc/arm_gicv3.h" #include "qapi/qmp/qlist.h" +#include "qemu/log.h" static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_SPI_BOOT] = 0x400000000, @@ -191,6 +192,97@@
hw/arm/aspeed_ast27x0.c
Quoted 6 lines
static
qemu_irqaspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)return qdev_get_gpio_in(a->intc.gic, sc->irqmap[dev]);}
hw/arm/aspeed_ast27x0.c +2
-0+static uint64_t aspeed_ram_capacity_read (void *opaque,hwaddr addr, + unsignedint
hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 8 lines
hw/arm/aspeed_ast27x0.c +8
-0+size) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: read @%" PRIx64" out of ram size\n" , + __func__, addr); +return 0 ; +} + +static void aspeed_ram_capacity_write(void *opaque, hwaddr addr,
uint64_tdata,Quoted 1 line
+ unsigned int size)
{
Quoted 19 lines
hw/arm/aspeed_ast27x0.c +19
-0+AspeedSoCState *s =ASPEED_SOC (opaque); +uint32_t test_pattern =0xdeadbeef ; +bool invalid_pattern = true; +uint32_t *ram_ptr; +int sz; + + ram_ptr =memory_region_get_ram_ptr (s->dram_mr); + +/* +* Emulate ddr capacity hardware behavior. +* If writes the test_pattern to address which is beyond the ram size, +* it would write the test_pattern to address 0. +*/ +for (sz =4 ; sz >0 ; sz--) { + test_pattern = (test_pattern <<4 ) + sz; +if (data == test_pattern) { + ram_ptr[0 ] = test_pattern; + invalid_pattern = false; +break ;hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev) · line 235
Quoted 10 lines
hw/arm/aspeed_ast27x0.c +10
-0+ } + } + +if (invalid_pattern) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: write invalid pattern @%" PRIx64 +" to addr @%" HWADDR_PRIx"]\n" , + __func__, data, addr); + } +}I would simplify with write transaction on the DRAM memory region of the SoC.
For that, initialize a '
dram_as' on top of 'dram_mr' inaspeed_soc_ast2700_dram_init():address_space_init(&s->dram_as, s->dram_mr, "dram");Then, in
aspeed_ram_capacity_write(), add :address_space_write(&s->dram_as, addr % ram_size, MEMTXATTRS_UNSPECIFIED, &data, size);
Quoted 9 lines
and check returned error.
It should be enough to detect the RAM size from FW.
Thanks,
C.
Thanks for your suggestion and review.
I changed to use address space APIs to write DRAM memory region(s->dram_mr). I have a question about aspeed_ram_capacity_write function implementation. Could you tell me which solution you prefer? Do you want to use solution 1? Thanks-Jamin
Solution 1:
static void aspeed_ram_capacity_write(void *opaque, hwaddr addr, uint64_t data,
unsigned int size)
{
AspeedSoCState *s = ASPEED_SOC(opaque);
ram_addr_t ram_size;
MemTxResult result;
ram_size = object_property_get_uint(OBJECT(&s->sdmc), "ram-size",
&error_abort);
/*
* Emulate ddr capacity hardware behavior.
* If writes the data to the address which is beyond the ram size,
* it would write the data to the "address % ram_size".
*/
result = address_space_write(&s->dram_as, addr % ram_size,
MEMTXATTRS_UNSPECIFIED, &data, 4);
if (result != MEMTX_OK) {
qemu_log_mask(LOG_GUEST_ERROR,
"%s: DRAM write failed, addr:0x%" HWADDR_PRIx
", data :0x%" PRIx64 "\n",
__func__, addr % ram_size, data);
}
}We don't care the test pattern. If users write the data to the invalid address, the date will be written into the DRAM memory region at "addr % dram_size".
Ex: dram size is 1G and the available address range is from "0x4 00000000" to "0x4 3FFFFFFF"
Users write data(0x12345678) at invalid address "0x5 00000000" and the data would be written at address "0x4 00000000" => md 400000000 1
400000000: dbeef432
=> mw 500000000 12345678
=> md 400000000 1
400000000: 12345678
Solution 2:
static void aspeed_ram_capacity_write(void *opaque, hwaddr addr, uint64_t data,
unsigned int size)
{
AspeedSoCState *s = ASPEED_SOC(opaque);
uint32_t test_pattern = 0xdeadbeef;
bool invalid_pattern = true;
ram_addr_t ram_size;
MemTxResult result;
int sz;
ram_size = object_property_get_uint(OBJECT(&s->sdmc), "ram-size",
&error_abort);
/*
* Emulate ddr capacity hardware behavior.
* If writes the test_pattern to the address which is beyond the ram size,
* it would write the test_pattern to the "address % ram_size".
*/
for (sz = 4; sz > 0 ; sz--) {
test_pattern = (test_pattern << 4) + sz;
if (data == test_pattern) {
result = address_space_write(&s->dram_as, addr % ram_size,
MEMTXATTRS_UNSPECIFIED, &data, 4);
if (result != MEMTX_OK) {
qemu_log_mask(LOG_GUEST_ERROR,
"%s: DRAM write failed, pattern:0x%" PRIx64
", addr:0x%" HWADDR_PRIx "\n",
__func__, data, addr % ram_size);
return;
}
invalid_pattern = false;
break;
}
}
if (invalid_pattern) {
qemu_log_mask(LOG_GUEST_ERROR,
"%s: DRAM write invalid pattern:0x%" PRIx64
", addr:0x%" HWADDR_PRIx "\n",
__func__, data, addr);
}
}It check test patterns. If users write the invalid test pattern to the invalid address, the date will NOT be written into the DRAM memory region at "addr % dram_size".
Ex: dram size is 1G and the available address range is from "0x4 00000000" to "0x4 3FFFFFFF"
Users write invalid test pattern (0x12345678) at invalid address "0x5 00000000" and the data would not be written at address "0x4 00000000"
Invalid test pattern
=> md 400000000 1
400000000: dbeef432
=> mw 500000000 12345678
=> md 400000000 1
400000000: dbeef432
Only valid pattern would be written at address "0x4 00000000" Pattern --> (0xdeadbeef << 4) + 4
=> md 400000000 1
400000000: dbeef432
=> mw 500000000 deadbeef4
=> md 400000000 1
400000000: eadbeef4
Quoted 81 lines
Quoted 17 lines
hw/arm/aspeed_ast27x0.c +14
-0+static const MemoryRegionOps aspeed_ram_capacity_ops = { + .read = aspeed_ram_capacity_read, + .write = aspeed_ram_capacity_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =8 , + }, +}; + +/* +* SDMC should be realized first to get correct RAM size and max size +* values +*/ hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 10 lines
hw/arm/aspeed_ast27x0.c +10
-0+static bool aspeed_soc_ast2700_dram_init (DeviceState *dev,Error +**errp) { +ram_addr_t ram_size, max_ram_size; +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); + + ram_size =object_property_get_uint (OBJECT (&s->sdmc),"ram-size" , + &error_abort); + max_ram_size = object_property_get_uint(OBJECT(&s->sdmc),"max-ram-size",
Quoted 4 lines
hw/arm/aspeed_ast27x0.c +4
-0+ &error_abort); + +memory_region_init (&s->dram_container,OBJECT (s),"ram-container" , + ram_size);hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 10 lines
hw/arm/aspeed_ast27x0.c +10
-0+memory_region_add_subregion (&s->dram_container,0 , s->dram_mr); + +/* +* Add a memory region beyond the RAM region to emulate +* ddr capacity hardware behavior. +*/ +if (ram_size < max_ram_size) { + memory_region_init_io(&a->dram_empty, OBJECT(s), + &aspeed_ram_capacity_ops, s, + "ram-empty", max_ram_size -
ram_size);hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev) · line 280
Quoted 3 lines
hw/arm/aspeed_ast27x0.c +3
-0+ + memory_region_add_subregion(s->memory, +sc->memmap[ASPEED_DEV_SDRAM] +
ram_size,hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 5 lines
hw/arm/aspeed_ast27x0.c +5
-0+ &a->dram_empty); + } + + memory_region_add_subregion(s->memory, + sc->memmap[ASPEED_DEV_SDRAM],
&s->dram_container);hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 6 lines
hw/arm/aspeed_ast27x0.c +3
-0+return true; +} +static void aspeed_soc_ast2700_init (Object *obj) { Aspeed27x0SoCState *a = ASPEED27X0_SOC(obj); @@ -461,7 +553,7@@
Quoted 21 lines
static void
aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)sc->memmap[ASPEED_DEV_SDMC]); /* RAM */hw/arm/aspeed_ast27x0.c +1
-1-if (!aspeed_soc_dram_init (s, errp)) { +if (!aspeed_soc_ast2700_dram_init (dev, errp)) {return ; }include/hw/arm/aspeed_soc.h +1
-0@@ -127,6 +127,7 @@ struct Aspeed27x0SoCState {ARMCPU cpu[ASPEED_CPUS_NUM ];AspeedINTCState intc; +MemoryRegion dram_empty; };#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc"
Re: [PATCH v4 14/16] aspeed/soc: fix incorrect dram size for AST2700
Quoted 110 lines · Jamin Lin
Hi Cedric,
Quoted 109 lines
From: Cédric Le Goater <[email protected]>>
Hello JaminQuoted 11 lines · Jamin Lin
AST2700 dram size calculation is not back compatible AST2600. According to the DDR capacity hardware behavior, if users write the data to address which is beyond the ram size, it would write the data to address 0.
For example:
a. sdram base address "0x400000000"
b. sdram size is 1 GiB
The available address range is from "0x400000000" to "0x440000000". If users write0xdeadbeefto address "0x600000000", the value of DRAM address 0 (base address0x400000000) should be0xdeadbeef.Quoted 3 lines
Add
aspeed_soc_ast2700_dram_initto calculate the dram size and add memory I/O whose address range is frommax_ram_size-ram_sizetomax_ram_sizeand its read/write handler to emulate DDR capacity hardwarebehavior.
Quoted 5 lines
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>--- hw/arm/aspeed_ast27x0.c | 94++++++++++++++++++++++++++++++++++++-
Quoted 8 lines
include/hw/arm/aspeed_soc.h | 1 + 2 files changed, 94 insertions(+), 1 deletion(-)hw/arm/aspeed_ast27x0.c index renamed from hw/arm/aspeed_ast27x0.c +0
-0
a3a03fc1ca..19380087fa100644hw/arm/aspeed_ast27x0.c line 26
Quoted 7 lines
hw/arm/aspeed_ast27x0.c +1
-0@@ -20,6 +20,7 @@#include "sysemu/sysemu.h" #include "hw/intc/arm_gicv3.h" #include "qapi/qmp/qlist.h" +#include "qemu/log.h" static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_SPI_BOOT] = 0x400000000, @@ -191,6 +192,97@@
hw/arm/aspeed_ast27x0.c
Quoted 6 lines
static
qemu_irqaspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)return qdev_get_gpio_in(a->intc.gic, sc->irqmap[dev]);}
hw/arm/aspeed_ast27x0.c +2
-0+static uint64_t aspeed_ram_capacity_read (void *opaque,hwaddr addr, + unsignedint
hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 8 lines
hw/arm/aspeed_ast27x0.c +8
-0+size) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: read @%" PRIx64" out of ram size\n" , + __func__, addr); +return 0 ; +} + +static void aspeed_ram_capacity_write(void *opaque, hwaddr addr,
uint64_tdata,Quoted 1 line
+ unsigned int size)
{
Quoted 19 lines
hw/arm/aspeed_ast27x0.c +19
-0+AspeedSoCState *s =ASPEED_SOC (opaque); +uint32_t test_pattern =0xdeadbeef ; +bool invalid_pattern = true; +uint32_t *ram_ptr; +int sz; + + ram_ptr =memory_region_get_ram_ptr (s->dram_mr); + +/* +* Emulate ddr capacity hardware behavior. +* If writes the test_pattern to address which is beyond the ram size, +* it would write the test_pattern to address 0. +*/ +for (sz =4 ; sz >0 ; sz--) { + test_pattern = (test_pattern <<4 ) + sz; +if (data == test_pattern) { + ram_ptr[0 ] = test_pattern; + invalid_pattern = false; +break ;hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev) · line 235
Quoted 10 lines
hw/arm/aspeed_ast27x0.c +10
-0+ } + } + +if (invalid_pattern) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: write invalid pattern @%" PRIx64 +" to addr @%" HWADDR_PRIx"]\n" , + __func__, data, addr); + } +}I would simplify with write transaction on the DRAM memory region of the SoC.
For that, initialize a '
dram_as' on top of 'dram_mr' inaspeed_soc_ast2700_dram_init():address_space_init(&s->dram_as, s->dram_mr, "dram");Then, in
aspeed_ram_capacity_write(), add :address_space_write(&s->dram_as, addr % ram_size, MEMTXATTRS_UNSPECIFIED, &data, size);and check returned error.
It should be enough to detect the RAM size from FW.
Quoted 8 lines
Quoted 4 lines
Thanks,
C.
Thanks for your suggestion and review.
I changed to use address space APIs to write DRAM memoryregion(s->dram_mr). I have a question aboutaspeed_ram_capacity_writefunction implementation. Could you tell me which solution you prefer? Do you want to use solution 1?
I prefer solution 1 because no assumption is made on what software does. It simply implements the wraparound HW does on RAM accesses.
Thanks,
C.
Quoted 182 lines
Thanks-Jamin
Solution 1:
static void aspeed_ram_capacity_write(void *opaque, hwaddr addr,uint64_tdata,
unsigned int size){ AspeedSoCState *s = ASPEED_SOC(opaque); ram_addr_t ram_size; MemTxResult result; ram_size = object_property_get_uint(OBJECT(&s->sdmc), "ram-size", &error_abort); /* * Emulate ddr capacity hardware behavior. * If writes the data to the address which is beyond the ram size, * it would write the data to the "address % ram_size". */ result = address_space_write(&s->dram_as, addr % ram_size, MEMTXATTRS_UNSPECIFIED, &data, 4); if (result != MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: DRAM write failed, addr:0x%" HWADDR_PRIx ", data :0x%" PRIx64 "\n", __func__, addr % ram_size, data); } }We don't care the test pattern. If users write the data to the invalid address, the date will be written into the DRAM memory region at "addr %
dram_size".
Ex: dram size is 1G and the available address range is from "0x400000000" to "0x43FFFFFFF"Users write data(0x12345678) at invalid address "
0x500000000" and the data would be written at address "0x400000000" => md 400000000 1
400000000:dbeef432
=> mw 500000000 12345678
=> md 400000000 1
400000000: 12345678Solution 2:
static void aspeed_ram_capacity_write(void *opaque, hwaddr addr,uint64_tdata,
unsigned int size){ AspeedSoCState *s = ASPEED_SOC(opaque); uint32_t test_pattern = 0xdeadbeef; bool invalid_pattern = true; ram_addr_t ram_size; MemTxResult result; int sz; ram_size = object_property_get_uint(OBJECT(&s->sdmc), "ram-size", &error_abort); /* * Emulate ddr capacity hardware behavior. * If writes the test_pattern to the address which is beyond the ram size, * it would write the test_pattern to the "address % ram_size". */ for (sz = 4; sz > 0 ; sz--) { test_pattern = (test_pattern << 4) + sz; if (data == test_pattern) { result = address_space_write(&s->dram_as, addr % ram_size, MEMTXATTRS_UNSPECIFIED, &data, 4); if (result != MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: DRAM write failed, pattern:0x%" PRIx64 ", addr:0x%" HWADDR_PRIx "\n", __func__, data, addr % ram_size); return; } invalid_pattern = false; break; } } if (invalid_pattern) { qemu_log_mask(LOG_GUEST_ERROR, "%s: DRAM write invalid pattern:0x%" PRIx64 ", addr:0x%" HWADDR_PRIx "\n", __func__, data, addr); } }It check test patterns. If users write the invalid test pattern to the invalid address, the date will NOT be written into the DRAM memory region at "addr %
dram_size".
Ex: dram size is 1G and the available address range is from "0x400000000" to "0x43FFFFFFF"Users write invalid test pattern (
0x12345678) at invalid address "0x500000000" and the data would not be written at address "0x400000000"Invalid test pattern
=> md 400000000 1
400000000:dbeef432
=> mw 500000000 12345678
=> md 400000000 1
400000000:dbeef432Only valid pattern would be written at address "
0x400000000" Pattern --> (0xdeadbeef<< 4) + 4
=> md 400000000 1
400000000:dbeef432
=> mw 500000000deadbeef4
=> md 400000000 1
400000000:eadbeef4Quoted 81 lines
Quoted 17 lines
hw/arm/aspeed_ast27x0.c +14
-0+static const MemoryRegionOps aspeed_ram_capacity_ops = { + .read = aspeed_ram_capacity_read, + .write = aspeed_ram_capacity_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =8 , + }, +}; + +/* +* SDMC should be realized first to get correct RAM size and max size +* values +*/ hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 10 lines
hw/arm/aspeed_ast27x0.c +10
-0+static bool aspeed_soc_ast2700_dram_init (DeviceState *dev,Error +**errp) { +ram_addr_t ram_size, max_ram_size; +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); + + ram_size =object_property_get_uint (OBJECT (&s->sdmc),"ram-size" , + &error_abort); + max_ram_size = object_property_get_uint(OBJECT(&s->sdmc),"max-ram-size",
Quoted 4 lines
hw/arm/aspeed_ast27x0.c +4
-0+ &error_abort); + +memory_region_init (&s->dram_container,OBJECT (s),"ram-container" , + ram_size);hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 10 lines
hw/arm/aspeed_ast27x0.c +10
-0+memory_region_add_subregion (&s->dram_container,0 , s->dram_mr); + +/* +* Add a memory region beyond the RAM region to emulate +* ddr capacity hardware behavior. +*/ +if (ram_size < max_ram_size) { + memory_region_init_io(&a->dram_empty, OBJECT(s), + &aspeed_ram_capacity_ops, s, + "ram-empty", max_ram_size -
ram_size);hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev) · line 280
Quoted 3 lines
hw/arm/aspeed_ast27x0.c +3
-0+ + memory_region_add_subregion(s->memory, +sc->memmap[ASPEED_DEV_SDRAM] +
ram_size,hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 5 lines
hw/arm/aspeed_ast27x0.c +5
-0+ &a->dram_empty); + } + + memory_region_add_subregion(s->memory, + sc->memmap[ASPEED_DEV_SDRAM],
&s->dram_container);hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 6 lines
hw/arm/aspeed_ast27x0.c +3
-0+return true; +} +static void aspeed_soc_ast2700_init (Object *obj) { Aspeed27x0SoCState *a = ASPEED27X0_SOC(obj); @@ -461,7 +553,7@@
Quoted 21 lines
static void
aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)sc->memmap[ASPEED_DEV_SDMC]); /* RAM */hw/arm/aspeed_ast27x0.c +1
-1-if (!aspeed_soc_dram_init (s, errp)) { +if (!aspeed_soc_ast2700_dram_init (dev, errp)) {return ; }include/hw/arm/aspeed_soc.h +1
-0@@ -127,6 +127,7 @@ struct Aspeed27x0SoCState {ARMCPU cpu[ASPEED_CPUS_NUM ];AspeedINTCState intc; +MemoryRegion dram_empty; };#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc"
RE: [PATCH v4 14/16] aspeed/soc: fix incorrect dram size for AST2700
Hi Cedric,
Quoted 123 lines
From: Cédric Le Goater <[email protected]>
Quoted 39 lines · Jamin Lin
Hi Cedric,
Quoted 38 lines
From: Cédric Le Goater <[email protected]>> Hello Jamin
Quoted 11 lines · Jamin Lin
AST2700 dram size calculation is not back compatible AST2600. According to the DDR capacity hardware behavior, if users write the data to address which is beyond the ram size, it would write the data to address 0.
For example:
a. sdram base address "0x400000000"
b. sdram size is 1 GiB
The available address range is from "0x400000000" to "0x440000000". If users write0xdeadbeefto address "0x600000000", the value of DRAM address 0 (base address0x400000000) should be0xdeadbeef.Quoted 4 lines
Add
aspeed_soc_ast2700_dram_initto calculate the dram size and add memory I/O whose address range is frommax_ram_size-ram_sizetomax_ram_sizeand its read/write handler to emulate DDR capacity hardwarebehavior.
Quoted 5 lines
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>--- hw/arm/aspeed_ast27x0.c | 94++++++++++++++++++++++++++++++++++++-
Quoted 13 lines
include/hw/arm/aspeed_soc.h | 1 + 2 files changed, 94 insertions(+), 1 deletion(-)hw/arm/aspeed_ast27x0.c index renamed from hw/arm/aspeed_ast27x0.c +0
-0
a3a03fc1ca..19380087fa100644hw/arm/aspeed_ast27x0.c +1
-0@@ -20,6 +20,7 @@#include "sysemu/sysemu.h" #include "hw/intc/arm_gicv3.h" #include "qapi/qmp/qlist.h" +#include "qemu/log.h" Quoted 2 lines
Quoted 2 lines
hw/arm/aspeed_ast27x0.c line 26
Quoted 2 lines
hw/arm/aspeed_ast27x0.c +0
-0static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_SPI_BOOT] = 0x400000000, @@ -191,6+192,97
Quoted 17 lines
Quoted 17 lines
@@
hw/arm/aspeed_ast27x0.c
Quoted 6 lines
static
qemu_irqaspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)return qdev_get_gpio_in(a->intc.gic, sc->irqmap[dev]);}
hw/arm/aspeed_ast27x0.c +2
-0+static uint64_t aspeed_ram_capacity_read (void *opaque,hwaddr addr, + unsignedint
hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 8 lines
hw/arm/aspeed_ast27x0.c +8
-0+size) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: read @%" PRIx64" out of ram size\n" , + __func__, addr); +return 0 ; +} + +static void aspeed_ram_capacity_write(void *opaque, hwaddr addr,
uint64_tdata,Quoted 1 line
Quoted 1 line
Quoted 1 line
+ unsigned int
size)
Quoted 51 lines
Quoted 51 lines
{
Quoted 19 lines
hw/arm/aspeed_ast27x0.c +19
-0+AspeedSoCState *s =ASPEED_SOC (opaque); +uint32_t test_pattern =0xdeadbeef ; +bool invalid_pattern = true; +uint32_t *ram_ptr; +int sz; + + ram_ptr =memory_region_get_ram_ptr (s->dram_mr); + +/* +* Emulate ddr capacity hardware behavior. +* If writes the test_pattern to address which is beyond the ram size, +* it would write the test_pattern to address 0. +*/ +for (sz =4 ; sz >0 ; sz--) { + test_pattern = (test_pattern <<4 ) + sz; +if (data == test_pattern) { + ram_ptr[0 ] = test_pattern; + invalid_pattern = false; +break ;hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev) · line 235
Quoted 10 lines
hw/arm/aspeed_ast27x0.c +10
-0+ } + } + +if (invalid_pattern) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: write invalid pattern @%" PRIx64 +" to addr @%" HWADDR_PRIx"]\n" , + __func__, data, addr); + } +}I would simplify with write transaction on the DRAM memory region of the SoC.
For that, initialize a '
dram_as' on top of 'dram_mr' inaspeed_soc_ast2700_dram_init():address_space_init(&s->dram_as, s->dram_mr, "dram");Then, in
aspeed_ram_capacity_write(), add :address_space_write(&s->dram_as, addr % ram_size, MEMTXATTRS_UNSPECIFIED, &data, size);and check returned error.
It should be enough to detect the RAM size from FW.
Quoted 6 lines
Quoted 4 lines
Thanks,
C.
Thanks for your suggestion and review.
I changed to use address space APIs to write DRAM memory
region(s->dram_mr).Quoted 1 line
I have a question about
aspeed_ram_capacity_writefunctionimplementation.
Quoted 8 lines
Quoted 1 line
Could you tell me which solution you prefer? Do you want to use solution 1?
I prefer solution 1 because no assumption is made on what software does. It simply implements the wraparound HW does on RAM accesses.
Thanks,
C.
Got it. I will update it in v5 patch (solution 1)
Thanks for your help and suggestion.
Jamin
Quoted 205 lines
Quoted 7 lines
Thanks-Jamin
Solution 1:
static void aspeed_ram_capacity_write(void *opaque, hwaddr addr,uint64_tdata,
Quoted 1 line
unsigned int
size) {
Quoted 7 lines
AspeedSoCState *s = ASPEED_SOC(opaque); ram_addr_t ram_size; MemTxResult result; ram_size = object_property_get_uint(OBJECT(&s->sdmc), "ram-size", &error_abort);Quoted 7 lines
/* * Emulate ddr capacity hardware behavior. * If writes the data to the address which is beyond the ram size, * it would write the data to the "address % ram_size". */ result = address_space_write(&s->dram_as, addr % ram_size, MEMTXATTRS_UNSPECIFIED,&data, 4);
Quoted 3 lines
if (result != MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: DRAM write failed, addr:0x%"
HWADDR_PRIxQuoted 5 lines
", data :0x%" PRIx64 "\n", __func__, addr % ram_size, data); } }We don't care the test pattern. If users write the data to the invalid address,
the date will be written into the DRAM memory region at "addr %
dram_size".Quoted 1 line
Ex: dram size is 1G and the available address range is from "
0x400000000"to "
0x43FFFFFFF"Quoted 2 lines
Users write data(0x12345678) at invalid address "
0x500000000" and thedata would be written at address "
0x400000000"Quoted 8 lines
=> md 400000000 1
400000000:dbeef432
=> mw 500000000 12345678
=> md 400000000 1
400000000: 12345678Solution 2:
static void aspeed_ram_capacity_write(void *opaque, hwaddr addr,uint64_tdata,
Quoted 1 line
unsigned int
size) {
Quoted 5 lines
AspeedSoCState *s = ASPEED_SOC(opaque); uint32_t test_pattern = 0xdeadbeef; bool invalid_pattern = true; ram_addr_t ram_size; MemTxResult result;Quoted 8 lines
int sz; ram_size = object_property_get_uint(OBJECT(&s->sdmc), "ram-size", &error_abort); /* * Emulate ddr capacity hardware behavior. * If writes the test_pattern to the address which is beyond the ramsize,
Quoted 6 lines
* it would write the test_pattern to the "address % ram_size". */ for (sz = 4; sz > 0 ; sz--) { test_pattern = (test_pattern << 4) + sz; if (data == test_pattern) { result = address_space_write(&s->dram_as, addr %
ram_size,Quoted 1 line
MEMTXATTRS_UNSPECIFIED, &data, 4);Quoted 3 lines
if (result != MEMTX_OK) { qemu_log_mask(LOG_GUEST_ERROR, "%s: DRAM write failed, pattern:0x%"PRIx64
Quoted 16 lines
", addr:0x%" HWADDR_PRIx "\n", __func__, data, addr % ram_size); return; } invalid_pattern = false; break; } } if (invalid_pattern) { qemu_log_mask(LOG_GUEST_ERROR, "%s: DRAM write invalid pattern:0x%" PRIx64 ", addr:0x%" HWADDR_PRIx "\n", __func__, data, addr); } }Quoted 1 line
It check test patterns. If users write the invalid test pattern to the invalid
address, the date will NOT be written into the DRAM memory region at "addr %
dram_size".Quoted 1 line
Ex: dram size is 1G and the available address range is from "
0x400000000"to "
0x43FFFFFFF"Quoted 2 lines
Users write invalid test pattern (
0x12345678) at invalid address "0x500000000" and the data would not be written at address "
0x400000000"Quoted 34 lines
Invalid test pattern
=> md 400000000 1
400000000:dbeef432
=> mw 500000000 12345678
=> md 400000000 1
400000000:dbeef432Only valid pattern would be written at address "
0x400000000" Pattern --> (0xdeadbeef<< 4) + 4
=> md 400000000 1
400000000:dbeef432
=> mw 500000000deadbeef4
=> md 400000000 1
400000000:eadbeef4Quoted 18 lines
Quoted 18 lines
hw/arm/aspeed_ast27x0.c +15
-0+static const MemoryRegionOps aspeed_ram_capacity_ops = { + .read = aspeed_ram_capacity_read, + .write = aspeed_ram_capacity_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =1 , + .max_access_size =8 , + }, +}; + +/* +* SDMC should be realized first to get correct RAM size and max +size +* values +*/ Quoted 8 lines
Quoted 8 lines
hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 8 lines
hw/arm/aspeed_ast27x0.c +8
-0+static bool aspeed_soc_ast2700_dram_init (DeviceState *dev,Error +**errp) { +ram_addr_t ram_size, max_ram_size; +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); + + ram_size = object_property_get_uint(OBJECT(&s->sdmc),"ram-size",
Quoted 6 lines
Quoted 6 lines
hw/arm/aspeed_ast27x0.c
Quoted 2 lines
hw/arm/aspeed_ast27x0.c +2
-0+ &error_abort); + max_ram_size = object_property_get_uint(OBJECT(&s->sdmc),"max-ram-size",
Quoted 3 lines
hw/arm/aspeed_ast27x0.c +3
-0+ &error_abort); + + memory_region_init(&s->dram_container, OBJECT(s),"ram-container",
Quoted 2 lines
Quoted 2 lines
hw/arm/aspeed_ast27x0.c
Quoted 2 lines
hw/arm/aspeed_ast27x0.c +2
-0+ ram_size); + memory_region_add_subregion(&s->dram_container, 0,
s->dram_mr);Quoted 19 lines
Quoted 19 lines
hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 9 lines
hw/arm/aspeed_ast27x0.c +9
-0+ +/* +* Add a memory region beyond the RAM region to emulate +* ddr capacity hardware behavior. +*/ +if (ram_size < max_ram_size) { + memory_region_init_io(&a->dram_empty, OBJECT(s), + &aspeed_ram_capacity_ops, s, + "ram-empty", max_ram_size -
ram_size);hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev) · line 280
Quoted 3 lines
hw/arm/aspeed_ast27x0.c +3
-0+ + memory_region_add_subregion(s->memory, +sc->memmap[ASPEED_DEV_SDRAM] +
ram_size,Quoted 5 lines
hw/arm/aspeed_ast27x0.c +5
-0+ &a->dram_empty); + } + + memory_region_add_subregion(s->memory, + sc->memmap[ASPEED_DEV_SDRAM],Quoted 7 lines
Quoted 7 lines
&s->dram_container);hw/arm/aspeed_ast27x0.c static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
Quoted 6 lines
hw/arm/aspeed_ast27x0.c +3
-0+return true; +} +static void aspeed_soc_ast2700_init (Object *obj) { Aspeed27x0SoCState *a = ASPEED27X0_SOC(obj); @@ -461,7+553,7
Quoted 23 lines
Quoted 22 lines
@@
Quoted 21 lines
static void
aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)sc->memmap[ASPEED_DEV_SDMC]); /* RAM */hw/arm/aspeed_ast27x0.c +1
-1-if (!aspeed_soc_dram_init (s, errp)) { +if (!aspeed_soc_ast2700_dram_init (dev, errp)) {return ; }(quoted diff) +0
-0
b/include/hw/arm/aspeed_soc.hindex9f177b6037..9dbf48f873100644include/hw/arm/aspeed_soc.h +1
-0@@ -127,6 +127,7 @@ struct Aspeed27x0SoCState {ARMCPU cpu[ASPEED_CPUS_NUM ];AspeedINTCState intc; +MemoryRegion dram_empty; };#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc"
RE: [PATCH v4 12/16] aspeed/soc: Add AST2700 support
In reply to Cédric Le GoaterHi Cedric,
Quoted 317 lines
From: Cédric Le Goater <[email protected]>
Subject: Re: [PATCH v4 12/16] aspeed/soc: Add AST2700 supportQuoted 1 line · Jamin Lin
Initial definitions for a simple machine using an AST2700 SOC (Cortex-a35
CPU).
Quoted 20 lines
AST2700 SOC and its interrupt controller are too complex to handle in the common Aspeed SoC framework. We introduce a new ast2700 class with
instance_initand realize handlers.AST2700 is a 64 bits quad core cpus and support 8 watchdog. Update maximum
ASPEED_CPUS_NUMto 4 andASPEED_WDTS_NUMto 8. In addition, update AspeedSocState to support scuio, sli, sliio and intc.Add
TYPE_ASPEED27X0_SOCmachine type.The SDMC controller is unlocked at SPL stage.
At present, only supports to emulate booting start from u-boot stage. Set SDMC controller unlocked by default.In INTC, each interrupt of INT 128 to INT 136 combines 32 interrupts. It connect GICINT IRQ GPIO-OUTPUT pins to GIC device with irq 128 to 136. And, if a device irq is 128 to 136, its irq GPIO-OUTPUT pin is connected to GICINT or-gates instead of GIC device.
Quoted 4 lines
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>--- hw/arm/aspeed_ast27x0.c | 563++++++++++++++++++++++++++++++++++++
Quoted 220 lines
hw/arm/meson.build | 1 + include/hw/arm/aspeed_soc.h | 26 +- 3 files changed, 588 insertions(+), 2 deletions(-)create mode 100644
hw/arm/aspeed_ast27x0.chw/arm/aspeed_ast27x0.c new renamed from hw/arm/aspeed_ast27x0.c +0
-0file mode 100644 index 0000000000..a3a03fc1ca
hw/arm/aspeed_ast27x0.c new file +210
-0@@ -0,0 +1,563 @@ +/* +* ASPEED SoC 27x0 family +* +* Copyright (C) 2024 ASPEED Technology Inc. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +* +* Implementation extracted from the AST2600 and adapted for AST27x0. +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/misc/unimp.h" +#include "hw/arm/aspeed_soc.h" +#include "qemu/module.h" +#include "qemu/error-report.h" +#include "hw/i2c/aspeed_i2c.h" +#include "net/net.h" +#include "sysemu/sysemu.h" +#include "hw/intc/arm_gicv3.h" +#include "qapi/qmp/qlist.h" + +static const hwaddr aspeed_soc_ast2700_memmap[] = { + [ASPEED_DEV_SPI_BOOT ] =0x400000000 , + [ASPEED_DEV_SRAM ] =0x10000000 , + [ASPEED_DEV_SDMC ] =0x12C00000 , + [ASPEED_DEV_SCU ] =0x12C02000 , + [ASPEED_DEV_SCUIO ] =0x14C02000 , + [ASPEED_DEV_UART0 ] =0X14C33000 , + [ASPEED_DEV_UART1 ] =0X14C33100 , + [ASPEED_DEV_UART2 ] =0X14C33200 , + [ASPEED_DEV_UART3 ] =0X14C33300 , + [ASPEED_DEV_UART4 ] =0X12C1A000 , + [ASPEED_DEV_UART5 ] =0X14C33400 , + [ASPEED_DEV_UART6 ] =0X14C33500 , + [ASPEED_DEV_UART7 ] =0X14C33600 , + [ASPEED_DEV_UART8 ] =0X14C33700 , + [ASPEED_DEV_UART9 ] =0X14C33800 , + [ASPEED_DEV_UART10 ] =0X14C33900 , + [ASPEED_DEV_UART11 ] =0X14C33A00 , + [ASPEED_DEV_UART12 ] =0X14C33B00 , + [ASPEED_DEV_WDT ] =0x14C37000 , + [ASPEED_DEV_VUART ] =0X14C30000 , + [ASPEED_DEV_FMC ] =0x14000000 , + [ASPEED_DEV_SPI0 ] =0x14010000 , + [ASPEED_DEV_SPI1 ] =0x14020000 , + [ASPEED_DEV_SPI2 ] =0x14030000 , + [ASPEED_DEV_SDRAM ] =0x400000000 , + [ASPEED_DEV_MII1 ] =0x14040000 , + [ASPEED_DEV_MII2 ] =0x14040008 , + [ASPEED_DEV_MII3 ] =0x14040010 , + [ASPEED_DEV_ETH1 ] =0x14050000 , + [ASPEED_DEV_ETH2 ] =0x14060000 , + [ASPEED_DEV_ETH3 ] =0x14070000 , + [ASPEED_DEV_EMMC ] =0x12090000 , + [ASPEED_DEV_INTC ] =0x12100000 , + [ASPEED_DEV_SLI ] =0x12C17000 , + [ASPEED_DEV_SLIIO ] =0x14C1E000 , + [ASPEED_GIC_DIST ] =0x12200000 , + [ASPEED_GIC_REDIST ] =0x12280000 , +}; + +#define AST2700_MAX_IRQ 288 + +/* Shared Peripheral Interrupt values below are offset by -32 from +datasheet */ static const int aspeed_soc_ast2700_irqmap[] = { + [ASPEED_DEV_UART0 ] =132 , + [ASPEED_DEV_UART1 ] =132 , + [ASPEED_DEV_UART2 ] =132 , + [ASPEED_DEV_UART3 ] =132 , + [ASPEED_DEV_UART4 ] =8 , + [ASPEED_DEV_UART5 ] =132 , + [ASPEED_DEV_UART6 ] =132 , + [ASPEED_DEV_UART7 ] =132 , + [ASPEED_DEV_UART8 ] =132 , + [ASPEED_DEV_UART9 ] =132 , + [ASPEED_DEV_UART10 ] =132 , + [ASPEED_DEV_UART11 ] =132 , + [ASPEED_DEV_UART12 ] =132 , + [ASPEED_DEV_FMC ] =131 , + [ASPEED_DEV_SDMC ] =0 , + [ASPEED_DEV_SCU ] =12 , + [ASPEED_DEV_ADC ] =130 , + [ASPEED_DEV_XDMA ] =5 , + [ASPEED_DEV_EMMC ] =15 , + [ASPEED_DEV_GPIO ] =11 , + [ASPEED_DEV_GPIO_1_8V ] =130 , + [ASPEED_DEV_RTC ] =13 , + [ASPEED_DEV_TIMER1 ] =16 , + [ASPEED_DEV_TIMER2 ] =17 , + [ASPEED_DEV_TIMER3 ] =18 , + [ASPEED_DEV_TIMER4 ] =19 , + [ASPEED_DEV_TIMER5 ] =20 , + [ASPEED_DEV_TIMER6 ] =21 , + [ASPEED_DEV_TIMER7 ] =22 , + [ASPEED_DEV_TIMER8 ] =23 , + [ASPEED_DEV_WDT ] =131 , + [ASPEED_DEV_PWM ] =131 , + [ASPEED_DEV_LPC ] =128 , + [ASPEED_DEV_IBT ] =128 , + [ASPEED_DEV_I2C ] =130 , + [ASPEED_DEV_PECI ] =133 , + [ASPEED_DEV_ETH1 ] =132 , + [ASPEED_DEV_ETH2 ] =132 , + [ASPEED_DEV_ETH3 ] =132 , + [ASPEED_DEV_HACE ] =4 , + [ASPEED_DEV_KCS ] =128 , + [ASPEED_DEV_DP ] =28 , + [ASPEED_DEV_I3C ] =131 , +}; + +/* GICINT 128 */ +static const int aspeed_soc_ast2700_gic128_intcmap[] = { + [ASPEED_DEV_LPC ] =0 , + [ASPEED_DEV_IBT ] =2 , + [ASPEED_DEV_KCS ] =4 , +}; + +/* GICINT 130 */ +static const int aspeed_soc_ast2700_gic130_intcmap[] = { + [ASPEED_DEV_I2C ] =0 , + [ASPEED_DEV_ADC ] =16 , + [ASPEED_DEV_GPIO_1_8V ] =18 , +}; + +/* GICINT 131 */ +static const int aspeed_soc_ast2700_gic131_intcmap[] = { + [ASPEED_DEV_I3C ] =0 , + [ASPEED_DEV_WDT ] =16 , + [ASPEED_DEV_FMC ] =25 , + [ASPEED_DEV_PWM ] =29 , +}; + +/* GICINT 132 */ +static const int aspeed_soc_ast2700_gic132_intcmap[] = { + [ASPEED_DEV_ETH1 ] =0 , + [ASPEED_DEV_ETH2 ] =1 , + [ASPEED_DEV_ETH3 ] =2 , + [ASPEED_DEV_UART0 ] =7 , + [ASPEED_DEV_UART1 ] =8 , + [ASPEED_DEV_UART2 ] =9 , + [ASPEED_DEV_UART3 ] =10 , + [ASPEED_DEV_UART5 ] =11 , + [ASPEED_DEV_UART6 ] =12 , + [ASPEED_DEV_UART7 ] =13 , + [ASPEED_DEV_UART8 ] =14 , + [ASPEED_DEV_UART9 ] =15 , + [ASPEED_DEV_UART10 ] =16 , + [ASPEED_DEV_UART11 ] =17 , + [ASPEED_DEV_UART12 ] =18 , +}; + +/* GICINT 133 */ +static const int aspeed_soc_ast2700_gic133_intcmap[] = { + [ASPEED_DEV_PECI ] =4 , +}; + +/* GICINT 128 ~ 136 */ +struct gic_intc_irq_info { +int irq; +const int *ptr; +}; + +static const struct gic_intc_irq_info aspeed_soc_ast2700_gic_intcmap[] = { + {128 , aspeed_soc_ast2700_gic128_intcmap}, + {129 ,NULL }, + {130 , aspeed_soc_ast2700_gic130_intcmap}, + {131 , aspeed_soc_ast2700_gic131_intcmap}, + {132 , aspeed_soc_ast2700_gic132_intcmap}, + {133 , aspeed_soc_ast2700_gic133_intcmap}, + {134 ,NULL }, + {135 ,NULL }, + {136 ,NULL }, +}; + +static qemu_irq aspeed_soc_ast2700_get_irq (AspeedSoCState *s,int +dev) { +Aspeed27x0SoCState *a =ASPEED27X0_SOC (s); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +int i; + +for (i =0 ; i <ARRAY_SIZE (aspeed_soc_ast2700_gic_intcmap); i++) { +if (sc->irqmap[dev] == aspeed_soc_ast2700_gic_intcmap[i].irq) { +assert (aspeed_soc_ast2700_gic_intcmap[i].ptr); +return qdev_get_gpio_in (DEVICE (&a->intc.orgates[i]), + aspeed_soc_ast2700_gic_intcmap[i].ptr[dev]); + } + } + +return qdev_get_gpio_in (a->intc.gic, sc->irqmap[dev]); } + +static void aspeed_soc_ast2700_init (Object *obj) { +Aspeed27x0SoCState *a =ASPEED27X0_SOC (obj); +AspeedSoCState *s =ASPEED_SOC (obj); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +int i; +char socname[8 ]; +char typename[64 ]; + +if (sscanf (sc->name,"%7s" , socname) !=1 ) { +g_assert_not_reached (); + } + +for (i =0 ; i < sc->num_cpus; i++) { +object_initialize_child (obj,"cpu[*]" , &a->cpu[i], +aspeed_soc_cpu_type (sc)); + } + +object_initialize_child (obj,"scu" , &s->scu,TYPE_ASPEED_2700_SCU );hw/arm/aspeed_ast27x0.c line 220
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+qdev_prop_set_uint32 (DEVICE (&s->scu),"silicon-rev" , + sc->silicon_rev); +object_property_add_alias (obj,"hw-strap1" ,OBJECT (&s->scu), +"hw-strap1" ); +object_property_add_alias (obj,"hw-strap2" ,OBJECT (&s->scu), +"hw-strap2" ); +object_property_add_alias (obj,"hw-prot-key" ,OBJECT (&s->scu), +"hw-prot-key" ); + + object_initialize_child(obj, "scuio", &s->scuio,
TYPE_ASPEED_2700_SCUIO);hw/arm/aspeed_ast27x0.c
Quoted 8 lines
hw/arm/aspeed_ast27x0.c new file +8
-0+qdev_prop_set_uint32 (DEVICE (&s->scuio),"silicon-rev" , + sc->silicon_rev); + +snprintf (typename,sizeof (typename),"aspeed.fmc-%s" , socname); +object_initialize_child (obj,"fmc" , &s->fmc, typename); + +for (i =0 ; i < sc->spis_num; i++) { + snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i,socname);
hw/arm/aspeed_ast27x0.c
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+object_initialize_child (obj,"spi[*]" , &s->spi[i], typename); + } + +snprintf (typename,sizeof (typename),"aspeed.sdmc-%s" , socname); +object_initialize_child (obj,"sdmc" , &s->sdmc, typename); +object_property_add_alias (obj,"ram-size" ,OBJECT (&s->sdmc), +"ram-size" ); + +for (i =0 ; i < sc->wdts_num; i++) { + snprintf(typename, sizeof(typename), "aspeed.wdt-%s",socname);
hw/arm/aspeed_ast27x0.c
Quoted 8 lines
hw/arm/aspeed_ast27x0.c new file +8
-0+object_initialize_child (obj,"wdt[*]" , &s->wdt[i], typename); + } + +for (i =0 ; i < sc->macs_num; i++) { +object_initialize_child (obj,"ftgmac100[*]" , &s->ftgmac100[i], +TYPE_FTGMAC100 ); + + object_initialize_child(obj, "mii[*]", &s->mii[i],
TYPE_ASPEED_MII);hw/arm/aspeed_ast27x0.c
Quoted 4 lines
hw/arm/aspeed_ast27x0.c new file +4
-0+ } + +for (i =0 ; i < sc->uarts_num; i++) { + object_initialize_child(obj, "uart[*]", &s->uart[i],
TYPE_SERIAL_MM);hw/arm/aspeed_ast27x0.c
Quoted 4 lines
hw/arm/aspeed_ast27x0.c new file +4
-0+ } + +object_initialize_child (obj,"sli" , &s->sli,TYPE_ASPEED_2700_SLI ); + object_initialize_child(obj, "sliio", &s->sliio,
TYPE_ASPEED_2700_SLIIO);Quoted 16 lines
hw/arm/aspeed_ast27x0.c new file +16
-0+object_initialize_child (obj,"intc" , &a->intc, +TYPE_ASPEED_2700_INTC ); } + +/* +* ASPEED ast2700 has 0x0 as cluster ID +* +* +https://developer.arm.com/documentation/100236/0100/register-descript +ions/aarch64-system-registers/multiprocessor-affinity-register--el1 +*/ +static uint64_t aspeed_calc_affinity (int cpu) { +return (0x0 <<ARM_AFF1_SHIFT ) | cpu; } + +static bool aspeed_soc_ast2700_gic (DeviceState *dev,Error **errp) { +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev);
Quoted 8 lines
hw/arm/aspeed_ast27x0.c line 279
Quoted 6 lines
hw/arm/aspeed_ast27x0.c new file +6
-0+AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +SysBusDevice *gicbusdev; +QList *redist_region_count; +int i; + + a->intc.gic =qdev_new (gicv3_class_name ());This object doesn't need to be allocated. See
versal_create_apu_gic()
Thanks for review and suggestion.
I updated this function and please see my new changes as below.
Quoted 17 lines
hw/arm/aspeed_ast27x0.c line 291
Quoted 13 lines
hw/arm/aspeed_ast27x0.c new file +12
-0+qdev_prop_set_uint32 (a->intc.gic,"revision" ,3 ); +qdev_prop_set_uint32 (a->intc.gic,"num-cpu" , sc->num_cpus); +qdev_prop_set_uint32 (a->intc.gic,"num-irq" ,AST2700_MAX_IRQ ); + + redist_region_count =qlist_new (); +qlist_append_int (redist_region_count, sc->num_cpus); +qdev_prop_set_array (a->intc.gic,"redist-region-count" , + redist_region_count); + + gicbusdev =SYS_BUS_DEVICE (a->intc.gic); +if (!sysbus_realize (gicbusdev, errp)) { +return false;I would find clearer to initialize/realize the underlying gic object under the AspeedINTCState model. You could add property aliases.
Quoted 5 lines
or
add a GICv3State gic object under the SoC. Probably better, since the AspeedINTCState doesn't need to know about the GIC.
Thanks review and suggestion.
I refer to versal_create_apu_gic function, https://github.com/qemu/qemu/blob/master/hw/arm/xlnx-versal.c#L67
and updated aspeed_soc_ast2700_gic as following.
If you have any concerned about the new changes, please let me know.
Thanks-Jamin
static bool aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp)
{
Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev);
AspeedSoCState *s = ASPEED_SOC(dev);
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
SysBusDevice *gicbusdev;
DeviceState *gicdev;
QList *redist_region_count;
int i;
object_initialize_child(OBJECT(a), "ast2700-gic", &a->gic,
gicv3_class_name());
gicbusdev = SYS_BUS_DEVICE(&a->gic);
gicdev = DEVICE(&a->gic);
qdev_prop_set_uint32(gicdev, "revision", 3);
qdev_prop_set_uint32(gicdev, "num-cpu", sc->num_cpus);
qdev_prop_set_uint32(gicdev, "num-irq", AST2700_MAX_IRQ);
redist_region_count = qlist_new();
qlist_append_int(redist_region_count, sc->num_cpus);
qdev_prop_set_array(gicdev, "redist-region-count", redist_region_count);
if (!sysbus_realize(gicbusdev, errp)) {
return false;
}
sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]);
sysbus_mmio_map(gicbusdev, 1, sc->memmap[ASPEED_GIC_REDIST]);
for (i = 0; i < sc->num_cpus; i++) {
DeviceState *cpudev = DEVICE(qemu_get_cpu(i));
int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9, VIRTUAL_PMU_IRQ = 7;
int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS;
const int timer_irq[] = {
[GTIMER_PHYS] = 14,
[GTIMER_VIRT] = 11,
[GTIMER_HYP] = 10,
[GTIMER_SEC] = 13,
};
int j;
for (j = 0; j < ARRAY_SIZE(timer_irq); j++) {
qdev_connect_gpio_out(cpudev, j,
qdev_get_gpio_in(gicdev, ppibase + timer_irq[j]));
}
qemu_irq irq = qdev_get_gpio_in(gicdev,
ppibase + ARCH_GIC_MAINT_IRQ);
qdev_connect_gpio_out_named(cpudev, "gicv3-maintenance-interrupt",
0, irq);
qdev_connect_gpio_out_named(cpudev, "pmu-interrupt", 0,
qdev_get_gpio_in(gicdev, ppibase + VIRTUAL_PMU_IRQ));
sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev, ARM_CPU_IRQ));
sysbus_connect_irq(gicbusdev, i + sc->num_cpus,
qdev_get_gpio_in(cpudev, ARM_CPU_FIQ));
sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus,
qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ));
sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus,
qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ));
}
return true;
}struct Aspeed27x0SoCState {
AspeedSoCState parent;
ARMCPU cpu[ASPEED_CPUS_NUM];
AspeedINTCState intc;
GICv3State gic;
};#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC)
Quoted 329 lines
hw/arm/aspeed_ast27x0.c
Quoted 7 lines
hw/arm/aspeed_ast27x0.c new file +6
-0+sysbus_mmio_map (gicbusdev,0 , sc->memmap[ASPEED_GIC_DIST ]); +sysbus_mmio_map (gicbusdev,1 , sc->memmap[ASPEED_GIC_REDIST ]); + +for (i =0 ; i < sc->num_cpus; i++) { +DeviceState *cpudev =DEVICE (qemu_get_cpu (i)); + int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9,
VIRTUAL_PMU_IRQ= 7;hw/arm/aspeed_ast27x0.c
Quoted 13 lines
hw/arm/aspeed_ast27x0.c new file +13
-0+int ppibase =NUM_IRQS + i *GIC_INTERNAL +GIC_NR_SGIS ; + +const int timer_irq[] = { + [GTIMER_PHYS ] =14 , + [GTIMER_VIRT ] =11 , + [GTIMER_HYP ] =10 , + [GTIMER_SEC ] =13 , + }; +int j; + +for (j =0 ; j <ARRAY_SIZE (timer_irq); j++) { + qdev_connect_gpio_out(cpudev, j, + qdev_get_gpio_in(a->intc.gic, ppibase +timer_irq[j]));
hw/arm/aspeed_ast27x0.c
Quoted 4 lines
hw/arm/aspeed_ast27x0.c new file +4
-0+ } + + qemu_irq irq = qdev_get_gpio_in(a->intc.gic, + ppibase +
ARCH_GIC_MAINT_IRQ);hw/arm/aspeed_ast27x0.c line 312
Quoted 1 line
hw/arm/aspeed_ast27x0.c new file +1
-0+ qdev_connect_gpio_out_named(cpudev,"gicv3-maintenance-interrupt",
hw/arm/aspeed_ast27x0.c
Quoted 6 lines
hw/arm/aspeed_ast27x0.c new file +6
-0+ 0, irq); +qdev_connect_gpio_out_named (cpudev,"pmu-interrupt" ,0 , +qdev_get_gpio_in (a->intc.gic, ppibase + +VIRTUAL_PMU_IRQ )); + + sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev,
ARM_CPU_IRQ));hw/arm/aspeed_ast27x0.c line 320
Quoted 2 lines
hw/arm/aspeed_ast27x0.c new file +2
-0+ sysbus_connect_irq(gicbusdev, i + sc->num_cpus, + qdev_get_gpio_in(cpudev,
ARM_CPU_FIQ));hw/arm/aspeed_ast27x0.c line 322
Quoted 2 lines
hw/arm/aspeed_ast27x0.c new file +2
-0+ sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus, + qdev_get_gpio_in(cpudev,
ARM_CPU_VIRQ));hw/arm/aspeed_ast27x0.c line 324
Quoted 2 lines
hw/arm/aspeed_ast27x0.c new file +2
-0+ sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus, + qdev_get_gpio_in(cpudev,
ARM_CPU_VFIQ));Quoted 8 lines
hw/arm/aspeed_ast27x0.c new file +8
-0+ } + +return true; +} + +static void aspeed_soc_ast2700_realize (DeviceState *dev,Error +**errp) { +int i;hw/arm/aspeed_ast27x0.c line 393
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); + g_autofree char *sram_name = NULL; +uint32_t num_ints; + +/* Default boot region (SPI memory or ROMs) */ +memory_region_init (&s->spi_boot_container,OBJECT (s), +"aspeed.spi_boot_container" ,0x400000000 ); + memory_region_add_subregion(s->memory,sc->memmap[ASPEED_DEV_SPI_BOOT],
hw/arm/aspeed_ast27x0.c
Quoted 9 lines
hw/arm/aspeed_ast27x0.c new file +9
-0+ &s->spi_boot_container); + +/* CPU */ +for (i =0 ; i < sc->num_cpus; i++) { +object_property_set_int (OBJECT (&a->cpu[i]),"mp-affinity" , +aspeed_calc_affinity (i), + &error_abort); + + object_property_set_int(OBJECT(&a->cpu[i]), "cntfrq",1125000000,
hw/arm/aspeed_ast27x0.c
Quoted 3 lines
hw/arm/aspeed_ast27x0.c new file +3
-0+ &error_abort); + object_property_set_link(OBJECT(&a->cpu[i]), "memory", + OBJECT(s->memory),
&error_abort);Quoted 15 lines
hw/arm/aspeed_ast27x0.c new file +15
-0+ +if (!qdev_realize (DEVICE (&a->cpu[i]),NULL , errp)) { +return ; + } + } + +/* GIC */ +if (!aspeed_soc_ast2700_gic (dev, errp)) { +return ; + } + +/* INTC */ +if (!sysbus_realize (SYS_BUS_DEVICE (&a->intc), errp)) { +return ; + }hw/arm/aspeed_ast27x0.c
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+ +aspeed_mmio_map (s,SYS_BUS_DEVICE (&a->intc),0 , + sc->memmap[ASPEED_DEV_INTC ]); + +/* GICINT orgates -> INTC -> GIC */ + num_ints =object_property_get_int (OBJECT (&a->intc),"num-ints" , + &error_abort); +for (i =0 ; i < num_ints; i++) { + qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0, + qdev_get_gpio_in(DEVICE(&a->intc),i));
hw/arm/aspeed_ast27x0.c line 386
Quoted 3 lines
hw/arm/aspeed_ast27x0.c new file +3
-0+ sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i, + qdev_get_gpio_in(a->intc.gic, +aspeed_soc_ast2700_gic_intcmap[i].irq));
hw/arm/aspeed_ast27x0.c
Quoted 4 lines
hw/arm/aspeed_ast27x0.c new file +4
-0+ } + +/* SRAM */ + sram_name = g_strdup_printf("aspeed.sram.%d",CPU(&a->cpu[0])->cpu_index);
hw/arm/aspeed_ast27x0.c line 387
Quoted 1 line
hw/arm/aspeed_ast27x0.c new file +1
-0+ if (!memory_region_init_ram(&s->sram, OBJECT(s), sram_name,
sc->sram_size,Quoted 21 lines
hw/arm/aspeed_ast27x0.c new file +21
-0+ errp)) { +return ; + } +memory_region_add_subregion (s->memory, + sc->memmap[ASPEED_DEV_SRAM ], + &s->sram); + +/* SCU */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->scu), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->scu),0 , + sc->memmap[ASPEED_DEV_SCU ]); + +/* SCU1 */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->scuio), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->scuio),0 , + sc->memmap[ASPEED_DEV_SCUIO ]); +hw/arm/aspeed_ast27x0.c
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+/* UART */ +if (!aspeed_soc_uart_realize (s, errp)) { +return ; + } + +/* FMC, The number of CS is set at the board level */ +object_property_set_int (OBJECT (&s->fmc),"dram-base" , + sc->memmap[ASPEED_DEV_SDRAM ], + &error_abort); + object_property_set_link(OBJECT(&s->fmc), "dram",
OBJECT(s->dram_mr),hw/arm/aspeed_ast27x0.c
Quoted 5 lines
hw/arm/aspeed_ast27x0.c new file +5
-0+ &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->fmc), errp)) { +return ; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 0,sc->memmap[ASPEED_DEV_FMC]);
hw/arm/aspeed_ast27x0.c line 428
Quoted 2 lines
hw/arm/aspeed_ast27x0.c new file +2
-0+ aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 1, +ASPEED_SMC_GET_CLASS(&s->fmc)->flash_window_base);
hw/arm/aspeed_ast27x0.c
Quoted 6 lines
hw/arm/aspeed_ast27x0.c new file +6
-0+sysbus_connect_irq (SYS_BUS_DEVICE (&s->fmc),0 , +aspeed_soc_get_irq (s,ASPEED_DEV_FMC )); + +/* Set up an alias on the FMC CE0 region (boot default) */ +MemoryRegion *fmc0_mmio = &s->fmc.flashes[0 ].mmio; + memory_region_init_alias(&s->spi_boot, OBJECT(s),"aspeed.spi_boot",
hw/arm/aspeed_ast27x0.c line 432
Quoted 1 line
hw/arm/aspeed_ast27x0.c new file +1
-0+ fmc0_mmio, 0,
memory_region_size(fmc0_mmio));hw/arm/aspeed_ast27x0.c
Quoted 7 lines
hw/arm/aspeed_ast27x0.c new file +7
-0+memory_region_add_subregion (&s->spi_boot_container,0x0 , + &s->spi_boot); + +/* SPI */ +for (i =0 ; i < sc->spis_num; i++) { + object_property_set_link(OBJECT(&s->spi[i]), "dram", + OBJECT(s->dram_mr),
&error_abort);hw/arm/aspeed_ast27x0.c line 447
Quoted 7 lines
hw/arm/aspeed_ast27x0.c new file +7
-0+if (!sysbus_realize (SYS_BUS_DEVICE (&s->spi[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->spi[i]),0 , + sc->memmap[ASPEED_DEV_SPI0 + i]); + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 1, +ASPEED_SMC_GET_CLASS(&s->spi[i])->flash_window_base);
Quoted 14 lines
hw/arm/aspeed_ast27x0.c new file +14
-0+ } + +/* +* SDMC - SDRAM Memory Controller +* The SDMC controller is unlocked at SPL stage. +* At present, only supports to emulate booting +* start from u-boot stage. Set SDMC controller +* unlocked by default. It is a temporarily solution. +*/ +object_property_set_bool (OBJECT (&s->sdmc),"unlocked" , true, + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sdmc), errp)) { +return ; + }hw/arm/aspeed_ast27x0.c
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sdmc),0 , + sc->memmap[ASPEED_DEV_SDMC ]); + +/* RAM */ +if (!aspeed_soc_dram_init (s, errp)) { +return ; + } + +for (i =0 ; i < sc->macs_num; i++) { + object_property_set_bool(OBJECT(&s->ftgmac100[i]), "aspeed",true,
hw/arm/aspeed_ast27x0.c
Quoted 8 lines
hw/arm/aspeed_ast27x0.c new file +8
-0+ &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->ftgmac100[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->ftgmac100[i]),0 , + sc->memmap[ASPEED_DEV_ETH1 + i]); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, + aspeed_soc_get_irq(s, ASPEED_DEV_ETH1+
hw/arm/aspeed_ast27x0.c
Quoted 4 lines
hw/arm/aspeed_ast27x0.c new file +4
-0+ i)); + + object_property_set_link(OBJECT(&s->mii[i]), "nic", + OBJECT(&s->ftgmac100[i]),
&error_abort);Quoted 5 lines
hw/arm/aspeed_ast27x0.c new file +5
-0+if (!sysbus_realize (SYS_BUS_DEVICE (&s->mii[i]), errp)) { +return ; + } + + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->mii[i]), 0,hw/arm/aspeed_ast27x0.c
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+ sc->memmap[ASPEED_DEV_MII1 + i]); + } + +/* Watch dog */ +for (i =0 ; i < sc->wdts_num; i++) { +AspeedWDTClass *awc =ASPEED_WDT_GET_CLASS (&s->wdt[i]); +hwaddr wdt_offset = sc->memmap[ASPEED_DEV_WDT ] + i * + awc->iosize; + + object_property_set_link(OBJECT(&s->wdt[i]), "scu",
OBJECT(&s->scu),hw/arm/aspeed_ast27x0.c
Quoted 5 lines
hw/arm/aspeed_ast27x0.c new file +5
-0+ &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->wdt[i]), errp)) { +return ; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->wdt[i]), 0,
wdt_offset);Quoted 6 lines
hw/arm/aspeed_ast27x0.c new file +6
-0+ } + +/* SLI */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sli), errp)) { +return ; + }hw/arm/aspeed_ast27x0.c
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sli),0 , + sc->memmap[ASPEED_DEV_SLI ]); + +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sliio), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sliio),0 , + sc->memmap[ASPEED_DEV_SLIIO ]); + + create_unimplemented_device("ast2700.dpmcu", 0x11000000,
0x40000);hw/arm/aspeed_ast27x0.c line 519
Quoted 1 line
hw/arm/aspeed_ast27x0.c new file +1
-0+ create_unimplemented_device("ast2700.iomem0", 0x12000000,
0x01000000);hw/arm/aspeed_ast27x0.c line 520
Quoted 1 line
hw/arm/aspeed_ast27x0.c new file +1
-0+ create_unimplemented_device("ast2700.iomem1", 0x14000000,
0x01000000);hw/arm/aspeed_ast27x0.c line 521
Quoted 1 line
hw/arm/aspeed_ast27x0.c new file +1
-0+ create_unimplemented_device("ast2700.ltpi", 0x30000000,
0x1000000);hw/arm/meson.build arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true:
Quoted 50 lines
hw/arm/aspeed_ast27x0.c new file +45
-0+create_unimplemented_device ("ast2700.io" ,0x0 ,0x4000000 ); } + +static void aspeed_soc_ast2700_class_init (ObjectClass *oc,void +*data) { +static const char *const valid_cpu_types[] = { +ARM_CPU_TYPE_NAME ("cortex-a35" ), +NULL + }; +DeviceClass *dc =DEVICE_CLASS (oc); +AspeedSoCClass *sc =ASPEED_SOC_CLASS (oc); + +/* Reason: The Aspeed SoC can only be instantiated from a board */ + dc->user_creatable = false; + dc->realize = aspeed_soc_ast2700_realize; + + sc->name ="ast2700-a0" ; + sc->valid_cpu_types = valid_cpu_types; + sc->silicon_rev =AST2700_A0_SILICON_REV ; + sc->sram_size =0x20000 ; + sc->spis_num =3 ; + sc->wdts_num =8 ; + sc->macs_num =1 ; + sc->uarts_num =13 ; + sc->num_cpus =4 ; + sc->uarts_base =ASPEED_DEV_UART0 ; + sc->irqmap = aspeed_soc_ast2700_irqmap; + sc->memmap = aspeed_soc_ast2700_memmap; + sc->get_irq = aspeed_soc_ast2700_get_irq; +} + +static const TypeInfo aspeed_soc_ast27x0_types[] = { + { + .name =TYPE_ASPEED27X0_SOC , + .parent =TYPE_ASPEED_SOC , + .instance_size =sizeof (Aspeed27x0SoCState), + .abstract = true, + }, { + .name ="ast2700-a0" , + .parent =TYPE_ASPEED27X0_SOC , + .instance_init = aspeed_soc_ast2700_init, + .class_init = aspeed_soc_ast2700_class_init, + }, +}; + +DEFINE_TYPES (aspeed_soc_ast27x0_types)hw/arm/meson.build index renamed from hw/arm/meson.build +0
-0
6808135c1f..1e3295a423100644hw/arm/meson.build +0
-0@@ -46,6 +46,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true:files(
hw/arm/meson.build arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( · line 52
Quoted 7 lines
hw/arm/meson.build +1
-0'aspeed_soc_common.c', 'aspeed_ast2400.c', 'aspeed_ast2600.c', + 'aspeed_ast27x0.c', 'aspeed_ast10x0.c', 'aspeed_eeprom.c', 'fby35.c'))Please change that to :
arm_ss.add(when: ['
CONFIG_ASPEED_SOC', 'TARGET_AARCH64'],if_true:files('aspeed_ast27x0.c'))
Quoted 7 lines
The AST2700 SoC model uses aarch64 CPUs.
Thanks,
C.
Thanks review and suggestion.
Wii fix it in v5 patch.
Jamin
Quoted 93 lines
Quoted 50 lines
include/hw/arm/aspeed_soc.h +7
-2@@ -15,6 +15,7 @@#include "hw/cpu/a15mpcore.h" #include "hw/arm/armv7m.h" #include "hw/intc/aspeed_vic.h" +#include "hw/intc/aspeed_intc.h" #include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/misc/aspeed_sdmc.h" @@ -26,6 +27,7 @@#include "hw/ssi/aspeed_smc.h" #include "hw/misc/aspeed_hace.h" #include "hw/misc/aspeed_sbc.h" +#include "hw/misc/aspeed_sli.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h" @@ -41,8 +43,8 @@#define ASPEED_SPIS_NUM 2#define ASPEED_EHCIS_NUM 2 -#define ASPEED_WDTS_NUM 4 -#define ASPEED_CPUS_NUM 2 +#define ASPEED_WDTS_NUM 8 +#define ASPEED_CPUS_NUM 4#define ASPEED_MACS_NUM 4#define ASPEED_UARTS_NUM 13#define ASPEED_JTAG_NUM 2@@ -61,6 +63,7 @@ struct AspeedSoCState {AspeedI2CState i2c;AspeedI3CState i3c;AspeedSCUState scu; +AspeedSCUState scuio;AspeedHACEState hace;AspeedXDMAState xdma;AspeedADCState adc;@@ -68,6 +71,8 @@ struct AspeedSoCState {AspeedSMCState spi[ASPEED_SPIS_NUM ];EHCISysBusState ehci[ASPEED_EHCIS_NUM ];AspeedSBCState sbc; +AspeedSLIState sli; +AspeedSLIState sliio;MemoryRegion secsram;UnimplementedDeviceState sbc_unimplemented;AspeedSDMCState sdmc;include/hw/arm/aspeed_soc.h struct Aspeed2600SoCState { · line 123
Quoted 2 lines
include/hw/arm/aspeed_soc.h +0
-0@@ -117,6 +122,16 @@ struct Aspeed2600SoCState {#define TYPE_ASPEED2600_SOC "aspeed2600-soc" OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2600SoCState,
ASPEED2600_SOC)Quoted 40 lines
include/hw/arm/aspeed_soc.h +17
-0+struct Aspeed27x0SoCState { +AspeedSoCState parent; + +ARMCPU cpu[ASPEED_CPUS_NUM ]; +AspeedINTCState intc; +}; + +#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" +OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) +struct Aspeed10x0SoCState {AspeedSoCState parent;@@ -168,11 +183,13 @@ enum {ASPEED_DEV_UART13 ,ASPEED_DEV_VUART ,ASPEED_DEV_FMC , +ASPEED_DEV_SPI0 ,ASPEED_DEV_SPI1 ,ASPEED_DEV_SPI2 ,ASPEED_DEV_EHCI1 ,ASPEED_DEV_EHCI2 ,ASPEED_DEV_VIC , +ASPEED_DEV_INTC ,ASPEED_DEV_SDMC ,ASPEED_DEV_SCU , ASPEED_DEV_ADC,@@ -222,6 +239,11 @@ enum {ASPEED_DEV_JTAG1 ,ASPEED_DEV_FSI1 ,ASPEED_DEV_FSI2 , +ASPEED_DEV_SCUIO , +ASPEED_DEV_SLI , +ASPEED_DEV_SLIIO , +ASPEED_GIC_DIST , + ASPEED_GIC_REDIST, };qemu_irq aspeed_soc_get_irq (AspeedSoCState *s,int dev);
Re: [PATCH v4 12/16] aspeed/soc: Add AST2700 support
Hello Jamin,
Quoted 6 lines
I refer to
versal_create_apu_gicfunction, https://github.com/qemu/qemu/blob/master/hw/arm/xlnx-versal.c#L67
and updatedaspeed_soc_ast2700_gicas following.
If you have any concerned about the new changes, please let me know.
Thanks-Jaminstatic bool
aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp)
Please rename to aspeed_soc_ast2700_gic_realize()
Quoted 11 lines
{
Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev);
AspeedSoCState *s = ASPEED_SOC(dev);
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
SysBusDevice *gicbusdev;
DeviceState *gicdev;
QList *redist_region_count;
int i;
object_initialize_child(OBJECT(a), "ast2700-gic", &a->gic,
gicv3_class_name());and object_initialize_child() can be called in aspeed_soc_ast2700_init().
Quoted 10 lines
gicbusdev = SYS_BUS_DEVICE(&a->gic);
gicdev = DEVICE(&a->gic);
qdev_prop_set_uint32(gicdev, "revision", 3);
qdev_prop_set_uint32(gicdev, "num-cpu", sc->num_cpus);
qdev_prop_set_uint32(gicdev, "num-irq", AST2700_MAX_IRQ);
redist_region_count = qlist_new();
qlist_append_int(redist_region_count, sc->num_cpus);
qdev_prop_set_array(gicdev, "redist-region-count", redist_region_count);Quoted 8 lines
if (!sysbus_realize(gicbusdev, errp)) {
return false;
}
sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]);
sysbus_mmio_map(gicbusdev, 1, sc->memmap[ASPEED_GIC_REDIST]);
for (i = 0; i < sc->num_cpus; i++) {
DeviceState *cpudev = DEVICE(qemu_get_cpu(i));Could we avoid qemu_get_cpu() and use the cpu array of the SoC instead ?
Quoted 43 lines
int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9, VIRTUAL_PMU_IRQ = 7; int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS; const int timer_irq[] = { [GTIMER_PHYS] = 14, [GTIMER_VIRT] = 11, [GTIMER_HYP] = 10, [GTIMER_SEC] = 13, }; int j; for (j = 0; j < ARRAY_SIZE(timer_irq); j++) { qdev_connect_gpio_out(cpudev, j, qdev_get_gpio_in(gicdev, ppibase + timer_irq[j])); } qemu_irq irq = qdev_get_gpio_in(gicdev, ppibase + ARCH_GIC_MAINT_IRQ); qdev_connect_gpio_out_named(cpudev, "gicv3-maintenance-interrupt", 0, irq); qdev_connect_gpio_out_named(cpudev, "pmu-interrupt", 0, qdev_get_gpio_in(gicdev, ppibase + VIRTUAL_PMU_IRQ)); sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev, ARM_CPU_IRQ)); sysbus_connect_irq(gicbusdev, i + sc->num_cpus, qdev_get_gpio_in(cpudev, ARM_CPU_FIQ)); sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus, qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ)); sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus, qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ)); } return true; }struct Aspeed27x0SoCState { AspeedSoCState parent; ARMCPU cpu[ASPEED_CPUS_NUM]; AspeedINTCState intc; GICv3State gic; };
Quoted 2 lines
#define
TYPE_ASPEED27X0_SOC"aspeed27x0-soc"OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC)
Thanks,
C.
RE: [PATCH v4 12/16] aspeed/soc: Add AST2700 support
Hi Cedric,
Quoted 6 lines
From: Cédric Le Goater <[email protected]>
Subject: Re: [PATCH v4 12/16] aspeed/soc: Add AST2700 supportHello Jamin,
Quoted 1 line
I refer to
versal_create_apu_gicfunction,
Quoted 8 lines
https://github.com/qemu/qemu/blob/master/hw/arm/xlnx-versal.c#L67
Quoted 5 lines
and updated
aspeed_soc_ast2700_gicas following.
If you have any concerned about the new changes, please let me know. Thanks-Jaminstatic bool
aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp)Please rename to
aspeed_soc_ast2700_gic_realize()
Will fix in v5 patch
Quoted 10 lines
Quoted 10 lines
{ Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); AspeedSoCState *s = ASPEED_SOC(dev); AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); SysBusDevice *gicbusdev; DeviceState *gicdev; QList *redist_region_count; int i;
Quoted 4 lines
Quoted 2 lines
object_initialize_child(OBJECT(a), "ast2700-gic", &a->gic, gicv3_class_name());and
object_initialize_child()can be called inaspeed_soc_ast2700_init().
Will fix in v5 patch
My new changes as following,
static void aspeed_soc_ast2700_init(Object *obj) { --
object_initialize_child(obj, "gic", &a->gic, gicv3_class_name());
--
}
Quoted 17 lines
Quoted 10 lines
gicbusdev = SYS_BUS_DEVICE(&a->gic); gicdev = DEVICE(&a->gic); qdev_prop_set_uint32(gicdev, "revision", 3); qdev_prop_set_uint32(gicdev, "num-cpu", sc->num_cpus); qdev_prop_set_uint32(gicdev, "num-irq", AST2700_MAX_IRQ); redist_region_count = qlist_new(); qlist_append_int(redist_region_count, sc->num_cpus); qdev_prop_set_array(gicdev, "redist-region-count",
redist_region_count);Quoted 6 lines
if (!sysbus_realize(gicbusdev, errp)) { return false; } sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]); sysbus_mmio_map(gicbusdev, 1,
Quoted 6 lines
sc->memmap[ASPEED_GIC_REDIST]);
Quoted 3 lines
for (i = 0; i < sc->num_cpus; i++) { DeviceState *cpudev = DEVICE(qemu_get_cpu(i));Could we avoid
qemu_get_cpu()and use the cpu array of the SoC instead ?
Yes, I can change it and my new changes as following.
DeviceState *cpudev = DEVICE(&a->cpu[i]);
Will fix in v5 patch.
Thanks for review.
Jamin
Quoted 60 lines
Quoted 2 lines
int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9,
VIRTUAL_PMU_IRQ= 7;Quoted 10 lines
int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS; const int timer_irq[] = { [GTIMER_PHYS] = 14, [GTIMER_VIRT] = 11, [GTIMER_HYP] = 10, [GTIMER_SEC] = 13, }; int j;Quoted 7 lines
for (j = 0; j < ARRAY_SIZE(timer_irq); j++) { qdev_connect_gpio_out(cpudev, j, qdev_get_gpio_in(gicdev, ppibase + timer_irq[j])); } qemu_irq irq = qdev_get_gpio_in(gicdev, ppibase +
ARCH_GIC_MAINT_IRQ);Quoted 1 line
qdev_connect_gpio_out_named(cpudev,
"gicv3-maintenance-interrupt",
Quoted 3 lines
0, irq);
qdev_connect_gpio_out_named(cpudev, "pmu-interrupt", 0,
qdev_get_gpio_in(gicdev, ppibase +
VIRTUAL_PMU_IRQ));Quoted 2 lines
sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev,
ARM_CPU_IRQ));Quoted 2 lines
sysbus_connect_irq(gicbusdev, i + sc->num_cpus, qdev_get_gpio_in(cpudev,
ARM_CPU_FIQ));Quoted 2 lines
sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus, qdev_get_gpio_in(cpudev,
ARM_CPU_VIRQ));Quoted 2 lines
sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus, qdev_get_gpio_in(cpudev,
ARM_CPU_VFIQ));Quoted 13 lines
} return true; }struct Aspeed27x0SoCState { AspeedSoCState parent; ARMCPU cpu[ASPEED_CPUS_NUM]; AspeedINTCState intc; GICv3State gic; };Quoted 2 lines
#define
TYPE_ASPEED27X0_SOC"aspeed27x0-soc"OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC)Thanks,
C.
RE: [PATCH v4 12/16] aspeed/soc: Add AST2700 support
In reply to Cédric Le GoaterHi Cedric,
Quoted 427 lines
From: Cédric Le Goater <[email protected]>
Quoted 1 line · Jamin Lin
Initial definitions for a simple machine using an AST2700 SOC (Cortex-a35
CPU).
Quoted 20 lines
AST2700 SOC and its interrupt controller are too complex to handle in the common Aspeed SoC framework. We introduce a new ast2700 class with
instance_initand realize handlers.AST2700 is a 64 bits quad core cpus and support 8 watchdog. Update maximum
ASPEED_CPUS_NUMto 4 andASPEED_WDTS_NUMto 8. In addition, update AspeedSocState to support scuio, sli, sliio and intc.Add
TYPE_ASPEED27X0_SOCmachine type.The SDMC controller is unlocked at SPL stage.
At present, only supports to emulate booting start from u-boot stage. Set SDMC controller unlocked by default.In INTC, each interrupt of INT 128 to INT 136 combines 32 interrupts. It connect GICINT IRQ GPIO-OUTPUT pins to GIC device with irq 128 to 136. And, if a device irq is 128 to 136, its irq GPIO-OUTPUT pin is connected to GICINT or-gates instead of GIC device.
Quoted 4 lines
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>--- hw/arm/aspeed_ast27x0.c | 563++++++++++++++++++++++++++++++++++++
Quoted 220 lines
hw/arm/meson.build | 1 + include/hw/arm/aspeed_soc.h | 26 +- 3 files changed, 588 insertions(+), 2 deletions(-)create mode 100644
hw/arm/aspeed_ast27x0.chw/arm/aspeed_ast27x0.c new renamed from hw/arm/aspeed_ast27x0.c +0
-0file mode 100644 index 0000000000..a3a03fc1ca
hw/arm/aspeed_ast27x0.c new file +210
-0@@ -0,0 +1,563 @@ +/* +* ASPEED SoC 27x0 family +* +* Copyright (C) 2024 ASPEED Technology Inc. +* +* This code is licensed under the GPL version 2 or later. See +* the COPYING file in the top-level directory. +* +* Implementation extracted from the AST2600 and adapted for AST27x0. +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/misc/unimp.h" +#include "hw/arm/aspeed_soc.h" +#include "qemu/module.h" +#include "qemu/error-report.h" +#include "hw/i2c/aspeed_i2c.h" +#include "net/net.h" +#include "sysemu/sysemu.h" +#include "hw/intc/arm_gicv3.h" +#include "qapi/qmp/qlist.h" + +static const hwaddr aspeed_soc_ast2700_memmap[] = { + [ASPEED_DEV_SPI_BOOT ] =0x400000000 , + [ASPEED_DEV_SRAM ] =0x10000000 , + [ASPEED_DEV_SDMC ] =0x12C00000 , + [ASPEED_DEV_SCU ] =0x12C02000 , + [ASPEED_DEV_SCUIO ] =0x14C02000 , + [ASPEED_DEV_UART0 ] =0X14C33000 , + [ASPEED_DEV_UART1 ] =0X14C33100 , + [ASPEED_DEV_UART2 ] =0X14C33200 , + [ASPEED_DEV_UART3 ] =0X14C33300 , + [ASPEED_DEV_UART4 ] =0X12C1A000 , + [ASPEED_DEV_UART5 ] =0X14C33400 , + [ASPEED_DEV_UART6 ] =0X14C33500 , + [ASPEED_DEV_UART7 ] =0X14C33600 , + [ASPEED_DEV_UART8 ] =0X14C33700 , + [ASPEED_DEV_UART9 ] =0X14C33800 , + [ASPEED_DEV_UART10 ] =0X14C33900 , + [ASPEED_DEV_UART11 ] =0X14C33A00 , + [ASPEED_DEV_UART12 ] =0X14C33B00 , + [ASPEED_DEV_WDT ] =0x14C37000 , + [ASPEED_DEV_VUART ] =0X14C30000 , + [ASPEED_DEV_FMC ] =0x14000000 , + [ASPEED_DEV_SPI0 ] =0x14010000 , + [ASPEED_DEV_SPI1 ] =0x14020000 , + [ASPEED_DEV_SPI2 ] =0x14030000 , + [ASPEED_DEV_SDRAM ] =0x400000000 , + [ASPEED_DEV_MII1 ] =0x14040000 , + [ASPEED_DEV_MII2 ] =0x14040008 , + [ASPEED_DEV_MII3 ] =0x14040010 , + [ASPEED_DEV_ETH1 ] =0x14050000 , + [ASPEED_DEV_ETH2 ] =0x14060000 , + [ASPEED_DEV_ETH3 ] =0x14070000 , + [ASPEED_DEV_EMMC ] =0x12090000 , + [ASPEED_DEV_INTC ] =0x12100000 , + [ASPEED_DEV_SLI ] =0x12C17000 , + [ASPEED_DEV_SLIIO ] =0x14C1E000 , + [ASPEED_GIC_DIST ] =0x12200000 , + [ASPEED_GIC_REDIST ] =0x12280000 , +}; + +#define AST2700_MAX_IRQ 288 + +/* Shared Peripheral Interrupt values below are offset by -32 from +datasheet */ static const int aspeed_soc_ast2700_irqmap[] = { + [ASPEED_DEV_UART0 ] =132 , + [ASPEED_DEV_UART1 ] =132 , + [ASPEED_DEV_UART2 ] =132 , + [ASPEED_DEV_UART3 ] =132 , + [ASPEED_DEV_UART4 ] =8 , + [ASPEED_DEV_UART5 ] =132 , + [ASPEED_DEV_UART6 ] =132 , + [ASPEED_DEV_UART7 ] =132 , + [ASPEED_DEV_UART8 ] =132 , + [ASPEED_DEV_UART9 ] =132 , + [ASPEED_DEV_UART10 ] =132 , + [ASPEED_DEV_UART11 ] =132 , + [ASPEED_DEV_UART12 ] =132 , + [ASPEED_DEV_FMC ] =131 , + [ASPEED_DEV_SDMC ] =0 , + [ASPEED_DEV_SCU ] =12 , + [ASPEED_DEV_ADC ] =130 , + [ASPEED_DEV_XDMA ] =5 , + [ASPEED_DEV_EMMC ] =15 , + [ASPEED_DEV_GPIO ] =11 , + [ASPEED_DEV_GPIO_1_8V ] =130 , + [ASPEED_DEV_RTC ] =13 , + [ASPEED_DEV_TIMER1 ] =16 , + [ASPEED_DEV_TIMER2 ] =17 , + [ASPEED_DEV_TIMER3 ] =18 , + [ASPEED_DEV_TIMER4 ] =19 , + [ASPEED_DEV_TIMER5 ] =20 , + [ASPEED_DEV_TIMER6 ] =21 , + [ASPEED_DEV_TIMER7 ] =22 , + [ASPEED_DEV_TIMER8 ] =23 , + [ASPEED_DEV_WDT ] =131 , + [ASPEED_DEV_PWM ] =131 , + [ASPEED_DEV_LPC ] =128 , + [ASPEED_DEV_IBT ] =128 , + [ASPEED_DEV_I2C ] =130 , + [ASPEED_DEV_PECI ] =133 , + [ASPEED_DEV_ETH1 ] =132 , + [ASPEED_DEV_ETH2 ] =132 , + [ASPEED_DEV_ETH3 ] =132 , + [ASPEED_DEV_HACE ] =4 , + [ASPEED_DEV_KCS ] =128 , + [ASPEED_DEV_DP ] =28 , + [ASPEED_DEV_I3C ] =131 , +}; + +/* GICINT 128 */ +static const int aspeed_soc_ast2700_gic128_intcmap[] = { + [ASPEED_DEV_LPC ] =0 , + [ASPEED_DEV_IBT ] =2 , + [ASPEED_DEV_KCS ] =4 , +}; + +/* GICINT 130 */ +static const int aspeed_soc_ast2700_gic130_intcmap[] = { + [ASPEED_DEV_I2C ] =0 , + [ASPEED_DEV_ADC ] =16 , + [ASPEED_DEV_GPIO_1_8V ] =18 , +}; + +/* GICINT 131 */ +static const int aspeed_soc_ast2700_gic131_intcmap[] = { + [ASPEED_DEV_I3C ] =0 , + [ASPEED_DEV_WDT ] =16 , + [ASPEED_DEV_FMC ] =25 , + [ASPEED_DEV_PWM ] =29 , +}; + +/* GICINT 132 */ +static const int aspeed_soc_ast2700_gic132_intcmap[] = { + [ASPEED_DEV_ETH1 ] =0 , + [ASPEED_DEV_ETH2 ] =1 , + [ASPEED_DEV_ETH3 ] =2 , + [ASPEED_DEV_UART0 ] =7 , + [ASPEED_DEV_UART1 ] =8 , + [ASPEED_DEV_UART2 ] =9 , + [ASPEED_DEV_UART3 ] =10 , + [ASPEED_DEV_UART5 ] =11 , + [ASPEED_DEV_UART6 ] =12 , + [ASPEED_DEV_UART7 ] =13 , + [ASPEED_DEV_UART8 ] =14 , + [ASPEED_DEV_UART9 ] =15 , + [ASPEED_DEV_UART10 ] =16 , + [ASPEED_DEV_UART11 ] =17 , + [ASPEED_DEV_UART12 ] =18 , +}; + +/* GICINT 133 */ +static const int aspeed_soc_ast2700_gic133_intcmap[] = { + [ASPEED_DEV_PECI ] =4 , +}; + +/* GICINT 128 ~ 136 */ +struct gic_intc_irq_info { +int irq; +const int *ptr; +}; + +static const struct gic_intc_irq_info aspeed_soc_ast2700_gic_intcmap[] = { + {128 , aspeed_soc_ast2700_gic128_intcmap}, + {129 ,NULL }, + {130 , aspeed_soc_ast2700_gic130_intcmap}, + {131 , aspeed_soc_ast2700_gic131_intcmap}, + {132 , aspeed_soc_ast2700_gic132_intcmap}, + {133 , aspeed_soc_ast2700_gic133_intcmap}, + {134 ,NULL }, + {135 ,NULL }, + {136 ,NULL }, +}; + +static qemu_irq aspeed_soc_ast2700_get_irq (AspeedSoCState *s,int +dev) { +Aspeed27x0SoCState *a =ASPEED27X0_SOC (s); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +int i; + +for (i =0 ; i <ARRAY_SIZE (aspeed_soc_ast2700_gic_intcmap); i++) { +if (sc->irqmap[dev] == aspeed_soc_ast2700_gic_intcmap[i].irq) { +assert (aspeed_soc_ast2700_gic_intcmap[i].ptr); +return qdev_get_gpio_in (DEVICE (&a->intc.orgates[i]), + aspeed_soc_ast2700_gic_intcmap[i].ptr[dev]); + } + } + +return qdev_get_gpio_in (a->intc.gic, sc->irqmap[dev]); } + +static void aspeed_soc_ast2700_init (Object *obj) { +Aspeed27x0SoCState *a =ASPEED27X0_SOC (obj); +AspeedSoCState *s =ASPEED_SOC (obj); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +int i; +char socname[8 ]; +char typename[64 ]; + +if (sscanf (sc->name,"%7s" , socname) !=1 ) { +g_assert_not_reached (); + } + +for (i =0 ; i < sc->num_cpus; i++) { +object_initialize_child (obj,"cpu[*]" , &a->cpu[i], +aspeed_soc_cpu_type (sc)); + } + +object_initialize_child (obj,"scu" , &s->scu,TYPE_ASPEED_2700_SCU );hw/arm/aspeed_ast27x0.c line 220
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+qdev_prop_set_uint32 (DEVICE (&s->scu),"silicon-rev" , + sc->silicon_rev); +object_property_add_alias (obj,"hw-strap1" ,OBJECT (&s->scu), +"hw-strap1" ); +object_property_add_alias (obj,"hw-strap2" ,OBJECT (&s->scu), +"hw-strap2" ); +object_property_add_alias (obj,"hw-prot-key" ,OBJECT (&s->scu), +"hw-prot-key" ); + + object_initialize_child(obj, "scuio", &s->scuio,
TYPE_ASPEED_2700_SCUIO);hw/arm/aspeed_ast27x0.c
Quoted 8 lines
hw/arm/aspeed_ast27x0.c new file +8
-0+qdev_prop_set_uint32 (DEVICE (&s->scuio),"silicon-rev" , + sc->silicon_rev); + +snprintf (typename,sizeof (typename),"aspeed.fmc-%s" , socname); +object_initialize_child (obj,"fmc" , &s->fmc, typename); + +for (i =0 ; i < sc->spis_num; i++) { + snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i,socname);
hw/arm/aspeed_ast27x0.c
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+object_initialize_child (obj,"spi[*]" , &s->spi[i], typename); + } + +snprintf (typename,sizeof (typename),"aspeed.sdmc-%s" , socname); +object_initialize_child (obj,"sdmc" , &s->sdmc, typename); +object_property_add_alias (obj,"ram-size" ,OBJECT (&s->sdmc), +"ram-size" ); + +for (i =0 ; i < sc->wdts_num; i++) { + snprintf(typename, sizeof(typename), "aspeed.wdt-%s",socname);
hw/arm/aspeed_ast27x0.c
Quoted 8 lines
hw/arm/aspeed_ast27x0.c new file +8
-0+object_initialize_child (obj,"wdt[*]" , &s->wdt[i], typename); + } + +for (i =0 ; i < sc->macs_num; i++) { +object_initialize_child (obj,"ftgmac100[*]" , &s->ftgmac100[i], +TYPE_FTGMAC100 ); + + object_initialize_child(obj, "mii[*]", &s->mii[i],
TYPE_ASPEED_MII);hw/arm/aspeed_ast27x0.c
Quoted 4 lines
hw/arm/aspeed_ast27x0.c new file +4
-0+ } + +for (i =0 ; i < sc->uarts_num; i++) { + object_initialize_child(obj, "uart[*]", &s->uart[i],
TYPE_SERIAL_MM);hw/arm/aspeed_ast27x0.c
Quoted 4 lines
hw/arm/aspeed_ast27x0.c new file +4
-0+ } + +object_initialize_child (obj,"sli" , &s->sli,TYPE_ASPEED_2700_SLI ); + object_initialize_child(obj, "sliio", &s->sliio,
TYPE_ASPEED_2700_SLIIO);Quoted 31 lines
hw/arm/aspeed_ast27x0.c new file +31
-0+object_initialize_child (obj,"intc" , &a->intc, +TYPE_ASPEED_2700_INTC ); } + +/* +* ASPEED ast2700 has 0x0 as cluster ID +* +* +https://developer.arm.com/documentation/100236/0100/register-descript +ions/aarch64-system-registers/multiprocessor-affinity-register--el1 +*/ +static uint64_t aspeed_calc_affinity (int cpu) { +return (0x0 <<ARM_AFF1_SHIFT ) | cpu; } + +static bool aspeed_soc_ast2700_gic (DeviceState *dev,Error **errp) { +Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); +SysBusDevice *gicbusdev; +QList *redist_region_count; +int i; + + a->intc.gic =qdev_new (gicv3_class_name ()); +qdev_prop_set_uint32 (a->intc.gic,"revision" ,3 ); +qdev_prop_set_uint32 (a->intc.gic,"num-cpu" , sc->num_cpus); +qdev_prop_set_uint32 (a->intc.gic,"num-irq" ,AST2700_MAX_IRQ ); + + redist_region_count =qlist_new (); +qlist_append_int (redist_region_count, sc->num_cpus); +qdev_prop_set_array (a->intc.gic,"redist-region-count" , + redist_region_count); +hw/arm/aspeed_ast27x0.c
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+ gicbusdev =SYS_BUS_DEVICE (a->intc.gic); +if (!sysbus_realize (gicbusdev, errp)) { +return false; + } +sysbus_mmio_map (gicbusdev,0 , sc->memmap[ASPEED_GIC_DIST ]); +sysbus_mmio_map (gicbusdev,1 , sc->memmap[ASPEED_GIC_REDIST ]); + +for (i =0 ; i < sc->num_cpus; i++) { +DeviceState *cpudev =DEVICE (qemu_get_cpu (i)); + int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9,
VIRTUAL_PMU_IRQ= 7;hw/arm/aspeed_ast27x0.c
Quoted 13 lines
hw/arm/aspeed_ast27x0.c new file +13
-0+int ppibase =NUM_IRQS + i *GIC_INTERNAL +GIC_NR_SGIS ; + +const int timer_irq[] = { + [GTIMER_PHYS ] =14 , + [GTIMER_VIRT ] =11 , + [GTIMER_HYP ] =10 , + [GTIMER_SEC ] =13 , + }; +int j; + +for (j =0 ; j <ARRAY_SIZE (timer_irq); j++) { + qdev_connect_gpio_out(cpudev, j, + qdev_get_gpio_in(a->intc.gic, ppibase +timer_irq[j]));
hw/arm/aspeed_ast27x0.c
Quoted 4 lines
hw/arm/aspeed_ast27x0.c new file +4
-0+ } + + qemu_irq irq = qdev_get_gpio_in(a->intc.gic, + ppibase +
ARCH_GIC_MAINT_IRQ);hw/arm/aspeed_ast27x0.c line 313
Quoted 1 line
hw/arm/aspeed_ast27x0.c new file +1
-0+ qdev_connect_gpio_out_named(cpudev,"gicv3-maintenance-interrupt",
hw/arm/aspeed_ast27x0.c
Quoted 6 lines
hw/arm/aspeed_ast27x0.c new file +6
-0+ 0, irq); +qdev_connect_gpio_out_named (cpudev,"pmu-interrupt" ,0 , +qdev_get_gpio_in (a->intc.gic, ppibase + +VIRTUAL_PMU_IRQ )); + + sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev,
ARM_CPU_IRQ));hw/arm/aspeed_ast27x0.c line 321
Quoted 2 lines
hw/arm/aspeed_ast27x0.c new file +2
-0+ sysbus_connect_irq(gicbusdev, i + sc->num_cpus, + qdev_get_gpio_in(cpudev,
ARM_CPU_FIQ));hw/arm/aspeed_ast27x0.c line 323
Quoted 2 lines
hw/arm/aspeed_ast27x0.c new file +2
-0+ sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus, + qdev_get_gpio_in(cpudev,
ARM_CPU_VIRQ));hw/arm/aspeed_ast27x0.c line 325
Quoted 2 lines
hw/arm/aspeed_ast27x0.c new file +2
-0+ sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus, + qdev_get_gpio_in(cpudev,
ARM_CPU_VFIQ));Quoted 8 lines
hw/arm/aspeed_ast27x0.c new file +8
-0+ } + +return true; +} + +static void aspeed_soc_ast2700_realize (DeviceState *dev,Error +**errp) { +int i;hw/arm/aspeed_ast27x0.c line 393
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+Aspeed27x0SoCState *a =ASPEED27X0_SOC (dev); +AspeedSoCState *s =ASPEED_SOC (dev); +AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS (s); + g_autofree char *sram_name = NULL; +uint32_t num_ints; + +/* Default boot region (SPI memory or ROMs) */ +memory_region_init (&s->spi_boot_container,OBJECT (s), +"aspeed.spi_boot_container" ,0x400000000 ); + memory_region_add_subregion(s->memory,sc->memmap[ASPEED_DEV_SPI_BOOT],
hw/arm/aspeed_ast27x0.c
Quoted 9 lines
hw/arm/aspeed_ast27x0.c new file +9
-0+ &s->spi_boot_container); + +/* CPU */ +for (i =0 ; i < sc->num_cpus; i++) { +object_property_set_int (OBJECT (&a->cpu[i]),"mp-affinity" , +aspeed_calc_affinity (i), + &error_abort); + + object_property_set_int(OBJECT(&a->cpu[i]), "cntfrq",1125000000,
hw/arm/aspeed_ast27x0.c
Quoted 3 lines
hw/arm/aspeed_ast27x0.c new file +3
-0+ &error_abort); + object_property_set_link(OBJECT(&a->cpu[i]), "memory", + OBJECT(s->memory),
&error_abort);Quoted 16 lines
hw/arm/aspeed_ast27x0.c new file +16
-0+ +if (!qdev_realize (DEVICE (&a->cpu[i]),NULL , errp)) { +return ; + } + } + +/* GIC */ +if (!aspeed_soc_ast2700_gic (dev, errp)) { +return ; + } + +/* INTC */ +if (!sysbus_realize (SYS_BUS_DEVICE (&a->intc), errp)) { +return ; + } +
Quoted 8 lines
hw/arm/aspeed_ast27x0.c line 378
Quoted 6 lines
hw/arm/aspeed_ast27x0.c new file +6
-0+aspeed_mmio_map (s,SYS_BUS_DEVICE (&a->intc),0 , + sc->memmap[ASPEED_DEV_INTC ]); + +/* GICINT orgates -> INTC -> GIC */ + num_ints =object_property_get_int (OBJECT (&a->intc),"num-ints" , + &error_abort);Please use the
num_intsvalue from the AspeedINTCClass instead.
Will fix it in v5 patch.
Thanks-Jamin
Quoted 323 lines
Thanks,
C.
hw/arm/aspeed_ast27x0.c
Quoted 3 lines
hw/arm/aspeed_ast27x0.c new file +3
-0+for (i =0 ; i < num_ints; i++) { + qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0, + qdev_get_gpio_in(DEVICE(&a->intc),i));
hw/arm/aspeed_ast27x0.c line 386
Quoted 3 lines
hw/arm/aspeed_ast27x0.c new file +3
-0+ sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i, + qdev_get_gpio_in(a->intc.gic, +aspeed_soc_ast2700_gic_intcmap[i].irq));
hw/arm/aspeed_ast27x0.c
Quoted 4 lines
hw/arm/aspeed_ast27x0.c new file +4
-0+ } + +/* SRAM */ + sram_name = g_strdup_printf("aspeed.sram.%d",CPU(&a->cpu[0])->cpu_index);
hw/arm/aspeed_ast27x0.c line 388
Quoted 1 line
hw/arm/aspeed_ast27x0.c new file +1
-0+ if (!memory_region_init_ram(&s->sram, OBJECT(s), sram_name,
sc->sram_size,Quoted 21 lines
hw/arm/aspeed_ast27x0.c new file +21
-0+ errp)) { +return ; + } +memory_region_add_subregion (s->memory, + sc->memmap[ASPEED_DEV_SRAM ], + &s->sram); + +/* SCU */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->scu), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->scu),0 , + sc->memmap[ASPEED_DEV_SCU ]); + +/* SCU1 */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->scuio), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->scuio),0 , + sc->memmap[ASPEED_DEV_SCUIO ]); +hw/arm/aspeed_ast27x0.c
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+/* UART */ +if (!aspeed_soc_uart_realize (s, errp)) { +return ; + } + +/* FMC, The number of CS is set at the board level */ +object_property_set_int (OBJECT (&s->fmc),"dram-base" , + sc->memmap[ASPEED_DEV_SDRAM ], + &error_abort); + object_property_set_link(OBJECT(&s->fmc), "dram",
OBJECT(s->dram_mr),hw/arm/aspeed_ast27x0.c
Quoted 5 lines
hw/arm/aspeed_ast27x0.c new file +5
-0+ &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->fmc), errp)) { +return ; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 0,sc->memmap[ASPEED_DEV_FMC]);
hw/arm/aspeed_ast27x0.c line 428
Quoted 2 lines
hw/arm/aspeed_ast27x0.c new file +2
-0+ aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 1, +ASPEED_SMC_GET_CLASS(&s->fmc)->flash_window_base);
hw/arm/aspeed_ast27x0.c
Quoted 6 lines
hw/arm/aspeed_ast27x0.c new file +6
-0+sysbus_connect_irq (SYS_BUS_DEVICE (&s->fmc),0 , +aspeed_soc_get_irq (s,ASPEED_DEV_FMC )); + +/* Set up an alias on the FMC CE0 region (boot default) */ +MemoryRegion *fmc0_mmio = &s->fmc.flashes[0 ].mmio; + memory_region_init_alias(&s->spi_boot, OBJECT(s),"aspeed.spi_boot",
hw/arm/aspeed_ast27x0.c line 433
Quoted 1 line
hw/arm/aspeed_ast27x0.c new file +1
-0+ fmc0_mmio, 0,
memory_region_size(fmc0_mmio));hw/arm/aspeed_ast27x0.c
Quoted 7 lines
hw/arm/aspeed_ast27x0.c new file +7
-0+memory_region_add_subregion (&s->spi_boot_container,0x0 , + &s->spi_boot); + +/* SPI */ +for (i =0 ; i < sc->spis_num; i++) { + object_property_set_link(OBJECT(&s->spi[i]), "dram", + OBJECT(s->dram_mr),
&error_abort);hw/arm/aspeed_ast27x0.c line 447
Quoted 7 lines
hw/arm/aspeed_ast27x0.c new file +7
-0+if (!sysbus_realize (SYS_BUS_DEVICE (&s->spi[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->spi[i]),0 , + sc->memmap[ASPEED_DEV_SPI0 + i]); + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 1, +ASPEED_SMC_GET_CLASS(&s->spi[i])->flash_window_base);
Quoted 14 lines
hw/arm/aspeed_ast27x0.c new file +14
-0+ } + +/* +* SDMC - SDRAM Memory Controller +* The SDMC controller is unlocked at SPL stage. +* At present, only supports to emulate booting +* start from u-boot stage. Set SDMC controller +* unlocked by default. It is a temporarily solution. +*/ +object_property_set_bool (OBJECT (&s->sdmc),"unlocked" , true, + &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sdmc), errp)) { +return ; + }hw/arm/aspeed_ast27x0.c
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sdmc),0 , + sc->memmap[ASPEED_DEV_SDMC ]); + +/* RAM */ +if (!aspeed_soc_dram_init (s, errp)) { +return ; + } + +for (i =0 ; i < sc->macs_num; i++) { + object_property_set_bool(OBJECT(&s->ftgmac100[i]), "aspeed",true,
hw/arm/aspeed_ast27x0.c
Quoted 8 lines
hw/arm/aspeed_ast27x0.c new file +8
-0+ &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->ftgmac100[i]), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->ftgmac100[i]),0 , + sc->memmap[ASPEED_DEV_ETH1 + i]); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, + aspeed_soc_get_irq(s, ASPEED_DEV_ETH1+
hw/arm/aspeed_ast27x0.c
Quoted 4 lines
hw/arm/aspeed_ast27x0.c new file +4
-0+ i)); + + object_property_set_link(OBJECT(&s->mii[i]), "nic", + OBJECT(&s->ftgmac100[i]),
&error_abort);Quoted 5 lines
hw/arm/aspeed_ast27x0.c new file +5
-0+if (!sysbus_realize (SYS_BUS_DEVICE (&s->mii[i]), errp)) { +return ; + } + + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->mii[i]), 0,hw/arm/aspeed_ast27x0.c
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+ sc->memmap[ASPEED_DEV_MII1 + i]); + } + +/* Watch dog */ +for (i =0 ; i < sc->wdts_num; i++) { +AspeedWDTClass *awc =ASPEED_WDT_GET_CLASS (&s->wdt[i]); +hwaddr wdt_offset = sc->memmap[ASPEED_DEV_WDT ] + i * + awc->iosize; + + object_property_set_link(OBJECT(&s->wdt[i]), "scu",
OBJECT(&s->scu),hw/arm/aspeed_ast27x0.c
Quoted 5 lines
hw/arm/aspeed_ast27x0.c new file +5
-0+ &error_abort); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->wdt[i]), errp)) { +return ; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->wdt[i]), 0,
wdt_offset);Quoted 6 lines
hw/arm/aspeed_ast27x0.c new file +6
-0+ } + +/* SLI */ +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sli), errp)) { +return ; + }hw/arm/aspeed_ast27x0.c
Quoted 10 lines
hw/arm/aspeed_ast27x0.c new file +10
-0+aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sli),0 , + sc->memmap[ASPEED_DEV_SLI ]); + +if (!sysbus_realize (SYS_BUS_DEVICE (&s->sliio), errp)) { +return ; + } +aspeed_mmio_map (s,SYS_BUS_DEVICE (&s->sliio),0 , + sc->memmap[ASPEED_DEV_SLIIO ]); + + create_unimplemented_device("ast2700.dpmcu", 0x11000000,
0x40000);hw/arm/aspeed_ast27x0.c line 520
Quoted 1 line
hw/arm/aspeed_ast27x0.c new file +1
-0+ create_unimplemented_device("ast2700.iomem0", 0x12000000,
0x01000000);hw/arm/aspeed_ast27x0.c line 521
Quoted 1 line
hw/arm/aspeed_ast27x0.c new file +1
-0+ create_unimplemented_device("ast2700.iomem1", 0x14000000,
0x01000000);hw/arm/aspeed_ast27x0.c line 522
Quoted 1 line
hw/arm/aspeed_ast27x0.c new file +1
-0+ create_unimplemented_device("ast2700.ltpi", 0x30000000,
0x1000000);hw/arm/meson.build arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true:
Quoted 50 lines
hw/arm/aspeed_ast27x0.c new file +45
-0+create_unimplemented_device ("ast2700.io" ,0x0 ,0x4000000 ); } + +static void aspeed_soc_ast2700_class_init (ObjectClass *oc,void +*data) { +static const char *const valid_cpu_types[] = { +ARM_CPU_TYPE_NAME ("cortex-a35" ), +NULL + }; +DeviceClass *dc =DEVICE_CLASS (oc); +AspeedSoCClass *sc =ASPEED_SOC_CLASS (oc); + +/* Reason: The Aspeed SoC can only be instantiated from a board */ + dc->user_creatable = false; + dc->realize = aspeed_soc_ast2700_realize; + + sc->name ="ast2700-a0" ; + sc->valid_cpu_types = valid_cpu_types; + sc->silicon_rev =AST2700_A0_SILICON_REV ; + sc->sram_size =0x20000 ; + sc->spis_num =3 ; + sc->wdts_num =8 ; + sc->macs_num =1 ; + sc->uarts_num =13 ; + sc->num_cpus =4 ; + sc->uarts_base =ASPEED_DEV_UART0 ; + sc->irqmap = aspeed_soc_ast2700_irqmap; + sc->memmap = aspeed_soc_ast2700_memmap; + sc->get_irq = aspeed_soc_ast2700_get_irq; +} + +static const TypeInfo aspeed_soc_ast27x0_types[] = { + { + .name =TYPE_ASPEED27X0_SOC , + .parent =TYPE_ASPEED_SOC , + .instance_size =sizeof (Aspeed27x0SoCState), + .abstract = true, + }, { + .name ="ast2700-a0" , + .parent =TYPE_ASPEED27X0_SOC , + .instance_init = aspeed_soc_ast2700_init, + .class_init = aspeed_soc_ast2700_class_init, + }, +}; + +DEFINE_TYPES (aspeed_soc_ast27x0_types)hw/arm/meson.build index renamed from hw/arm/meson.build +0
-0
6808135c1f..1e3295a423100644hw/arm/meson.build +0
-0@@ -46,6 +46,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true:files(
Quoted 56 lines
hw/arm/meson.build +1
-0'aspeed_soc_common.c', 'aspeed_ast2400.c', 'aspeed_ast2600.c', + 'aspeed_ast27x0.c', 'aspeed_ast10x0.c', 'aspeed_eeprom.c', 'fby35.c'))include/hw/arm/aspeed_soc.h +7
-2@@ -15,6 +15,7 @@#include "hw/cpu/a15mpcore.h" #include "hw/arm/armv7m.h" #include "hw/intc/aspeed_vic.h" +#include "hw/intc/aspeed_intc.h" #include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/misc/aspeed_sdmc.h" @@ -26,6 +27,7 @@#include "hw/ssi/aspeed_smc.h" #include "hw/misc/aspeed_hace.h" #include "hw/misc/aspeed_sbc.h" +#include "hw/misc/aspeed_sli.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h" @@ -41,8 +43,8 @@#define ASPEED_SPIS_NUM 2#define ASPEED_EHCIS_NUM 2 -#define ASPEED_WDTS_NUM 4 -#define ASPEED_CPUS_NUM 2 +#define ASPEED_WDTS_NUM 8 +#define ASPEED_CPUS_NUM 4#define ASPEED_MACS_NUM 4#define ASPEED_UARTS_NUM 13#define ASPEED_JTAG_NUM 2@@ -61,6 +63,7 @@ struct AspeedSoCState {AspeedI2CState i2c;AspeedI3CState i3c;AspeedSCUState scu; +AspeedSCUState scuio;AspeedHACEState hace;AspeedXDMAState xdma;AspeedADCState adc;@@ -68,6 +71,8 @@ struct AspeedSoCState {AspeedSMCState spi[ASPEED_SPIS_NUM ];EHCISysBusState ehci[ASPEED_EHCIS_NUM ];AspeedSBCState sbc; +AspeedSLIState sli; +AspeedSLIState sliio;MemoryRegion secsram;UnimplementedDeviceState sbc_unimplemented;AspeedSDMCState sdmc;include/hw/arm/aspeed_soc.h struct Aspeed2600SoCState { · line 123
Quoted 2 lines
include/hw/arm/aspeed_soc.h +0
-0@@ -117,6 +122,16 @@ struct Aspeed2600SoCState {#define TYPE_ASPEED2600_SOC "aspeed2600-soc" OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2600SoCState,
ASPEED2600_SOC)Quoted 40 lines
include/hw/arm/aspeed_soc.h +17
-0+struct Aspeed27x0SoCState { +AspeedSoCState parent; + +ARMCPU cpu[ASPEED_CPUS_NUM ]; +AspeedINTCState intc; +}; + +#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" +OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) +struct Aspeed10x0SoCState {AspeedSoCState parent;@@ -168,11 +183,13 @@ enum {ASPEED_DEV_UART13 ,ASPEED_DEV_VUART ,ASPEED_DEV_FMC , +ASPEED_DEV_SPI0 ,ASPEED_DEV_SPI1 ,ASPEED_DEV_SPI2 ,ASPEED_DEV_EHCI1 ,ASPEED_DEV_EHCI2 ,ASPEED_DEV_VIC , +ASPEED_DEV_INTC ,ASPEED_DEV_SDMC ,ASPEED_DEV_SCU , ASPEED_DEV_ADC,@@ -222,6 +239,11 @@ enum {ASPEED_DEV_JTAG1 ,ASPEED_DEV_FSI1 ,ASPEED_DEV_FSI2 , +ASPEED_DEV_SCUIO , +ASPEED_DEV_SLI , +ASPEED_DEV_SLIIO , +ASPEED_GIC_DIST , + ASPEED_GIC_REDIST, };qemu_irq aspeed_soc_get_irq (AspeedSoCState *s,int dev);
Re: [PATCH v4 12/16] aspeed/soc: Add AST2700 support
In reply to Cédric Le GoaterQuoted 41 lines · Cédric Le Goater
Hello Jamin,
Quoted 6 lines
I refer to
versal_create_apu_gicfunction, https://github.com/qemu/qemu/blob/master/hw/arm/xlnx-versal.c#L67
and updatedaspeed_soc_ast2700_gicas following.
If you have any concerned about the new changes, please let me know.
Thanks-Jaminstatic bool
aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp)Please rename to
aspeed_soc_ast2700_gic_realize()Quoted 11 lines
{
Aspeed27x0SoCState *a =ASPEED27X0_SOC(dev); AspeedSoCState *s =ASPEED_SOC(dev); AspeedSoCClass *sc =ASPEED_SOC_GET_CLASS(s); SysBusDevice *gicbusdev;
DeviceState *gicdev;
QList*redist_region_count;
int i;
object_initialize_child(OBJECT(a), "ast2700-gic", &a->gic, gicv3_class_name());and
object_initialize_child()can be called inaspeed_soc_ast2700_init().Quoted 16 lines
gicbusdev =
SYS_BUS_DEVICE(&a->gic);
gicdev =DEVICE(&a->gic);qdev_prop_set_uint32(gicdev, "revision", 3);qdev_prop_set_uint32(gicdev, "num-cpu", sc->num_cpus);qdev_prop_set_uint32(gicdev, "num-irq", AST2700_MAX_IRQ);
redist_region_count=qlist_new();qlist_append_int(redist_region_count, sc->num_cpus);qdev_prop_set_array(gicdev, "redist-region-count", redist_region_count);if (!sysbus_realize(gicbusdev, errp)) {
return false;
}
sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]);sysbus_mmio_map(gicbusdev, 1, sc->memmap[ASPEED_GIC_REDIST]);
Quoted 4 lines
Quoted 2 lines
for (i = 0; i <
sc->num_cpus; i++) { DeviceState *cpudev = DEVICE(qemu_get_cpu(i));Could we avoid
qemu_get_cpu()and use the cpu array of the SoC instead ?
If it is too invasive, I might take care of it later when respinning
https://lore.kernel.org/qemu-devel/[email protected]
RE: [PATCH v4 11/16] aspeed/intc: Add AST2700 support
In reply to Cédric Le GoaterHi Cedric,
Quoted 156 lines
From: Cédric Le Goater <[email protected]>
Subject: Re: [PATCH v4 11/16] aspeed/intc: Add AST2700 supportQuoted 22 lines · Jamin Lin
AST2700 interrupt controller(INTC) provides hardware interrupt interfaces to interrupt of processors PSP, SSP and TSP. In INTC, each interrupt of INT 128 to INT136 combines 32 interrupts.
Introduce a new
aspeed_intcclass withinstance_initand realize handlers.So far, this model only supports GICINT128 to GICINT136.
It creates 9 GICINT or-gates to connect 32 interrupts sources from GICINT128 to GICINT136 as IRQ GPIO-OUTPUT pins.
Then, this model registers IRQ handler with its IRQ GPIO-INPUT pins which connect to GICINT or-gates. And creates 9 GICINT IRQ GPIO-OUTPUT pins which connect to GIC device with GIC IRQ 128 to 136.If one interrupt source from GICINT128 to GICINT136 set irq, the OR-GATE irq callback function is called and set irq to INTC by OR-GATE GPIO-OUTPUT pins. Then, the INTC irq callback function is called and set irq to GIC by its GICINT IRQ GPIO-OUTPUT pins. Finally, the GIC irq callback function is called and set irq to CPUs and CPUs execute Interrupt Service Routine (ISR).
Block diagram of GICINT132:
Quoted 7 lines
GICINT132 ETH1 +-----------+ +-------->+0 3| ETH2 | 4| +-------->+1 5| ETH3 | 6| +-------->+2 19| INTCGIC
Quoted 2 lines
UART0 | 20| +--------------------------++-------->+7 21| | |
+--------------+ > UART1 | 22| |orgate0 +----> output_pin0+----------->+GIC128 | > +-------->+8 23| | | | | > UART2 | 24| |orgate1 +----> output_pin1+----------->+GIC129 | > +-------->+9 25| | | | | > UART3 | 26| |orgate2 +----> output_pin2+----------->+GIC130 | > +--------->10 27| | | | | > UART5 | 28| |orgate3 +----> output_pin3+----------->+GIC131 | > +-------->+11 29| | | | | > UART6 | +----------->+orgate4 +----> output_pin4+----------->+GIC132 | > +-------->+12 30| | | | | > UART7 | 31| |orgate5 +----> output_pin5+----------->+GIC133 | > +-------->+13 | | | | | > UART8 | OR[0:31] | |orgate6 +----> output_pin6+----------->+GIC134 | > ---------->14 | | | | | > UART9 | | |orgate7 +----> output_pin7+----------->+GIC135 | > --------->+15 | | | | | > UART10 | | |orgate8 +----> output_pin8+----------->+GIC136 | > --------->+16 | | | +--------------+ > UART11 | | +--------------------------+ > +-------->+17 | > UART12 | | > +--------->18 | > | | > | | > | | > +-----------+Quoted 5 lines
Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>--- hw/intc/aspeed_intc.c | 355++++++++++++++++++++++++++++++++++
Quoted 69 lines
hw/intc/meson.build | 1 + hw/intc/trace-events | 6 + include/hw/intc/aspeed_intc.h | 46 +++++ 4 files changed, 408 insertions(+)create mode 100644
hw/intc/aspeed_intc.ccreate mode 100644include/hw/intc/aspeed_intc.hhw/intc/aspeed_intc.c new file renamed from hw/intc/aspeed_intc.c +0
-0mode 100644 index 0000000000..cb6111d79c
hw/intc/aspeed_intc.c new file +57
-0@@ -0,0 +1,355 @@ +/* +* ASPEED INTC Controller +* +* Copyright (C) 2024 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "hw/intc/aspeed_intc.h" +#include "hw/irq.h" +#include "migration/vmstate.h" +#include "qemu/bitops.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "hw/intc/arm_gicv3.h" +#include "trace.h" +#include "hw/registerfields.h" +#include "qapi/error.h" +#include "hw/qdev-properties.h" + +/* INTC Registers */ +REG32(GICINT128_EN, 0x1000) +REG32(GICINT128_STATUS, 0x1004) +REG32(GICINT129_EN, 0x1100) +REG32(GICINT129_STATUS, 0x1104) +REG32(GICINT130_EN, 0x1200) +REG32(GICINT130_STATUS, 0x1204) +REG32(GICINT131_EN, 0x1300) +REG32(GICINT131_STATUS, 0x1304) +REG32(GICINT132_EN, 0x1400) +REG32(GICINT132_STATUS, 0x1404) +REG32(GICINT133_EN, 0x1500) +REG32(GICINT133_STATUS, 0x1504) +REG32(GICINT134_EN, 0x1600) +REG32(GICINT134_STATUS, 0x1604) +REG32(GICINT135_EN, 0x1700) +REG32(GICINT135_STATUS, 0x1704) +REG32(GICINT136_EN, 0x1800) +REG32(GICINT136_STATUS, 0x1804) + +#define GICINT_STATUS_BASE R_GICINT128_STATUS + +static void aspeed_intc_update (AspeedINTCState *s,int irq,int +level) { +trace_aspeed_intc_update_irq (irq, level); +qemu_set_irq (s->output_pins[irq], level); } + +/* +* The address of GICINT128 to GICINT136 are from 0x1000 to 0x1804. +* Utilize "address & 0x0f00" to get the irq and irq output pin index +* The value of irq should be 0 to num_ints. +* The irq 0 indicates GICINT128, irq 1 indicates GICINT129 and so on. +*/ +static void aspeed_intc_set_irq (void *opaque,int irq,int level) { +AspeedINTCState *s = (AspeedINTCState *)opaque; +AspeedINTCClass *aic =ASPEED_INTC_GET_CLASS (s); +uint32_t status_addr =GICINT_STATUS_BASE + ((0x100 * irq) >>2 );
Quoted 8 lines
hw/intc/aspeed_intc.c line 65
Quoted 5 lines
hw/intc/aspeed_intc.c new file +5
-0+uint32_t enable = s->enable[irq]; +uint32_t select =0 ; +int i; + +if (irq > aic->num_ints) {This check should be done before setting the enable variable. Or use an
assert().
Will fix
Quoted 23 lines
hw/intc/aspeed_intc.c line 63
Quoted 2 lines
hw/intc/aspeed_intc.c new file +1
-0+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid interruptnumber: %d\n",
Quoted 20 lines
hw/intc/aspeed_intc.c new file +20
-0+ __func__, irq); +return ; + } + +trace_aspeed_intc_set_irq (irq, level); + +if (!level) { +return ; + } + +for (i =0 ; i < aic->num_lines; i++) { +if (s->orgates[irq].levels[i]) { +if (enable &BIT (i)) { + select |=BIT (i); + } + } + } + +if (!select) { +return ;
Quoted 9 lines
hw/intc/aspeed_intc.c line 91
Quoted 5 lines
hw/intc/aspeed_intc.c new file +5
-0+ } + +trace_aspeed_intc_debug ("select" , select); +trace_aspeed_intc_debug ("mask" , s->mask[irq]); +trace_aspeed_intc_debug ("status" , s->regs[status_addr]);Hmm,
trace_aspeed_intc_debugseems a bit overuse to me. May be you could remove a few or introduce specific trace events ?
Will fix
Quoted 56 lines
hw/intc/aspeed_intc.c
Quoted 11 lines
hw/intc/aspeed_intc.c new file +11
-0+if (s->mask[irq] || s->regs[status_addr]) { +/* +* a. mask is not 0 means in ISR mode +* sources interrupt routine are executing. +* b. status register value is not 0 means previous +* source interrupt does not be executed, yet. +* +* save source interrupt to pending variable. +*/ + s->pending[irq] |= select; + trace_aspeed_intc_debug("pending source interrupt",s->pending[irq]);
Quoted 11 lines
hw/intc/aspeed_intc.c new file +11
-0+ }else { +/* +* notify firmware which source interrupt are coming +* by setting status register +*/ + s->regs[status_addr] = select; +trace_aspeed_intc_debug ("trigger source interrupt" , + s->regs[status_addr]); +aspeed_intc_update (s, irq,1 ); + } +}hw/intc/aspeed_intc.c
Quoted 10 lines
hw/intc/aspeed_intc.c new file +10
-0+ +static uint64_t aspeed_intc_read (void *opaque,hwaddr offset, +unsigned int size) { +AspeedINTCState *s =ASPEED_INTC (opaque); +uint32_t addr = offset >>2 ; +uint32_t value =0 ; + +if (addr >=ASPEED_INTC_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , + "%s: Out-of-bounds read at offset 0x%"
HWADDR_PRIx"\n",Quoted 11 lines
hw/intc/aspeed_intc.c new file +11
-0+ __func__, offset); +return 0 ; + } + + value = s->regs[addr]; +trace_aspeed_intc_read (offset, size, value); + +return value; +} + +static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,hw/intc/aspeed_intc.c
Quoted 10 lines
hw/intc/aspeed_intc.c new file +10
-0+ unsigned size) { +AspeedINTCState *s =ASPEED_INTC (opaque); +uint32_t irq = (offset &0x0f00 ) >>8 ; +uint32_t addr = offset >>2 ; +uint32_t old_enable; +uint32_t change; + +if (addr >=ASPEED_INTC_NR_REGS ) { +qemu_log_mask (LOG_GUEST_ERROR , + "%s: Out-of-bounds write at offset 0x%"
HWADDR_PRIx"\n",
Quoted 7 lines
hw/intc/aspeed_intc.c line 149
Quoted 3 lines
hw/intc/aspeed_intc.c new file +3
-0+ __func__, offset); +return ; + }irq needs a check also.
Will fix
Quoted 111 lines
Quoted 51 lines
hw/intc/aspeed_intc.c new file +51
-0+trace_aspeed_intc_write (offset, size, data); + +switch (addr) { +case R_GICINT128_EN : +case R_GICINT129_EN : +case R_GICINT130_EN : +case R_GICINT131_EN : +case R_GICINT132_EN : +case R_GICINT133_EN : +case R_GICINT134_EN : +case R_GICINT135_EN : +case R_GICINT136_EN : +/* +* These registers are used for enable sources interrupt and +* mask and unmask source interrupt while executing source ISR. +*/ + +/* disable all source interrupt */ +if (!data && !s->enable[irq]) { + s->regs[addr] = data; +trace_aspeed_intc_debug ("disable all source interrupt" , irq); +return ; + } + + old_enable = s->enable[irq]; + s->enable[irq] |= data; + +/* enable new source interrupt */ +if (old_enable != s->enable[irq]) { +trace_aspeed_intc_debug ("enable new source interrupt" , + s->enable[irq]); + s->regs[addr] = data; +return ; + } + +/* mask and unmask source interrupt */ + change = s->regs[addr] ^ data; +trace_aspeed_intc_debug ("enable change bit" , change); +if (change & data) { + s->mask[irq] &= ~change; +trace_aspeed_intc_debug ("enable umask" , s->mask[irq]); + }else { + s->mask[irq] |= change; +trace_aspeed_intc_debug ("enable mask" , s->mask[irq]); + } + s->regs[addr] = data; +break ; +case R_GICINT128_STATUS : +case R_GICINT129_STATUS : +case R_GICINT130_STATUS : +case R_GICINT131_STATUS :hw/intc/aspeed_intc.c
Quoted 10 lines
hw/intc/aspeed_intc.c new file +10
-0+case R_GICINT132_STATUS : +case R_GICINT133_STATUS : +case R_GICINT134_STATUS : +case R_GICINT135_STATUS : +case R_GICINT136_STATUS : +/* clear status */ + s->regs[addr] &= ~data; + +/* +* These status registers are used for notify sources ISR are executed.
hw/intc/aspeed_intc.c
Quoted 13 lines
hw/intc/aspeed_intc.c new file +13
-0+* If one source ISR is executed, it will clear one bit. +* If it clear all bits, it means to initialize this register status +* rather than sources ISR are executed. +*/ +if (data ==0xffffffff ) { +trace_aspeed_intc_debug ("clear all source interrupt status" , + s->regs[addr]); +return ; + } + +/* All source ISR execution are done */ +if (!s->regs[addr]) { + trace_aspeed_intc_debug("all source ISR execution aredone",
Quoted 35 lines
hw/intc/aspeed_intc.c new file +35
-0+ s->regs[addr]); +if (s->pending[irq]) { +/* +* handle pending source interrupt +* notify firmware which source interrupt are pending +* by setting status register +*/ + s->regs[addr] = s->pending[irq]; + s->pending[irq] =0 ; +trace_aspeed_intc_debug ("trigger pending interrupt" , + s->regs[addr]); +aspeed_intc_update (s, irq,1 ); + }else { +/* clear irq */ +aspeed_intc_update (s, irq,0 ); + } + } +break ; +default : + s->regs[addr] = data; +break ; + } + +return ; +} + +static const MemoryRegionOps aspeed_intc_ops = { + .read = aspeed_intc_read, + .write = aspeed_intc_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =4 , + .max_access_size =4 , + } +};
Quoted 10 lines
hw/intc/aspeed_intc.c line 265
Quoted 5 lines
hw/intc/aspeed_intc.c new file +5
-0+ +static void aspeed_intc_instance_init (Object *obj) { +AspeedINTCState *s =ASPEED_INTC (obj); +AspeedINTCClass *aic =ASPEED_INTC_GET_CLASS (s); +int i;I would add an assert on
aic->num_intsto make sure it is not greater thanASPEED_INTC_NR_INTS.
Will add
Quoted 11 lines
hw/intc/aspeed_intc.c line 274
Quoted 8 lines
hw/intc/aspeed_intc.c new file +8
-0+for (i =0 ; i < aic->num_ints; i++) { +object_initialize_child (obj,"intc-orgates[*]" , &s->orgates[i], +TYPE_OR_IRQ ); +object_property_set_int (OBJECT (&s->orgates[i]),"num-lines" , + aic->num_lines, &error_abort); + } + + s->num_ints = aic->num_ints;Seems unused ?
Yes, will remove it
Quoted 30 lines
Quoted 30 lines
hw/intc/aspeed_intc.c new file +30
-0+} + +static void aspeed_intc_reset (DeviceState *dev) { +AspeedINTCState *s =ASPEED_INTC (dev); + +memset (s->regs,0 ,sizeof (s->regs)); +memset (s->enable,0 ,sizeof (s->enable)); +memset (s->mask,0 ,sizeof (s->mask)); +memset (s->pending,0 ,sizeof (s->pending)); } + +static void aspeed_intc_realize (DeviceState *dev,Error **errp) { +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); +AspeedINTCState *s =ASPEED_INTC (dev); +AspeedINTCClass *aic =ASPEED_INTC_GET_CLASS (s); +int i; + +memory_region_init_io (&s->iomem,OBJECT (s), &aspeed_intc_ops, s, +TYPE_ASPEED_INTC ".regs" , +ASPEED_INTC_NR_REGS <<2 ); + +sysbus_init_mmio (sbd, &s->iomem); +qdev_init_gpio_in (dev, aspeed_intc_set_irq, aic->num_ints); + +for (i =0 ; i < aic->num_ints; i++) { +if (!qdev_realize (DEVICE (&s->orgates[i]),NULL , errp)) { +return ; + } +sysbus_init_irq (sbd, &s->output_pins[i]); + } +}
Quoted 9 lines
hw/intc/aspeed_intc.c line 311
Quoted 5 lines
hw/intc/aspeed_intc.c new file +5
-0+ +static Property aspeed_intc_properties[] = { +DEFINE_PROP_UINT32 ("num-ints" , AspeedINTCState, num_ints,0 ), +DEFINE_PROP_END_OF_LIST (), +};This property doesn't seem useful. Please use the
num_intsvalue from the AspeedINTCClass instead.
Will fix
Quoted 22 lines
Quoted 22 lines
hw/intc/aspeed_intc.c new file +22
-0+ +static void aspeed_intc_class_init (ObjectClass *klass,void *data) { +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->desc ="ASPEED INTC Controller" ; + dc->realize = aspeed_intc_realize; + dc->reset = aspeed_intc_reset; +device_class_set_props (dc, aspeed_intc_properties); + dc->vmsd =NULL ; +} + +static const TypeInfo aspeed_intc_info = { + .name =TYPE_ASPEED_INTC , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_init = aspeed_intc_instance_init, + .instance_size =sizeof (AspeedINTCState), + .class_init = aspeed_intc_class_init, + .abstract = true, +}; + +static void aspeed_2700_intc_class_init (ObjectClass *klass,void +*data) {
Quoted 9 lines
hw/intc/aspeed_intc.c line 340
Quoted 6 lines
hw/intc/aspeed_intc.c new file +6
-0+DeviceClass *dc =DEVICE_CLASS (klass); +AspeedINTCClass *aic =ASPEED_INTC_CLASS (klass); + + dc->desc ="ASPEED 2700 INTC Controller" ; + aic->num_lines =32 ; + aic->num_ints =9 ;Use
ASPEED_INTC_NR_INTS?
I am considering to support INTC model for future BMC SOCs.
For example, if the num_ints has been changed to "18" in the future BMC Socs, users only need to update ASPEED_INTC_NR_INTS and Create a aspeed_XXXX_intc_class_init to set its "aic->num_ints 18".
That was why I set aic->num_ints 9 in aspeed_2700_intc_class_init.
Thanks for your review and suggestion.
Jamin
Quoted 109 lines
Thanks,
C.
hw/intc/meson.build system_ss.add(when: 'CONFIG_ARM_GICV3_TCG',
Quoted 18 lines
hw/intc/aspeed_intc.c new file +13
-0+} + +static const TypeInfo aspeed_2700_intc_info = { + .name =TYPE_ASPEED_2700_INTC , + .parent =TYPE_ASPEED_INTC , + .class_init = aspeed_2700_intc_class_init, }; + +static void aspeed_intc_register_types (void ) { +type_register_static (&aspeed_intc_info); +type_register_static (&aspeed_2700_intc_info); +} + +type_init (aspeed_intc_register_types);hw/intc/meson.build index renamed from hw/intc/meson.build +0
-0
ed355941d1..f5c574f584100644hw/intc/meson.build +0
-0@@ -14,6 +14,7 @@ system_ss.add(when: 'CONFIG_ARM_GICV3_TCG',
if_true: files(hw/intc/meson.build system_ss.add(when: 'CONFIG_ARM_GICV3_TCG', · line 15
Quoted 2 lines
hw/intc/meson.build +0
-0)) system_ss.add(when: 'CONFIG_ALLWINNER_A10_PIC', if_true:files('allwinner-a10-pic.c'))
hw/intc/meson.build system_ss.add(when: 'CONFIG_ARM_GICV3_TCG',
Quoted 6 lines
hw/intc/meson.build +2
-0system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c')) +system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: +files('aspeed_intc.c')) system_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c')) system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c','
exynos4210_combiner.c'))hw/intc/trace-events aspeed_vic_update_fiq(int flags) "Raising FIQ: %d" · line 80
Quoted 8 lines
system_ss.add(when: '
CONFIG_GOLDFISH_PIC',if_true:files('goldfish_pic.c')) diff --git a/hw/intc/trace-events b/hw/intc/trace-events index1ef29d0256..05f2c235bd100644hw/intc/trace-events +0
-0@@ -79,6 +79,12 @@ aspeed_vic_update_fiq(int flags) "Raising FIQ: %d" aspeed_vic_update_irq(int flags) "Raising IRQ: %d" aspeed_vic_read(uint64_t offset, unsigned size, uint32_t value) "From0x%" PRIx64 " of size %u: 0x%" PRIx32
hw/intc/trace-events
Quoted 6 lines
hw/intc/trace-events +0
-0aspeed_vic_write(uint64_t offset, unsigned size, uint32_t data) "To0x%" PRIx64 " of size %u: 0x%" PRIx32
hw/intc/trace-events +4
-0+# aspeed_intc.c +aspeed_intc_read(uint64_t offset, unsigned size, uint32_t value) +"From 0x%" PRIx64 " of size %u: 0x%" PRIx32 +aspeed_intc_write(uint64_t offset, unsigned size, uint32_t data) "To 0x%"PRIx64 " of size %u: 0x%" PRIx32
aspeed_intc_set_irq(int irq, int level)"Set IRQ %d: %d"Quoted 18 lines
hw/intc/trace-events +2
-0+aspeed_intc_update_irq(int irq, int level) "Update IRQ: %d: %d" +aspeed_intc_debug(const char *str, uint32_t value) "%s: 0x%x" # arm_gic.c gic_enable_irq(int irq) "irq %d enabled"(quoted diff) +0
-0
b/include/hw/intc/aspeed_intc.hnew file mode 100644 index 0000000000..8f1909dcbdinclude/hw/intc/aspeed_intc.h new file +7
-0@@ -0,0 +1,46 @@ +/* +* ASPEED INTC Controller +* +* Copyright (C) 2024 ASPEED Technology Inc. +* +* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef +ASPEED_INTC_H #define ASPEED_INTC_H include/hw/intc/aspeed_intc.h line 17
Quoted 10 lines
include/hw/intc/aspeed_intc.h new file +10
-0+ +#include "hw/sysbus.h" +#include "qom/object.h" +#include "hw/or-irq.h" + +#define TYPE_ASPEED_INTC "aspeed.intc" +#define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700" +OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC) + +#define ASPEED_INTC_NR_REGS (0x2000 >> 2) #define
ASPEED_INTC_NR_INTSQuoted 27 lines
include/hw/intc/aspeed_intc.h new file +27
-0+9 + +struct AspeedINTCState { +/*< private >*/ +SysBusDevice parent_obj; +DeviceState *gic; + +/*< public >*/ +MemoryRegion iomem; +uint32_t regs[ASPEED_INTC_NR_REGS ]; +OrIRQState orgates[ASPEED_INTC_NR_INTS ]; +qemu_irq output_pins[ASPEED_INTC_NR_INTS ]; + +uint32_t enable[ASPEED_INTC_NR_INTS ]; +uint32_t mask[ASPEED_INTC_NR_INTS ]; +uint32_t pending[ASPEED_INTC_NR_INTS ]; +uint32_t num_ints; +}; + +struct AspeedINTCClass { +SysBusDeviceClass parent_class; + +uint32_t num_lines; +uint32_t num_ints; +}; + +#endif /* ASPEED_INTC_H */
RE: [SPAM] Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 support
In reply to Cédric Le GoaterHi Cedric, Philippe
Quoted 31 lines
From: Cédric Le Goater <[email protected]>
Sent: Tuesday, May 28, 2024 3:03 PM
To: Philippe Mathieu-Daudé <[email protected]>; Jamin Lin <[email protected]>; Peter Maydell <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; Alistair Francis <[email protected]>; Cleber Rosa <[email protected]>; Wainer dos Santos Moschetta <[email protected]>; Beraldo Leal <[email protected]>; open list:ASPEED BMCs <[email protected]>; open list:All patches CC here <[email protected]>
Cc: Troy Lee <[email protected]>; Yunlin Tang <[email protected]>
Subject: Re: [SPAM] Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 supportQuoted 16 lines · Philippe Mathieu-Daudé
Hi,
Quoted 13 lines · Jamin Lin
AST2700 fmc/spi controller's address decoding unit is 64KB and only bits [31:16] are used for decoding. Introduce
seg_to_regandreg_to_seghandlers for ast2700 fmc/spi controller.
In addition, adds ast2700 fmc, spi0, spi1, and spi2 class init handler.Signed-off-by Troy Lee <[email protected]>Signed-off-by Jamin Lin <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>---
hw/ssi/aspeed_smc.c| 222
+++++++++++++++++++++++++++++++++++++++++++-1 file changed, 220 insertions(+), 2 deletions(-)
Quoted 25 lines
Quoted 6 lines
Quoted 6 lines
hw/ssi/aspeed_smc.c index renamed from hw/ssi/aspeed_smc.c +0
-0
df0c63469c..b4006c8339100644hw/ssi/aspeed_smc.c +0
-0@@ -185,7 +185,7 @@ * 0: 4 bytesQuoted 8 lines
hw/ssi/aspeed_smc.c static const MemoryRegionOps
Quoted 8 lines
hw/ssi/aspeed_smc.c +1
-1* 0x1FFFFFC: 32M bytes * -* DMA length is from 1 byte to 32MB (AST2600, AST10x0) +* DMA length is from 1 byte to 32MB (AST2600, AST10x0 and AST2700) * 0: 1 byte * 0x1FFFFFF: 32M bytes */ @@ -670,7 +670,7 @@ static const MemoryRegionOps
aspeed_smc_flash_opsQuoted 9 lines
hw/ssi/aspeed_smc.c static const MemoryRegionOps aspeed_smc_flash_ops = { · line 673
Quoted 6 lines
hw/ssi/aspeed_smc.c +1
-1= { .endianness = DEVICE_LITTLE_ENDIAN, .valid = { .min_access_size = 1, - .max_access_size = 4, + .max_access_size = 8,Is this a bugfix? If so, please use a separate patch. Otherwise please mention why it is OK to widen access for AST2600 & AST10x0.
According the design of SPI drivers, it uses this "memcpy_fromio" KERNEL API for SPI calibration.
https://github.com/AspeedTech-BMC/linux/blob/1062a07420f9aed4ed7dc9deb3429b8e7828f5cf/drivers/spi/spi-aspeed-smc.c#L1832
AST2700 is a 64 bits quad core cpus(Cortex-a35), so kernel API use 64 bits for data access.
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/arm64/kernel/io.c#L25
I simply set the max_access_size to 8 for AST2700 support.
AST2500, AST2600 and AST10x0 are all 32bits CPUS, that was why this max_access_size 8 did not impact these models.
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/arm/kernel/io.c#L45
If you have any suggestion about this patch modification, please let me know. I am going to re-send v5 patch for AST2700 support.
Thanks-Jamin
Quoted 13 lines
Ah I missed that. I wonder how we could set different access width tough on the model ?
Should we allocate a MemoryRegionOps in the
realize()handler and set the width depending on the SoC ?Thanks,
C.
Re: [PATCH v4 11/16] aspeed/intc: Add AST2700 support
In reply to Jamin LinQuoted 11 lines
Quoted 11 lines
hw/intc/aspeed_intc.c line 340
Quoted 8 lines
hw/intc/aspeed_intc.c new file +8
-0+static void aspeed_2700_intc_class_init (ObjectClass *klass,void +*data) { +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedINTCClass *aic =ASPEED_INTC_CLASS (klass); + + dc->desc ="ASPEED 2700 INTC Controller" ; + aic->num_lines =32 ; + aic->num_ints =9 ;Use
ASPEED_INTC_NR_INTS?
Quoted 4 lines
I am considering to support INTC model for future BMC SOCs.
For example, if thenum_intshas been changed to "18" in the future BMC Socs, users only need to updateASPEED_INTC_NR_INTSand Create aaspeed_XXXX_intc_class_initto set its "aic->num_ints18".
That was why I setaic->num_ints9 inaspeed_2700_intc_class_init.
OK. This is minor.
Thanks,
C.
Re: [SPAM] Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 support
In reply to Jamin LinQuoted 12 lines
Quoted 12 lines
Quoted 1 line
Review static const MemoryRegionOps
Quoted 1 line
(quoted diff) +0
-0@@ -670,7 +670,7 @@ static const MemoryRegionOps
aspeed_smc_flash_opsQuoted 9 lines
hw/ssi/aspeed_smc.c static const MemoryRegionOps aspeed_smc_flash_ops = { · line 673
Quoted 6 lines
hw/ssi/aspeed_smc.c +1
-1= { .endianness = DEVICE_LITTLE_ENDIAN, .valid = { .min_access_size = 1, - .max_access_size = 4, + .max_access_size = 8,Is this a bugfix? If so, please use a separate patch. Otherwise please mention why it is OK to widen access for AST2600 & AST10x0.
Quoted 7 lines
According the design of SPI drivers, it uses this "
memcpy_fromio" KERNEL API for SPI calibration.
https://github.com/AspeedTech-BMC/linux/blob/1062a07420f9aed4ed7dc9deb3429b8e7828f5cf/drivers/spi/spi-aspeed-smc.c#L1832
AST2700 is a 64 bits quad core cpus(Cortex-a35), so kernel API use 64 bits for data access.
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/arm64/kernel/io.c#L25
I simply set themax_access_sizeto 8 for AST2700 support.
AST2500, AST2600 and AST10x0 are all 32bits CPUS, that was why thismax_access_size8 did not impact these models.
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/arm/kernel/io.c#L45
Yes. I think we are safe on that side.
Quoted 2 lines
If you have any suggestion about this patch modification, please let me know. I am going to re-send v5 patch for AST2700 support.
Please move this change in its own commit explaining the reason and add a TODO comment in the code.
The aspeed_smc_flash_ops MemoryRegionOps should be copied in _realize() to set a different width for the AST2700 SoC. You could do that too.
Thanks,
C.
RE: [SPAM] Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 support
Hi Cedric,
Quoted 38 lines
From: Cédric Le Goater <[email protected]>
Subject: Re: [SPAM] Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 supportQuoted 9 lines
Quoted 9 lines
Quoted 1 line
Review static const MemoryRegionOps
Quoted 1 line
(quoted diff) +0
-0@@ -670,7 +670,7 @@ static const MemoryRegionOps
aspeed_smc_flash_opsQuoted 7 lines
Quoted 6 lines
hw/ssi/aspeed_smc.c +1
-1= { .endianness = DEVICE_LITTLE_ENDIAN, .valid = { .min_access_size = 1, - .max_access_size = 4, + .max_access_size = 8,Quoted 4 lines
Quoted 3 lines
Quoted 2 lines
Is this a bugfix? If so, please use a separate patch. Otherwise please mention why it is OK to widen access for AST2600 & AST10x0.
According the design of SPI drivers, it uses this "
memcpy_fromio" KERNEL APIfor SPI calibration.
Quoted 1 line
https://github.com/AspeedTech-BMC/linux/blob/1062a07420f9aed4ed7dc9deb
Quoted 2 lines
3429b8e7828f5cf/drivers/spi/spi-aspeed-smc.c#L1832
AST2700 is a 64 bits quad core cpus(Cortex-a35), so kernel API use 64 bits fordata access.
Quoted 4 lines
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/a
rm64/kernel/io.c#L25 I simply set themax_access_sizeto 8 for AST2700 support.
AST2500, AST2600 and AST10x0 are all 32bits CPUS, that was why this
max_access_size8 did not impact these models.Quoted 2 lines
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/a
rm/kernel/io.c#L45Yes. I think we are safe on that side.
Quoted 2 lines
If you have any suggestion about this patch modification, please let me know. I am going to re-send v5 patch for AST2700 support.
Please move this change in its own commit explaining the reason and add a TODO comment in the code.
Quoted 6 lines
The
aspeed_smc_flash_opsMemoryRegionOps should be copied in_realize()to set a different width for the AST2700 SoC. You could do that too.Thanks,
C.
I will do the following changes. Could you give me any suggestion?
1. add asc->max_access_size = 8 in aspeed_2700_fmc_class_init, aspeed_2700_spi0_class_init, aspeed_2700_spi1_class_init and aspeed_2700_spi2_class_init
2. Update aspeed_smc_flash_realize as below
static void aspeed_smc_flash_realize(DeviceState *dev, Error **errp)
{
------
s->asc = ASPEED_SMC_GET_CLASS(s->controller)
if (s->asc->max_access_size ==8) --> check max_access_size
aspeed_smc_flash_ops.valid.max_access_size = s->asc->max_access --> update max_access_size
/*
* Use the default segment value to size the memory region. This
* can be changed by FW at runtime.
*/
memory_region_init_io(&s->mmio, OBJECT(s), &aspeed_smc_flash_ops,
s, name, s->asc->segments[s->cs].size); ------
}
Thanks-Jamin
Re: [SPAM] Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 support
Quoted 48 lines · Jamin Lin
Hi Cedric,
Quoted 38 lines
From: Cédric Le Goater <[email protected]>
Subject: Re: [SPAM] Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 supportQuoted 9 lines
Quoted 9 lines
Quoted 1 line
Review static const MemoryRegionOps
Quoted 1 line
(quoted diff) +0
-0@@ -670,7 +670,7 @@ static const MemoryRegionOps
aspeed_smc_flash_opsQuoted 7 lines
Quoted 6 lines
hw/ssi/aspeed_smc.c +1
-1= { .endianness = DEVICE_LITTLE_ENDIAN, .valid = { .min_access_size = 1, - .max_access_size = 4, + .max_access_size = 8,Quoted 4 lines
Quoted 3 lines
Quoted 2 lines
Is this a bugfix? If so, please use a separate patch. Otherwise please mention why it is OK to widen access for AST2600 & AST10x0.
According the design of SPI drivers, it uses this "
memcpy_fromio" KERNEL APIfor SPI calibration.
Quoted 1 line
https://github.com/AspeedTech-BMC/linux/blob/1062a07420f9aed4ed7dc9deb
Quoted 2 lines
3429b8e7828f5cf/drivers/spi/spi-aspeed-smc.c#L1832
AST2700 is a 64 bits quad core cpus(Cortex-a35), so kernel API use 64 bits fordata access.
Quoted 4 lines
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/a
rm64/kernel/io.c#L25 I simply set themax_access_sizeto 8 for AST2700 support.
AST2500, AST2600 and AST10x0 are all 32bits CPUS, that was why this
max_access_size8 did not impact these models.Quoted 2 lines
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch/a
rm/kernel/io.c#L45Yes. I think we are safe on that side.
Quoted 2 lines
If you have any suggestion about this patch modification, please let me know. I am going to re-send v5 patch for AST2700 support.
Please move this change in its own commit explaining the reason and add a TODO comment in the code.
Quoted 6 lines
The
aspeed_smc_flash_opsMemoryRegionOps should be copied in_realize()to set a different width for the AST2700 SoC. You could do that too.Thanks,
C.
I will do the following changes. Could you give me any suggestion?
Quoted 8 lines
1. add
asc->max_access_size= 8 inaspeed_2700_fmc_class_init,aspeed_2700_spi0_class_init,aspeed_2700_spi1_class_initandaspeed_2700_spi2_class_init
2. Updateaspeed_smc_flash_realizeas below
static voidaspeed_smc_flash_realize(DeviceState *dev, Error **errp){ ------ s->asc = ASPEED_SMC_GET_CLASS(s->controller) if (s->asc->max_access_size ==8) --> check max_access_size aspeed_smc_flash_ops.valid.max_access_size = s->asc->max_access --> update max_access_size
You can not because aspeed_smc_flash_ops is a static const shared by all models
Best option is to introduce a new 'const MemoryRegionOps*' attribute in AspeedSMCClass and use it in aspeed_smc_flash_realize().
Thanks,
C.
RE: [SPAM] Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 support
Hi Cedric,
Quoted 70 lines
From: Cédric Le Goater <[email protected]>
Subject: Re: [SPAM] Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 supportQuoted 23 lines · Jamin Lin
Hi Cedric,
Quoted 21 lines
From: Cédric Le Goater <[email protected]>
Subject: Re: [SPAM] Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 supportQuoted 9 lines
Quoted 9 lines
Quoted 1 line
Review static const MemoryRegionOps
Quoted 1 line
(quoted diff) +0
-0@@ -670,7 +670,7 @@ static const MemoryRegionOps
aspeed_smc_flash_opsQuoted 7 lines
Quoted 6 lines
(quoted diff) +1
-1= { .endianness = DEVICE_LITTLE_ENDIAN, .valid = { .min_access_size = 1, - .max_access_size = 4, + .max_access_size = 8,Quoted 5 lines
Quoted 3 lines
Quoted 2 lines
Is this a bugfix? If so, please use a separate patch. Otherwise please mention why it is OK to widen access for AST2600 & AST10x0.
According the design of SPI drivers, it uses this "
memcpy_fromio" KERNEL APIfor SPI calibration.
Quoted 1 line
https://github.com/AspeedTech-BMC/linux/blob/1062a07420f9aed4ed7dc9de
Quoted 10 lines
Quoted 10 lines
b
Quoted 3 lines
3429b8e7828f5cf/drivers/spi/spi-aspeed-smc.c#L1832 AST2700 is a 64 bits quad core cpus(Cortex-a35), so kernel API use 64 bits for
data access.
Quoted 5 lines
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch
/a
rm64/kernel/io.c#L25 I simply set themax_access_sizeto 8 for AST2700 support.
AST2500, AST2600 and AST10x0 are all 32bits CPUS, that was why thisQuoted 8 lines
Quoted 8 lines
max_access_size8 did not impact these models.Quoted 3 lines
https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v6.6/arch
/a
rm/kernel/io.c#L45Yes. I think we are safe on that side.
Quoted 1 line
If you have any suggestion about this patch modification, please let me
know.
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
I am going to re-send v5 patch for AST2700 support.
Please move this change in its own commit explaining the reason and add a TODO comment in the code.
The
aspeed_smc_flash_opsMemoryRegionOps should be copied in_realize()to set a different width for the AST2700 SoC. You could do thattoo.
Quoted 10 lines
Quoted 4 lines
Thanks,
C.
I will do the following changes. Could you give me any suggestion?
1. add
asc->max_access_size= 8 inaspeed_2700_fmc_class_init,aspeed_2700_spi0_class_init,aspeed_2700_spi1_class_initandaspeed_2700_spi2_class_init2. Updateaspeed_smc_flash_realizeas below static voidaspeed_smc_flash_realize(DeviceState *dev, Error **errp){
Quoted 4 lines
------ s->asc = ASPEED_SMC_GET_CLASS(s->controller) if (s->asc->max_access_size ==8) --> check max_access_size aspeed_smc_flash_ops.valid.max_access_size =
Quoted 9 lines
s->asc->max_accessQuoted 1 line
--> update
max_access_sizeYou can not because
aspeed_smc_flash_opsis a static const shared by all modelsBest option is to introduce a new 'const MemoryRegionOps*' attribute in AspeedSMCClass and use it in
aspeed_smc_flash_realize().
Thanks for your suggestion. How about these changes?
1. aspeed_smc.h
struct AspeedSMCClass {
const MemoryRegionOps *reg_ops;
}2. aspeed_smc.c
a. create new memory region opts for ast2700
static const MemoryRegionOps aspeed_2700_smc_flash_ops = {
.read = aspeed_smc_flash_read,
.write = aspeed_smc_flash_write,
.endianness = DEVICE_LITTLE_ENDIAN,
.valid = {
.min_access_size = 1,
.max_access_size = 8,
},
};b. set memory region opts in all model class init
static void aspeed_2400_smc_class_init(ObjectClass *klass, void *data){
asc->reg_ops = &aspeed_smc_flash_ops;
}
static void aspeed_2400_fmc_class_init (ObjectClass *klass, void *data){
asc->reg_ops = &aspeed_smc_flash_ops;
}
static void aspeed_2400_spi1_class_init (ObjectClass *klass, void *data){
asc->reg_ops = &aspeed_smc_flash_ops;
}
static void aspeed_2500_fmc_class_init (ObjectClass *klass, void *data){
asc->reg_ops = &aspeed_smc_flash_ops;
}
static void aspeed_2500_spi1_class_init (ObjectClass *klass, void *data){
asc->reg_ops = &aspeed_smc_flash_ops;
}
static void aspeed_2500_spi2_class_init (ObjectClass *klass, void *data){
asc->reg_ops = &aspeed_smc_flash_ops;
}
static void aspeed_2600_fmc_class_init (ObjectClass *klass, void *data){
asc->reg_ops = &aspeed_smc_flash_ops;
}
static void aspeed_2600_spi1_class_init (ObjectClass *klass, void *data){
asc->reg_ops = &aspeed_smc_flash_ops;
}
static void aspeed_2600_spi2_class_init (ObjectClass *klass, void *data){
asc->reg_ops = &aspeed_smc_flash_ops;
}
static void aspeed_1030_fmc_class_init (ObjectClass *klass, void *data){
asc->reg_ops = &aspeed_smc_flash_ops;
}
static void aspeed_1030_spi1_class_init (ObjectClass *klass, void *data){
asc->reg_ops = &aspeed_smc_flash_ops;
}
static void aspeed_1030_spi2_class_init (ObjectClass *klass, void *data){
asc->reg_ops = &aspeed_smc_flash_ops;
}static void aspeed_2700_fmc_class_init(ObjectClass *klass, void *data) {
asc->reg_ops = &aspeed_2700_smc_flash_ops;
}
static void aspeed_2700_spi0_class_init (ObjectClass *klass, void *data) {
asc->reg_ops = &aspeed_2700_smc_flash_ops;
}
static void aspeed_2700_spi1_class_init (ObjectClass *klass, void *data) {
asc->reg_ops = &aspeed_2700_smc_flash_ops;
}
static void aspeed_2700_spi2_class_init (ObjectClass *klass, void *data) {
asc->reg_ops = &aspeed_2700_smc_flash_ops;
}
c. update realize to use memory region opts from class reg_opts
static void aspeed_smc_flash_realize(DeviceState *dev, Error **errp) {
memory_region_init_io(&s->mmio, OBJECT(s), s->asc->reg_ops,
s, name, s->asc->segments[s->cs].size);
}Thanks-Jamin
Quoted 5 lines
Thanks,
C.
Re: [SPAM] Re: [PATCH v4 09/16] aspeed/smc: Add AST2700 support
Quoted 73 lines
Thanks for your suggestion. How about these changes?
1.
aspeed_smc.hstruct AspeedSMCClass { const MemoryRegionOps *reg_ops; }2.
aspeed_smc.c
a. create new memory region opts for ast2700static const MemoryRegionOps aspeed_2700_smc_flash_ops = { .read = aspeed_smc_flash_read, .write = aspeed_smc_flash_write, .endianness = DEVICE_LITTLE_ENDIAN, .valid = { .min_access_size = 1, .max_access_size = 8, }, };b. set memory region opts in all model class init
static void aspeed_2400_smc_class_init(ObjectClass *klass, void *data){ asc->reg_ops = &aspeed_smc_flash_ops; } static void aspeed_2400_fmc_class_init (ObjectClass *klass, void *data){ asc->reg_ops = &aspeed_smc_flash_ops; } static void aspeed_2400_spi1_class_init (ObjectClass *klass, void *data){ asc->reg_ops = &aspeed_smc_flash_ops; } static void aspeed_2500_fmc_class_init (ObjectClass *klass, void *data){ asc->reg_ops = &aspeed_smc_flash_ops; } static void aspeed_2500_spi1_class_init (ObjectClass *klass, void *data){ asc->reg_ops = &aspeed_smc_flash_ops; } static void aspeed_2500_spi2_class_init (ObjectClass *klass, void *data){ asc->reg_ops = &aspeed_smc_flash_ops; } static void aspeed_2600_fmc_class_init (ObjectClass *klass, void *data){ asc->reg_ops = &aspeed_smc_flash_ops; } static void aspeed_2600_spi1_class_init (ObjectClass *klass, void *data){ asc->reg_ops = &aspeed_smc_flash_ops; } static void aspeed_2600_spi2_class_init (ObjectClass *klass, void *data){ asc->reg_ops = &aspeed_smc_flash_ops; } static void aspeed_1030_fmc_class_init (ObjectClass *klass, void *data){ asc->reg_ops = &aspeed_smc_flash_ops; } static void aspeed_1030_spi1_class_init (ObjectClass *klass, void *data){ asc->reg_ops = &aspeed_smc_flash_ops; } static void aspeed_1030_spi2_class_init (ObjectClass *klass, void *data){ asc->reg_ops = &aspeed_smc_flash_ops; } static void aspeed_2700_fmc_class_init(ObjectClass *klass, void *data) { asc->reg_ops = &aspeed_2700_smc_flash_ops; } static void aspeed_2700_spi0_class_init (ObjectClass *klass, void *data) { asc->reg_ops = &aspeed_2700_smc_flash_ops; } static void aspeed_2700_spi1_class_init (ObjectClass *klass, void *data) { asc->reg_ops = &aspeed_2700_smc_flash_ops; } static void aspeed_2700_spi2_class_init (ObjectClass *klass, void *data) { asc->reg_ops = &aspeed_2700_smc_flash_ops; }
Quoted 5 lines
c. update realize to use memory region opts from class
reg_optsstatic void aspeed_smc_flash_realize(DeviceState *dev, Error **errp) { memory_region_init_io(&s->mmio, OBJECT(s), s->asc->reg_ops, s, name, s->asc->segments[s->cs].size); }
LGTM,
Thanks,
C.
Hi Cedric,
Quoted 37 lines
From: Jamin Lin
Subject: RE: [PATCH v4 00/16] Add AST2700 supportHi Cedric,
Quoted 32 lines
From: Cédric Le Goater <[email protected]>
Quoted 12 lines · Jamin Lin
Hi Cedric,
Quoted 10 lines
-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Tuesday, May 28, 2024 5:56 PM
To: Jamin Lin <[email protected]>; Peter Maydell <[email protected]>; Andrew Jeffery <[email protected]>; Joel Stanley <[email protected]>; Alistair Francis <[email protected]>; Cleber Rosa <[email protected]>; Philippe Mathieu-Daudé <[email protected]>; Wainer dos Santos Moschetta <[email protected]>; Beraldo Leal <[email protected]>; open list:ASPEED BMCs <[email protected]>;open
Quoted 16 lines
Quoted 10 lines
list:All patches CC here <[email protected]>
Cc: Troy Lee <[email protected]>; Yunlin Tang <[email protected]>
Subject: Re: [PATCH v4 00/16] Add AST2700 supportJamin,
I think you should add your self as a Reviewer to the ASPEED BMCs machine in the
MAINTAINERSfiles. Would you agree ?Agree.
Could you please add me, Troy and Steven in the
MAINTAINERSfiles? [email protected]
[email protected]
[email protected]
Quoted 9 lines
Quoted 6 lines
You should send a patch updating the
MAINTAINERSfile with new names and those promoted should reply that they agree, or not.See https://qemu.readthedocs.io/en/v9.0.0/devel/maintainers.html for more info and the git history of
MAINTAINERSalso.Will send a patch to updating the
MAINTAINERSfile. Thanks-JaminQuoted 1 line
Thanks,
https://patchew.org/QEMU/[email protected]/
Thanks-Jamin
Quoted 3 lines
Quoted 3 lines
C.