Skip to content

hw/riscv: Add Microchip PolarFire SoC Icicle Kit board support

Bin Meng qemu-arm qemu-devel qemu-riscv 3 versions – Applied

Status from this message: Applied to riscv-to-apply.next

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest16 patches 25 repliesApplied
  2. v216 patches 3 repliesSuperseded
  3. v118 patches 42 repliesSuperseded

Changes in v3 from the cover letter

- rebase on qemu/master
- change MCHP_PFSOC_DMA to SIFIVE_PDMA
- use the correct (Object *) to set the 'phy-addr' in xlnx-zynqmp.c

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/16target/riscv: cpu: Add a new 'resetvec' propertytarget/riscv/cpu.c target/riscv/cpu.h+2 -01 reply
2/16hw/riscv: hart: Add a new 'resetvec' propertyhw/riscv/riscv_hart.c include/hw/riscv/riscv_hart.h+4 -01 reply
3/16target/riscv: cpu: Set reset vector based on the configured property valuehw/riscv/opentitan.c hw/riscv/sifive_e.c hw/riscv/sifive_u.c +1 more+6 -51 reply
4/16hw/riscv: Initial support for Microchip PolarFire SoC Icicle Kit boardMAINTAINERS default-configs/riscv64-softmmu.mak hw/riscv/Kconfig +3 more+415 -00 replies
5/16hw/char: Add Microchip PolarFire SoC MMUART emulationMAINTAINERS hw/char/Kconfig hw/char/mchp_pfsoc_mmuart.c +2 more+153 -01 reply
6/16hw/riscv: microchip_pfsoc: Connect 5 MMUARTshw/riscv/Kconfig hw/riscv/microchip_pfsoc.c include/hw/riscv/microchip_pfsoc.h+51 -00 replies
7/16hw/sd: Add Cadence SDHCI emulationhw/sd/Kconfig hw/sd/cadence_sdhci.c hw/sd/meson.build +1 more+245 -01 reply
8/16hw/riscv: microchip_pfsoc: Connect a Cadence SDHCI controller and an SD cardhw/riscv/Kconfig hw/riscv/microchip_pfsoc.c include/hw/riscv/microchip_pfsoc.h+28 -04 replies
9/16hw/dma: Add SiFive platform DMA controller emulationhw/dma/Kconfig hw/dma/meson.build hw/dma/sifive_pdma.c +1 more+374 -01 reply
10/16hw/riscv: microchip_pfsoc: Connect a DMA controllerhw/riscv/Kconfig hw/riscv/microchip_pfsoc.c include/hw/riscv/microchip_pfsoc.h+27 -01 reply
11/16hw/net: cadence_gem: Add a new 'phy-addr' propertyhw/net/cadence_gem.c include/hw/net/cadence_gem.h+5 -23 replies
12/16hw/arm: xlnx: Set all boards' GEM 'phy-addr' property value to 23hw/arm/xilinx_zynq.c hw/arm/xlnx-versal.c hw/arm/xlnx-zynqmp.c +1 more+7 -32 replies
13/16hw/riscv: microchip_pfsoc: Connect 2 Cadence GEMshw/riscv/microchip_pfsoc.c include/hw/riscv/microchip_pfsoc.h+46 -01 reply
14/16hw/riscv: microchip_pfsoc: Hook GPIO controllershw/riscv/microchip_pfsoc.c include/hw/riscv/microchip_pfsoc.h+17 -01 reply
15/16hw/riscv: clint: Avoid using hard-coded timebase frequencyhw/riscv/microchip_pfsoc.c hw/riscv/sifive_clint.c hw/riscv/sifive_e.c +7 more+40 -221 reply
16/16hw/riscv: sifive_u: Connect a DMA controllerhw/riscv/Kconfig hw/riscv/sifive_u.c include/hw/riscv/sifive_u.h+42 -01 reply

Reviews trailers per patch

All 16 patches have a Reviewed-by or Acked-by.

PatchAlistair FrancisPhilippe Mathieu-DaudéEdgar E. Iglesias
1/16R-b R-b
2/16R-b R-b
3/16R-b R-b
4/16R-b
5/16R-b
6/16R-b
7/16A-b A-b
8/16R-b R-b
9/16A-b
10/16R-b
11/16R-b R-b R-b
12/16R-b R-b
13/16R-b R-b
14/16R-b R-b
15/16R-b
16/16R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCH v3 00/16] 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:serial1

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.

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 v3:
- rebase on qemu/master
- change MCHP_PFSOC_DMA to SIFIVE_PDMA
- use the correct (Object *) to set the 'phy-addr' in xlnx-zynqmp.c

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                |   2 +
 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, 1459 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