aspeed: Add support for the AST2600 SoC
v2 cover aspeed: Add support for the AST2600 SoC
Hello,
The series starts with a watchdog fix and a new model for the SDHCI controller. Follows the code for the AST2600 SoC.
Most of the Aspeed models are reworked with an object class to introduce the AST2600 variant. A model for the AST2600 SoC and a simple AST2600 EVB machine is proposed at the end of the series. It can boot the OpenBMC firmware image which is currently used for HW bringup.
Thanks,
C.
Changes since v1:
- better SMC model, proof tested against Linux and Aspeed drivers used on HW bringup
- new w25q512jv flash model for the AST2600 EVB
- removed the use of "cntfrq" property not yet merged
- tuned the HW strapping values of the AST2600 EVB
Amithash Prasad (1):
aspeed/wdt: Check correct register for clock source
Cédric Le Goater (15):
aspeed/timer: Introduce an object class per SoC aspeed/timer: Add support for control register 3 aspeed/timer: Add AST2600 support
aspeed/timer: Add support for IRQ status register on the AST2600 aspeed/sdmc: Introduce an object class per SoC watchdog/aspeed: Introduce an object class per SoC aspeed/smc: Introduce segment operations
aspeed/smc: Add AST2600 support
aspeed/i2c: Introduce an object class per SoC aspeed/i2c: Add AST2600 support
aspeed: Introduce an object class per SoC
aspeed/soc: Add AST2600 support
m25p80: Add support for w25q512jv
aspeed: Add an AST2600 eval board
aspeed: add support for the Aspeed MII controller of the AST2600
Eddie James (1):
hw/sd/aspeed_sdhci: New device
Joel Stanley (5):
hw: aspeed_scu: Add AST2600 support
aspeed/sdmc: Add AST2600 support
hw: wdt_aspeed: Add AST2600 support
aspeed: Parameterise number of MACs
aspeed/soc: Add ASPEED Video stub
Rashmica Gupta (1):
hw/gpio: Add in AST2600 specific implementation
include/hw/arm/aspeed.h | 1 + include/hw/arm/aspeed_soc.h | 29 +- include/hw/i2c/aspeed_i2c.h | 20 +- include/hw/misc/aspeed_scu.h | 7 +- include/hw/misc/aspeed_sdmc.h | 20 +- include/hw/net/ftgmac100.h | 17 + include/hw/sd/aspeed_sdhci.h | 34 ++ include/hw/ssi/aspeed_smc.h | 4 + include/hw/timer/aspeed_timer.h | 18 ++ include/hw/watchdog/wdt_aspeed.h | 19 +- hw/arm/aspeed.c | 42 ++- hw/arm/aspeed_ast2600.c | 523 +++++++++++++++++++++++++++++++ hw/arm/aspeed_soc.c | 199 +++++++----- hw/block/m25p80.c | 1 + hw/gpio/aspeed_gpio.c | 142 ++++++++- hw/i2c/aspeed_i2c.c | 106 ++++++- hw/misc/aspeed_scu.c | 194 +++++++++++- hw/misc/aspeed_sdmc.c | 250 +++++++++++---- hw/net/ftgmac100.c | 162 ++++++++++ hw/sd/aspeed_sdhci.c | 198 ++++++++++++ hw/ssi/aspeed_smc.c | 177 +++++++++-- hw/timer/aspeed_timer.c | 213 +++++++++++-- hw/watchdog/wdt_aspeed.c | 153 +++++---- hw/arm/Makefile.objs | 2 +- hw/sd/Makefile.objs | 1 + 25 files changed, 2253 insertions(+), 279 deletions(-) create mode 100644 include/hw/sd/aspeed_sdhci.h create mode 100644 hw/arm/aspeed_ast2600.c create mode 100644 hw/sd/aspeed_sdhci.c
Signature · 1 line
2.21.0
PATCH v2 1/23 aspeed/wdt: Check correct register for clock source
From: Amithash Prasad <[email protected]>
When WDT_RESTART is written, the data is not the contents of the WDT_CTRL register. Hence ensure we are looking at WDT_CTRL to check if bit WDT_CTRL_1MHZ_CLK is set or not.
--- hw/watchdog/wdt_aspeed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/watchdog/wdt_aspeed.c +1 -1
@@ -140,7 +140,7 @@ static void aspeed_wdt_write(void *opaque, hwaddr offset, uint64_t data,case WDT_RESTART :if ((data &0xFFFF ) ==WDT_RESTART_MAGIC ) { s->regs[WDT_STATUS ] = s->regs[WDT_RELOAD_VALUE ]; -aspeed_wdt_reload (s, !(data &WDT_CTRL_1MHZ_CLK )); +aspeed_wdt_reload (s, !(s->regs[WDT_CTRL ] &WDT_CTRL_1MHZ_CLK )); }break ;case WDT_CTRL :
Signature · 1 line
2.21.0
PATCH v2 2/23 hw/sd/aspeed_sdhci: New device
In reply to Cédric Le GoaterFrom: Eddie James <[email protected]>
The Aspeed SOCs have two SD/MMC controllers. Add a device that encapsulates both of these controllers and models the Aspeed-specific registers and behavior.
Tested by reading from mmcblk0 in Linux:
qemu-system-arm -machine romulus-bmc -nographic \
-drive file=flash-romulus,format=raw,if=mtd \
-device sd-card,drive=sd0 -drive file=_tmp/kernel,format=raw,if=sd,id=sd0
[clg: - changed the controller MMIO window size to 0x1000
- moved the MMIO mapping of the SDHCI slots at the SoC level
- merged code to add SD drives on the SD buses at the machine level ]
--- include/hw/arm/aspeed_soc.h | 3 + include/hw/sd/aspeed_sdhci.h | 34 ++++++ hw/arm/aspeed.c | 15 ++- hw/arm/aspeed_soc.c | 23 ++++ hw/sd/aspeed_sdhci.c | 198 +++++++++++++++++++++++++++++++++++ hw/sd/Makefile.objs | 1 + 6 files changed, 273 insertions(+), 1 deletion(-) create mode 100644 include/hw/sd/aspeed_sdhci.h create mode 100644 hw/sd/aspeed_sdhci.c
include/hw/arm/aspeed_soc.h +3 -0
@@ -24,6 +24,7 @@#include "hw/net/ftgmac100.h" #include "target/arm/cpu.h" #include "hw/gpio/aspeed_gpio.h" +#include "hw/sd/aspeed_sdhci.h" #define ASPEED_SPIS_NUM 2#define ASPEED_WDTS_NUM 3
@@ -50,6 +51,7 @@ typedef struct AspeedSoCState {AspeedWDTState wdt[ASPEED_WDTS_NUM ];FTGMAC100State ftgmac100[ASPEED_MACS_NUM ];AspeedGPIOState gpio; +AspeedSDHCIState sdhci; } AspeedSoCState;#define TYPE_ASPEED_SOC "aspeed-soc"
@@ -93,6 +95,7 @@ enum {ASPEED_SCU ,ASPEED_ADC ,ASPEED_SRAM , +ASPEED_SDHCI ,ASPEED_GPIO ,ASPEED_RTC , ASPEED_TIMER1,
include/hw/sd/aspeed_sdhci.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* Aspeed SD Host Controller +* Eddie James <[email protected]> +* +* Copyright (C) 2019 IBM Corp +* SPDX-License-Identifer: GPL-2.0-or-later +*/ + +#ifndef ASPEED_SDHCI_H +#define ASPEED_SDHCI_H + +#include "hw/sd/sdhci.h" + +#define TYPE_ASPEED_SDHCI "aspeed.sdhci" +#define ASPEED_SDHCI (obj) OBJECT_CHECK(AspeedSDHCIState, (obj), \ + TYPE_ASPEED_SDHCI) + +#define ASPEED_SDHCI_CAPABILITIES 0x01E80080 +#define ASPEED_SDHCI_NUM_SLOTS 2 +#define ASPEED_SDHCI_NUM_REGS (ASPEED_SDHCI_REG_SIZE / sizeof(uint32_t)) +#define ASPEED_SDHCI_REG_SIZE 0x100 + +typedef struct AspeedSDHCIState { +SysBusDevice parent; + +SDHCIState slots[ASPEED_SDHCI_NUM_SLOTS ]; + +MemoryRegion iomem; +qemu_irq irq; + +uint32_t regs[ASPEED_SDHCI_NUM_REGS ]; +}AspeedSDHCIState ; + +#endif /* ASPEED_SDHCI_H */
hw/arm/aspeed.c +14 -1
@@ -170,6 +170,7 @@ static void aspeed_board_init(MachineState *machine,AspeedSoCClass *sc;DriveInfo *drive0 =drive_get (IF_MTD ,0 ,0 );ram_addr_t max_ram_size; +int i; bmc =g_new0 (AspeedBoardState,1 );
@@ -252,6 +253,19 @@ static void aspeed_board_init(MachineState *machine, cfg->i2c_init (bmc); } +for (i =0 ; i <ARRAY_SIZE (bmc->soc.sdhci.slots); i++) { +SDHCIState *sdhci = &bmc->soc.sdhci.slots[i]; +DriveInfo *dinfo =drive_get_next (IF_SD ); +BlockBackend *blk; +DeviceState *card; + + blk = dinfo ?blk_by_legacy_dinfo (dinfo) :NULL ; + card =qdev_create (qdev_get_child_bus (DEVICE (sdhci),"sd-bus" ), +TYPE_SD_CARD ); +qdev_prop_set_drive (card,"drive" , blk, &error_fatal); +object_property_set_bool (OBJECT (card), true,"realized" , &error_fatal); + } +arm_load_kernel (ARM_CPU (first_cpu), machine, &aspeed_board_binfo); }
@@ -373,7 +387,6 @@ static void aspeed_machine_class_init(ObjectClass *oc, void *data) mc->desc = board->desc; mc->init = aspeed_machine_init; mc->max_cpus =ASPEED_CPUS_NUM ; - mc->no_sdcard =1 ; mc->no_floppy =1 ; mc->no_cdrom =1 ; mc->no_parallel =1 ;
hw/arm/aspeed_soc.c +23 -0
@@ -36,6 +36,7 @@ static const hwaddr aspeed_soc_ast2400_memmap[] = { [ASPEED_XDMA] = 0x1E6E7000, [ASPEED_ADC] = 0x1E6E9000, [ASPEED_SRAM] = 0x1E720000, + [ASPEED_SDHCI] = 0x1E740000, [ASPEED_GPIO] = 0x1E780000, [ASPEED_RTC] = 0x1E781000, [ASPEED_TIMER1] = 0x1E782000,
@@ -63,6 +64,7 @@ static const hwaddr aspeed_soc_ast2500_memmap[] = { [ASPEED_XDMA] = 0x1E6E7000, [ASPEED_ADC] = 0x1E6E9000, [ASPEED_SRAM] = 0x1E720000, + [ASPEED_SDHCI] = 0x1E740000, [ASPEED_GPIO] = 0x1E780000, [ASPEED_RTC] = 0x1E781000, [ASPEED_TIMER1] = 0x1E782000,
@@ -108,6 +110,7 @@ static const int aspeed_soc_ast2400_irqmap[] = { [ASPEED_ETH1] = 2, [ASPEED_ETH2] = 3, [ASPEED_XDMA] = 6, + [ASPEED_SDHCI] = 26, };#define aspeed_soc_ast2500_irqmap aspeed_soc_ast2400_irqmap
@@ -230,6 +233,15 @@ static void aspeed_soc_init(Object *obj)snprintf (typename,sizeof (typename),"aspeed.gpio-%s" , socname);sysbus_init_child_obj (obj,"gpio" ,OBJECT (&s->gpio),sizeof (s->gpio), typename); + +sysbus_init_child_obj (obj,"sdc" ,OBJECT (&s->sdhci),sizeof (s->sdhci), +TYPE_ASPEED_SDHCI ); + +/* Init sd card slot class here so that they're under the correct parent */ +for (i =0 ; i <ASPEED_SDHCI_NUM_SLOTS ; ++i) { +sysbus_init_child_obj (obj,"sdhci[*]" ,OBJECT (&s->sdhci.slots[i]), +sizeof (s->sdhci.slots[i]),TYPE_SYSBUS_SDHCI ); + } }static void aspeed_soc_realize (DeviceState *dev,Error **errp)
@@ -419,6 +431,17 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->gpio),0 , sc->info->memmap[ASPEED_GPIO ]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpio),0 ,aspeed_soc_get_irq (s,ASPEED_GPIO )); + +/* SDHCI */ +object_property_set_bool (OBJECT (&s->sdhci), true,"realized" , &err); +if (err) { +error_propagate (errp, err); +return ; + } +sysbus_mmio_map (SYS_BUS_DEVICE (&s->sdhci),0 , + sc->info->memmap[ASPEED_SDHCI ]); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->sdhci),0 , +aspeed_soc_get_irq (s,ASPEED_SDHCI )); }static Property aspeed_soc_properties[] = {DEFINE_PROP_UINT32 ("num-cpus" , AspeedSoCState, num_cpus,0 ),
hw/sd/aspeed_sdhci.c new file +198 -0
198 lines not on this page · raw message
hw/sd/Makefile.objs +1 -0
@@ -8,3 +8,4 @@ obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o obj-$(CONFIG_OMAP) += omap_mmc.o obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o obj-$(CONFIG_RASPI) += bcm2835_sdhost.o +obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o
Signature · 1 line
2.21.0
Re: [PATCH v2 02/23] hw/sd/aspeed_sdhci: New device
Quoted 12 lines · Cédric Le Goater
From: Eddie James <[email protected]>
The Aspeed SOCs have two SD/MMC controllers. Add a device that encapsulates both of these controllers and models the Aspeed-specific registers and behavior.
Tested by reading from mmcblk0 in Linux:
qemu-system-arm -machine romulus-bmc -nographic \
-drive file=flash-romulus,format=raw,if=mtd \
-device sd-card,drive=sd0 -drive file=_tmp/kernel,format=raw,if=sd,id=sd0
Quoted 6 lines
Signed-off-by Eddie James <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>[clg: - changed the controller MMIO window size to
0x1000
- moved the MMIO mapping of the SDHCI slots at the SoC level
- merged code to add SD drives on the SD buses at the machine level ]Signed-off-by Cédric Le Goater <[email protected]>
PATCH v2 3/23 hw: aspeed_scu: Add AST2600 support
In reply to Cédric Le GoaterFrom: Joel Stanley <[email protected]>
The SCU controller on the AST2600 SoC has extra registers. Increase the number of regs of the model and introduce a new field in the class to customize the MemoryRegion operations depending on the SoC model.
[clg: - improved commit log
- changed vmstate version
- reworked model integration into new object class
- included AST2600_HPLL_PARAM value ]
--- include/hw/misc/aspeed_scu.h | 7 +- hw/misc/aspeed_scu.c | 192 +++++++++++++++++++++++++++++++++-- 2 files changed, 191 insertions(+), 8 deletions(-)
include/hw/misc/aspeed_scu.h +6 -1
@@ -17,8 +17,10 @@#define ASPEED_SCU (obj) OBJECT_CHECK(AspeedSCUState, (obj), TYPE_ASPEED_SCU)#define TYPE_ASPEED_2400_SCU TYPE_ASPEED_SCU "-ast2400"#define TYPE_ASPEED_2500_SCU TYPE_ASPEED_SCU "-ast2500" +#define TYPE_ASPEED_2600_SCU TYPE_ASPEED_SCU "-ast2600"#define ASPEED_SCU_NR_REGS (0x1A8 >> 2) +#define ASPEED_AST2600_SCU_NR_REGS (0xE20 >> 2) typedef struct AspeedSCUState { /*< private >*/
@@ -27,7 +29,7 @@ typedef struct AspeedSCUState {/*< public >*/ MemoryRegion iomem; -uint32_t regs[ASPEED_SCU_NR_REGS ]; +uint32_t regs[ASPEED_AST2600_SCU_NR_REGS ];uint32_t silicon_rev;uint32_t hw_strap1;uint32_t hw_strap2;
@@ -38,6 +40,7 @@ typedef struct AspeedSCUState {#define AST2400_A1_SILICON_REV 0x02010303U#define AST2500_A0_SILICON_REV 0x04000303U#define AST2500_A1_SILICON_REV 0x04010303U +#define AST2600_A0_SILICON_REV 0x05000303U#define ASPEED_IS_AST2500 (si_rev) ((((si_rev) >> 24) & 0xff) == 0x04)
@@ -54,6 +57,8 @@ typedef struct AspeedSCUClass {const uint32_t *resets;uint32_t (*calc_hpll)(AspeedSCUState *s,uint32_t hpll_reg);uint32_t apb_divider; +uint32_t nr_regs; +const MemoryRegionOps *ops; } AspeedSCUClass;#define ASPEED_SCU_PROT_KEY 0x1688A8A8
hw/misc/aspeed_scu.c +185 -7
264 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 4/23 aspeed/timer: Introduce an object class per SoC
In reply to Cédric Le GoaterThe most important changes will be on the register range 0x34 - 0x3C memops. Introduce class read/write operations to handle the differences between SoCs.
--- include/hw/timer/aspeed_timer.h | 15 +++++ hw/arm/aspeed_soc.c | 3 +- hw/timer/aspeed_timer.c | 107 ++++++++++++++++++++++++++++---- 3 files changed, 113 insertions(+), 12 deletions(-)
include/hw/timer/aspeed_timer.h +15 -0
@@ -28,6 +28,9 @@#define ASPEED_TIMER (obj) \ OBJECT_CHECK(AspeedTimerCtrlState, (obj), TYPE_ASPEED_TIMER);#define TYPE_ASPEED_TIMER "aspeed.timer" +#define TYPE_ASPEED_2400_TIMER TYPE_ASPEED_TIMER "-ast2400" +#define TYPE_ASPEED_2500_TIMER TYPE_ASPEED_TIMER "-ast2500" +#define ASPEED_TIMER_NR_TIMERS 8 typedef struct AspeedTimer {
@@ -60,4 +63,16 @@ typedef struct AspeedTimerCtrlState { AspeedSCUState *scu; } AspeedTimerCtrlState; +#define ASPEED_TIMER_CLASS (klass) \ + OBJECT_CLASS_CHECK(AspeedTimerClass, (klass), TYPE_ASPEED_TIMER) +#define ASPEED_TIMER_GET_CLASS (obj) \ + OBJECT_GET_CLASS(AspeedTimerClass, (obj), TYPE_ASPEED_TIMER) + +typedef struct AspeedTimerClass { +SysBusDeviceClass parent_class; + +uint64_t (*read)(AspeedTimerCtrlState *s,hwaddr offset); +void (*write)(AspeedTimerCtrlState *s,hwaddr offset,uint64_t value); +}AspeedTimerClass ; +#endif /* ASPEED_TIMER_H */
hw/arm/aspeed_soc.c +2 -1
@@ -182,8 +182,9 @@ static void aspeed_soc_init(Object *obj)sysbus_init_child_obj (obj,"rtc" ,OBJECT (&s->rtc),sizeof (s->rtc),TYPE_ASPEED_RTC ); +snprintf (typename,sizeof (typename),"aspeed.timer-%s" , socname);sysbus_init_child_obj (obj,"timerctrl" ,OBJECT (&s->timerctrl), -sizeof (s->timerctrl),TYPE_ASPEED_TIMER ); +sizeof (s->timerctrl), typename);object_property_add_const_link (OBJECT (&s->timerctrl),"scu" ,OBJECT (&s->scu), &error_abort);
hw/timer/aspeed_timer.c +96 -11
138 lines not on this page · raw message
Signature · 1 line
2.21.0
Re: [PATCH v2 04/23] aspeed/timer: Introduce an object class per SoC
Quoted 6 lines · Cédric Le Goater
The most important changes will be on the register range
0x34-0x3Cmemops. Introduce class read/write operations to handle the differences between SoCs.Signed-off-by Cédric Le Goater <[email protected]>
PATCH v2 5/23 aspeed/timer: Add support for control register 3
In reply to Cédric Le GoaterThe AST2500 timer has a third control register that is used to implement a set-to-clear feature for the main control register.
This models the behaviour expected by the AST2500 while maintaining the same behaviour for the AST2400.
The vmstate version is not increased yet because the structure is modified again in the following patches.
Based on previous work from Joel Stanley.
--- include/hw/timer/aspeed_timer.h | 1 + hw/timer/aspeed_timer.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)
include/hw/timer/aspeed_timer.h +1 -0
@@ -58,6 +58,7 @@ typedef struct AspeedTimerCtrlState {uint32_t ctrl;uint32_t ctrl2; +uint32_t ctrl3;AspeedTimer timers[ASPEED_TIMER_NR_TIMERS ];AspeedSCUState *scu;
hw/timer/aspeed_timer.c +19 -0
@@ -498,6 +498,8 @@ static uint64_t aspeed_2500_timer_read(AspeedTimerCtrlState *s, hwaddr offset)switch (offset) {case 0x38 : + value = s->ctrl3 &BIT (0 ); +break ;case 0x3C :default : qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIx "\n",
@@ -511,9 +513,24 @@ static uint64_t aspeed_2500_timer_read(AspeedTimerCtrlState *s, hwaddr offset)static void aspeed_2500_timer_write (AspeedTimerCtrlState *s,hwaddr offset,uint64_t value) { +const uint32_t tv = (uint32_t )(value &0xFFFFFFFF ); +uint8_t command; +switch (offset) {case 0x38 : + command = (value >>1 ) &0xFF ; +if (command ==0xAE ) { + s->ctrl3 =0x1 ; + }else if (command ==0xEA ) { + s->ctrl3 =0x0 ; + } +break ;case 0x3C : +if (s->ctrl3 &BIT (0 )) { +aspeed_timer_set_ctrl (s, s->ctrl & ~tv); + } +break ; +default :qemu_log_mask (LOG_GUEST_ERROR ,"%s: Bad offset 0x%" HWADDR_PRIx"\n" , __func__, offset);
@@ -574,6 +591,7 @@ static void aspeed_timer_reset(DeviceState *dev) } s->ctrl =0 ; s->ctrl2 =0 ; + s->ctrl3 =0 ; }static const VMStateDescription vmstate_aspeed_timer = {
@@ -597,6 +615,7 @@ static const VMStateDescription vmstate_aspeed_timer_state = { .fields = (VMStateField[]) {VMSTATE_UINT32 (ctrl, AspeedTimerCtrlState),VMSTATE_UINT32 (ctrl2, AspeedTimerCtrlState), +VMSTATE_UINT32 (ctrl3, AspeedTimerCtrlState),VMSTATE_STRUCT_ARRAY (timers, AspeedTimerCtrlState,ASPEED_TIMER_NR_TIMERS ,1 , vmstate_aspeed_timer, AspeedTimer),
Signature · 1 line
2.21.0
Re: [PATCH v2 05/23] aspeed/timer: Add support for control register 3
Quoted 7 lines · Cédric Le Goater
The AST2500 timer has a third control register that is used to implement a set-to-clear feature for the main control register.
This models the behaviour expected by the AST2500 while maintaining the same behaviour for the AST2400.
Quoted 6 lines
The vmstate version is not increased yet because the structure is modified again in the following patches.
Based on previous work from Joel Stanley.
Signed-off-by Cédric Le Goater <[email protected]>
PATCH v2 6/23 aspeed/timer: Add AST2600 support
In reply to Cédric Le GoaterThe AST2600 timer has a third control register that is used to implement a set-to-clear feature for the main control register.
On the AST2600, it is not configurable via 0x38 (control register 3) as it is on the AST2500.
Based on previous work from Joel Stanley.
--- include/hw/timer/aspeed_timer.h | 1 + hw/timer/aspeed_timer.c | 51 +++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+)
include/hw/timer/aspeed_timer.h +1 -0
@@ -30,6 +30,7 @@#define TYPE_ASPEED_TIMER "aspeed.timer"#define TYPE_ASPEED_2400_TIMER TYPE_ASPEED_TIMER "-ast2400"#define TYPE_ASPEED_2500_TIMER TYPE_ASPEED_TIMER "-ast2500" +#define TYPE_ASPEED_2600_TIMER TYPE_ASPEED_TIMER "-ast2600"#define ASPEED_TIMER_NR_TIMERS 8
hw/timer/aspeed_timer.c +51 -0
68 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 7/23 aspeed/timer: Add support for IRQ status register on the AST2600
In reply to Cédric Le GoaterThe AST2600 timer replaces control register 2 with a interrupt status register. It is set by hardware when an IRQ occurs and cleared by software.
Modify the vmstate version to take into account the new fields.
Based on previous work from Joel Stanley.
--- include/hw/timer/aspeed_timer.h | 1 + hw/timer/aspeed_timer.c | 36 +++++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-)
include/hw/timer/aspeed_timer.h +1 -0
@@ -60,6 +60,7 @@ typedef struct AspeedTimerCtrlState {uint32_t ctrl;uint32_t ctrl2;uint32_t ctrl3; +uint32_t irq_sts;AspeedTimer timers[ASPEED_TIMER_NR_TIMERS ];AspeedSCUState *scu;
hw/timer/aspeed_timer.c +28 -8
@@ -160,7 +160,9 @@ static uint64_t calculate_next(struct AspeedTimer *t)timer_del (&t->timer);if (timer_overflow_interrupt (t)) { +AspeedTimerCtrlState *s =timer_to_ctrl (t); t->level = !t->level; + s->irq_sts |=BIT (t->id);qemu_set_irq (t->irq, t->level); }
@@ -199,7 +201,9 @@ static void aspeed_timer_expire(void *opaque) }if (interrupt) { +AspeedTimerCtrlState *s =timer_to_ctrl (t); t->level = !t->level; + s->irq_sts |=BIT (t->id);qemu_set_irq (t->irq, t->level); }
@@ -244,9 +248,6 @@ static uint64_t aspeed_timer_read(void *opaque, hwaddr offset, unsigned size)case 0x30 :/* Control Register */ value = s->ctrl;break ; -case 0x34 :/* Control Register 2 */ - value = s->ctrl2; -break ; case 0x00 ... 0x2c: /* Timers 1 - 4 */ value =aspeed_timer_get_value (&s->timers[(offset >>4 )], reg);break ;
@@ -438,9 +439,6 @@ static void aspeed_timer_write(void *opaque, hwaddr offset, uint64_t value,case 0x30 :aspeed_timer_set_ctrl (s, tv);break ; -case 0x34 : -aspeed_timer_set_ctrl2 (s, tv); -break ;/* Timer Registers */ case 0x00 ... 0x2c:aspeed_timer_set_value (s, (offset >>TIMER_NR_REGS ), reg, tv);
@@ -468,6 +466,9 @@ static uint64_t aspeed_2400_timer_read(AspeedTimerCtrlState *s, hwaddr offset)uint64_t value;switch (offset) { +case 0x34 : + value = s->ctrl2; +break ;case 0x38 :case 0x3C :default :
@@ -482,7 +483,12 @@ static uint64_t aspeed_2400_timer_read(AspeedTimerCtrlState *s, hwaddr offset)static void aspeed_2400_timer_write (AspeedTimerCtrlState *s,hwaddr offset,uint64_t value) { +const uint32_t tv = (uint32_t )(value &0xFFFFFFFF ); +switch (offset) { +case 0x34 : +aspeed_timer_set_ctrl2 (s, tv); +break ;case 0x38 :case 0x3C :default :
@@ -497,6 +503,9 @@ static uint64_t aspeed_2500_timer_read(AspeedTimerCtrlState *s, hwaddr offset)uint64_t value;switch (offset) { +case 0x34 : + value = s->ctrl2; +break ;case 0x38 : value = s->ctrl3 &BIT (0 );break ;
@@ -517,6 +526,9 @@ static void aspeed_2500_timer_write(AspeedTimerCtrlState *s, hwaddr offset,uint8_t command;switch (offset) { +case 0x34 : +aspeed_timer_set_ctrl2 (s, tv); +break ;case 0x38 : command = (value >>1 ) &0xFF ;if (command ==0xAE ) {
@@ -543,6 +555,9 @@ static uint64_t aspeed_2600_timer_read(AspeedTimerCtrlState *s, hwaddr offset)uint64_t value;switch (offset) { +case 0x34 : + value = s->irq_sts; +break ;case 0x38 :case 0x3C :default :
@@ -560,6 +575,9 @@ static void aspeed_2600_timer_write(AspeedTimerCtrlState *s, hwaddr offset,const uint32_t tv = (uint32_t )(value &0xFFFFFFFF );switch (offset) { +case 0x34 : + s->irq_sts &= tv; +break ;case 0x3C :aspeed_timer_set_ctrl (s, s->ctrl & ~tv);break ;
@@ -626,6 +644,7 @@ static void aspeed_timer_reset(DeviceState *dev) s->ctrl =0 ; s->ctrl2 =0 ; s->ctrl3 =0 ; + s->irq_sts =0 ; }static const VMStateDescription vmstate_aspeed_timer = {
@@ -644,12 +663,13 @@ static const VMStateDescription vmstate_aspeed_timer = {static const VMStateDescription vmstate_aspeed_timer_state = { .name ="aspeed.timerctrl" , - .version_id =1 , - .minimum_version_id =1 , + .version_id =2 , + .minimum_version_id =2 , .fields = (VMStateField []) {VMSTATE_UINT32 (ctrl, AspeedTimerCtrlState),VMSTATE_UINT32 (ctrl2, AspeedTimerCtrlState),VMSTATE_UINT32 (ctrl3, AspeedTimerCtrlState), +VMSTATE_UINT32 (irq_sts, AspeedTimerCtrlState),VMSTATE_STRUCT_ARRAY (timers, AspeedTimerCtrlState,ASPEED_TIMER_NR_TIMERS ,1 , vmstate_aspeed_timer, AspeedTimer),
Signature · 1 line
2.21.0
PATCH v2 8/23 aspeed/sdmc: Introduce an object class per SoC
In reply to Cédric Le GoaterUse class handlers and class constants to differentiate the characteristics of the memory controller and remove the 'silicon_rev' property.
--- include/hw/misc/aspeed_sdmc.h | 19 +++- hw/arm/aspeed_soc.c | 5 +- hw/misc/aspeed_sdmc.c | 168 +++++++++++++++++++++------------- 3 files changed, 122 insertions(+), 70 deletions(-)
include/hw/misc/aspeed_sdmc.h +15 -4
@@ -13,6 +13,8 @@#define TYPE_ASPEED_SDMC "aspeed.sdmc"#define ASPEED_SDMC (obj) OBJECT_CHECK(AspeedSDMCState, (obj), TYPE_ASPEED_SDMC) +#define TYPE_ASPEED_2400_SDMC TYPE_ASPEED_SDMC "-ast2400" +#define TYPE_ASPEED_2500_SDMC TYPE_ASPEED_SDMC "-ast2500"#define ASPEED_SDMC_NR_REGS (0x174 >> 2)
@@ -24,12 +26,21 @@ typedef struct AspeedSDMCState {MemoryRegion iomem;uint32_t regs[ASPEED_SDMC_NR_REGS ]; -uint32_t silicon_rev; -uint32_t ram_bits;uint64_t ram_size; uint64_t max_ram_size; - uint32_t fixed_conf; - } AspeedSDMCState; +#define ASPEED_SDMC_CLASS (klass) \ + OBJECT_CLASS_CHECK(AspeedSDMCClass, (klass), TYPE_ASPEED_SDMC) +#define ASPEED_SDMC_GET_CLASS (obj) \ + OBJECT_GET_CLASS(AspeedSDMCClass, (obj), TYPE_ASPEED_SDMC) + +typedef struct AspeedSDMCClass { +SysBusDeviceClass parent_class; + +uint64_t max_ram_size; +uint32_t (*compute_conf)(AspeedSDMCState *s,uint32_t data); +void (*write)(AspeedSDMCState *s,uint32_t reg,uint32_t data); +}AspeedSDMCClass ; +#endif /* ASPEED_SDMC_H */
hw/arm/aspeed_soc.c +2 -3
@@ -205,10 +205,9 @@ static void aspeed_soc_init(Object *obj) sizeof(s->spi[i]), typename); } +snprintf (typename,sizeof (typename),"aspeed.sdmc-%s" , socname);sysbus_init_child_obj (obj,"sdmc" ,OBJECT (&s->sdmc),sizeof (s->sdmc), -TYPE_ASPEED_SDMC ); -qdev_prop_set_uint32 (DEVICE (&s->sdmc),"silicon-rev" , - sc->info->silicon_rev); + typename);object_property_add_alias (obj,"ram-size" ,OBJECT (&s->sdmc),"ram-size" , &error_abort); object_property_add_alias(obj, "max-ram-size", OBJECT(&s->sdmc),
hw/misc/aspeed_sdmc.c +105 -63
214 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 9/23 aspeed/sdmc: Add AST2600 support
In reply to Cédric Le GoaterFrom: Joel Stanley <[email protected]>
The AST2600 SDMC controller is slightly different from its predecessor (DRAM training). Max memory is now 2G on the AST2600.
[clg: - improved commit log
- reworked model integration into new object class ]
--- include/hw/misc/aspeed_sdmc.h | 1 + hw/misc/aspeed_scu.c | 2 + hw/misc/aspeed_sdmc.c | 82 +++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+)
include/hw/misc/aspeed_sdmc.h +1 -0
@@ -15,6 +15,7 @@#define ASPEED_SDMC (obj) OBJECT_CHECK(AspeedSDMCState, (obj), TYPE_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 ASPEED_SDMC_NR_REGS (0x174 >> 2)
hw/misc/aspeed_scu.c +2 -0
@@ -99,6 +99,7 @@#define AST2600_CLK_STOP_CTRL_CLR TO_REG(0x84)#define AST2600_CLK_STOP_CTRL2 TO_REG(0x90)#define AST2600_CLK_STOP_CTR2L_CLR TO_REG(0x94) +#define AST2600_SDRAM_HANDSHAKE TO_REG(0x100)#define AST2600_HPLL_PARAM TO_REG(0x200)#define AST2600_HPLL_EXT TO_REG(0x204)#define AST2600_MPLL_EXT TO_REG(0x224)
@@ -602,6 +603,7 @@ static const uint32_t ast2600_a0_resets[ASPEED_AST2600_SCU_NR_REGS] = { [AST2600_SYS_RST_CTRL2] = 0xFFFFFFFC, [AST2600_CLK_STOP_CTRL] = 0xEFF43E8B, [AST2600_CLK_STOP_CTRL2] = 0xFFF0FFF0, + [AST2600_SDRAM_HANDSHAKE] = 0x00000040, /* SoC completed DRAM init */ [AST2600_HPLL_PARAM] = 0x1000405F, };
hw/misc/aspeed_sdmc.c +82 -0
111 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 10/23 watchdog/aspeed: Introduce an object class per SoC
In reply to Cédric Le GoaterIt cleanups the current models for the Aspeed AST2400 and AST2500 SoCs and prepares ground for future SoCs.
--- include/hw/watchdog/wdt_aspeed.h | 18 ++++- hw/arm/aspeed_soc.c | 9 ++- hw/watchdog/wdt_aspeed.c | 122 ++++++++++++++++--------------- 3 files changed, 86 insertions(+), 63 deletions(-)
include/hw/watchdog/wdt_aspeed.h +16 -2
@@ -16,6 +16,8 @@#define TYPE_ASPEED_WDT "aspeed.wdt"#define ASPEED_WDT (obj) \ OBJECT_CHECK(AspeedWDTState, (obj), TYPE_ASPEED_WDT) +#define TYPE_ASPEED_2400_WDT TYPE_ASPEED_WDT "-ast2400" +#define TYPE_ASPEED_2500_WDT TYPE_ASPEED_WDT "-ast2500"#define ASPEED_WDT_REGS_MAX (0x20 / 4)
@@ -30,8 +32,20 @@ typedef struct AspeedWDTState {AspeedSCUState *scu; uint32_t pclk_freq; -uint32_t silicon_rev; - uint32_t ext_pulse_width_mask; } AspeedWDTState; +#define ASPEED_WDT_CLASS (klass) \ + OBJECT_CLASS_CHECK(AspeedWDTClass, (klass), TYPE_ASPEED_WDT) +#define ASPEED_WDT_GET_CLASS (obj) \ + OBJECT_GET_CLASS(AspeedWDTClass, (obj), TYPE_ASPEED_WDT) + +typedef struct AspeedWDTClass { +SysBusDeviceClass parent_class; + +uint32_t offset; +uint32_t ext_pulse_width_mask; +uint32_t reset_ctrl_reg; +void (*reset_pulse)(AspeedWDTState *s,uint32_t property); +}AspeedWDTClass ; +#endif /* WDT_ASPEED_H */
hw/arm/aspeed_soc.c +5 -4
@@ -214,10 +214,9 @@ static void aspeed_soc_init(Object *obj) "max-ram-size", &error_abort);for (i =0 ; i < sc->info->wdts_num; i++) { +snprintf (typename,sizeof (typename),"aspeed.wdt-%s" , socname);sysbus_init_child_obj (obj,"wdt[*]" ,OBJECT (&s->wdt[i]), -sizeof (s->wdt[i]),TYPE_ASPEED_WDT ); -qdev_prop_set_uint32 (DEVICE (&s->wdt[i]),"silicon-rev" , - sc->info->silicon_rev); +sizeof (s->wdt[i]), typename);object_property_add_const_link (OBJECT (&s->wdt[i]),"scu" ,OBJECT (&s->scu), &error_abort); }
@@ -384,13 +383,15 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)/* Watch dog */ for (i =0 ; i < sc->info->wdts_num; i++) { +AspeedWDTClass *awc =ASPEED_WDT_GET_CLASS (&s->wdt[i]); +object_property_set_bool (OBJECT (&s->wdt[i]), true,"realized" , &err);if (err) {error_propagate (errp, err);return ; }sysbus_mmio_map (SYS_BUS_DEVICE (&s->wdt[i]),0 , - sc->info->memmap[ASPEED_WDT ] + i *0x20 ); + sc->info->memmap[ASPEED_WDT ] + i * awc->offset); }/* Net */
hw/watchdog/wdt_aspeed.c +65 -57
182 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 11/23 hw: wdt_aspeed: Add AST2600 support
In reply to Cédric Le GoaterFrom: Joel Stanley <[email protected]>
The AST2600 has four watchdogs, and they each have a 0x40 of registers.
When running as part of an ast2600 system we must check a different offset for the system reset control register in the SCU.
--- include/hw/arm/aspeed_soc.h | 2 +- include/hw/watchdog/wdt_aspeed.h | 1 + hw/watchdog/wdt_aspeed.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-)
include/hw/arm/aspeed_soc.h +1 -1
@@ -27,7 +27,7 @@#include "hw/sd/aspeed_sdhci.h" #define ASPEED_SPIS_NUM 2 -#define ASPEED_WDTS_NUM 3 +#define ASPEED_WDTS_NUM 4#define ASPEED_CPUS_NUM 2#define ASPEED_MACS_NUM 2
include/hw/watchdog/wdt_aspeed.h +1 -0
@@ -18,6 +18,7 @@ OBJECT_CHECK(AspeedWDTState, (obj), TYPE_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 ASPEED_WDT_REGS_MAX (0x20 / 4)
hw/watchdog/wdt_aspeed.c +29 -0
@@ -40,12 +40,14 @@#define WDT_DRIVE_TYPE_MASK (0xFF << 24)#define WDT_PUSH_PULL_MAGIC (0xA8 << 24)#define WDT_OPEN_DRAIN_MAGIC (0x8A << 24) +#define WDT_RESET_MASK1 (0x1c / 4)#define WDT_TIMEOUT_STATUS (0x10 / 4)#define WDT_TIMEOUT_CLEAR (0x14 / 4)#define WDT_RESTART_MAGIC 0x4755 +#define AST2600_SCU_RESET_CONTROL1 (0x40 / 4)#define SCU_RESET_CONTROL1 (0x04 / 4)#define SCU_RESET_SDRAM BIT(0)
@@ -74,6 +76,8 @@ static uint64_t aspeed_wdt_read(void *opaque, hwaddr offset, unsigned size)return s->regs[WDT_CTRL ];case WDT_RESET_WIDTH :return s->regs[WDT_RESET_WIDTH ]; +case WDT_RESET_MASK1 : +return s->regs[WDT_RESET_MASK1 ];case WDT_TIMEOUT_STATUS :case WDT_TIMEOUT_CLEAR : qemu_log_mask(LOG_UNIMP,
@@ -146,6 +150,11 @@ static void aspeed_wdt_write(void *opaque, hwaddr offset, uint64_t data, s->regs[WDT_RESET_WIDTH ] |= data & awc->ext_pulse_width_mask;break ; +case WDT_RESET_MASK1 : +/* TODO: implement */ + s->regs[WDT_RESET_MASK1 ] = data; +break ; +case WDT_TIMEOUT_STATUS :case WDT_TIMEOUT_CLEAR : qemu_log_mask(LOG_UNIMP,
@@ -316,12 +325,32 @@ static const TypeInfo aspeed_2500_wdt_info = { .class_init = aspeed_2500_wdt_class_init, }; +static void aspeed_2600_wdt_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +AspeedWDTClass *awc =ASPEED_WDT_CLASS (klass); + + dc->desc ="ASPEED 2600 Watchdog Controller" ; + awc->offset =0x40 ; + awc->ext_pulse_width_mask =0xfffff ;/* TODO */ + awc->reset_ctrl_reg =AST2600_SCU_RESET_CONTROL1 ; + awc->reset_pulse = aspeed_2500_wdt_reset_pulse; +} + +static const TypeInfo aspeed_2600_wdt_info = { + .name =TYPE_ASPEED_2600_WDT , + .parent =TYPE_ASPEED_WDT , + .instance_size =sizeof (AspeedWDTState), + .class_init = aspeed_2600_wdt_class_init, +}; +static void wdt_aspeed_register_types (void ) {watchdog_add_model (&model);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_init (wdt_aspeed_register_types)
Signature · 1 line
2.21.0
PATCH v2 12/23 aspeed/smc: Introduce segment operations
In reply to Cédric Le GoaterAST2600 will use a different encoding for the addresses defined in the Segment Register.
--- include/hw/ssi/aspeed_smc.h | 4 ++++ hw/ssi/aspeed_smc.c | 45 ++++++++++++++++++++++++------------- 2 files changed, 34 insertions(+), 15 deletions(-)
include/hw/ssi/aspeed_smc.h +4 -0
@@ -49,6 +49,10 @@ typedef struct AspeedSMCController {hwaddr dma_flash_mask;hwaddr dma_dram_mask;uint32_t nregs; +uint32_t (*segment_to_reg)(const struct AspeedSMCState *s, +const AspeedSegments *seg); +void (*reg_to_segment)(const struct AspeedSMCState *s,uint32_t reg, +AspeedSegments *seg); } AspeedSMCController; typedef struct AspeedSMCFlash {
hw/ssi/aspeed_smc.c +30 -15
134 lines not on this page · raw message
Signature · 1 line
2.21.0
Re: [PATCH v2 12/23] aspeed/smc: Introduce segment operations
Quoted 5 lines · Cédric Le Goater
AST2600 will use a different encoding for the addresses defined in the Segment Register.
Signed-off-by Cédric Le Goater <[email protected]>
PATCH v2 13/23 aspeed/smc: Add AST2600 support
In reply to Cédric Le GoaterThe AST2600 SoC SMC controller is a SPI only controller now and has a few extensions which we will need to take into account when SW requires it. This is enough to support u-boot and Linux.
--- hw/ssi/aspeed_smc.c | 132 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 128 insertions(+), 4 deletions(-)
hw/ssi/aspeed_smc.c +128 -4
@@ -30,6 +30,7 @@#include "qemu/error-report.h" #include "qapi/error.h" #include "exec/address-spaces.h" +#include "qemu/units.h" #include "hw/irq.h" #include "hw/qdev-properties.h"
@@ -50,7 +51,7 @@#define CONF_FLASH_TYPE0 0#define CONF_FLASH_TYPE_NOR 0x0#define CONF_FLASH_TYPE_NAND 0x1 -#define CONF_FLASH_TYPE_SPI 0x2 +#define CONF_FLASH_TYPE_SPI 0x2/* AST2600 is SPI only */ /* CE Control Register */ #define R_CE_CTRL (0x04 / 4)
@@ -71,8 +72,11 @@/* CEx Control Register */ #define R_CTRL0 (0x10 / 4) +#define CTRL_IO_QPI (1 << 31) +#define CTRL_IO_QUAD_DATA (1 << 30)#define CTRL_IO_DUAL_DATA (1 << 29)#define CTRL_IO_DUAL_ADDR_DATA (1 << 28)/* Includes dummies */ +#define CTRL_IO_QUAD_ADDR_DATA (1 << 28)/* Includes dummies */ #define CTRL_CMD_SHIFT 16#define CTRL_CMD_MASK 0xff#define CTRL_DUMMY_HIGH_SHIFT 14
@@ -136,7 +140,7 @@/* Misc Control Register #2 */ #define R_TIMINGS (0x94 / 4) -/* SPI controller registers and bits */ +/* SPI controller registers and bits (AST2400) */ #define R_SPI_CONF (0x00 / 4)#define SPI_CONF_ENABLE_W0 0#define R_SPI_CTRL0 (0x4 / 4)
@@ -216,6 +220,35 @@ static uint32_t aspeed_smc_segment_to_reg(const AspeedSMCState *s,static void aspeed_smc_reg_to_segment (const AspeedSMCState *s,uint32_t reg,AspeedSegments *seg); +/* +* AST2600 definitions +*/ +#define ASPEED26_SOC_FMC_FLASH_BASE 0x20000000 +#define ASPEED26_SOC_SPI_FLASH_BASE 0x30000000 +#define ASPEED26_SOC_SPI2_FLASH_BASE 0x50000000 + +static const AspeedSegments aspeed_segments_ast2600_fmc[] = { + {0x0 ,128 * MiB },/* start address is readonly */ + {0x0 ,0 },/* disabled */ + {0x0 ,0 },/* disabled */ +}; + +static const AspeedSegments aspeed_segments_ast2600_spi1[] = { + {0x0 ,128 * MiB },/* start address is readonly */ + {0x0 ,0 },/* disabled */ +}; + +static const AspeedSegments aspeed_segments_ast2600_spi2[] = { + {0x0 ,128 * MiB },/* start address is readonly */ + {0x0 ,0 },/* disabled */ + {0x0 ,0 },/* disabled */ +}; + +static uint32_t aspeed_2600_smc_segment_to_reg (const AspeedSMCState *s, +const AspeedSegments *seg); +static void aspeed_2600_smc_reg_to_segment (const AspeedSMCState *s, +uint32_t reg,AspeedSegments *seg); +static const AspeedSMCController controllers[] = { { .name ="aspeed.smc-ast2400" ,
@@ -311,6 +344,51 @@ static const AspeedSMCController controllers[] = { .nregs = ASPEED_SMC_R_MAX, .segment_to_reg = aspeed_smc_segment_to_reg, .reg_to_segment = aspeed_smc_reg_to_segment, + }, { + .name = "aspeed.fmc-ast2600", + .r_conf = R_CONF, + .r_ce_ctrl = R_CE_CTRL, + .r_ctrl0 = R_CTRL0, + .r_timings = R_TIMINGS, + .conf_enable_w0 = CONF_ENABLE_W0, + .max_slaves = 3, + .segments = aspeed_segments_ast2600_fmc, + .flash_window_base = ASPEED26_SOC_FMC_FLASH_BASE, + .flash_window_size = 0x10000000, + .has_dma = true, + .nregs = ASPEED_SMC_R_MAX, + .segment_to_reg = aspeed_2600_smc_segment_to_reg, + .reg_to_segment = aspeed_2600_smc_reg_to_segment, + }, { + .name = "aspeed.spi1-ast2600", + .r_conf = R_CONF, + .r_ce_ctrl = R_CE_CTRL, + .r_ctrl0 = R_CTRL0, + .r_timings = R_TIMINGS, + .conf_enable_w0 = CONF_ENABLE_W0, + .max_slaves = 2, + .segments = aspeed_segments_ast2600_spi1, + .flash_window_base = ASPEED26_SOC_SPI_FLASH_BASE, + .flash_window_size = 0x10000000, + .has_dma = false, + .nregs = ASPEED_SMC_R_MAX, + .segment_to_reg = aspeed_2600_smc_segment_to_reg, + .reg_to_segment = aspeed_2600_smc_reg_to_segment, + }, { + .name = "aspeed.spi2-ast2600", + .r_conf = R_CONF, + .r_ce_ctrl = R_CE_CTRL, + .r_ctrl0 = R_CTRL0, + .r_timings = R_TIMINGS, + .conf_enable_w0 = CONF_ENABLE_W0, + .max_slaves = 3, + .segments = aspeed_segments_ast2600_spi2, + .flash_window_base = ASPEED26_SOC_SPI2_FLASH_BASE, + .flash_window_size = 0x10000000, + .has_dma = false, + .nregs = ASPEED_SMC_R_MAX, + .segment_to_reg = aspeed_2600_smc_segment_to_reg, + .reg_to_segment = aspeed_2600_smc_reg_to_segment, }, };
@@ -336,6 +414,40 @@ static void aspeed_smc_reg_to_segment(const AspeedSMCState *s, seg->size = (((reg >>SEG_END_SHIFT ) &SEG_END_MASK ) <<23 ) - seg->addr; } +/* +* The Segment Registers of the AST2600 have a 1MB unit. The address +* range of a flash SPI slave is encoded with offsets in the overall +* controller window. The previous SoC AST2400 and AST2500 used +* absolute addresses. Only bits [27:20] are relevant and the end +* address is an upper bound limit. +*/ +#define AST2600_SEG_ADDR_MASK 0x0ff00000 + +static uint32_t aspeed_2600_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 &AST2600_SEG_ADDR_MASK ) >>16 ;/* start offset */ + reg |= (seg->addr + seg->size -1 ) &AST2600_SEG_ADDR_MASK ;/* end offset */ +return reg; +} + +static void aspeed_2600_smc_reg_to_segment (const AspeedSMCState *s, +uint32_t reg,AspeedSegments *seg) +{ +uint32_t start_offset = (reg <<16 ) &AST2600_SEG_ADDR_MASK ; +uint32_t end_offset = reg &AST2600_SEG_ADDR_MASK ; + + seg->addr = s->ctrl->flash_window_base + start_offset; + seg->size = end_offset + MiB - start_offset; +} +static bool aspeed_smc_flash_overlap (const AspeedSMCState *s,const AspeedSegments *new,int cs)
@@ -470,8 +582,12 @@ static inline int aspeed_smc_flash_cmd(const AspeedSMCFlash *fl)const AspeedSMCState *s = fl->controller;int cmd = (s->regs[s->r_ctrl0 + fl->id] >>CTRL_CMD_SHIFT ) &CTRL_CMD_MASK ; -/* In read mode, the default SPI command is READ (0x3). In other -* modes, the command should necessarily be defined */ +/* +* In read mode, the default SPI command is READ (0x3). In other +* modes, the command should necessarily be defined +* +* TODO: add support for READ4 (0x13) on AST2600 +*/ if (aspeed_smc_flash_mode (fl) ==CTRL_READMODE ) { cmd =SPI_OP_READ ; }
@@ -787,6 +903,14 @@ static void aspeed_smc_reset(DeviceState *d) s->ctrl->segment_to_reg (s, &s->ctrl->segments[i]); } +/* HW strapping flash type for the AST2600 controllers */ +if (s->ctrl->segments == aspeed_segments_ast2600_fmc) { +/* flash type is fixed to SPI for all */ + s->regs[s->r_conf] |= (CONF_FLASH_TYPE_SPI <<CONF_FLASH_TYPE0 ); + s->regs[s->r_conf] |= (CONF_FLASH_TYPE_SPI <<CONF_FLASH_TYPE1 ); + s->regs[s->r_conf] |= (CONF_FLASH_TYPE_SPI <<CONF_FLASH_TYPE2 ); + } +/* HW strapping flash type for FMC controllers */ if (s->ctrl->segments == aspeed_segments_ast2500_fmc) {/* flash type is fixed to SPI for CE0 and CE1 */
Signature · 1 line
2.21.0
Re: [PATCH v2 13/23] aspeed/smc: Add AST2600 support
Quoted 6 lines · Cédric Le Goater
The AST2600 SoC SMC controller is a SPI only controller now and has a few extensions which we will need to take into account when SW requires it. This is enough to support u-boot and Linux.
Signed-off-by Cédric Le Goater <[email protected]>
PATCH v2 14/23 hw/gpio: Add in AST2600 specific implementation
In reply to Cédric Le GoaterFrom: Rashmica Gupta <[email protected]>
The AST2600 has the same sets of 3.6v gpios as the AST2400 plus an addtional two sets of 1.8V gpios.
--- hw/gpio/aspeed_gpio.c | 142 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 137 insertions(+), 5 deletions(-)
hw/gpio/aspeed_gpio.c +137 -5
@@ -169,6 +169,48 @@#define GPIO_3_6V_MEM_SIZE 0x1F0#define GPIO_3_6V_REG_ARRAY_SIZE (GPIO_3_6V_MEM_SIZE >> 2) +/* AST2600 only - 1.8V gpios */ +/* +* The AST2600 has same 3.6V gpios as the AST2400 (memory offsets 0x0-0x198) +* and addtional 1.8V gpios (memory offsets 0x800-0x9D4). +*/ +#define GPIO_1_8V_REG_OFFSET 0x800 +#define GPIO_1_8V_ABCD_DATA_VALUE ((0x800 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_DIRECTION ((0x804 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_INT_ENABLE ((0x808 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_INT_SENS_0 ((0x80C - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_INT_SENS_1 ((0x810 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_INT_SENS_2 ((0x814 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_INT_STATUS ((0x818 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_RESET_TOLERANT ((0x81C - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_DATA_VALUE ((0x820 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_DIRECTION ((0x824 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_INT_ENABLE ((0x828 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_INT_SENS_0 ((0x82C - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_INT_SENS_1 ((0x830 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_INT_SENS_2 ((0x834 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_INT_STATUS ((0x838 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_RESET_TOLERANT ((0x83C - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_DEBOUNCE_1 ((0x840 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_DEBOUNCE_2 ((0x844 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_DEBOUNCE_1 ((0x848 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_DEBOUNCE_2 ((0x84C - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_DEBOUNCE_TIME_1 ((0x850 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_DEBOUNCE_TIME_2 ((0x854 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_DEBOUNCE_TIME_3 ((0x858 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_COMMAND_SRC_0 ((0x860 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_COMMAND_SRC_1 ((0x864 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_COMMAND_SRC_0 ((0x868 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_COMMAND_SRC_1 ((0x86C - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_DATA_READ ((0x8C0 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_DATA_READ ((0x8C4 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_ABCD_INPUT_MASK ((0x9D0 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_E_INPUT_MASK ((0x9D4 - GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_1_8V_MEM_SIZE 0x9D8 +#define GPIO_1_8V_REG_ARRAY_SIZE ((GPIO_1_8V_MEM_SIZE - \ + GPIO_1_8V_REG_OFFSET) >> 2) +#define GPIO_MAX_MEM_SIZE MAX(GPIO_3_6V_MEM_SIZE, GPIO_1_8V_MEM_SIZE) +static int aspeed_evaluate_irq (GPIOSets *regs,int gpio_prev_high,int gpio) {uint32_t falling_edge =0 , rising_edge =0 ;
@@ -465,6 +507,39 @@ static const AspeedGPIOReg aspeed_3_6v_gpios[GPIO_3_6V_REG_ARRAY_SIZE] = { [GPIO_AC_INPUT_MASK] = { 7, gpio_reg_input_mask }, }; +static const AspeedGPIOReg aspeed_1_8v_gpios[GPIO_1_8V_REG_ARRAY_SIZE ] = { +/* 1.8V Set ABCD */ + [GPIO_1_8V_ABCD_DATA_VALUE ] = {0 , gpio_reg_data_value}, + [GPIO_1_8V_ABCD_DIRECTION ] = {0 , gpio_reg_direction}, + [GPIO_1_8V_ABCD_INT_ENABLE ] = {0 , gpio_reg_int_enable}, + [GPIO_1_8V_ABCD_INT_SENS_0 ] = {0 , gpio_reg_int_sens_0}, + [GPIO_1_8V_ABCD_INT_SENS_1 ] = {0 , gpio_reg_int_sens_1}, + [GPIO_1_8V_ABCD_INT_SENS_2 ] = {0 , gpio_reg_int_sens_2}, + [GPIO_1_8V_ABCD_INT_STATUS ] = {0 , gpio_reg_int_status}, + [GPIO_1_8V_ABCD_RESET_TOLERANT ] = {0 , gpio_reg_reset_tolerant}, + [GPIO_1_8V_ABCD_DEBOUNCE_1 ] = {0 , gpio_reg_debounce_1}, + [GPIO_1_8V_ABCD_DEBOUNCE_2 ] = {0 , gpio_reg_debounce_2}, + [GPIO_1_8V_ABCD_COMMAND_SRC_0 ] = {0 , gpio_reg_cmd_source_0}, + [GPIO_1_8V_ABCD_COMMAND_SRC_1 ] = {0 , gpio_reg_cmd_source_1}, + [GPIO_1_8V_ABCD_DATA_READ ] = {0 , gpio_reg_data_read}, + [GPIO_1_8V_ABCD_INPUT_MASK ] = {0 , gpio_reg_input_mask}, +/* 1.8V Set E */ + [GPIO_1_8V_E_DATA_VALUE ] = {1 , gpio_reg_data_value}, + [GPIO_1_8V_E_DIRECTION ] = {1 , gpio_reg_direction}, + [GPIO_1_8V_E_INT_ENABLE ] = {1 , gpio_reg_int_enable}, + [GPIO_1_8V_E_INT_SENS_0 ] = {1 , gpio_reg_int_sens_0}, + [GPIO_1_8V_E_INT_SENS_1 ] = {1 , gpio_reg_int_sens_1}, + [GPIO_1_8V_E_INT_SENS_2 ] = {1 , gpio_reg_int_sens_2}, + [GPIO_1_8V_E_INT_STATUS ] = {1 , gpio_reg_int_status}, + [GPIO_1_8V_E_RESET_TOLERANT ] = {1 , gpio_reg_reset_tolerant}, + [GPIO_1_8V_E_DEBOUNCE_1 ] = {1 , gpio_reg_debounce_1}, + [GPIO_1_8V_E_DEBOUNCE_2 ] = {1 , gpio_reg_debounce_2}, + [GPIO_1_8V_E_COMMAND_SRC_0 ] = {1 , gpio_reg_cmd_source_0}, + [GPIO_1_8V_E_COMMAND_SRC_1 ] = {1 , gpio_reg_cmd_source_1}, + [GPIO_1_8V_E_DATA_READ ] = {1 , gpio_reg_data_read}, + [GPIO_1_8V_E_INPUT_MASK ] = {1 , gpio_reg_input_mask}, +}; +static uint64_t aspeed_gpio_read (void *opaque,hwaddr offset,uint32_t size) {AspeedGPIOState *s =ASPEED_GPIO (opaque);
@@ -663,8 +738,11 @@ static void aspeed_gpio_get_pin(Object *obj, Visitor *v, const char *name,int set_idx, group_idx =0 ;if (sscanf (name,"gpio%2[A-Z]%1d" , group, &pin) !=2 ) { -error_setg (errp,"%s: error reading %s" , __func__, name); -return ; +/* 1.8V gpio */ +if (sscanf (name,"gpio%3s%1d" , group, &pin) !=2 ) { +error_setg (errp,"%s: error reading %s" , __func__, name); +return ; + } } set_idx =get_set_idx (s, group, &group_idx);if (set_idx ==-1 ) {
@@ -692,8 +770,11 @@ static void aspeed_gpio_set_pin(Object *obj, Visitor *v, const char *name,return ; }if (sscanf (name,"gpio%2[A-Z]%1d" , group, &pin) !=2 ) { -error_setg (errp,"%s: error reading %s" , __func__, name); -return ; +/* 1.8V gpio */ +if (sscanf (name,"gpio%3s%1d" , group, &pin) !=2 ) { +error_setg (errp,"%s: error reading %s" , __func__, name); +return ; + } } set_idx =get_set_idx (s, group, &group_idx);if (set_idx ==-1 ) {
@@ -726,6 +807,21 @@ static const GPIOSetProperties ast2500_set_props[] = { [7] = {0x000000ff, 0x000000ff, {"AC"} }, }; +static GPIOSetProperties ast2600_3_6v_set_props[] = { + [0 ] = {0xffffffff ,0xffffffff , {"A" ,"B" ,"C" ,"D" } }, + [1 ] = {0xffffffff ,0xffffffff , {"E" ,"F" ,"G" ,"H" } }, + [2 ] = {0xffffffff ,0xffffffff , {"I" ,"J" ,"K" ,"L" } }, + [3 ] = {0xffffffff ,0xffffffff , {"M" ,"N" ,"O" ,"P" } }, + [4 ] = {0xffffffff ,0xffffffff , {"Q" ,"R" ,"S" ,"T" } }, + [5 ] = {0xffffffff ,0x0000ffff , {"U" ,"V" ,"W" ,"X" } }, + [6 ] = {0xffff0000 ,0x0fff0000 , {"Y" ,"Z" ,"" ,"" } }, +}; + +static GPIOSetProperties ast2600_1_8v_set_props[] = { + [0 ] = {0xffffffff ,0xffffffff , {"18A" ,"18B" ,"18C" ,"18D" } }, + [1 ] = {0x0000000f ,0x0000000f , {"18E" } }, +}; +static const MemoryRegionOps aspeed_gpio_ops = { .read = aspeed_gpio_read, .write = aspeed_gpio_write,
@@ -758,7 +854,7 @@ static void aspeed_gpio_realize(DeviceState *dev, Error **errp) }memory_region_init_io (&s->iomem,OBJECT (s), &aspeed_gpio_ops, s, -TYPE_ASPEED_GPIO ,GPIO_3_6V_MEM_SIZE ); +TYPE_ASPEED_GPIO ,GPIO_MAX_MEM_SIZE );sysbus_init_mmio (sbd, &s->iomem); }
@@ -851,6 +947,26 @@ static void aspeed_gpio_2500_class_init(ObjectClass *klass, void *data) agc->reg_table = aspeed_3_6v_gpios; } +static void aspeed_gpio_ast2600_3_6v_class_init (ObjectClass *klass,void *data) +{ +AspeedGPIOClass *agc =ASPEED_GPIO_CLASS (klass); + + agc->props = ast2600_3_6v_set_props; + agc->nr_gpio_pins =208 ; + agc->nr_gpio_sets =7 ; + agc->reg_table = aspeed_3_6v_gpios; +} + +static void aspeed_gpio_ast2600_1_8v_class_init (ObjectClass *klass,void *data) +{ +AspeedGPIOClass *agc =ASPEED_GPIO_CLASS (klass); + + agc->props = ast2600_1_8v_set_props; + agc->nr_gpio_pins =36 ; + agc->nr_gpio_sets =2 ; + agc->reg_table = aspeed_1_8v_gpios; +} +static const TypeInfo aspeed_gpio_info = { .name =TYPE_ASPEED_GPIO , .parent =TYPE_SYS_BUS_DEVICE ,
@@ -874,11 +990,27 @@ static const TypeInfo aspeed_gpio_ast2500_info = { .instance_init = aspeed_gpio_init, }; +static const TypeInfo aspeed_gpio_ast2600_3_6v_info = { + .name =TYPE_ASPEED_GPIO "-ast2600" , + .parent =TYPE_ASPEED_GPIO , + .class_init = aspeed_gpio_ast2600_3_6v_class_init, + .instance_init = aspeed_gpio_init, +}; + +static const TypeInfo aspeed_gpio_ast2600_1_8v_info = { + .name =TYPE_ASPEED_GPIO "-ast2600-1_8v" , + .parent =TYPE_ASPEED_GPIO , + .class_init = aspeed_gpio_ast2600_1_8v_class_init, + .instance_init = aspeed_gpio_init, +}; +static void aspeed_gpio_register_types (void ) {type_register_static (&aspeed_gpio_info);type_register_static (&aspeed_gpio_ast2400_info);type_register_static (&aspeed_gpio_ast2500_info); +type_register_static (&aspeed_gpio_ast2600_3_6v_info); +type_register_static (&aspeed_gpio_ast2600_1_8v_info); }type_init (aspeed_gpio_register_types);
Signature · 1 line
2.21.0
Re: [PATCH v2 14/23] hw/gpio: Add in AST2600 specific implementation
Quoted 9 lines · Cédric Le Goater
From: Rashmica Gupta <[email protected]>
The AST2600 has the same sets of 3.6v gpios as the AST2400 plus an addtional two sets of 1.8V gpios.
Signed-off-by Rashmica Gupta <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>Signed-off-by Cédric Le Goater <[email protected]>
PATCH v2 15/23 aspeed/i2c: Introduce an object class per SoC
In reply to Cédric Le GoaterIt prepares ground for register differences between SoCs.
--- include/hw/i2c/aspeed_i2c.h | 15 ++++++++++ hw/arm/aspeed_soc.c | 3 +- hw/i2c/aspeed_i2c.c | 60 ++++++++++++++++++++++++++++++++----- 3 files changed, 69 insertions(+), 9 deletions(-)
include/hw/i2c/aspeed_i2c.h +15 -0
@@ -25,6 +25,8 @@#include "hw/sysbus.h" #define TYPE_ASPEED_I2C "aspeed.i2c" +#define TYPE_ASPEED_2400_I2C TYPE_ASPEED_I2C "-ast2400" +#define TYPE_ASPEED_2500_I2C TYPE_ASPEED_I2C "-ast2500"#define ASPEED_I2C (obj) \ OBJECT_CHECK(AspeedI2CState, (obj), TYPE_ASPEED_I2C)
@@ -59,6 +61,19 @@ typedef struct AspeedI2CState { AspeedI2CBus busses[ASPEED_I2C_NR_BUSSES]; } AspeedI2CState; +#define ASPEED_I2C_CLASS (klass) \ + OBJECT_CLASS_CHECK(AspeedI2CClass, (klass), TYPE_ASPEED_I2C) +#define ASPEED_I2C_GET_CLASS (obj) \ + OBJECT_GET_CLASS(AspeedI2CClass, (obj), TYPE_ASPEED_I2C) + +typedef struct AspeedI2CClass { +SysBusDeviceClass parent_class; + +uint8_t num_busses; +uint8_t reg_size; +uint8_t gap; +}AspeedI2CClass ; +I2CBus *aspeed_i2c_get_bus (DeviceState *dev,int busnr);#endif /* ASPEED_I2C_H */
hw/arm/aspeed_soc.c +2 -1
@@ -188,8 +188,9 @@ static void aspeed_soc_init(Object *obj)object_property_add_const_link (OBJECT (&s->timerctrl),"scu" ,OBJECT (&s->scu), &error_abort); +snprintf (typename,sizeof (typename),"aspeed.i2c-%s" , socname);sysbus_init_child_obj (obj,"i2c" ,OBJECT (&s->i2c),sizeof (s->i2c), -TYPE_ASPEED_I2C ); + typename);snprintf (typename,sizeof (typename),"aspeed.fmc-%s" , socname); sysbus_init_child_obj(obj, "fmc", OBJECT(&s->fmc), sizeof(s->fmc),
hw/i2c/aspeed_i2c.c +52 -8
111 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 16/23 aspeed/i2c: Add AST2600 support
In reply to Cédric Le GoaterThe I2C controller of the AST2400 and AST2500 SoCs have one IRQ shared by all I2C busses. The AST2600 SoC I2C controller has one IRQ per bus and 16 busses.
--- include/hw/i2c/aspeed_i2c.h | 5 +++- hw/i2c/aspeed_i2c.c | 46 +++++++++++++++++++++++++++++++++++-- 2 files changed, 48 insertions(+), 3 deletions(-)
include/hw/i2c/aspeed_i2c.h +4 -1
@@ -27,10 +27,11 @@#define TYPE_ASPEED_I2C "aspeed.i2c"#define TYPE_ASPEED_2400_I2C TYPE_ASPEED_I2C "-ast2400"#define TYPE_ASPEED_2500_I2C TYPE_ASPEED_I2C "-ast2500" +#define TYPE_ASPEED_2600_I2C TYPE_ASPEED_I2C "-ast2600"#define ASPEED_I2C (obj) \ OBJECT_CHECK(AspeedI2CState, (obj), TYPE_ASPEED_I2C) -#define ASPEED_I2C_NR_BUSSES 14 +#define ASPEED_I2C_NR_BUSSES 16struct AspeedI2CState ;
@@ -41,6 +42,7 @@ typedef struct AspeedI2CBus {I2CBus *bus;uint8_t id; +qemu_irq irq;uint32_t ctrl;uint32_t timing[2 ];
@@ -72,6 +74,7 @@ typedef struct AspeedI2CClass {uint8_t num_busses;uint8_t reg_size;uint8_t gap; +qemu_irq (*bus_get_irq)(AspeedI2CBus *); } AspeedI2CClass;I2CBus *aspeed_i2c_get_bus (DeviceState *dev,int busnr);
hw/i2c/aspeed_i2c.c +44 -2
108 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 17/23 aspeed: Introduce an object class per SoC
In reply to Cédric Le GoaterIt prepares ground for the AST2600.
--- include/hw/arm/aspeed_soc.h | 9 +-- hw/arm/aspeed.c | 4 +- hw/arm/aspeed_soc.c | 148 +++++++++++++++++++----------------- 3 files changed, 84 insertions(+), 77 deletions(-)
include/hw/arm/aspeed_soc.h +3 -6
@@ -57,7 +57,9 @@ typedef struct AspeedSoCState {#define TYPE_ASPEED_SOC "aspeed-soc"#define ASPEED_SOC (obj) OBJECT_CHECK(AspeedSoCState, (obj), TYPE_ASPEED_SOC) -typedef struct AspeedSoCInfo { +typedef struct AspeedSoCClass { + DeviceClass parent_class; + const char *name; const char *cpu_type; uint32_t silicon_rev;
@@ -67,11 +69,6 @@ typedef struct AspeedSoCInfo {const int *irqmap;const hwaddr *memmap;uint32_t num_cpus; -} AspeedSoCInfo; - -typedef struct AspeedSoCClass { -DeviceClass parent_class; -AspeedSoCInfo *info; } AspeedSoCClass;#define ASPEED_SOC_CLASS (klass) \
hw/arm/aspeed.c +2 -2
@@ -215,7 +215,7 @@ static void aspeed_board_init(MachineState *machine,memory_region_allocate_system_memory (&bmc->ram,NULL ,"ram" , ram_size);memory_region_add_subregion (&bmc->ram_container,0 , &bmc->ram);memory_region_add_subregion (get_system_memory (), - sc->info->memmap[ASPEED_SDRAM ], + sc->memmap[ASPEED_SDRAM ], &bmc->ram_container); max_ram_size = object_property_get_uint(OBJECT(&bmc->soc), "max-ram-size",
@@ -246,7 +246,7 @@ static void aspeed_board_init(MachineState *machine, } aspeed_board_binfo.ram_size = ram_size; - aspeed_board_binfo.loader_start = sc->info->memmap[ASPEED_SDRAM ]; + aspeed_board_binfo.loader_start = sc->memmap[ASPEED_SDRAM ]; aspeed_board_binfo.nb_cpus = bmc->soc.num_cpus;if (cfg->i2c_init) {
hw/arm/aspeed_soc.c +79 -69
322 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 18/23 aspeed/soc: Add AST2600 support
In reply to Cédric Le GoaterInitial definitions for a simple machine using an AST2600 SoC (Cortex CPU).
The Cortex CPU and its interrupt controller are too complex to handle in the common Aspeed SoC framework. We introduce a new Aspeed SoC class with instance_init and realize handlers to handle the differences with the AST2400 and the AST2500 SoCs. This will add extra work to keep in sync both models with future extensions but it makes the code clearer.
--- include/hw/arm/aspeed_soc.h | 4 + hw/arm/aspeed_ast2600.c | 492 ++++++++++++++++++++++++++++++++++++ hw/arm/Makefile.objs | 2 +- 3 files changed, 497 insertions(+), 1 deletion(-) create mode 100644 hw/arm/aspeed_ast2600.c
include/hw/arm/aspeed_soc.h +4 -0
@@ -12,6 +12,7 @@#ifndef ASPEED_SOC_H #define ASPEED_SOC_H +#include "hw/cpu/a15mpcore.h" #include "hw/intc/aspeed_vic.h" #include "hw/misc/aspeed_scu.h" #include "hw/misc/aspeed_sdmc.h"
@@ -38,6 +39,7 @@ typedef struct AspeedSoCState {/*< public >*/ ARMCPU cpu[ASPEED_CPUS_NUM ];uint32_t num_cpus; +A15MPPrivState a7mpcore;MemoryRegion sram;AspeedVICState vic;AspeedRtcState rtc;
@@ -51,6 +53,7 @@ typedef struct AspeedSoCState {AspeedWDTState wdt[ASPEED_WDTS_NUM ];FTGMAC100State ftgmac100[ASPEED_MACS_NUM ];AspeedGPIOState gpio; +AspeedGPIOState gpio_1_8v;AspeedSDHCIState sdhci; } AspeedSoCState;
@@ -94,6 +97,7 @@ enum {ASPEED_SRAM ,ASPEED_SDHCI ,ASPEED_GPIO , +ASPEED_GPIO_1_8V ,ASPEED_RTC ,ASPEED_TIMER1 , ASPEED_TIMER2,
hw/arm/aspeed_ast2600.c new file +492 -0
492 lines not on this page · raw message
hw/arm/Makefile.objs +1 -1
@@ -41,7 +41,7 @@ obj-$(CONFIG_XLNX_VERSAL) += xlnx-versal.o xlnx-versal-virt.o obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o -obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o +obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o aspeed_ast2600.o obj-$(CONFIG_MPS2) += mps2.o obj-$(CONFIG_MPS2) += mps2-tz.o obj-$(CONFIG_MSF2) += msf2-soc.o
Signature · 1 line
2.21.0
PATCH v2 19/23 m25p80: Add support for w25q512jv
In reply to Cédric Le Goater--- hw/block/m25p80.c | 1 + 1 file changed, 1 insertion(+)
hw/block/m25p80.c +1 -0
@@ -327,6 +327,7 @@ static const FlashPartInfo known_devices[] = { { INFO("w25q80", 0xef5014, 0, 64 << 10, 16, ER_4K) }, { INFO("w25q80bl", 0xef4014, 0, 64 << 10, 16, ER_4K) }, { INFO("w25q256", 0xef4019, 0, 64 << 10, 512, ER_4K) }, + { INFO("w25q512jv", 0xef4020, 0, 64 << 10, 1024, ER_4K) }, }; typedef enum {
Signature · 1 line
2.21.0
Re: [PATCH v2 19/23] m25p80: Add support for w25q512jv
Quoted 2 lines · Cédric Le Goater
Signed-off-by Cédric Le Goater <[email protected]>
PATCH v2 20/23 aspeed: Add an AST2600 eval board
In reply to Cédric Le Goater--- include/hw/arm/aspeed.h | 1 + hw/arm/aspeed.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)
include/hw/arm/aspeed.h +1 -0
@@ -18,6 +18,7 @@ typedef struct AspeedBoardConfig {const char *desc;const char *soc_name;uint32_t hw_strap1; +uint32_t hw_strap2;const char *fmc_model;const char *spi_model;uint32_t num_cs;
hw/arm/aspeed.c +23 -0
@@ -88,6 +88,10 @@ struct AspeedBoardState {/* Witherspoon hardware value: 0xF10AD216 (but use romulus definition) */ #define WITHERSPOON_BMC_HW_STRAP1 ROMULUS_BMC_HW_STRAP1 +/* AST2600 evb hardware value */ +#define AST2600_EVB_HW_STRAP1 0x000000C0 +#define AST2600_EVB_HW_STRAP2 0x00000003 +/* * The max ram region is for firmwares that scan the address space * with load/store to guess how much RAM the SoC has.
@@ -187,6 +191,8 @@ static void aspeed_board_init(MachineState *machine, &error_abort);object_property_set_int (OBJECT (&bmc->soc), cfg->hw_strap1,"hw-strap1" , &error_abort); +object_property_set_int (OBJECT (&bmc->soc), cfg->hw_strap2,"hw-strap2" , + &error_abort);object_property_set_int (OBJECT (&bmc->soc), cfg->num_cs,"num-cs" , &error_abort); object_property_set_int(OBJECT(&bmc->soc), machine->smp.cpus, "num-cpus",
@@ -308,6 +314,12 @@ static void ast2500_evb_i2c_init(AspeedBoardState *bmc)i2c_create_slave (aspeed_i2c_get_bus (DEVICE (&soc->i2c),11 ),"ds1338" ,0x32 ); } +static void ast2600_evb_i2c_init (AspeedBoardState *bmc) +{ +/* Start with some devices on our I2C busses */ +ast2500_evb_i2c_init (bmc); +} +static void romulus_bmc_i2c_init (AspeedBoardState *bmc) {AspeedSoCState *soc = &bmc->soc;
@@ -455,6 +467,17 @@ static const AspeedBoardConfig aspeed_boards[] = { .num_cs = 2, .i2c_init = witherspoon_bmc_i2c_init, .ram = 512 * MiB, + }, { + .name = MACHINE_TYPE_NAME("ast2600-evb"), + .desc = "Aspeed AST2600 EVB (Cortex A7)", + .soc_name = "ast2600-a0", + .hw_strap1 = AST2600_EVB_HW_STRAP1, + .hw_strap2 = AST2600_EVB_HW_STRAP2, + .fmc_model = "w25q512jv", + .spi_model = "mx66u51235f", + .num_cs = 1, + .i2c_init = ast2600_evb_i2c_init, + .ram = 2 * GiB, }, };
Signature · 1 line
2.21.0
PATCH v2 21/23 aspeed: Parameterise number of MACs
In reply to Cédric Le GoaterFrom: Joel Stanley <[email protected]>
To support the ast2600's four MACs allow SoCs to specify the number they have, and create that many.
[clg: - included a check on sc->macs_num when realizing the macs
- included interrupt definitions for the AST2600 ]
--- include/hw/arm/aspeed_soc.h | 5 ++++- hw/arm/aspeed_ast2600.c | 10 ++++++++-- hw/arm/aspeed_soc.c | 6 ++++-- 3 files changed, 16 insertions(+), 5 deletions(-)
include/hw/arm/aspeed_soc.h +4 -1
@@ -30,7 +30,7 @@#define ASPEED_SPIS_NUM 2#define ASPEED_WDTS_NUM 4#define ASPEED_CPUS_NUM 2 -#define ASPEED_MACS_NUM 2 +#define ASPEED_MACS_NUM 4 typedef struct AspeedSoCState { /*< private >*/
@@ -69,6 +69,7 @@ typedef struct AspeedSoCClass {uint64_t sram_size;int spis_num;int wdts_num; +int macs_num;const int *irqmap;const hwaddr *memmap;uint32_t num_cpus;
@@ -114,6 +115,8 @@ enum {ASPEED_I2C ,ASPEED_ETH1 ,ASPEED_ETH2 , +ASPEED_ETH3 , +ASPEED_ETH4 ,ASPEED_SDRAM , ASPEED_XDMA, };
hw/arm/aspeed_ast2600.c +8 -2
@@ -32,7 +32,9 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = { [ASPEED_SPI1] = 0x1E630000, [ASPEED_SPI2] = 0x1E641000, [ASPEED_ETH1] = 0x1E660000, + [ASPEED_ETH3] = 0x1E670000, [ASPEED_ETH2] = 0x1E680000, + [ASPEED_ETH4] = 0x1E690000, [ASPEED_VIC] = 0x1E6C0000, [ASPEED_SDMC] = 0x1E6E0000, [ASPEED_SCU] = 0x1E6E2000,
@@ -88,6 +90,9 @@ static const int aspeed_soc_ast2600_irqmap[] = { [ASPEED_I2C] = 110, /* 110 -> 125 */ [ASPEED_ETH1] = 2, [ASPEED_ETH2] = 3, + [ASPEED_ETH3] = 32, + [ASPEED_ETH4] = 33, + };static qemu_irq aspeed_soc_get_irq (AspeedSoCState *s,int ctrl)
@@ -173,7 +178,7 @@ static void aspeed_soc_ast2600_init(Object *obj) OBJECT(&s->scu), &error_abort); } -for (i =0 ; i <ASPEED_MACS_NUM ; i++) { +for (i =0 ; i < sc->macs_num; i++) {sysbus_init_child_obj (obj,"ftgmac100[*]" ,OBJECT (&s->ftgmac100[i]),sizeof (s->ftgmac100[i]),TYPE_FTGMAC100 ); }
@@ -397,7 +402,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) }/* Net */ -for (i =0 ; i < nb_nics; i++) { +for (i =0 ; i < nb_nics && i < sc->macs_num; i++) {qdev_set_nic_properties (DEVICE (&s->ftgmac100[i]), &nd_table[i]);object_property_set_bool (OBJECT (&s->ftgmac100[i]), true,"aspeed" , &err);
@@ -470,6 +475,7 @@ static void aspeed_soc_ast2600_class_init(ObjectClass *oc, void *data) sc->sram_size =0x10000 ; sc->spis_num =2 ; sc->wdts_num =4 ; + sc->macs_num =4 ; sc->irqmap = aspeed_soc_ast2600_irqmap; sc->memmap = aspeed_soc_ast2600_memmap; sc->num_cpus =2 ;
hw/arm/aspeed_soc.c +4 -2
@@ -198,7 +198,7 @@ static void aspeed_soc_init(Object *obj) OBJECT(&s->scu), &error_abort); } -for (i =0 ; i <ASPEED_MACS_NUM ; i++) { +for (i =0 ; i < sc->macs_num; i++) {sysbus_init_child_obj (obj,"ftgmac100[*]" ,OBJECT (&s->ftgmac100[i]),sizeof (s->ftgmac100[i]),TYPE_FTGMAC100 ); }
@@ -372,7 +372,7 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) }/* Net */ -for (i =0 ; i < nb_nics; i++) { +for (i =0 ; i < nb_nics && i < sc->macs_num; i++) {qdev_set_nic_properties (DEVICE (&s->ftgmac100[i]), &nd_table[i]);object_property_set_bool (OBJECT (&s->ftgmac100[i]), true,"aspeed" , &err);
@@ -455,6 +455,7 @@ static void aspeed_soc_ast2400_class_init(ObjectClass *oc, void *data) sc->sram_size =0x8000 ; sc->spis_num =1 ; sc->wdts_num =2 ; + sc->macs_num =2 ; sc->irqmap = aspeed_soc_ast2400_irqmap; sc->memmap = aspeed_soc_ast2400_memmap; sc->num_cpus =1 ;
@@ -478,6 +479,7 @@ static void aspeed_soc_ast2500_class_init(ObjectClass *oc, void *data) sc->sram_size =0x9000 ; sc->spis_num =2 ; sc->wdts_num =3 ; + sc->macs_num =2 ; sc->irqmap = aspeed_soc_ast2500_irqmap; sc->memmap = aspeed_soc_ast2500_memmap; sc->num_cpus =1 ;
Signature · 1 line
2.21.0
PATCH v2 22/23 aspeed: add support for the Aspeed MII controller of the AST2600
In reply to Cédric Le GoaterThe AST2600 SoC has an extra controller to set the PHY registers.
--- include/hw/arm/aspeed_soc.h | 5 ++ include/hw/net/ftgmac100.h | 17 ++++ hw/arm/aspeed_ast2600.c | 20 +++++ hw/net/ftgmac100.c | 162 ++++++++++++++++++++++++++++++++++++ 4 files changed, 204 insertions(+)
include/hw/arm/aspeed_soc.h +5 -0
@@ -52,6 +52,7 @@ typedef struct AspeedSoCState {AspeedSDMCState sdmc;AspeedWDTState wdt[ASPEED_WDTS_NUM ];FTGMAC100State ftgmac100[ASPEED_MACS_NUM ]; +AspeedMiiState mii[ASPEED_MACS_NUM ];AspeedGPIOState gpio;AspeedGPIOState gpio_1_8v;AspeedSDHCIState sdhci;
@@ -117,6 +118,10 @@ enum {ASPEED_ETH2 ,ASPEED_ETH3 ,ASPEED_ETH4 , +ASPEED_MII1 , +ASPEED_MII2 , +ASPEED_MII3 , +ASPEED_MII4 ,ASPEED_SDRAM , ASPEED_XDMA, };
include/hw/net/ftgmac100.h +17 -0
@@ -66,4 +66,21 @@ typedef struct FTGMAC100State { uint32_t rxdes0_edorr; } FTGMAC100State; +#define TYPE_ASPEED_MII "aspeed-mmi" +#define ASPEED_MII (obj) OBJECT_CHECK(AspeedMiiState, (obj), TYPE_ASPEED_MII) + +/* +* AST2600 MII controller +*/ +typedef struct AspeedMiiState { +/*< private >*/ +SysBusDevice parent_obj; + +FTGMAC100State *nic; + +MemoryRegion iomem; +uint32_t phycr; +uint32_t phydata; +}AspeedMiiState ; +#endif
hw/arm/aspeed_ast2600.c +20 -0
@@ -31,6 +31,10 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = { [ASPEED_FMC] = 0x1E620000, [ASPEED_SPI1] = 0x1E630000, [ASPEED_SPI2] = 0x1E641000, + [ASPEED_MII1] = 0x1E650000, + [ASPEED_MII2] = 0x1E650008, + [ASPEED_MII3] = 0x1E650010, + [ASPEED_MII4] = 0x1E650018, [ASPEED_ETH1] = 0x1E660000, [ASPEED_ETH3] = 0x1E670000, [ASPEED_ETH2] = 0x1E680000,
@@ -181,6 +185,12 @@ static void aspeed_soc_ast2600_init(Object *obj)for (i =0 ; i < sc->macs_num; i++) {sysbus_init_child_obj (obj,"ftgmac100[*]" ,OBJECT (&s->ftgmac100[i]),sizeof (s->ftgmac100[i]),TYPE_FTGMAC100 ); + +sysbus_init_child_obj (obj,"mii[*]" , &s->mii[i],sizeof (s->mii[i]), +TYPE_ASPEED_MII ); +object_property_add_const_link (OBJECT (&s->mii[i]),"nic" , +OBJECT (&s->ftgmac100[i]), + &error_abort); } sysbus_init_child_obj(obj, "xdma", OBJECT(&s->xdma), sizeof(s->xdma),
@@ -417,6 +427,16 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) sc->memmap[ASPEED_ETH1 + i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->ftgmac100[i]),0 ,aspeed_soc_get_irq (s,ASPEED_ETH1 + i)); + +object_property_set_bool (OBJECT (&s->mii[i]), true,"realized" , + &err); +if (err) { +error_propagate (errp, err); +return ; + } + +sysbus_mmio_map (SYS_BUS_DEVICE (&s->mii[i]),0 , + sc->memmap[ASPEED_MII1 + i]); }/* XDMA */
hw/net/ftgmac100.c +162 -0
177 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 23/23 aspeed/soc: Add ASPEED Video stub
In reply to Cédric Le GoaterFrom: Joel Stanley <[email protected]>
--- include/hw/arm/aspeed_soc.h | 1 + hw/arm/aspeed_ast2600.c | 5 +++++ hw/arm/aspeed_soc.c | 6 ++++++ 3 files changed, 12 insertions(+)
include/hw/arm/aspeed_soc.h +1 -0
@@ -96,6 +96,7 @@ enum {ASPEED_SDMC ,ASPEED_SCU ,ASPEED_ADC , +ASPEED_VIDEO ,ASPEED_SRAM ,ASPEED_SDHCI , ASPEED_GPIO,
hw/arm/aspeed_ast2600.c +5 -0
@@ -44,6 +44,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = { [ASPEED_SCU] = 0x1E6E2000, [ASPEED_XDMA] = 0x1E6E7000, [ASPEED_ADC] = 0x1E6E9000, + [ASPEED_VIDEO] = 0x1E700000, [ASPEED_SDHCI] = 0x1E740000, [ASPEED_GPIO] = 0x1E780000, [ASPEED_GPIO_1_8V] = 0x1E780800,
@@ -236,6 +237,10 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)create_unimplemented_device ("aspeed_soc.io" , sc->memmap[ASPEED_IOMEM ],ASPEED_SOC_IOMEM_SIZE ); +/* Video engine stub */ +create_unimplemented_device ("aspeed.video" , sc->memmap[ASPEED_VIDEO ], +0x1000 ); +if (s->num_cpus > sc->num_cpus) {warn_report ("%s: invalid number of CPUs %d, using default %d" , sc->name, s->num_cpus, sc->num_cpus);
hw/arm/aspeed_soc.c +6 -0
@@ -34,6 +34,7 @@ static const hwaddr aspeed_soc_ast2400_memmap[] = { [ASPEED_SDMC] = 0x1E6E0000, [ASPEED_SCU] = 0x1E6E2000, [ASPEED_XDMA] = 0x1E6E7000, + [ASPEED_VIDEO] = 0x1E700000, [ASPEED_ADC] = 0x1E6E9000, [ASPEED_SRAM] = 0x1E720000, [ASPEED_SDHCI] = 0x1E740000,
@@ -63,6 +64,7 @@ static const hwaddr aspeed_soc_ast2500_memmap[] = { [ASPEED_SCU] = 0x1E6E2000, [ASPEED_XDMA] = 0x1E6E7000, [ASPEED_ADC] = 0x1E6E9000, + [ASPEED_VIDEO] = 0x1E700000, [ASPEED_SRAM] = 0x1E720000, [ASPEED_SDHCI] = 0x1E740000, [ASPEED_GPIO] = 0x1E780000,
@@ -231,6 +233,10 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)create_unimplemented_device ("aspeed_soc.io" , sc->memmap[ASPEED_IOMEM ],ASPEED_SOC_IOMEM_SIZE ); +/* Video engine stub */ +create_unimplemented_device ("aspeed.video" , sc->memmap[ASPEED_VIDEO ], +0x1000 ); +if (s->num_cpus > sc->num_cpus) {warn_report ("%s: invalid number of CPUs %d, using default %d" , sc->name, s->num_cpus, sc->num_cpus);
Signature · 1 line
2.21.0
Peter Maydell
AppliedQuoted 11 lines · Cédric Le Goater
Hello,
The series starts with a watchdog fix and a new model for the SDHCI controller. Follows the code for the AST2600 SoC.
Most of the Aspeed models are reworked with an object class to introduce the AST2600 variant. A model for the AST2600 SoC and a simple AST2600 EVB machine is proposed at the end of the series. It can boot the OpenBMC firmware image which is currently used for HW bringup.
Applied to target-arm.next, thanks.
-- PMM