hw/riscv: Add Microchip PolarFire SoC Icicle Kit board support
v2 cover hw/riscv: Add Microchip PolarFire SoC Icicle Kit board support
From: Bin Meng <[email protected]>
This adds support for Microchip PolarFire SoC Icicle Kit board. The Icicle Kit board integrates a PolarFire SoC, with one SiFive's E51 plus four U54 cores and many on-chip peripherals and an FPGA.
For more details about Microchip PolarFire SoC, please see:
https://www.microsemi.com/product-directory/soc-fpgas/5498-polarfire-soc-fpga
The Icicle Kit board information can be found here:
https://www.microsemi.com/existing-parts/parts/152514
Unlike SiFive FU540, the RISC-V core resect vector is at 0x20220000. The RISC-V CPU and HART codes has been updated to set the core's reset vector based on a configurable property from machine codes.
The following perepherals are created as an unimplemented device:
- Bus Error Uint 0/1/2/3/4
- L2 cache controller
- SYSREG
- MPUCFG
- IOSCBCFG
- GPIO
The following perepherals are emulated:
- SiFive CLINT
- SiFive PLIC
- PolarFire SoC Multi-Mode UART
- SiFive PDMA
- Cadence eMMC/SDHCI controller
- Cadence Gigabit Ethernet MAC
The BIOS image used by this machine is hss.bin, aka Hart Software Services, which can be built from:
https://github.com/polarfire-soc/hart-software-services
To launch this machine:
$ qemu-system-riscv64 -M microchip-icicle-kit -smp 5 \
-bios path/to/hss.bin -sd path/to/sdcard.img \
-nic tap,ifname=tap,script=no,model=cadence_gem \
-display none -serial stdio \
-chardev socket,id=serial1,path=serial1.sock,server,wait \
-serial chardev:serial1The memory is set to 1 GiB by default to match the hardware. A sanity check on ram size is performed in the machine init routine to prompt user to increase the RAM size to > 1 GiB when less than 1 GiB ram is detected.
HSS output is on the first serial port (stdio) and U-Boot/Linux outputs on the 2nd serial port. OpenSBI outputs on a random serial port due to the lottery mechanism used during the multi-core boot.
Please check the QEMU WiKi page for the target specific information:
https://wiki.qemu.org/Documentation/Platforms/RISCV#Microchip_PolarFire_SoC_Icicle_Kit
Changes in v2:
- change to update hw/char/meson.build
- add impl.min_access_size and impl.max_access_size as part of MemoryRegionOps and remove the allignment check
- change to update hw/sd/meson.build
- change the name to "generic-sdhci" when calling object_initialize_child()
- add a container MR to simplify out-of-bounds access checks
- do not initialize TYPE_SYSBUS_SDHCI in the SoC instance_init(), instead move that to the cadence_sdhci model
- do not access generic-sdhci's state directly,
instead move that to the cadence_sdhci model
- change to update hw/dma/meson.build
- rename the file names to sifive_pdma.[c|h]
- update irq number to 8 per the SiFive FU540 manual
- fix the register offset for channel 1/2/3 in the read/write ops
- connect 8 IRQs to the PLIC
- change "phy-addr" default value to BOARD_PHY_ADDRESS
Bin Meng (16):
target/riscv: cpu: Add a new 'resetvec' property
hw/riscv: hart: Add a new 'resetvec' property target/riscv: cpu: Set reset vector based on the configured property
value
hw/riscv: Initial support for Microchip PolarFire SoC Icicle Kit board hw/char: Add Microchip PolarFire SoC MMUART emulation hw/riscv: microchip_pfsoc: Connect 5 MMUARTs
hw/sd: Add Cadence SDHCI emulation
hw/riscv: microchip_pfsoc: Connect a Cadence SDHCI controller and an
SD card
hw/dma: Add SiFive platform DMA controller emulation hw/riscv: microchip_pfsoc: Connect a DMA controller hw/net: cadence_gem: Add a new 'phy-addr' property
hw/arm: xlnx: Set all boards' GEM 'phy-addr' property value to 23 hw/riscv: microchip_pfsoc: Connect 2 Cadence GEMs hw/riscv: microchip_pfsoc: Hook GPIO controllers
hw/riscv: clint: Avoid using hard-coded timebase frequency hw/riscv: sifive_u: Connect a DMA controller
default-configs/riscv64-softmmu.mak | 1 + include/hw/char/mchp_pfsoc_mmuart.h | 61 +++++ include/hw/dma/sifive_pdma.h | 57 +++++ include/hw/net/cadence_gem.h | 2 + include/hw/riscv/microchip_pfsoc.h | 133 +++++++++++ include/hw/riscv/riscv_hart.h | 1 + include/hw/riscv/sifive_clint.h | 4 +- include/hw/riscv/sifive_u.h | 11 + include/hw/sd/cadence_sdhci.h | 47 ++++ target/riscv/cpu.h | 7 +- hw/arm/xilinx_zynq.c | 1 + hw/arm/xlnx-versal.c | 1 + hw/arm/xlnx-zynqmp.c | 1 + hw/char/mchp_pfsoc_mmuart.c | 86 +++++++ hw/dma/sifive_pdma.c | 313 ++++++++++++++++++++++++++ hw/net/cadence_gem.c | 7 +- hw/riscv/microchip_pfsoc.c | 437 ++++++++++++++++++++++++++++++++++++ hw/riscv/opentitan.c | 1 + hw/riscv/riscv_hart.c | 3 + hw/riscv/sifive_clint.c | 26 ++- hw/riscv/sifive_e.c | 4 +- hw/riscv/sifive_u.c | 35 ++- hw/riscv/spike.c | 3 +- hw/riscv/virt.c | 3 +- hw/sd/cadence_sdhci.c | 193 ++++++++++++++++ target/riscv/cpu.c | 8 +- target/riscv/cpu_helper.c | 4 +- target/riscv/csr.c | 4 +- MAINTAINERS | 9 + hw/char/Kconfig | 3 + hw/char/meson.build | 1 + hw/dma/Kconfig | 3 + hw/dma/meson.build | 1 + hw/riscv/Kconfig | 10 + hw/riscv/meson.build | 1 + hw/sd/Kconfig | 4 + hw/sd/meson.build | 1 + 37 files changed, 1458 insertions(+), 29 deletions(-) create mode 100644 include/hw/char/mchp_pfsoc_mmuart.h create mode 100644 include/hw/dma/sifive_pdma.h create mode 100644 include/hw/riscv/microchip_pfsoc.h create mode 100644 include/hw/sd/cadence_sdhci.h create mode 100644 hw/char/mchp_pfsoc_mmuart.c create mode 100644 hw/dma/sifive_pdma.c create mode 100644 hw/riscv/microchip_pfsoc.c create mode 100644 hw/sd/cadence_sdhci.c
Signature · 1 line
2.7.4
PATCH v2 1/16 target/riscv: cpu: Add a new 'resetvec' property
From: Bin Meng <[email protected]>
Currently the reset vector address is hard-coded in a RISC-V CPU's instance_init() routine. In a real world we can have 2 exact same CPUs except for the reset vector address, which is pretty common in the RISC-V core IP licensing business.
Normally reset vector address is a configurable parameter. Let's create a 64-bit property to store the reset vector address which covers both 32-bit and 64-bit CPUs.
---
(no changes since v1)
target/riscv/cpu.h | 1 + target/riscv/cpu.c | 1 + 2 files changed, 2 insertions(+)
target/riscv/cpu.h +1 -0
@@ -291,6 +291,7 @@ typedef struct RISCVCPU {uint16_t elen;bool mmu;bool pmp; +uint64_t resetvec; } cfg; }RISCVCPU ;
target/riscv/cpu.c +1 -0
@@ -518,6 +518,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_UINT16 ("elen" ,RISCVCPU , cfg.elen,64 ),DEFINE_PROP_BOOL ("mmu" ,RISCVCPU , cfg.mmu, true),DEFINE_PROP_BOOL ("pmp" ,RISCVCPU , cfg.pmp, true), +DEFINE_PROP_UINT64 ("resetvec" ,RISCVCPU , cfg.resetvec,DEFAULT_RSTVEC ), DEFINE_PROP_END_OF_LIST(), };
Signature · 1 line
2.7.4
PATCH v2 2/16 hw/riscv: hart: Add a new 'resetvec' property
In reply to Bin MengFrom: Bin Meng <[email protected]>
RISC-V machines do not instantiate RISC-V CPUs directly, instead they do that via the hart array. Add a new property for the reset vector address to allow the value to be passed to the CPU, before CPU is realized.
---
(no changes since v1)
include/hw/riscv/riscv_hart.h | 1 + hw/riscv/riscv_hart.c | 3 +++ 2 files changed, 4 insertions(+)
include/hw/riscv/riscv_hart.h +1 -0
@@ -37,6 +37,7 @@ typedef struct RISCVHartArrayState {uint32_t num_harts;uint32_t hartid_base;char *cpu_type; +uint64_t resetvec;RISCVCPU *harts; } RISCVHartArrayState;
hw/riscv/riscv_hart.c +3 -0
@@ -31,6 +31,8 @@ static Property riscv_harts_props[] = {DEFINE_PROP_UINT32 ("num-harts" , RISCVHartArrayState, num_harts,1 ),DEFINE_PROP_UINT32 ("hartid-base" , RISCVHartArrayState, hartid_base,0 ),DEFINE_PROP_STRING ("cpu-type" , RISCVHartArrayState, cpu_type), +DEFINE_PROP_UINT64 ("resetvec" , RISCVHartArrayState, resetvec, +DEFAULT_RSTVEC ), DEFINE_PROP_END_OF_LIST(), };
@@ -44,6 +46,7 @@ static bool riscv_hart_realize(RISCVHartArrayState *s, int idx, char *cpu_type, Error **errp) { object_initialize_child(OBJECT(s), "harts[*]", &s->harts[idx], cpu_type); +qdev_prop_set_uint64 (DEVICE (&s->harts[idx]),"resetvec" , s->resetvec); s->harts[idx].env.mhartid = s->hartid_base + idx;qemu_register_reset (riscv_harts_cpu_reset, &s->harts[idx]);return qdev_realize (DEVICE (&s->harts[idx]),NULL , errp);
Signature · 1 line
2.7.4
PATCH v2 3/16 target/riscv: cpu: Set reset vector based on the configured property value
In reply to Bin MengFrom: Bin Meng <[email protected]>
Now that we have the newly introduced 'resetvec' property in the RISC-V CPU and HART, instead of hard-coding the reset vector addr in the CPU's instance_init(), move that to riscv_cpu_realize() based on the configured property value from the RISC-V machines.
---
(no changes since v1)
hw/riscv/opentitan.c | 1 + hw/riscv/sifive_e.c | 1 + hw/riscv/sifive_u.c | 2 ++ target/riscv/cpu.c | 7 ++----- 4 files changed, 6 insertions(+), 5 deletions(-)
hw/riscv/opentitan.c +1 -0
@@ -111,6 +111,7 @@ static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp) &error_abort);object_property_set_int (OBJECT (&s->cpus),"num-harts" , ms->smp.cpus, &error_abort); +object_property_set_int (OBJECT (&s->cpus),"resetvec" ,0x8090 , &error_abort);sysbus_realize (SYS_BUS_DEVICE (&s->cpus), &error_abort);/* Boot ROM */
hw/riscv/sifive_e.c +1 -0
@@ -177,6 +177,7 @@ static void sifive_e_soc_init(Object *obj)object_initialize_child (obj,"cpus" , &s->cpus,TYPE_RISCV_HART_ARRAY );object_property_set_int (OBJECT (&s->cpus),"num-harts" , ms->smp.cpus, &error_abort); +object_property_set_int (OBJECT (&s->cpus),"resetvec" ,0x1004 , &error_abort);object_initialize_child (obj,"riscv.sifive.e.gpio0" , &s->gpio,TYPE_SIFIVE_GPIO ); }
hw/riscv/sifive_u.c +2 -0
@@ -611,6 +611,7 @@ static void sifive_u_soc_instance_init(Object *obj)qdev_prop_set_uint32 (DEVICE (&s->e_cpus),"num-harts" ,1 );qdev_prop_set_uint32 (DEVICE (&s->e_cpus),"hartid-base" ,0 );qdev_prop_set_string (DEVICE (&s->e_cpus),"cpu-type" ,SIFIVE_E_CPU ); +qdev_prop_set_uint64 (DEVICE (&s->e_cpus),"resetvec" ,0x1004 );object_initialize_child (obj,"u-cluster" , &s->u_cluster,TYPE_CPU_CLUSTER );qdev_prop_set_uint32 (DEVICE (&s->u_cluster),"cluster-id" ,1 );
@@ -620,6 +621,7 @@ static void sifive_u_soc_instance_init(Object *obj)qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"num-harts" , ms->smp.cpus -1 );qdev_prop_set_uint32 (DEVICE (&s->u_cpus),"hartid-base" ,1 );qdev_prop_set_string (DEVICE (&s->u_cpus),"cpu-type" ,SIFIVE_U_CPU ); +qdev_prop_set_uint64 (DEVICE (&s->u_cpus),"resetvec" ,0x1004 );object_initialize_child (obj,"prci" , &s->prci,TYPE_SIFIVE_U_PRCI );object_initialize_child (obj,"otp" , &s->otp,TYPE_SIFIVE_U_OTP );
target/riscv/cpu.c +2 -5
@@ -128,7 +128,6 @@ static void riscv_any_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RVXLEN |RVI |RVM |RVA |RVF |RVD |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_11_0 ); -set_resetvec (env,DEFAULT_RSTVEC ); }static void riscv_base_cpu_init (Object *obj)
@@ -136,7 +135,6 @@ static void riscv_base_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;/* We set this in the realise function */ set_misa (env,0 ); -set_resetvec (env,DEFAULT_RSTVEC ); }static void rvxx_sifive_u_cpu_init (Object *obj)
@@ -144,7 +142,6 @@ static void rvxx_sifive_u_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RVXLEN |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,0x1004 ); }static void rvxx_sifive_e_cpu_init (Object *obj)
@@ -152,7 +149,6 @@ static void rvxx_sifive_e_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RVXLEN |RVI |RVM |RVA |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,0x1004 );qdev_prop_set_bit (DEVICE (obj),"mmu" , false); }
@@ -163,7 +159,6 @@ static void rv32_ibex_cpu_init(Object *obj)CPURISCVState *env = &RISCV_CPU (obj)->env;set_misa (env,RV32 |RVI |RVM |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); -set_resetvec (env,0x8090 );qdev_prop_set_bit (DEVICE (obj),"mmu" , false); }
@@ -373,6 +368,8 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)set_feature (env,RISCV_FEATURE_PMP ); } +set_resetvec (env, cpu->cfg.resetvec); +/* If misa isn't set (rv32 and rv64 machines) set it here */ if (!env->misa) {/* Do some ISA extension error checking */
Signature · 1 line
2.7.4
PATCH v2 4/16 hw/riscv: Initial support for Microchip PolarFire SoC Icicle Kit board
In reply to Bin MengFrom: Bin Meng <[email protected]>
This is an initial support for Microchip PolarFire SoC Icicle Kit. The Icicle Kit board integrates a PolarFire SoC, with one SiFive's E51 plus four U54 cores and many on-chip peripherals and an FPGA.
For more details about Microchip PolarFire Soc, please see:
https://www.microsemi.com/product-directory/soc-fpgas/5498-polarfire-soc-fpga
Unlike SiFive FU540, the RISC-V core resect vector is at 0x20220000. The following perepherals are created as an unimplemented device:
- Bus Error Uint 0/1/2/3/4
- L2 cache controller
- SYSREG
- MPUCFG
- IOSCBCFG
More devices will be added later.
The BIOS image used by this machine is hss.bin, aka Hart Software Services, which can be built from:
https://github.com/polarfire-soc/hart-software-services
To launch this machine:
$ qemu-system-riscv64 -nographic -M microchip-icicle-kit
The memory is set to 1 GiB by default to match the hardware. A sanity check on ram size is performed in the machine init routine to prompt user to increase the RAM size to > 1 GiB when less than 1 GiB ram is detected.
---
(no changes since v1)
default-configs/riscv64-softmmu.mak | 1 + include/hw/riscv/microchip_pfsoc.h | 88 ++++++++++ hw/riscv/microchip_pfsoc.c | 312 ++++++++++++++++++++++++++++++++++++ MAINTAINERS | 7 + hw/riscv/Kconfig | 6 + hw/riscv/meson.build | 1 + 6 files changed, 415 insertions(+) create mode 100644 include/hw/riscv/microchip_pfsoc.h create mode 100644 hw/riscv/microchip_pfsoc.c
default-configs/riscv64-softmmu.mak +1 -0
@@ -10,3 +10,4 @@ CONFIG_SPIKE=y CONFIG_SIFIVE_E=y CONFIG_SIFIVE_U=y CONFIG_RISCV_VIRT=y +CONFIG_MICROCHIP_PFSOC=y
include/hw/riscv/microchip_pfsoc.h new file +88 -0
88 lines not on this page · raw message
hw/riscv/microchip_pfsoc.c new file +312 -0
312 lines not on this page · raw message
MAINTAINERS +7 -0
@@ -1315,6 +1315,13 @@ F: include/hw/riscv/opentitan.h F: include/hw/char/ibex_uart.h F: include/hw/intc/ibex_plic.h +Microchip PolarFire SoC Icicle Kit +M: Bin Meng <[email protected]> +L: [email protected] +S: Supported +F: hw/riscv/microchip_pfsoc.c +F: include/hw/riscv/microchip_pfsoc.h + RX Machines ----------- rx-gdbsim
hw/riscv/Kconfig +6 -0
@@ -48,3 +48,9 @@ config RISCV_VIRT select PCI_EXPRESS_GENERIC_BRIDGE select PFLASH_CFI01 select SIFIVE + +config MICROCHIP_PFSOC + bool + select HART + select SIFIVE + select UNIMP
hw/riscv/meson.build +1 -0
@@ -16,5 +16,6 @@ riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u_otp.c')) riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u_prci.c')) riscv_ss.add(when: 'CONFIG_SPIKE', if_true: files('riscv_htif.c')) riscv_ss.add(when: 'CONFIG_SPIKE', if_true: files('spike.c')) +riscv_ss.add(when: 'CONFIG_MICROCHIP_PFSOC', if_true: files('microchip_pfsoc.c')) hw_arch += {'riscv': riscv_ss}
Signature · 1 line
2.7.4
PATCH v2 5/16 hw/char: Add Microchip PolarFire SoC MMUART emulation
In reply to Bin MengFrom: Bin Meng <[email protected]>
Microchip PolarFire SoC MMUART is ns16550 compatible, with some additional registers. Create a simple MMUART model built on top of the existing ns16550 model.
---
Changes in v2:
- change to update hw/char/meson.build
- add impl.min_access_size and impl.max_access_size as part of MemoryRegionOps and remove the allignment check
include/hw/char/mchp_pfsoc_mmuart.h | 61 ++++++++++++++++++++++++++ hw/char/mchp_pfsoc_mmuart.c | 86 +++++++++++++++++++++++++++++++++++++ MAINTAINERS | 2 + hw/char/Kconfig | 3 ++ hw/char/meson.build | 1 + 5 files changed, 153 insertions(+) create mode 100644 include/hw/char/mchp_pfsoc_mmuart.h create mode 100644 hw/char/mchp_pfsoc_mmuart.c
include/hw/char/mchp_pfsoc_mmuart.h new file +61 -0
@@ -0,0 +1,61 @@ +/* +* Microchip PolarFire SoC MMUART emulation +* +* Copyright (c) 2020 Wind River Systems, Inc. +* +* Author: +* Bin Meng <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef HW_MCHP_PFSOC_MMUART_H +#define HW_MCHP_PFSOC_MMUART_H + +#include "hw/char/serial.h" + +#define MCHP_PFSOC_MMUART_REG_SIZE 52 + +typedef struct MchpPfSoCMMUartState { +MemoryRegion iomem; +hwaddr base; +qemu_irq irq; + +SerialMM *serial; + +uint32_t reg[MCHP_PFSOC_MMUART_REG_SIZE /sizeof (uint32_t )]; +}MchpPfSoCMMUartState ; + +/** +* mchp_pfsoc_mmuart_create - Create a Microchip PolarFire SoC MMUART +* +* This is a helper routine for board to create a MMUART device that is +* compatible with Microchip PolarFire SoC. +* +* @sysmem: system memory region to map +* @base: base address of the MMUART registers +* @irq: IRQ number of the MMUART device +* @chr: character device to associate to +* +* @return: a pointer to the device specific control structure +*/ +MchpPfSoCMMUartState *mchp_pfsoc_mmuart_create (MemoryRegion *sysmem, +hwaddr base,qemu_irq irq,Chardev *chr); + +#endif /* HW_MCHP_PFSOC_MMUART_H */
hw/char/mchp_pfsoc_mmuart.c new file +86 -0
86 lines not on this page · raw message
MAINTAINERS +2 -0
@@ -1320,7 +1320,9 @@ M: Bin Meng <[email protected]> L: [email protected] S: Supported F: hw/riscv/microchip_pfsoc.c +F: hw/char/mchp_pfsoc_mmuart.c F: include/hw/riscv/microchip_pfsoc.h +F: include/hw/char/mchp_pfsoc_mmuart.h RX Machines -----------
hw/char/Kconfig +3 -0
@@ -52,3 +52,6 @@ config RENESAS_SCI config AVR_USART bool + +config MCHP_PFSOC_MMUART + bool
hw/char/meson.build +1 -0
@@ -32,6 +32,7 @@ softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_aux.c')) softmmu_ss.add(when: 'CONFIG_RENESAS_SCI', if_true: files('renesas_sci.c')) softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('sh_serial.c')) softmmu_ss.add(when: 'CONFIG_STM32F2XX_USART', if_true: files('stm32f2xx_usart.c')) +softmmu_ss.add(when: 'CONFIG_MCHP_PFSOC_MMUART', if_true: files('mchp_pfsoc_mmuart.c')) specific_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('terminal3270.c')) specific_ss.add(when: 'CONFIG_VIRTIO', if_true: files('virtio-serial-bus.c'))
Signature · 1 line
2.7.4
PATCH v2 6/16 hw/riscv: microchip_pfsoc: Connect 5 MMUARTs
In reply to Bin MengFrom: Bin Meng <[email protected]>
Microchip PolarFire SoC has 5 MMUARTs, and the Icicle Kit board wires 4 of them out. Let's connect all 5 MMUARTs.
---
(no changes since v1)
include/hw/riscv/microchip_pfsoc.h | 20 ++++++++++++++++++++ hw/riscv/microchip_pfsoc.c | 30 ++++++++++++++++++++++++++++++ hw/riscv/Kconfig | 1 + 3 files changed, 51 insertions(+)
include/hw/riscv/microchip_pfsoc.h +20 -0
@@ -22,6 +22,8 @@ #ifndef HW_MICROCHIP_PFSOC_H #define HW_MICROCHIP_PFSOC_H +#include "hw/char/mchp_pfsoc_mmuart.h" + typedef struct MicrochipPFSoCState { /*< private >*/ DeviceState parent_obj;
@@ -32,6 +34,11 @@ typedef struct MicrochipPFSoCState {RISCVHartArrayState e_cpus;RISCVHartArrayState u_cpus;DeviceState *plic; +MchpPfSoCMMUartState *serial0; +MchpPfSoCMMUartState *serial1; +MchpPfSoCMMUartState *serial2; +MchpPfSoCMMUartState *serial3; +MchpPfSoCMMUartState *serial4; } MicrochipPFSoCState;#define TYPE_MICROCHIP_PFSOC "microchip.pfsoc"
@@ -64,14 +71,27 @@ enum {MICROCHIP_PFSOC_L2CC ,MICROCHIP_PFSOC_L2LIM ,MICROCHIP_PFSOC_PLIC , +MICROCHIP_PFSOC_MMUART0 ,MICROCHIP_PFSOC_SYSREG ,MICROCHIP_PFSOC_MPUCFG , +MICROCHIP_PFSOC_MMUART1 , +MICROCHIP_PFSOC_MMUART2 , +MICROCHIP_PFSOC_MMUART3 , +MICROCHIP_PFSOC_MMUART4 ,MICROCHIP_PFSOC_ENVM_CFG ,MICROCHIP_PFSOC_ENVM_DATA ,MICROCHIP_PFSOC_IOSCB_CFG , MICROCHIP_PFSOC_DRAM, }; +enum { +MICROCHIP_PFSOC_MMUART0_IRQ =90 , +MICROCHIP_PFSOC_MMUART1_IRQ =91 , +MICROCHIP_PFSOC_MMUART2_IRQ =92 , +MICROCHIP_PFSOC_MMUART3_IRQ =93 , +MICROCHIP_PFSOC_MMUART4_IRQ =94 , +}; +#define MICROCHIP_PFSOC_MANAGEMENT_CPU_COUNT 1#define MICROCHIP_PFSOC_COMPUTE_CPU_COUNT 4
hw/riscv/microchip_pfsoc.c +30 -0
@@ -11,6 +11,7 @@* 0) CLINT (Core Level Interruptor) * 1) PLIC (Platform Level Interrupt Controller) * 2) eNVM (Embedded Non-Volatile Memory) +* 3) MMUARTs (Multi-Mode UART) * * This board currently generates devicetree dynamically that indicates at least * two harts and up to five harts.
@@ -38,6 +39,7 @@#include "hw/irq.h" #include "hw/loader.h" #include "hw/sysbus.h" +#include "chardev/char.h" #include "hw/cpu/cluster.h" #include "target/riscv/cpu.h" #include "hw/misc/unimp.h"
@@ -46,6 +48,7 @@#include "hw/riscv/sifive_clint.h" #include "hw/riscv/sifive_plic.h" #include "hw/riscv/microchip_pfsoc.h" +#include "sysemu/sysemu.h" /* * The BIOS image used by this machine is called Hart Software Services (HSS).
@@ -69,8 +72,13 @@ static const struct MemmapEntry { [MICROCHIP_PFSOC_L2CC] = { 0x2010000, 0x1000 }, [MICROCHIP_PFSOC_L2LIM] = { 0x8000000, 0x2000000 }, [MICROCHIP_PFSOC_PLIC] = { 0xc000000, 0x4000000 }, + [MICROCHIP_PFSOC_MMUART0] = { 0x20000000, 0x1000 }, [MICROCHIP_PFSOC_SYSREG] = { 0x20002000, 0x2000 }, [MICROCHIP_PFSOC_MPUCFG] = { 0x20005000, 0x1000 }, + [MICROCHIP_PFSOC_MMUART1] = { 0x20100000, 0x1000 }, + [MICROCHIP_PFSOC_MMUART2] = { 0x20102000, 0x1000 }, + [MICROCHIP_PFSOC_MMUART3] = { 0x20104000, 0x1000 }, + [MICROCHIP_PFSOC_MMUART4] = { 0x20106000, 0x1000 }, [MICROCHIP_PFSOC_ENVM_CFG] = { 0x20200000, 0x1000 }, [MICROCHIP_PFSOC_ENVM_DATA] = { 0x20220000, 0x20000 }, [MICROCHIP_PFSOC_IOSCB_CFG] = { 0x37080000, 0x1000 },
@@ -215,6 +223,28 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp) memmap[MICROCHIP_PFSOC_MPUCFG ].base, memmap[MICROCHIP_PFSOC_MPUCFG].size); +/* MMUARTs */ + s->serial0 =mchp_pfsoc_mmuart_create (system_memory, + memmap[MICROCHIP_PFSOC_MMUART0 ].base, +qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_MMUART0_IRQ ), +serial_hd (0 )); + s->serial1 =mchp_pfsoc_mmuart_create (system_memory, + memmap[MICROCHIP_PFSOC_MMUART1 ].base, +qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_MMUART1_IRQ ), +serial_hd (1 )); + s->serial2 =mchp_pfsoc_mmuart_create (system_memory, + memmap[MICROCHIP_PFSOC_MMUART2 ].base, +qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_MMUART2_IRQ ), +serial_hd (2 )); + s->serial3 =mchp_pfsoc_mmuart_create (system_memory, + memmap[MICROCHIP_PFSOC_MMUART3 ].base, +qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_MMUART3_IRQ ), +serial_hd (3 )); + s->serial4 =mchp_pfsoc_mmuart_create (system_memory, + memmap[MICROCHIP_PFSOC_MMUART4 ].base, +qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_MMUART4_IRQ ), +serial_hd (4 )); +/* eNVM */ memory_region_init_rom(envm_data, OBJECT(dev), "microchip.pfsoc.envm.data", memmap[MICROCHIP_PFSOC_ENVM_DATA].size,
hw/riscv/Kconfig +1 -0
@@ -54,3 +54,4 @@ config MICROCHIP_PFSOC select HART select SIFIVE select UNIMP + select MCHP_PFSOC_MMUART
Signature · 1 line
2.7.4
PATCH v2 7/16 hw/sd: Add Cadence SDHCI emulation
In reply to Bin MengFrom: Bin Meng <[email protected]>
Cadence SD/SDIO/eMMC Host Controller (SD4HC) is an SDHCI compatible controller. The SDHCI compatible registers start from offset 0x200, which are called Slot Register Set (SRS) in its datasheet.
This creates a Cadence SDHCI model built on top of the existing generic SDHCI model. Cadence specific Host Register Set (HRS) is implemented to make guest software happy.
---
Changes in v2:
- change to update hw/sd/meson.build
- change the name to "generic-sdhci" when calling object_initialize_child()
- add a container MR to simplify out-of-bounds access checks
include/hw/sd/cadence_sdhci.h | 47 ++++++++++ hw/sd/cadence_sdhci.c | 193 ++++++++++++++++++++++++++++++++++++++++++ hw/sd/Kconfig | 4 + hw/sd/meson.build | 1 + 4 files changed, 245 insertions(+) create mode 100644 include/hw/sd/cadence_sdhci.h create mode 100644 hw/sd/cadence_sdhci.c
include/hw/sd/cadence_sdhci.h new file +47 -0
@@ -0,0 +1,47 @@ +/* +* Cadence SDHCI emulation +* +* Copyright (c) 2020 Wind River Systems, Inc. +* +* Author: +* Bin Meng <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 or +* (at your option) version 3 of the License. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef CADENCE_SDHCI_H +#define CADENCE_SDHCI_H + +#include "hw/sd/sdhci.h" + +#define CADENCE_SDHCI_REG_SIZE 0x100 +#define CADENCE_SDHCI_NUM_REGS (CADENCE_SDHCI_REG_SIZE / sizeof(uint32_t)) + +typedef struct CadenceSDHCIState { +SysBusDevice parent; + +MemoryRegion container; +MemoryRegion iomem; +BusState *bus; + +uint32_t regs[CADENCE_SDHCI_NUM_REGS ]; + +SDHCIState sdhci; +}CadenceSDHCIState ; + +#define TYPE_CADENCE_SDHCI "cadence.sdhci" +#define CADENCE_SDHCI (obj) OBJECT_CHECK(CadenceSDHCIState, (obj), \ + TYPE_CADENCE_SDHCI) + +#endif /* CADENCE_SDHCI_H */
hw/sd/cadence_sdhci.c new file +193 -0
193 lines not on this page · raw message
hw/sd/Kconfig +4 -0
@@ -19,3 +19,7 @@ config SDHCI_PCI default y if PCI_DEVICES depends on PCI select SDHCI + +config CADENCE_SDHCI + bool + select SDHCI
hw/sd/meson.build +1 -0
@@ -10,3 +10,4 @@ softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_mmci.c')) softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_sdhost.c')) softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_sdhci.c')) softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sdhost.c')) +softmmu_ss.add(when: 'CONFIG_CADENCE_SDHCI', if_true: files('cadence_sdhci.c'))
Signature · 1 line
2.7.4
PATCH v2 8/16 hw/riscv: microchip_pfsoc: Connect a Cadence SDHCI controller and an SD card
In reply to Bin MengFrom: Bin Meng <[email protected]>
Microchip PolarFire SoC integrates one Cadence SDHCI controller. On the Icicle Kit board, one eMMC chip and an external SD card connect to this controller depending on different configuration.
As QEMU does not support eMMC yet, we just emulate the SD card configuration. To test this, the Hart Software Services (HSS) should choose the SD card configuration:
$ cp boards/icicle-kit-es/def_config.sdcard .config $ make BOARD=icicle-kit-es
The SD card image can be built from the Yocto BSP at:
https://github.com/polarfire-soc/meta-polarfire-soc-yocto-bsp
Note the generated SD card image should be resized before use:
$ qemu-img resize /path/to/sdcard.img 4G
Launch QEMU with the following command:
$ qemu-system-riscv64 -nographic -M microchip-icicle-kit -sd sdcard.img
---
Changes in v2:
- do not initialize TYPE_SYSBUS_SDHCI in the SoC instance_init(), instead move that to the cadence_sdhci model
- do not access generic-sdhci's state directly,
instead move that to the cadence_sdhci model
include/hw/riscv/microchip_pfsoc.h | 4 ++++ hw/riscv/microchip_pfsoc.c | 23 +++++++++++++++++++++++ hw/riscv/Kconfig | 1 + 3 files changed, 28 insertions(+)
include/hw/riscv/microchip_pfsoc.h +4 -0
@@ -23,6 +23,7 @@#define HW_MICROCHIP_PFSOC_H #include "hw/char/mchp_pfsoc_mmuart.h" +#include "hw/sd/cadence_sdhci.h" typedef struct MicrochipPFSoCState { /*< private >*/
@@ -39,6 +40,7 @@ typedef struct MicrochipPFSoCState {MchpPfSoCMMUartState *serial2;MchpPfSoCMMUartState *serial3;MchpPfSoCMMUartState *serial4; +CadenceSDHCIState sdhci; } MicrochipPFSoCState;#define TYPE_MICROCHIP_PFSOC "microchip.pfsoc"
@@ -74,6 +76,7 @@ enum {MICROCHIP_PFSOC_MMUART0 ,MICROCHIP_PFSOC_SYSREG ,MICROCHIP_PFSOC_MPUCFG , +MICROCHIP_PFSOC_EMMC_SD ,MICROCHIP_PFSOC_MMUART1 ,MICROCHIP_PFSOC_MMUART2 , MICROCHIP_PFSOC_MMUART3,
@@ -85,6 +88,7 @@ enum { };enum { +MICROCHIP_PFSOC_EMMC_SD_IRQ =88 ,MICROCHIP_PFSOC_MMUART0_IRQ =90 ,MICROCHIP_PFSOC_MMUART1_IRQ =91 ,MICROCHIP_PFSOC_MMUART2_IRQ =92 ,
hw/riscv/microchip_pfsoc.c +23 -0
@@ -12,6 +12,7 @@* 1) PLIC (Platform Level Interrupt Controller) * 2) eNVM (Embedded Non-Volatile Memory) * 3) MMUARTs (Multi-Mode UART) +* 4) Cadence eMMC/SDHC controller and an SD card connected to it * * This board currently generates devicetree dynamically that indicates at least * two harts and up to five harts.
@@ -75,6 +76,7 @@ static const struct MemmapEntry { [MICROCHIP_PFSOC_MMUART0] = { 0x20000000, 0x1000 }, [MICROCHIP_PFSOC_SYSREG] = { 0x20002000, 0x2000 }, [MICROCHIP_PFSOC_MPUCFG] = { 0x20005000, 0x1000 }, + [MICROCHIP_PFSOC_EMMC_SD] = { 0x20008000, 0x1000 }, [MICROCHIP_PFSOC_MMUART1] = { 0x20100000, 0x1000 }, [MICROCHIP_PFSOC_MMUART2] = { 0x20102000, 0x1000 }, [MICROCHIP_PFSOC_MMUART3] = { 0x20104000, 0x1000 },
@@ -111,6 +113,9 @@ static void microchip_pfsoc_soc_instance_init(Object *obj)qdev_prop_set_string (DEVICE (&s->u_cpus),"cpu-type" ,TYPE_RISCV_CPU_SIFIVE_U54 );qdev_prop_set_uint64 (DEVICE (&s->u_cpus),"resetvec" ,RESET_VECTOR ); + +object_initialize_child (obj,"sd-controller" , &s->sdhci, +TYPE_CADENCE_SDHCI ); }static void microchip_pfsoc_soc_realize (DeviceState *dev,Error **errp)
@@ -223,6 +228,13 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp) memmap[MICROCHIP_PFSOC_MPUCFG ].base, memmap[MICROCHIP_PFSOC_MPUCFG].size); +/* SDHCI */ +sysbus_realize (SYS_BUS_DEVICE (&s->sdhci), errp); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->sdhci),0 , + memmap[MICROCHIP_PFSOC_EMMC_SD ].base); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->sdhci),0 , +qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_EMMC_SD_IRQ )); +/* MMUARTs */ s->serial0 = mchp_pfsoc_mmuart_create(system_memory, memmap[MICROCHIP_PFSOC_MMUART0].base,
@@ -290,6 +302,7 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)MicrochipIcicleKitState *s =MICROCHIP_ICICLE_KIT_MACHINE (machine);MemoryRegion *system_memory =get_system_memory ();MemoryRegion *main_mem =g_new (MemoryRegion,1 ); +DriveInfo *dinfo =drive_get_next (IF_SD );/* Sanity check on RAM size */ if (machine->ram_size < mc->default_ram_size) {
@@ -312,6 +325,16 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)/* Load the firmware */ riscv_find_and_load_firmware (machine,BIOS_FILENAME ,RESET_VECTOR ,NULL ); + +/* Attach an SD card */ +if (dinfo) { +CadenceSDHCIState *sdhci = &(s->soc.sdhci); +DeviceState *card =qdev_new (TYPE_SD_CARD ); + +qdev_prop_set_drive_err (card,"drive" ,blk_by_legacy_dinfo (dinfo), + &error_fatal); +qdev_realize_and_unref (card, sdhci->bus, &error_fatal); + } }static void microchip_icicle_kit_machine_class_init (ObjectClass *oc,void *data)
hw/riscv/Kconfig +1 -0
@@ -55,3 +55,4 @@ config MICROCHIP_PFSOC select SIFIVE select UNIMP select MCHP_PFSOC_MMUART + select CADENCE_SDHCI
Signature · 1 line
2.7.4
PATCH v2 9/16 hw/dma: Add SiFive platform DMA controller emulation
In reply to Bin MengFrom: Bin Meng <[email protected]>
Microchip PolarFire SoC integrates a DMA engine that supports:
* Independent concurrent DMA transfers using 4 DMA channels
* Generation of interrupts on various conditions during execution which is actually an IP reused from the SiFive FU540 chip.
This creates a model to support both polling and interrupt modes.
---
Changes in v2:
- change to update hw/dma/meson.build
- rename the file names to sifive_pdma.[c|h]
- update irq number to 8 per the SiFive FU540 manual
- fix the register offset for channel 1/2/3 in the read/write ops
include/hw/dma/sifive_pdma.h | 57 ++++++++ hw/dma/sifive_pdma.c | 313 +++++++++++++++++++++++++++++++++++++++++++ hw/dma/Kconfig | 3 + hw/dma/meson.build | 1 + 4 files changed, 374 insertions(+) create mode 100644 include/hw/dma/sifive_pdma.h create mode 100644 hw/dma/sifive_pdma.c
include/hw/dma/sifive_pdma.h new file +57 -0
@@ -0,0 +1,57 @@ +/* +* SiFive Platform DMA emulation +* +* Copyright (c) 2020 Wind River Systems, Inc. +* +* Author: +* Bin Meng <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 or +* (at your option) version 3 of the License. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef SIFIVE_PDMA_H +#define SIFIVE_PDMA_H + +struct sifive_pdma_chan { +uint32_t control; +uint32_t next_config; +uint64_t next_bytes; +uint64_t next_dst; +uint64_t next_src; +uint32_t exec_config; +uint64_t exec_bytes; +uint64_t exec_dst; +uint64_t exec_src; +int state; +}; + +#define SIFIVE_PDMA_CHANS 4 +#define SIFIVE_PDMA_IRQS (SIFIVE_PDMA_CHANS * 2) +#define SIFIVE_PDMA_REG_SIZE 0x100000 +#define SIFIVE_PDMA_CHAN_NO (reg) ((reg & (SIFIVE_PDMA_REG_SIZE - 1)) >> 12) + +typedef struct SiFivePDMAState { +SysBusDevice parent; +MemoryRegion iomem; +qemu_irq irq[SIFIVE_PDMA_IRQS ]; + +struct sifive_pdma_chan chan[SIFIVE_PDMA_CHANS ]; +}SiFivePDMAState ; + +#define TYPE_SIFIVE_PDMA "sifive.pdma" + +#define MCHP_PFSOC_DMA (obj) \ + OBJECT_CHECK(SiFivePDMAState, (obj), TYPE_SIFIVE_PDMA) + +#endif /* SIFIVE_PDMA_H */
hw/dma/sifive_pdma.c new file +313 -0
313 lines not on this page · raw message
hw/dma/Kconfig +3 -0
@@ -20,3 +20,6 @@ config ZYNQ_DEVCFG config STP2000 bool + +config SIFIVE_PDMA + bool
hw/dma/meson.build +1 -0
@@ -13,3 +13,4 @@ softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zdma.c')) softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c', 'soc_dma.c')) softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_dma.c')) softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_dma.c')) +softmmu_ss.add(when: 'CONFIG_SIFIVE_PDMA', if_true: files('sifive_pdma.c'))
Signature · 1 line
2.7.4
PATCH v2 10/16 hw/riscv: microchip_pfsoc: Connect a DMA controller
In reply to Bin MengFrom: Bin Meng <[email protected]>
On the Icicle Kit board, the HSS firmware utilizes the on-chip DMA controller to move the 2nd stage bootloader in the system memory. Let's connect a DMA controller to Microchip PolarFire SoC.
---
Changes in v2:
- connect 8 IRQs to the PLIC
include/hw/riscv/microchip_pfsoc.h | 11 +++++++++++ hw/riscv/microchip_pfsoc.c | 15 +++++++++++++++ hw/riscv/Kconfig | 1 + 3 files changed, 27 insertions(+)
include/hw/riscv/microchip_pfsoc.h +11 -0
@@ -23,6 +23,7 @@#define HW_MICROCHIP_PFSOC_H #include "hw/char/mchp_pfsoc_mmuart.h" +#include "hw/dma/sifive_pdma.h" #include "hw/sd/cadence_sdhci.h" typedef struct MicrochipPFSoCState {
@@ -40,6 +41,7 @@ typedef struct MicrochipPFSoCState {MchpPfSoCMMUartState *serial2;MchpPfSoCMMUartState *serial3;MchpPfSoCMMUartState *serial4; +SiFivePDMAState dma;CadenceSDHCIState sdhci; } MicrochipPFSoCState;
@@ -71,6 +73,7 @@ enum {MICROCHIP_PFSOC_BUSERR_UNIT4 ,MICROCHIP_PFSOC_CLINT ,MICROCHIP_PFSOC_L2CC , +MICROCHIP_PFSOC_DMA ,MICROCHIP_PFSOC_L2LIM ,MICROCHIP_PFSOC_PLIC , MICROCHIP_PFSOC_MMUART0,
@@ -88,6 +91,14 @@ enum { };enum { +MICROCHIP_PFSOC_DMA_IRQ0 =5 , +MICROCHIP_PFSOC_DMA_IRQ1 =6 , +MICROCHIP_PFSOC_DMA_IRQ2 =7 , +MICROCHIP_PFSOC_DMA_IRQ3 =8 , +MICROCHIP_PFSOC_DMA_IRQ4 =9 , +MICROCHIP_PFSOC_DMA_IRQ5 =10 , +MICROCHIP_PFSOC_DMA_IRQ6 =11 , +MICROCHIP_PFSOC_DMA_IRQ7 =12 ,MICROCHIP_PFSOC_EMMC_SD_IRQ =88 ,MICROCHIP_PFSOC_MMUART0_IRQ =90 ,MICROCHIP_PFSOC_MMUART1_IRQ =91 ,
hw/riscv/microchip_pfsoc.c +15 -0
@@ -13,6 +13,7 @@* 2) eNVM (Embedded Non-Volatile Memory) * 3) MMUARTs (Multi-Mode UART) * 4) Cadence eMMC/SDHC controller and an SD card connected to it +* 5) SiFive Platform DMA (Direct Memory Access Controller) * * This board currently generates devicetree dynamically that indicates at least * two harts and up to five harts.
@@ -71,6 +72,7 @@ static const struct MemmapEntry { [MICROCHIP_PFSOC_BUSERR_UNIT4] = { 0x1704000, 0x1000 }, [MICROCHIP_PFSOC_CLINT] = { 0x2000000, 0x10000 }, [MICROCHIP_PFSOC_L2CC] = { 0x2010000, 0x1000 }, + [MICROCHIP_PFSOC_DMA] = { 0x3000000, 0x100000 }, [MICROCHIP_PFSOC_L2LIM] = { 0x8000000, 0x2000000 }, [MICROCHIP_PFSOC_PLIC] = { 0xc000000, 0x4000000 }, [MICROCHIP_PFSOC_MMUART0] = { 0x20000000, 0x1000 },
@@ -114,6 +116,9 @@ static void microchip_pfsoc_soc_instance_init(Object *obj) TYPE_RISCV_CPU_SIFIVE_U54);qdev_prop_set_uint64 (DEVICE (&s->u_cpus),"resetvec" ,RESET_VECTOR ); +object_initialize_child (obj,"dma-controller" , &s->dma, +TYPE_SIFIVE_PDMA ); +object_initialize_child (obj,"sd-controller" , &s->sdhci,TYPE_CADENCE_SDHCI ); }
@@ -218,6 +223,16 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp) memmap[MICROCHIP_PFSOC_PLIC].size);g_free (plic_hart_config); +/* DMA */ +sysbus_realize (SYS_BUS_DEVICE (&s->dma), errp); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->dma),0 , + memmap[MICROCHIP_PFSOC_DMA ].base); +for (i =0 ; i <SIFIVE_PDMA_IRQS ; i++) { +sysbus_connect_irq (SYS_BUS_DEVICE (&s->dma), i, +qdev_get_gpio_in (DEVICE (s->plic), +MICROCHIP_PFSOC_DMA_IRQ0 + i)); + } +/* SYSREG */ create_unimplemented_device("microchip.pfsoc.sysreg", memmap[MICROCHIP_PFSOC_SYSREG].base,
hw/riscv/Kconfig +1 -0
@@ -55,4 +55,5 @@ config MICROCHIP_PFSOC select SIFIVE select UNIMP select MCHP_PFSOC_MMUART + select SIFIVE_PDMA select CADENCE_SDHCI
Signature · 1 line
2.7.4
PATCH v2 11/16 hw/net: cadence_gem: Add a new 'phy-addr' property
In reply to Bin MengFrom: Bin Meng <[email protected]>
At present the PHY address of the PHY connected to GEM is hard-coded to either 23 (BOARD_PHY_ADDRESS) or 0. This might not be the case for all boards. Add a new 'phy-addr' property so that board can specify the PHY address for each GEM instance.
---
Changes in v2:
- change "phy-addr" default value to BOARD_PHY_ADDRESS
include/hw/net/cadence_gem.h | 2 ++ hw/net/cadence_gem.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-)
include/hw/net/cadence_gem.h +2 -0
@@ -73,6 +73,8 @@ typedef struct CadenceGEMState {/* Mask of register bits which are write 1 to clear */ uint32_t regs_w1c[CADENCE_GEM_MAXREG ]; +/* PHY address */ +uint8_t phy_addr;/* PHY registers backing store */ uint16_t phy_regs[32 ];
hw/net/cadence_gem.c +3 -2
@@ -1446,7 +1446,7 @@ static uint64_t gem_read(void *opaque, hwaddr offset, unsigned size)uint32_t phy_addr, reg_num; phy_addr = (retval &GEM_PHYMNTNC_ADDR ) >>GEM_PHYMNTNC_ADDR_SHFT ; -if (phy_addr ==BOARD_PHY_ADDRESS || phy_addr ==0 ) { +if (phy_addr == s->phy_addr || phy_addr ==0 ) { reg_num = (retval &GEM_PHYMNTNC_REG ) >>GEM_PHYMNTNC_REG_SHIFT ; retval &=0xFFFF0000 ; retval |=gem_phy_read (s, reg_num);
@@ -1569,7 +1569,7 @@ static void gem_write(void *opaque, hwaddr offset, uint64_t val,uint32_t phy_addr, reg_num; phy_addr = (val &GEM_PHYMNTNC_ADDR ) >>GEM_PHYMNTNC_ADDR_SHFT ; -if (phy_addr ==BOARD_PHY_ADDRESS || phy_addr ==0 ) { +if (phy_addr == s->phy_addr || phy_addr ==0 ) { reg_num = (val &GEM_PHYMNTNC_REG ) >>GEM_PHYMNTNC_REG_SHIFT ;gem_phy_write (s, reg_num, val); }
@@ -1682,6 +1682,7 @@ static Property gem_properties[] = {DEFINE_NIC_PROPERTIES (CadenceGEMState, conf),DEFINE_PROP_UINT32 ("revision" , CadenceGEMState, revision,GEM_MODID_VALUE ), +DEFINE_PROP_UINT8 ("phy-addr" , CadenceGEMState, phy_addr,BOARD_PHY_ADDRESS ),DEFINE_PROP_UINT8 ("num-priority-queues" , CadenceGEMState, num_priority_queues,1 ), DEFINE_PROP_UINT8("num-type1-screeners", CadenceGEMState,
Signature · 1 line
2.7.4
PATCH v2 12/16 hw/arm: xlnx: Set all boards' GEM 'phy-addr' property value to 23
In reply to Bin MengFrom: Bin Meng <[email protected]>
When cadence_gem model was created for Xilinx boards, the PHY address was hard-coded to 23 in the GEM model. Now that we have introduced a property we can use that to tell GEM model what our PHY address is. Change all boards' GEM 'phy-addr' property value to 23, and set the PHY address default value to 0 in the GEM model.
---
(no changes since v1)
hw/arm/xilinx_zynq.c | 1 + hw/arm/xlnx-versal.c | 1 + hw/arm/xlnx-zynqmp.c | 1 + hw/net/cadence_gem.c | 6 +++--- 4 files changed, 6 insertions(+), 3 deletions(-)
hw/arm/xilinx_zynq.c +1 -0
@@ -119,6 +119,7 @@ static void gem_init(NICInfo *nd, uint32_t base, qemu_irq irq)qemu_check_nic_model (nd,TYPE_CADENCE_GEM );qdev_set_nic_properties (dev, nd); } +object_property_set_int (OBJECT (dev),"phy-addr" ,23 , &error_abort); s =SYS_BUS_DEVICE (dev);sysbus_realize_and_unref (s, &error_fatal);sysbus_mmio_map (s,0 , base);
hw/arm/xlnx-versal.c +1 -0
@@ -165,6 +165,7 @@ static void versal_create_gems(Versal *s, qemu_irq *pic)qemu_check_nic_model (nd,"cadence_gem" );qdev_set_nic_properties (dev, nd); } +object_property_set_int (OBJECT (dev),"phy-addr" ,23 , &error_abort);object_property_set_int (OBJECT (dev),"num-priority-queues" ,2 , &error_abort); object_property_set_link(OBJECT(dev), "dma", OBJECT(&s->mr_ps),
hw/arm/xlnx-zynqmp.c +1 -0
@@ -460,6 +460,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) }object_property_set_int (OBJECT (&s->gem[i]),"revision" ,GEM_REVISION , &error_abort); +object_property_set_int (OBJECT (dev),"phy-addr" ,23 , &error_abort);object_property_set_int (OBJECT (&s->gem[i]),"num-priority-queues" ,2 , &error_abort);if (!sysbus_realize (SYS_BUS_DEVICE (&s->gem[i]), errp)) {
hw/net/cadence_gem.c +3 -3
@@ -250,7 +250,7 @@#define GEM_PHYMNTNC_REG_SHIFT 18/* Marvell PHY definitions */ -#define BOARD_PHY_ADDRESS 23/* PHY address we will emulate a device at */ +#define BOARD_PHY_ADDRESS 0/* PHY address we will emulate a device at */ #define PHY_REG_CONTROL 0#define PHY_REG_STATUS 1
@@ -1446,7 +1446,7 @@ static uint64_t gem_read(void *opaque, hwaddr offset, unsigned size)uint32_t phy_addr, reg_num; phy_addr = (retval &GEM_PHYMNTNC_ADDR ) >>GEM_PHYMNTNC_ADDR_SHFT ; -if (phy_addr == s->phy_addr || phy_addr ==0 ) { +if (phy_addr == s->phy_addr) { reg_num = (retval &GEM_PHYMNTNC_REG ) >>GEM_PHYMNTNC_REG_SHIFT ; retval &=0xFFFF0000 ; retval |=gem_phy_read (s, reg_num);
@@ -1569,7 +1569,7 @@ static void gem_write(void *opaque, hwaddr offset, uint64_t val,uint32_t phy_addr, reg_num; phy_addr = (val &GEM_PHYMNTNC_ADDR ) >>GEM_PHYMNTNC_ADDR_SHFT ; -if (phy_addr == s->phy_addr || phy_addr ==0 ) { +if (phy_addr == s->phy_addr) { reg_num = (val &GEM_PHYMNTNC_REG ) >>GEM_PHYMNTNC_REG_SHIFT ;gem_phy_write (s, reg_num, val); }
Signature · 1 line
2.7.4
PATCH v2 13/16 hw/riscv: microchip_pfsoc: Connect 2 Cadence GEMs
In reply to Bin MengFrom: Bin Meng <[email protected]>
Microchip PolarFire SoC integrates 2 Candence GEMs to provide IEEE 802.3 standard-compliant 10/100/1000 Mbps ethernet interface.
On the Icicle Kit board, GEM0 connects to a PHY at address 8 while GEM1 connects to a PHY at address 9.
The 2nd stage bootloader (U-Boot) is using GEM1 by default, so we must specify 2 '-nic' options from the command line in order to get a working ethernet.
---
(no changes since v1)
include/hw/riscv/microchip_pfsoc.h | 7 +++++++ hw/riscv/microchip_pfsoc.c | 39 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+)
include/hw/riscv/microchip_pfsoc.h +7 -0
@@ -24,6 +24,7 @@#include "hw/char/mchp_pfsoc_mmuart.h" #include "hw/dma/sifive_pdma.h" +#include "hw/net/cadence_gem.h" #include "hw/sd/cadence_sdhci.h" typedef struct MicrochipPFSoCState {
@@ -42,6 +43,8 @@ typedef struct MicrochipPFSoCState {MchpPfSoCMMUartState *serial3;MchpPfSoCMMUartState *serial4;SiFivePDMAState dma; +CadenceGEMState gem0; +CadenceGEMState gem1;CadenceSDHCIState sdhci; } MicrochipPFSoCState;
@@ -84,6 +87,8 @@ enum {MICROCHIP_PFSOC_MMUART2 ,MICROCHIP_PFSOC_MMUART3 ,MICROCHIP_PFSOC_MMUART4 , +MICROCHIP_PFSOC_GEM0 , +MICROCHIP_PFSOC_GEM1 ,MICROCHIP_PFSOC_ENVM_CFG ,MICROCHIP_PFSOC_ENVM_DATA , MICROCHIP_PFSOC_IOSCB_CFG,
@@ -99,6 +104,8 @@ enum {MICROCHIP_PFSOC_DMA_IRQ5 =10 ,MICROCHIP_PFSOC_DMA_IRQ6 =11 ,MICROCHIP_PFSOC_DMA_IRQ7 =12 , +MICROCHIP_PFSOC_GEM0_IRQ =64 , +MICROCHIP_PFSOC_GEM1_IRQ =70 ,MICROCHIP_PFSOC_EMMC_SD_IRQ =88 ,MICROCHIP_PFSOC_MMUART0_IRQ =90 , MICROCHIP_PFSOC_MMUART1_IRQ = 91,
hw/riscv/microchip_pfsoc.c +39 -0
@@ -14,6 +14,7 @@* 3) MMUARTs (Multi-Mode UART) * 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) * * This board currently generates devicetree dynamically that indicates at least * two harts and up to five harts.
@@ -59,6 +60,9 @@#define BIOS_FILENAME "hss.bin"#define RESET_VECTOR 0x20220000 +/* GEM version */ +#define GEM_REVISION 0x0107010c + static const struct MemmapEntry { hwaddr base; hwaddr size;
@@ -83,6 +87,8 @@ static const struct MemmapEntry { [MICROCHIP_PFSOC_MMUART2] = { 0x20102000, 0x1000 }, [MICROCHIP_PFSOC_MMUART3] = { 0x20104000, 0x1000 }, [MICROCHIP_PFSOC_MMUART4] = { 0x20106000, 0x1000 }, + [MICROCHIP_PFSOC_GEM0] = { 0x20110000, 0x2000 }, + [MICROCHIP_PFSOC_GEM1] = { 0x20112000, 0x2000 }, [MICROCHIP_PFSOC_ENVM_CFG] = { 0x20200000, 0x1000 }, [MICROCHIP_PFSOC_ENVM_DATA] = { 0x20220000, 0x20000 }, [MICROCHIP_PFSOC_IOSCB_CFG] = { 0x37080000, 0x1000 },
@@ -119,6 +125,9 @@ static void microchip_pfsoc_soc_instance_init(Object *obj)object_initialize_child (obj,"dma-controller" , &s->dma,TYPE_SIFIVE_PDMA ); +object_initialize_child (obj,"gem0" , &s->gem0,TYPE_CADENCE_GEM ); +object_initialize_child (obj,"gem1" , &s->gem1,TYPE_CADENCE_GEM ); +object_initialize_child (obj,"sd-controller" , &s->sdhci,TYPE_CADENCE_SDHCI ); }
@@ -134,6 +143,7 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)MemoryRegion *envm_data =g_new (MemoryRegion,1 );char *plic_hart_config;size_t plic_hart_config_len; +NICInfo *nd;int i;sysbus_realize (SYS_BUS_DEVICE (&s->e_cpus), &error_abort);
@@ -272,6 +282,35 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_MMUART4_IRQ ), serial_hd(4)); +/* GEMs */ + + nd = &nd_table[0 ]; +if (nd->used) { +qemu_check_nic_model (nd,TYPE_CADENCE_GEM ); +qdev_set_nic_properties (DEVICE (&s->gem0), nd); + } + nd = &nd_table[1 ]; +if (nd->used) { +qemu_check_nic_model (nd,TYPE_CADENCE_GEM ); +qdev_set_nic_properties (DEVICE (&s->gem1), nd); + } + +object_property_set_int (OBJECT (&s->gem0),"revision" ,GEM_REVISION , errp); +object_property_set_int (OBJECT (&s->gem0),"phy-addr" ,8 , errp); +sysbus_realize (SYS_BUS_DEVICE (&s->gem0), errp); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->gem0),0 , + memmap[MICROCHIP_PFSOC_GEM0 ].base); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->gem0),0 , +qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_GEM0_IRQ )); + +object_property_set_int (OBJECT (&s->gem1),"revision" ,GEM_REVISION , errp); +object_property_set_int (OBJECT (&s->gem1),"phy-addr" ,9 , errp); +sysbus_realize (SYS_BUS_DEVICE (&s->gem1), errp); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->gem1),0 , + memmap[MICROCHIP_PFSOC_GEM1 ].base); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->gem1),0 , +qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_GEM1_IRQ )); +/* eNVM */ memory_region_init_rom(envm_data, OBJECT(dev), "microchip.pfsoc.envm.data", memmap[MICROCHIP_PFSOC_ENVM_DATA].size,
Signature · 1 line
2.7.4
PATCH v2 14/16 hw/riscv: microchip_pfsoc: Hook GPIO controllers
In reply to Bin MengFrom: Bin Meng <[email protected]>
Microchip PolarFire SoC integrates 3 GPIOs controllers. It seems enough to create unimplemented devices to cover their register spaces at this point.
With this commit, QEMU can boot to U-Boot (2nd stage bootloader) all the way to the Linux shell login prompt, with a modified HSS (1st stage bootloader).
For detailed instructions on how to create images for the Icicle Kit board, please check QEMU RISC-V WiKi page at:
https://wiki.qemu.org/Documentation/Platforms/RISCV
---
(no changes since v1)
include/hw/riscv/microchip_pfsoc.h | 3 +++ hw/riscv/microchip_pfsoc.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+)
include/hw/riscv/microchip_pfsoc.h +3 -0
@@ -89,6 +89,9 @@ enum {MICROCHIP_PFSOC_MMUART4 ,MICROCHIP_PFSOC_GEM0 ,MICROCHIP_PFSOC_GEM1 , +MICROCHIP_PFSOC_GPIO0 , +MICROCHIP_PFSOC_GPIO1 , +MICROCHIP_PFSOC_GPIO2 ,MICROCHIP_PFSOC_ENVM_CFG ,MICROCHIP_PFSOC_ENVM_DATA , MICROCHIP_PFSOC_IOSCB_CFG,
hw/riscv/microchip_pfsoc.c +14 -0
@@ -89,6 +89,9 @@ static const struct MemmapEntry { [MICROCHIP_PFSOC_MMUART4] = { 0x20106000, 0x1000 }, [MICROCHIP_PFSOC_GEM0] = { 0x20110000, 0x2000 }, [MICROCHIP_PFSOC_GEM1] = { 0x20112000, 0x2000 }, + [MICROCHIP_PFSOC_GPIO0] = { 0x20120000, 0x1000 }, + [MICROCHIP_PFSOC_GPIO1] = { 0x20121000, 0x1000 }, + [MICROCHIP_PFSOC_GPIO2] = { 0x20122000, 0x1000 }, [MICROCHIP_PFSOC_ENVM_CFG] = { 0x20200000, 0x1000 }, [MICROCHIP_PFSOC_ENVM_DATA] = { 0x20220000, 0x20000 }, [MICROCHIP_PFSOC_IOSCB_CFG] = { 0x37080000, 0x1000 },
@@ -311,6 +314,17 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&s->gem1),0 ,qdev_get_gpio_in (DEVICE (s->plic),MICROCHIP_PFSOC_GEM1_IRQ )); +/* GPIOs */ +create_unimplemented_device ("microchip.pfsoc.gpio0" , + memmap[MICROCHIP_PFSOC_GPIO0 ].base, + memmap[MICROCHIP_PFSOC_GPIO0 ].size); +create_unimplemented_device ("microchip.pfsoc.gpio1" , + memmap[MICROCHIP_PFSOC_GPIO1 ].base, + memmap[MICROCHIP_PFSOC_GPIO1 ].size); +create_unimplemented_device ("microchip.pfsoc.gpio2" , + memmap[MICROCHIP_PFSOC_GPIO2 ].base, + memmap[MICROCHIP_PFSOC_GPIO2 ].size); +/* eNVM */ memory_region_init_rom(envm_data, OBJECT(dev), "microchip.pfsoc.envm.data", memmap[MICROCHIP_PFSOC_ENVM_DATA].size,
Signature · 1 line
2.7.4
PATCH v2 15/16 hw/riscv: clint: Avoid using hard-coded timebase frequency
In reply to Bin MengFrom: Bin Meng <[email protected]>
At present the CLINT timestamp is using a hard-coded timebase frequency value SIFIVE_CLINT_TIMEBASE_FREQ. This might not be true for all boards.
Add a new 'timebase-freq' property to the CLINT device, and update various functions to accept this as a parameter.
---
(no changes since v1)
include/hw/riscv/sifive_clint.h | 4 +++- target/riscv/cpu.h | 6 ++++-- hw/riscv/microchip_pfsoc.c | 6 +++++- hw/riscv/sifive_clint.c | 26 +++++++++++++++----------- hw/riscv/sifive_e.c | 3 ++- hw/riscv/sifive_u.c | 3 ++- hw/riscv/spike.c | 3 ++- hw/riscv/virt.c | 3 ++- target/riscv/cpu_helper.c | 4 +++- target/riscv/csr.c | 4 ++-- 10 files changed, 40 insertions(+), 22 deletions(-)
include/hw/riscv/sifive_clint.h +3 -1
@@ -39,11 +39,13 @@ typedef struct SiFiveCLINTState {uint32_t timecmp_base;uint32_t time_base;uint32_t aperture_size; +uint32_t timebase_freq; } SiFiveCLINTState;DeviceState *sifive_clint_create (hwaddr addr,hwaddr size,uint32_t hartid_base,uint32_t num_harts,uint32_t sip_base, -uint32_t timecmp_base,uint32_t time_base,bool provide_rdtime); +uint32_t timecmp_base,uint32_t time_base,uint32_t timebase_freq, +bool provide_rdtime);enum {SIFIVE_SIP_BASE =0x0 ,
target/riscv/cpu.h +4 -2
@@ -219,7 +219,8 @@ struct CPURISCVState {pmp_table_t pmp_state;/* machine specific rdtime callback */ -uint64_t (*rdtime_fn)(void ); +uint64_t (*rdtime_fn)(uint32_t ); +uint32_t rdtime_fn_arg;/* True if in debugger mode. */ bool debugger;
@@ -349,7 +350,8 @@ void riscv_cpu_swap_hypervisor_regs(CPURISCVState *env);int riscv_cpu_claim_interrupts (RISCVCPU *cpu,uint32_t interrupts);uint32_t riscv_cpu_update_mip (RISCVCPU *cpu,uint32_t mask,uint32_t value);#define BOOL_TO_MASK (x) (-!!(x))/* helper for riscv_cpu_update_mip value */ -void riscv_cpu_set_rdtime_fn (CPURISCVState *env,uint64_t (*fn)(void )); +void riscv_cpu_set_rdtime_fn (CPURISCVState *env,uint64_t (*fn)(uint32_t ), +uint32_t arg);#endif void riscv_cpu_set_mode (CPURISCVState *env,target_ulong newpriv);
hw/riscv/microchip_pfsoc.c +5 -1
@@ -60,6 +60,9 @@#define BIOS_FILENAME "hss.bin"#define RESET_VECTOR 0x20220000 +/* CLINT timebase frequency */ +#define CLINT_TIMEBASE_FREQ 1000000 +/* GEM version */ #define GEM_REVISION 0x0107010c
@@ -187,7 +190,8 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)/* CLINT */ sifive_clint_create (memmap[MICROCHIP_PFSOC_CLINT ].base, memmap[MICROCHIP_PFSOC_CLINT ].size,0 , ms->smp.cpus, -SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE , false); +SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE , +CLINT_TIMEBASE_FREQ , false);/* L2 cache controller */ create_unimplemented_device("microchip.pfsoc.l2cc",
hw/riscv/sifive_clint.c +15 -11
@@ -29,22 +29,23 @@#include "hw/riscv/sifive_clint.h" #include "qemu/timer.h" -static uint64_t cpu_riscv_read_rtc (void ) +static uint64_t cpu_riscv_read_rtc (uint32_t timebase_freq) {return muldiv64 (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ), -SIFIVE_CLINT_TIMEBASE_FREQ ,NANOSECONDS_PER_SECOND ); + timebase_freq,NANOSECONDS_PER_SECOND ); }/* * Called when timecmp is written to update the QEMU timer or immediately * trigger timer interrupt if mtimecmp <= current timer value. */ -static void sifive_clint_write_timecmp (RISCVCPU *cpu,uint64_t value) +static void sifive_clint_write_timecmp (RISCVCPU *cpu,uint64_t value, +uint32_t timebase_freq) {uint64_t next;uint64_t diff; -uint64_t rtc_r =cpu_riscv_read_rtc (); +uint64_t rtc_r =cpu_riscv_read_rtc (timebase_freq); cpu->env.timecmp = value;if (cpu->env.timecmp <= rtc_r) {
@@ -59,7 +60,7 @@ static void sifive_clint_write_timecmp(RISCVCPU *cpu, uint64_t value) diff = cpu->env.timecmp - rtc_r;/* back to ns (note args switched in muldiv64) */ next =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + -muldiv64 (diff,NANOSECONDS_PER_SECOND ,SIFIVE_CLINT_TIMEBASE_FREQ ); +muldiv64 (diff,NANOSECONDS_PER_SECOND , timebase_freq);timer_mod (cpu->env.timer, next); }
@@ -112,10 +113,10 @@ static uint64_t sifive_clint_read(void *opaque, hwaddr addr, unsigned size) } }else if (addr == clint->time_base) {/* time_lo */ -return cpu_riscv_read_rtc () &0xFFFFFFFF ; +return cpu_riscv_read_rtc (clint->timebase_freq) &0xFFFFFFFF ; }else if (addr == clint->time_base +4 ) {/* time_hi */ -return (cpu_riscv_read_rtc () >>32 ) &0xFFFFFFFF ; +return (cpu_riscv_read_rtc (clint->timebase_freq) >>32 ) &0xFFFFFFFF ; }error_report ("clint: invalid read: %08x" , (uint32_t )addr);
@@ -153,13 +154,13 @@ static void sifive_clint_write(void *opaque, hwaddr addr, uint64_t value,/* timecmp_lo */ uint64_t timecmp_hi = env->timecmp >>32 ;sifive_clint_write_timecmp (RISCV_CPU (cpu), - timecmp_hi <<32 | (value &0xFFFFFFFF )); + timecmp_hi <<32 | (value &0xFFFFFFFF ), clint->timebase_freq);return ; }else if ((addr &0x7 ) ==4 ) {/* timecmp_hi */ uint64_t timecmp_lo = env->timecmp;sifive_clint_write_timecmp (RISCV_CPU (cpu), - value <<32 | (timecmp_lo &0xFFFFFFFF )); + value <<32 | (timecmp_lo &0xFFFFFFFF ), clint->timebase_freq); }else {error_report ("clint: invalid timecmp write: %08x" , (uint32_t )addr); }
@@ -194,6 +195,7 @@ static Property sifive_clint_properties[] = {DEFINE_PROP_UINT32 ("timecmp-base" , SiFiveCLINTState, timecmp_base,0 ),DEFINE_PROP_UINT32 ("time-base" , SiFiveCLINTState, time_base,0 ),DEFINE_PROP_UINT32 ("aperture-size" , SiFiveCLINTState, aperture_size,0 ), +DEFINE_PROP_UINT32 ("timebase-freq" , SiFiveCLINTState, timebase_freq,0 ), DEFINE_PROP_END_OF_LIST(), };
@@ -232,7 +234,8 @@ type_init(sifive_clint_register_types)*/ DeviceState *sifive_clint_create (hwaddr addr,hwaddr size,uint32_t hartid_base,uint32_t num_harts,uint32_t sip_base, -uint32_t timecmp_base,uint32_t time_base,bool provide_rdtime) +uint32_t timecmp_base,uint32_t time_base,uint32_t timebase_freq, +bool provide_rdtime) {int i;for (i =0 ; i < num_harts; i++) {
@@ -242,7 +245,7 @@ DeviceState *sifive_clint_create(hwaddr addr, hwaddr size,continue ; }if (provide_rdtime) { -riscv_cpu_set_rdtime_fn (env, cpu_riscv_read_rtc); +riscv_cpu_set_rdtime_fn (env, cpu_riscv_read_rtc, timebase_freq); } env->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , &sifive_clint_timer_cb, cpu);
@@ -256,6 +259,7 @@ DeviceState *sifive_clint_create(hwaddr addr, hwaddr size,qdev_prop_set_uint32 (dev,"timecmp-base" , timecmp_base);qdev_prop_set_uint32 (dev,"time-base" , time_base);qdev_prop_set_uint32 (dev,"aperture-size" , size); +qdev_prop_set_uint32 (dev,"timebase-freq" , timebase_freq);sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , addr);return dev;
hw/riscv/sifive_e.c +2 -1
@@ -213,7 +213,8 @@ static void sifive_e_soc_realize(DeviceState *dev, Error **errp) memmap[SIFIVE_E_PLIC].size);sifive_clint_create (memmap[SIFIVE_E_CLINT ].base, memmap[SIFIVE_E_CLINT ].size,0 , ms->smp.cpus, -SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE , false); +SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE , +SIFIVE_CLINT_TIMEBASE_FREQ , false);create_unimplemented_device ("riscv.sifive.e.aon" , memmap[SIFIVE_E_AON ].base, memmap[SIFIVE_E_AON ].size);sifive_e_prci_create (memmap[SIFIVE_E_PRCI ].base);
hw/riscv/sifive_u.c +2 -1
@@ -706,7 +706,8 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp) serial_hd(1), qdev_get_gpio_in(DEVICE(s->plic), SIFIVE_U_UART1_IRQ));sifive_clint_create (memmap[SIFIVE_U_CLINT ].base, memmap[SIFIVE_U_CLINT ].size,0 , ms->smp.cpus, -SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE , false); +SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE , +SIFIVE_CLINT_TIMEBASE_FREQ , false);if (!sysbus_realize (SYS_BUS_DEVICE (&s->prci), errp)) {return ;
hw/riscv/spike.c +2 -1
@@ -242,7 +242,8 @@ static void spike_board_init(MachineState *machine)sifive_clint_create ( memmap[SPIKE_CLINT ].base + i * memmap[SPIKE_CLINT ].size, memmap[SPIKE_CLINT ].size, base_hartid, hart_count, -SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE , false); +SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE , +SIFIVE_CLINT_TIMEBASE_FREQ , false); }/* register system main memory (actual RAM) */
hw/riscv/virt.c +2 -1
@@ -541,7 +541,8 @@ static void virt_machine_init(MachineState *machine)sifive_clint_create ( memmap[VIRT_CLINT ].base + i * memmap[VIRT_CLINT ].size, memmap[VIRT_CLINT ].size, base_hartid, hart_count, -SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE , true); +SIFIVE_SIP_BASE ,SIFIVE_TIMECMP_BASE ,SIFIVE_TIME_BASE , +SIFIVE_CLINT_TIMEBASE_FREQ , true);/* Per-socket PLIC hart topology configuration string */ plic_hart_config_len =
target/riscv/cpu_helper.c +3 -1
@@ -276,9 +276,11 @@ uint32_t riscv_cpu_update_mip(RISCVCPU *cpu, uint32_t mask, uint32_t value)return old; } -void riscv_cpu_set_rdtime_fn (CPURISCVState *env,uint64_t (*fn)(void )) +void riscv_cpu_set_rdtime_fn (CPURISCVState *env,uint64_t (*fn)(uint32_t ), +uint32_t arg) { env->rdtime_fn = fn; + env->rdtime_fn_arg = arg; }void riscv_cpu_set_mode (CPURISCVState *env,target_ulong newpriv)
target/riscv/csr.c +2 -2
@@ -351,7 +351,7 @@ static int read_time(CPURISCVState *env, int csrno, target_ulong *val)return -RISCV_EXCP_ILLEGAL_INST ; } - *val = env->rdtime_fn () + delta; + *val = env->rdtime_fn (env->rdtime_fn_arg) + delta;return 0 ; }
@@ -364,7 +364,7 @@ static int read_timeh(CPURISCVState *env, int csrno, target_ulong *val) return -RISCV_EXCP_ILLEGAL_INST; } - *val = (env->rdtime_fn () + delta) >>32 ; + *val = (env->rdtime_fn (env->rdtime_fn_arg) + delta) >>32 ;return 0 ; }#endif
Signature · 1 line
2.7.4
PATCH v2 16/16 hw/riscv: sifive_u: Connect a DMA controller
In reply to Bin MengFrom: Bin Meng <[email protected]>
SiFive FU540 SoC integrates a platform DMA controller with 4 DMA channels. This connects the exsiting SiFive PDMA model to the SoC, and adds its device tree data as well.
---
(no changes since v1)
include/hw/riscv/sifive_u.h | 11 +++++++++++ hw/riscv/sifive_u.c | 30 ++++++++++++++++++++++++++++++ hw/riscv/Kconfig | 1 + 3 files changed, 42 insertions(+)
include/hw/riscv/sifive_u.h +11 -0
@@ -19,6 +19,7 @@#ifndef HW_SIFIVE_U_H #define HW_SIFIVE_U_H +#include "hw/dma/sifive_pdma.h" #include "hw/net/cadence_gem.h" #include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_cpu.h"
@@ -43,6 +44,7 @@ typedef struct SiFiveUSoCState {SiFiveUPRCIState prci;SIFIVEGPIOState gpio;SiFiveUOTPState otp; +SiFivePDMAState dma;CadenceGEMState gem;uint32_t serial;
@@ -72,6 +74,7 @@ enum {SIFIVE_U_MROM ,SIFIVE_U_CLINT ,SIFIVE_U_L2CC , +SIFIVE_U_PDMA ,SIFIVE_U_L2LIM ,SIFIVE_U_PLIC , SIFIVE_U_PRCI,
@@ -108,6 +111,14 @@ enum {SIFIVE_U_GPIO_IRQ13 =20 ,SIFIVE_U_GPIO_IRQ14 =21 ,SIFIVE_U_GPIO_IRQ15 =22 , +SIFIVE_U_PDMA_IRQ0 =23 , +SIFIVE_U_PDMA_IRQ1 =24 , +SIFIVE_U_PDMA_IRQ2 =25 , +SIFIVE_U_PDMA_IRQ3 =26 , +SIFIVE_U_PDMA_IRQ4 =27 , +SIFIVE_U_PDMA_IRQ5 =28 , +SIFIVE_U_PDMA_IRQ6 =29 , +SIFIVE_U_PDMA_IRQ7 =30 ,SIFIVE_U_GEM_IRQ =0x35 };
hw/riscv/sifive_u.c +30 -0
@@ -14,6 +14,7 @@* 4) GPIO (General Purpose Input/Output Controller) * 5) OTP (One-Time Programmable) memory with stored serial number * 6) GEM (Gigabit Ethernet Controller) and management block +* 7) DMA (Direct Memory Access Controller) * * This board currently generates devicetree dynamically that indicates at least * two harts and up to five harts.
@@ -73,6 +74,7 @@ static const struct MemmapEntry { [SIFIVE_U_MROM] = { 0x1000, 0xf000 }, [SIFIVE_U_CLINT] = { 0x2000000, 0x10000 }, [SIFIVE_U_L2CC] = { 0x2010000, 0x1000 }, + [SIFIVE_U_PDMA] = { 0x3000000, 0x100000 }, [SIFIVE_U_L2LIM] = { 0x8000000, 0x2000000 }, [SIFIVE_U_PLIC] = { 0xc000000, 0x4000000 }, [SIFIVE_U_PRCI] = { 0x10000000, 0x1000 },
@@ -303,6 +305,22 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"gpio-restart" );g_free (nodename); + nodename =g_strdup_printf ("/soc/dma@%lx" , + (long )memmap[SIFIVE_U_PDMA ].base); +qemu_fdt_add_subnode (fdt, nodename); +qemu_fdt_setprop_cell (fdt, nodename,"#dma-cells" ,1 ); +qemu_fdt_setprop_cells (fdt, nodename,"interrupts" , +SIFIVE_U_PDMA_IRQ0 ,SIFIVE_U_PDMA_IRQ1 ,SIFIVE_U_PDMA_IRQ2 , +SIFIVE_U_PDMA_IRQ3 ,SIFIVE_U_PDMA_IRQ4 ,SIFIVE_U_PDMA_IRQ5 , +SIFIVE_U_PDMA_IRQ6 ,SIFIVE_U_PDMA_IRQ7 ); +qemu_fdt_setprop_cell (fdt, nodename,"interrupt-parent" , plic_phandle); +qemu_fdt_setprop_cells (fdt, nodename,"reg" , +0x0 , memmap[SIFIVE_U_PDMA ].base, +0x0 , memmap[SIFIVE_U_PDMA ].size); +qemu_fdt_setprop_string (fdt, nodename,"compatible" , +"sifive,fu540-c000-pdma" ); +g_free (nodename); + nodename =g_strdup_printf ("/soc/cache-controller@%lx" , (long )memmap[SIFIVE_U_L2CC ].base);qemu_fdt_add_subnode (fdt, nodename);
@@ -627,6 +645,7 @@ static void sifive_u_soc_instance_init(Object *obj)object_initialize_child (obj,"otp" , &s->otp,TYPE_SIFIVE_U_OTP );object_initialize_child (obj,"gem" , &s->gem,TYPE_CADENCE_GEM );object_initialize_child (obj,"gpio" , &s->gpio,TYPE_SIFIVE_GPIO ); +object_initialize_child (obj,"pdma" , &s->dma,TYPE_SIFIVE_PDMA ); }static void sifive_u_soc_realize (DeviceState *dev,Error **errp)
@@ -730,6 +749,17 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp) SIFIVE_U_GPIO_IRQ0 + i)); } +/* PDMA */ +sysbus_realize (SYS_BUS_DEVICE (&s->dma), errp); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->dma),0 , memmap[SIFIVE_U_PDMA ].base); + +/* Connect PDMA interrupts to the PLIC */ +for (i =0 ; i <SIFIVE_PDMA_IRQS ; i++) { +sysbus_connect_irq (SYS_BUS_DEVICE (&s->dma), i, +qdev_get_gpio_in (DEVICE (s->plic), +SIFIVE_U_PDMA_IRQ0 + i)); + } +qdev_prop_set_uint32 (DEVICE (&s->otp),"serial" , s->serial);if (!sysbus_realize (SYS_BUS_DEVICE (&s->otp), errp)) {return ;
hw/riscv/Kconfig +1 -0
@@ -22,6 +22,7 @@ config SIFIVE_U select CADENCE select HART select SIFIVE + select SIFIVE_PDMA select UNIMP config SPIKE
Signature · 1 line
2.7.4
Hi Bin,
Quoted 33 lines · Bin Meng
From: Bin Meng <[email protected]>
This adds support for Microchip PolarFire SoC Icicle Kit board. The Icicle Kit board integrates a PolarFire SoC, with one SiFive's E51 plus four U54 cores and many on-chip peripherals and an FPGA.
For more details about Microchip PolarFire SoC, please see:
https://www.microsemi.com/product-directory/soc-fpgas/5498-polarfire-soc-fpgaThe Icicle Kit board information can be found here:
https://www.microsemi.com/existing-parts/parts/152514Unlike SiFive FU540, the RISC-V core resect vector is at
0x20220000. The RISC-V CPU and HART codes has been updated to set the core's reset vector based on a configurable property from machine codes.The following perepherals are created as an unimplemented device:
- Bus Error Uint 0/1/2/3/4
- L2 cache controller
- SYSREG
- MPUCFG
- IOSCBCFG
- GPIOThe following perepherals are emulated:
- SiFive CLINT
- SiFive PLIC
- PolarFire SoC Multi-Mode UART
- SiFive PDMA
- Cadence eMMC/SDHCI controller
- Cadence Gigabit Ethernet MAC
Quoted 3 lines
The BIOS image used by this machine is hss.bin, aka Hart Software Services, which can be built from:
https://github.com/polarfire-soc/hart-software-services
Are there any version requirements, or additional qemu patches, that need to be taken into account. Should I expect to see output on stdio?
I tried to build hss 3faaaaf8ce0d, using
https://github.com/riscv/riscv-gnu-toolchain (7f1f4ab5b0e0), which ends up being a gcc 10.1. That caused me to raise
https://github.com/polarfire-soc/hart-software-services/issues/2.
Suppressing that warning gets me a hss.bin, but neither that, nor one I build with Debian's 8.3 riscv64-linux-gnu- produces any output when I apply this set on top of 39335fab59. (Even when I change the wait to nowait.)
/
Leif
Quoted 109 lines
To launch this machine:
$ qemu-system-riscv64 -M microchip-icicle-kit -smp 5 \ -bios path/to/hss.bin -sd path/to/sdcard.img \ -nic tap,ifname=tap,script=no,model=cadence_gem \ -display none -serial stdio \ -chardev socket,id=serial1,path=serial1.sock,server,wait \ -serial chardev:serial1The memory is set to 1 GiB by default to match the hardware. A sanity check on ram size is performed in the machine init routine to prompt user to increase the RAM size to > 1 GiB when less than 1 GiB ram is detected.
HSS output is on the first serial port (stdio) and U-Boot/Linux outputs on the 2nd serial port. OpenSBI outputs on a random serial port due to the lottery mechanism used during the multi-core boot.
Please check the QEMU WiKi page for the target specific information:
https://wiki.qemu.org/Documentation/Platforms/RISCV#Microchip_PolarFire_SoC_Icicle_KitChanges in v2:
- change to update hw/char/meson.build
- add impl.min_access_size and impl.max_access_size as part of MemoryRegionOps and remove the allignment check
- change to update hw/sd/meson.build
- change the name to "generic-sdhci" when callingobject_initialize_child()
- add a container MR to simplify out-of-bounds access checks
- do not initializeTYPE_SYSBUS_SDHCIin the SoCinstance_init(), instead move that to thecadence_sdhcimodel
- do not access generic-sdhci's state directly,
instead move that to thecadence_sdhcimodel
- change to update hw/dma/meson.build
- rename the file names to sifive_pdma.[c|h]
- update irq number to 8 per the SiFive FU540 manual
- fix the register offset for channel 1/2/3 in the read/write ops
- connect 8 IRQs to the PLIC
- change "phy-addr" default value toBOARD_PHY_ADDRESSBin Meng (16):
target/riscv: cpu: Add a new 'resetvec' property
hw/riscv: hart: Add a new 'resetvec' property target/riscv: cpu: Set reset vector based on the configured property
value
hw/riscv: Initial support for Microchip PolarFire SoC Icicle Kit board hw/char: Add Microchip PolarFire SoC MMUART emulation hw/riscv:microchip_pfsoc: Connect 5 MMUARTs
hw/sd: Add Cadence SDHCI emulation
hw/riscv:microchip_pfsoc: Connect a Cadence SDHCI controller and an
SD card
hw/dma: Add SiFive platform DMA controller emulation hw/riscv:microchip_pfsoc: Connect a DMA controller hw/net:cadence_gem: Add a new 'phy-addr' property
hw/arm: xlnx: Set all boards' GEM 'phy-addr' property value to 23 hw/riscv:microchip_pfsoc: Connect 2 Cadence GEMs hw/riscv:microchip_pfsoc: Hook GPIO controllers
hw/riscv: clint: Avoid using hard-coded timebase frequency hw/riscv:sifive_u: Connect a DMA controllerdefault-configs/riscv64-softmmu.mak | 1 + include/hw/char/mchp_pfsoc_mmuart.h | 61 +++++ include/hw/dma/sifive_pdma.h | 57 +++++ include/hw/net/cadence_gem.h | 2 + include/hw/riscv/microchip_pfsoc.h | 133 +++++++++++ include/hw/riscv/riscv_hart.h | 1 + include/hw/riscv/sifive_clint.h | 4 +- include/hw/riscv/sifive_u.h | 11 + include/hw/sd/cadence_sdhci.h | 47 ++++ target/riscv/cpu.h | 7 +- hw/arm/xilinx_zynq.c | 1 + hw/arm/xlnx-versal.c | 1 + hw/arm/xlnx-zynqmp.c | 1 + hw/char/mchp_pfsoc_mmuart.c | 86 +++++++ hw/dma/sifive_pdma.c | 313 ++++++++++++++++++++++++++ hw/net/cadence_gem.c | 7 +- hw/riscv/microchip_pfsoc.c | 437 ++++++++++++++++++++++++++++++++++++ hw/riscv/opentitan.c | 1 + hw/riscv/riscv_hart.c | 3 + hw/riscv/sifive_clint.c | 26 ++- hw/riscv/sifive_e.c | 4 +- hw/riscv/sifive_u.c | 35 ++- hw/riscv/spike.c | 3 +- hw/riscv/virt.c | 3 +- hw/sd/cadence_sdhci.c | 193 ++++++++++++++++ target/riscv/cpu.c | 8 +- target/riscv/cpu_helper.c | 4 +- target/riscv/csr.c | 4 +- MAINTAINERS | 9 + hw/char/Kconfig | 3 + hw/char/meson.build | 1 + hw/dma/Kconfig | 3 + hw/dma/meson.build | 1 + hw/riscv/Kconfig | 10 + hw/riscv/meson.build | 1 + hw/sd/Kconfig | 4 + hw/sd/meson.build | 1 + 37 files changed, 1458 insertions(+), 29 deletions(-) create mode 100644 include/hw/char/mchp_pfsoc_mmuart.h create mode 100644 include/hw/dma/sifive_pdma.h create mode 100644 include/hw/riscv/microchip_pfsoc.h create mode 100644 include/hw/sd/cadence_sdhci.h create mode 100644 hw/char/mchp_pfsoc_mmuart.c create mode 100644 hw/dma/sifive_pdma.c create mode 100644 hw/riscv/microchip_pfsoc.c create mode 100644 hw/sd/cadence_sdhci.cSignature · 1 line
2.7.4
Hi Leif,
Quoted 37 lines · Leif Lindholm
Hi Bin,
Quoted 33 lines · Bin Meng
From: Bin Meng <[email protected]>
This adds support for Microchip PolarFire SoC Icicle Kit board. The Icicle Kit board integrates a PolarFire SoC, with one SiFive's E51 plus four U54 cores and many on-chip peripherals and an FPGA.
For more details about Microchip PolarFire SoC, please see:
https://www.microsemi.com/product-directory/soc-fpgas/5498-polarfire-soc-fpgaThe Icicle Kit board information can be found here:
https://www.microsemi.com/existing-parts/parts/152514Unlike SiFive FU540, the RISC-V core resect vector is at
0x20220000. The RISC-V CPU and HART codes has been updated to set the core's reset vector based on a configurable property from machine codes.The following perepherals are created as an unimplemented device:
- Bus Error Uint 0/1/2/3/4
- L2 cache controller
- SYSREG
- MPUCFG
- IOSCBCFG
- GPIOThe following perepherals are emulated:
- SiFive CLINT
- SiFive PLIC
- PolarFire SoC Multi-Mode UART
- SiFive PDMA
- Cadence eMMC/SDHCI controller
- Cadence Gigabit Ethernet MAC
Quoted 6 lines
Quoted 3 lines
The BIOS image used by this machine is hss.bin, aka Hart Software Services, which can be built from:
https://github.com/polarfire-soc/hart-software-servicesAre there any version requirements, or additional qemu patches, that need to be taken into account. Should I expect to see output on stdio?
Thanks for trying!
Did you apply the patch to skip the DDR memory initialization mentioned in this page?
https://wiki.qemu.org/Documentation/Platforms/RISCV#Microchip_PolarFire_SoC_Icicle_Kit
Quoted 5 lines
I tried to build hss
3faaaaf8ce0d, using
https://github.com/riscv/riscv-gnu-toolchain (7f1f4ab5b0e0), which ends up being a gcc 10.1. That caused me to raise
https://github.com/polarfire-soc/hart-software-services/issues/2.
Yes, GCC 10 does not build is a known issue. Currently I am using GCC 9 to build HSS.
Quoted 6 lines
Suppressing that warning gets me a hss.bin, but neither that, nor one I build with Debian's 8.3 riscv64-linux-gnu- produces any output when I apply this set on top of
39335fab59. (Even when I change the wait to nowait.)
Regards,
Bin
Quoted 14 lines · Bin Meng
Hi Leif,
Quoted 12 lines
Quoted 11 lines
The following perepherals are emulated:
- SiFive CLINT
- SiFive PLIC
- PolarFire SoC Multi-Mode UART
- SiFive PDMA
- Cadence eMMC/SDHCI controller
- Cadence Gigabit Ethernet MACThe BIOS image used by this machine is hss.bin, aka Hart Software Services, which can be built from:
https://github.com/polarfire-soc/hart-software-services
Quoted 8 lines
Quoted 2 lines
Are there any version requirements, or additional qemu patches, that need to be taken into account. Should I expect to see output on stdio?
Thanks for trying!
Did you apply the patch to skip the DDR memory initialization mentioned in this page?
https://wiki.qemu.org/Documentation/Platforms/RISCV#Microchip_PolarFire_SoC_Icicle_Kit
I did, but in honesty only after I sent the previous email :) (Since it made no difference, I didn't bother following up.)
Quoted 7 lines
Quoted 4 lines
I tried to build hss
3faaaaf8ce0d, using
https://github.com/riscv/riscv-gnu-toolchain (7f1f4ab5b0e0), which ends up being a gcc 10.1. That caused me to raise
https://github.com/polarfire-soc/hart-software-services/issues/2.Yes, GCC 10 does not build is a known issue. Currently I am using GCC 9 to build HSS.
Right, I can confirm that with commit 93f82dc18e1d riscv-gnu-toolchain (the last before changing to gcc 10.1), I generate a 9.2.0 gcc that builds a hss.bin that boots successfully with the minimal command line
qemu-system-riscv64 -M microchip-icicle-kit -smp 5 -bios hss.bin \
-display none -serial stdio
Thanks!
(I haven't looked any further than the hss.bin yet, but I'm now unblocked to do so.)
Best Regards,
Leif