hw/riscv: microchip_pfsoc: Support factory HSS boot out of the box
Subsystems (2)
cover hw/riscv: microchip_pfsoc: Support factory HSS boot out of the box
At present the DDR memory controller is not modeled, hence the factory HSS firmware does not boot out of the box on QEMU. A modified HSS is required per the instructions on [1].
This series adds the missing DDR memory controller support to PolarFire SoC, as well as adding various misc models to support the DDR memory initialization done by HSS.
With this series, the unmodified HSS image can boot on QEMU out of the box. The latest SD card image [2] released by Microchip was used for testing which includes the pre-built U-Boot, device tree blob and Linux kernel for the Icicle Kit. The instructions on [1] have been updated to include the information on HSS and SD card image.
[1] https://wiki.qemu.org/Documentation/Platforms/RISCV#Microchip_PolarFire_SoC_Icicle_Kit
[2] ftp://ftpsoc.microsemi.com/outgoing/core-image-minimal-dev-icicle-kit-es-sd-20201009141623.rootfs.wic.gz
Bin Meng (9):
hw/misc: Add Microchip PolarFire SoC DDR Memory Controller support hw/riscv: microchip_pfsoc: Connect DDR memory controller modules hw/misc: Add Microchip PolarFire SoC IOSCB module support hw/riscv: microchip_pfsoc: Connect the IOSCB module hw/misc: Add Microchip PolarFire SoC SYSREG module support hw/riscv: microchip_pfsoc: Connect the SYSREG module hw/riscv: microchip_pfsoc: Map debug memory
hw/riscv: microchip_pfsoc: Correct DDR memory map hw/riscv: microchip_pfsoc: Hook the I2C1 controller
MAINTAINERS | 6 + hw/misc/Kconfig | 9 ++ hw/misc/mchp_pfsoc_dmc.c | 216 +++++++++++++++++++++++++ hw/misc/mchp_pfsoc_ioscb.c | 242 ++++++++++++++++++++++++++++ hw/misc/mchp_pfsoc_sysreg.c | 99 ++++++++++++ hw/misc/meson.build | 3 + hw/riscv/Kconfig | 3 + hw/riscv/microchip_pfsoc.c | 103 ++++++++++-- include/hw/misc/mchp_pfsoc_dmc.h | 56 +++++++ include/hw/misc/mchp_pfsoc_ioscb.h | 50 ++++++ include/hw/misc/mchp_pfsoc_sysreg.h | 39 +++++ include/hw/riscv/microchip_pfsoc.h | 17 +- 12 files changed, 828 insertions(+), 15 deletions(-) create mode 100644 hw/misc/mchp_pfsoc_dmc.c create mode 100644 hw/misc/mchp_pfsoc_ioscb.c create mode 100644 hw/misc/mchp_pfsoc_sysreg.c create mode 100644 include/hw/misc/mchp_pfsoc_dmc.h create mode 100644 include/hw/misc/mchp_pfsoc_ioscb.h create mode 100644 include/hw/misc/mchp_pfsoc_sysreg.h
Signature · 1 line
2.25.1
PATCH 1/9 hw/misc: Add Microchip PolarFire SoC DDR Memory Controller support
The PolarFire SoC DDR Memory Controller mainly includes 2 modules, called SGMII PHY module and the CFG module, as documented in the chipset datasheet.
This creates a single file that groups these 2 modules, providing the minimum functionalities that make the HSS DDR initialization codes happy.
---
MAINTAINERS | 2 + hw/misc/Kconfig | 3 + hw/misc/mchp_pfsoc_dmc.c | 216 +++++++++++++++++++++++++++++++ hw/misc/meson.build | 1 + include/hw/misc/mchp_pfsoc_dmc.h | 56 ++++++++ 5 files changed, 278 insertions(+) create mode 100644 hw/misc/mchp_pfsoc_dmc.c create mode 100644 include/hw/misc/mchp_pfsoc_dmc.h
MAINTAINERS +2 -0
@@ -1326,8 +1326,10 @@ L: [email protected] S: Supported F: hw/riscv/microchip_pfsoc.c F: hw/char/mchp_pfsoc_mmuart.c +F: hw/misc/mchp_pfsoc_dmc.c F: include/hw/riscv/microchip_pfsoc.h F: include/hw/char/mchp_pfsoc_mmuart.h +F: include/hw/misc/mchp_pfsoc_dmc.h RX Machines -----------
hw/misc/Kconfig +3 -0
@@ -134,6 +134,9 @@ config MAC_VIA config AVR_POWER bool +config MCHP_PFSOC_DMC + bool + config SIFIVE_TEST bool
hw/misc/mchp_pfsoc_dmc.c new file +216 -0
216 lines not on this page · raw message
hw/misc/meson.build +1 -0
@@ -22,6 +22,7 @@ softmmu_ss.add(when: 'CONFIG_ARM11SCU', if_true: files('arm11scu.c')) softmmu_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c')) # RISC-V devices +softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_DMC', if_true: files('mchp_pfsoc_dmc.c')) softmmu_ss.add(when: 'CONFIG_SIFIVE_TEST', if_true: files('sifive_test.c')) softmmu_ss.add(when: 'CONFIG_SIFIVE_E_PRCI', if_true: files('sifive_e_prci.c')) softmmu_ss.add(when: 'CONFIG_SIFIVE_U_OTP', if_true: files('sifive_u_otp.c'))
include/hw/misc/mchp_pfsoc_dmc.h new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 2/9 hw/riscv: microchip_pfsoc: Connect DDR memory controller modules
In reply to Bin MengConnect DDR SGMII PHY module and CFG module to the PolarFire SoC.
---
hw/riscv/Kconfig | 1 + hw/riscv/microchip_pfsoc.c | 18 ++++++++++++++++++ include/hw/riscv/microchip_pfsoc.h | 5 +++++ 3 files changed, 24 insertions(+)
hw/riscv/Kconfig +1 -0
@@ -4,6 +4,7 @@ config IBEX config MICROCHIP_PFSOC bool select CADENCE_SDHCI + select MCHP_PFSOC_DMC select MCHP_PFSOC_MMUART select MSI_NONBROKEN select SIFIVE_CLINT
hw/riscv/microchip_pfsoc.c +18 -0
@@ -15,6 +15,7 @@* 4) Cadence eMMC/SDHC controller and an SD card connected to it * 5) SiFive Platform DMA (Direct Memory Access Controller) * 6) GEM (Gigabit Ethernet MAC Controller) +* 7) DMC (DDR Memory Controller) * * This board currently generates devicetree dynamically that indicates at least * two harts and up to five harts.
@@ -85,7 +86,9 @@ static const struct MemmapEntry { [MICROCHIP_PFSOC_MMUART0] = { 0x20000000, 0x1000 }, [MICROCHIP_PFSOC_SYSREG] = { 0x20002000, 0x2000 }, [MICROCHIP_PFSOC_MPUCFG] = { 0x20005000, 0x1000 }, + [MICROCHIP_PFSOC_DDR_SGMII_PHY] = { 0x20007000, 0x1000 }, [MICROCHIP_PFSOC_EMMC_SD] = { 0x20008000, 0x1000 }, + [MICROCHIP_PFSOC_DDR_CFG] = { 0x20080000, 0x40000 }, [MICROCHIP_PFSOC_MMUART1] = { 0x20100000, 0x1000 }, [MICROCHIP_PFSOC_MMUART2] = { 0x20102000, 0x1000 }, [MICROCHIP_PFSOC_MMUART3] = { 0x20104000, 0x1000 },
@@ -131,6 +134,11 @@ static void microchip_pfsoc_soc_instance_init(Object *obj)object_initialize_child (obj,"dma-controller" , &s->dma,TYPE_SIFIVE_PDMA ); +object_initialize_child (obj,"ddr-sgmii-phy" , &s->ddr_sgmii_phy, +TYPE_MCHP_PFSOC_DDR_SGMII_PHY ); +object_initialize_child (obj,"ddr-cfg" , &s->ddr_cfg, +TYPE_MCHP_PFSOC_DDR_CFG ); +object_initialize_child (obj,"gem0" , &s->gem0,TYPE_CADENCE_GEM );object_initialize_child (obj,"gem1" , &s->gem1,TYPE_CADENCE_GEM );
@@ -260,6 +268,16 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp) memmap[MICROCHIP_PFSOC_MPUCFG ].base, memmap[MICROCHIP_PFSOC_MPUCFG].size); +/* DDR SGMII PHY */ +sysbus_realize (SYS_BUS_DEVICE (&s->ddr_sgmii_phy), errp); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->ddr_sgmii_phy),0 , + memmap[MICROCHIP_PFSOC_DDR_SGMII_PHY ].base); + +/* DDR CFG */ +sysbus_realize (SYS_BUS_DEVICE (&s->ddr_cfg), errp); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->ddr_cfg),0 , + memmap[MICROCHIP_PFSOC_DDR_CFG ].base); +/* SDHCI */ sysbus_realize (SYS_BUS_DEVICE (&s->sdhci), errp); sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdhci), 0,
include/hw/riscv/microchip_pfsoc.h +5 -0
@@ -24,6 +24,7 @@#include "hw/char/mchp_pfsoc_mmuart.h" #include "hw/dma/sifive_pdma.h" +#include "hw/misc/mchp_pfsoc_dmc.h" #include "hw/net/cadence_gem.h" #include "hw/sd/cadence_sdhci.h"
@@ -37,6 +38,8 @@ typedef struct MicrochipPFSoCState {RISCVHartArrayState e_cpus;RISCVHartArrayState u_cpus;DeviceState *plic; +MchpPfSoCDdrSgmiiPhyState ddr_sgmii_phy; +MchpPfSoCDdrCfgState ddr_cfg;MchpPfSoCMMUartState *serial0;MchpPfSoCMMUartState *serial1;MchpPfSoCMMUartState *serial2;
@@ -82,7 +85,9 @@ enum {MICROCHIP_PFSOC_MMUART0 ,MICROCHIP_PFSOC_SYSREG ,MICROCHIP_PFSOC_MPUCFG , +MICROCHIP_PFSOC_DDR_SGMII_PHY ,MICROCHIP_PFSOC_EMMC_SD , +MICROCHIP_PFSOC_DDR_CFG ,MICROCHIP_PFSOC_MMUART1 ,MICROCHIP_PFSOC_MMUART2 , MICROCHIP_PFSOC_MMUART3,
Signature · 1 line
2.25.1