Re: [RFC v2 2/2] hw/riscv: Add server platform reference machine
On Tue, Mar 12, 2024 at 09:52:21PM GMT, Fei Wu wrote: > The RISC-V Server Platform specification[1] defines a standardized set > of hardware and software capabilities, that portable system software, > such as OS and hypervisors can rely on being present in a RISC-V server > platform. > > A corresponding Qemu RISC-V server platform reference (rvsp-ref for > short) machine type is added to provide a environment for firmware/OS > development and testing. The main features included in rvsp-ref are: > > - Based on riscv virt machine type > - A new memory map as close as virt machine as possible > - A new virt CPU type rvsp-ref-cpu for server platform compliance > - AIA > - PCIe AHCI > - PCIe NIC We should rebase on the IOMMU series [1] and add an IOMMU to the platform, as it's required by the Server Soc spec (which is required by the server platform spec). [1] https://lore.kernel.org/qemu-devel/20240307160319.675044-1-dbarb...@ventanamicro.com/ Thanks, drew
Re: [RFC v2 2/2] hw/riscv: Add server platform reference machine
On 3/23/2024 3:14 AM, Atish Kumar Patra wrote:
> On Tue, Mar 12, 2024 at 6:53 AM Fei Wu wrote:
>>
>> The RISC-V Server Platform specification[1] defines a standardized set
>> of hardware and software capabilities, that portable system software,
>> such as OS and hypervisors can rely on being present in a RISC-V server
>> platform.
>>
[...]
>> +
>> +static void finalize_fdt(RVSPMachineState *s)
>> +{
>> +uint32_t phandle = 1, irq_mmio_phandle = 1, msi_pcie_phandle = 1;
>> +uint32_t irq_pcie_phandle = 1;
>> +
>> +create_fdt_sockets(s, rvsp_ref_memmap, , _mmio_phandle,
>> + _pcie_phandle, _pcie_phandle);
>> +
>> +create_fdt_pcie(s, rvsp_ref_memmap, irq_pcie_phandle, msi_pcie_phandle);
>> +
>> +create_fdt_reset(s, rvsp_ref_memmap, );
>> +
>> +create_fdt_uart(s, rvsp_ref_memmap, irq_mmio_phandle);
>> +
>> +create_fdt_rtc(s, rvsp_ref_memmap, irq_mmio_phandle);
>
>
> We need a minimalistic DT for firmwares which probably don't use rtc, pcie
> etc.
> Does EDK2 plan to generate ACPI tables from these DT ? Otherwise, we
> can get rid of these.
>
Yes, I agree. Eventually we can remove many of these fdt when EDK2 is
able to generate the ACPI tables directly. I add it here as EDK2 has not
been adapted yet, the system won't boot up with the upstream EDK2 if
e.g. fdt of pcie is removed.
Thanks,
Fei.
> As Heinrich said, Linux kernels should boot using ACPI only.
>
Re: [RFC v2 2/2] hw/riscv: Add server platform reference machine
On Tue, Mar 12, 2024 at 6:53 AM Fei Wu wrote:
>
> The RISC-V Server Platform specification[1] defines a standardized set
> of hardware and software capabilities, that portable system software,
> such as OS and hypervisors can rely on being present in a RISC-V server
> platform.
>
> A corresponding Qemu RISC-V server platform reference (rvsp-ref for
> short) machine type is added to provide a environment for firmware/OS
> development and testing. The main features included in rvsp-ref are:
>
> - Based on riscv virt machine type
> - A new memory map as close as virt machine as possible
> - A new virt CPU type rvsp-ref-cpu for server platform compliance
> - AIA
> - PCIe AHCI
> - PCIe NIC
> - No virtio device
> - No fw_cfg device
> - No ACPI table provided
> - Only minimal device tree nodes
>
> [1] https://github.com/riscv-non-isa/riscv-server-platform
>
> Signed-off-by: Fei Wu
> ---
> configs/devices/riscv64-softmmu/default.mak |1 +
> hw/riscv/Kconfig| 12 +
> hw/riscv/meson.build|1 +
> hw/riscv/server_platform_ref.c | 1276 +++
> 4 files changed, 1290 insertions(+)
> create mode 100644 hw/riscv/server_platform_ref.c
>
> diff --git a/configs/devices/riscv64-softmmu/default.mak
> b/configs/devices/riscv64-softmmu/default.mak
> index 3f68059448..a1d98e49ef 100644
> --- a/configs/devices/riscv64-softmmu/default.mak
> +++ b/configs/devices/riscv64-softmmu/default.mak
> @@ -10,5 +10,6 @@ CONFIG_SPIKE=y
> CONFIG_SIFIVE_E=y
> CONFIG_SIFIVE_U=y
> CONFIG_RISCV_VIRT=y
> +CONFIG_SERVER_PLATFORM_REF=y
> CONFIG_MICROCHIP_PFSOC=y
> CONFIG_SHAKTI_C=y
> diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
> index 5d644eb7b1..5674589e66 100644
> --- a/hw/riscv/Kconfig
> +++ b/hw/riscv/Kconfig
> @@ -48,6 +48,18 @@ config RISCV_VIRT
> select ACPI
> select ACPI_PCI
>
> +config SERVER_PLATFORM_REF
> +bool
> +select RISCV_NUMA
> +select GOLDFISH_RTC
> +select PCI
> +select PCI_EXPRESS_GENERIC_BRIDGE
> +select PFLASH_CFI01
> +select SERIAL
> +select RISCV_ACLINT
> +select RISCV_APLIC
> +select RISCV_IMSIC
> +
> config SHAKTI_C
> bool
> select RISCV_ACLINT
> diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build
> index 2f7ee81be3..bb3aff91ea 100644
> --- a/hw/riscv/meson.build
> +++ b/hw/riscv/meson.build
> @@ -4,6 +4,7 @@ riscv_ss.add(when: 'CONFIG_RISCV_NUMA', if_true:
> files('numa.c'))
> riscv_ss.add(files('riscv_hart.c'))
> riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c'))
> riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c'))
> +riscv_ss.add(when: 'CONFIG_SERVER_PLATFORM_REF', if_true:
> files('server_platform_ref.c'))
> riscv_ss.add(when: 'CONFIG_SHAKTI_C', if_true: files('shakti_c.c'))
> riscv_ss.add(when: 'CONFIG_SIFIVE_E', if_true: files('sifive_e.c'))
> riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u.c'))
> diff --git a/hw/riscv/server_platform_ref.c b/hw/riscv/server_platform_ref.c
> new file mode 100644
> index 00..b552650265
> --- /dev/null
> +++ b/hw/riscv/server_platform_ref.c
> @@ -0,0 +1,1276 @@
> +/*
> + * QEMU RISC-V Server Platform (RVSP) Reference Board
> + *
> + * Copyright (c) 2024 Intel, Inc.
> + *
> + * This board is compliant RISC-V Server platform specification and
> leveraging
> + * a lot of riscv virt code.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2 or later, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope 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
Re: [RFC v2 2/2] hw/riscv: Add server platform reference machine
On Fri, Mar 22, 2024 at 2:20 AM Marcin Juszkiewicz wrote: > > W dniu 22.03.2024 o 09:50, Heinrich Schuchardt pisze: > >>> I see no mention of device trees in the spec, but I do see ACPI. Do we > >>> really expect a server platform to use DTs? > >> > >> This platform "kind of" follows sbsa-ref where we have very > >> minimalistic device tree sharing information qemu->firmware. > >> > >> libfdt is small, format is known and describes hardware. Firmware is > >> free to make use of it in any way it wants. > >> > >> On sbsa-ref we parse DT in TF-A (base firmware) and provide hardware > >> information to higher level (edk2) via SMC mechanism. Then EDK2 > >> creates ACPI tables and provide them to the Operating System. > > > We should ensure that only either an ACPI table or a device-tree > > description is passed to the OS and not both, e.g. when using > > > > qemu-system-riscv64 -kernel vmlinux -M sbsa-ref > > > > But that requirement is not machine specific. > > I would not call "qemu-system-* -M machinename -k kernel_image" a proper > way to boot for several systems emulated by QEMU. > > DeviceTree is in rvsp-ref and sbsa-ref because it is easy to process in > limited space 1st stage of firmware has. > OpenSBI also has DT support only. So a minimalistic DT generated by the machine for the firmware is required for RISC-V as well. > And if we knew how people will mention 'sbsa-ref uses DT' we would use > something else instead. But that would require adding more code into > existing firmware projects (libfdt is usually already there). > > I did not looked at DT generated for rvsp-ref. I know that sbsa-ref one > is too minimalistic for kernel use as we added only those fields/nodes > we need to provide data for firmware.
Re: [RFC v2 2/2] hw/riscv: Add server platform reference machine
W dniu 22.03.2024 o 09:50, Heinrich Schuchardt pisze: >>> I see no mention of device trees in the spec, but I do see ACPI. Do we >>> really expect a server platform to use DTs? >> >> This platform "kind of" follows sbsa-ref where we have very >> minimalistic device tree sharing information qemu->firmware. >> >> libfdt is small, format is known and describes hardware. Firmware is >> free to make use of it in any way it wants. >> >> On sbsa-ref we parse DT in TF-A (base firmware) and provide hardware >> information to higher level (edk2) via SMC mechanism. Then EDK2 >> creates ACPI tables and provide them to the Operating System. > We should ensure that only either an ACPI table or a device-tree > description is passed to the OS and not both, e.g. when using > > qemu-system-riscv64 -kernel vmlinux -M sbsa-ref > > But that requirement is not machine specific. I would not call "qemu-system-* -M machinename -k kernel_image" a proper way to boot for several systems emulated by QEMU. DeviceTree is in rvsp-ref and sbsa-ref because it is easy to process in limited space 1st stage of firmware has. And if we knew how people will mention 'sbsa-ref uses DT' we would use something else instead. But that would require adding more code into existing firmware projects (libfdt is usually already there). I did not looked at DT generated for rvsp-ref. I know that sbsa-ref one is too minimalistic for kernel use as we added only those fields/nodes we need to provide data for firmware.
Re: [RFC v2 2/2] hw/riscv: Add server platform reference machine
On 3/22/24 08:14, Marcin Juszkiewicz wrote: W dniu 22.03.2024 o 05:55, Alistair Francis pisze: I see no mention of device trees in the spec, but I do see ACPI. Do we really expect a server platform to use DTs? This platform "kind of" follows sbsa-ref where we have very minimalistic device tree sharing information qemu->firmware. libfdt is small, format is known and describes hardware. Firmware is free to make use of it in any way it wants. On sbsa-ref we parse DT in TF-A (base firmware) and provide hardware information to higher level (edk2) via SMC mechanism. Then EDK2 creates ACPI tables and provide them to the Operating System. We should ensure that only either an ACPI table or a device-tree description is passed to the OS and not both, e.g. when using qemu-system-riscv64 -kernel vmlinux -M sbsa-ref But that requirement is not machine specific. Best regards Heinrich In physical system some parts of information provided in DT would be read by firmware from onboard Embedded Controller chip. These functions should be shared with the virt machine if we really do want DTs, but I'm not convinced we do
Re: [RFC v2 2/2] hw/riscv: Add server platform reference machine
W dniu 22.03.2024 o 05:55, Alistair Francis pisze: I see no mention of device trees in the spec, but I do see ACPI. Do we really expect a server platform to use DTs? This platform "kind of" follows sbsa-ref where we have very minimalistic device tree sharing information qemu->firmware. libfdt is small, format is known and describes hardware. Firmware is free to make use of it in any way it wants. On sbsa-ref we parse DT in TF-A (base firmware) and provide hardware information to higher level (edk2) via SMC mechanism. Then EDK2 creates ACPI tables and provide them to the Operating System. In physical system some parts of information provided in DT would be read by firmware from onboard Embedded Controller chip. These functions should be shared with the virt machine if we really do want DTs, but I'm not convinced we do
Re: [RFC v2 2/2] hw/riscv: Add server platform reference machine
On Tue, Mar 12, 2024 at 11:55 PM Fei Wu wrote:
>
> The RISC-V Server Platform specification[1] defines a standardized set
> of hardware and software capabilities, that portable system software,
> such as OS and hypervisors can rely on being present in a RISC-V server
> platform.
>
> A corresponding Qemu RISC-V server platform reference (rvsp-ref for
> short) machine type is added to provide a environment for firmware/OS
> development and testing. The main features included in rvsp-ref are:
>
> - Based on riscv virt machine type
> - A new memory map as close as virt machine as possible
> - A new virt CPU type rvsp-ref-cpu for server platform compliance
> - AIA
> - PCIe AHCI
> - PCIe NIC
> - No virtio device
> - No fw_cfg device
> - No ACPI table provided
> - Only minimal device tree nodes
>
> [1] https://github.com/riscv-non-isa/riscv-server-platform
>
> Signed-off-by: Fei Wu
> ---
> configs/devices/riscv64-softmmu/default.mak |1 +
> hw/riscv/Kconfig| 12 +
> hw/riscv/meson.build|1 +
> hw/riscv/server_platform_ref.c | 1276 +++
> 4 files changed, 1290 insertions(+)
> create mode 100644 hw/riscv/server_platform_ref.c
>
> diff --git a/configs/devices/riscv64-softmmu/default.mak
> b/configs/devices/riscv64-softmmu/default.mak
> index 3f68059448..a1d98e49ef 100644
> --- a/configs/devices/riscv64-softmmu/default.mak
> +++ b/configs/devices/riscv64-softmmu/default.mak
> @@ -10,5 +10,6 @@ CONFIG_SPIKE=y
> CONFIG_SIFIVE_E=y
> CONFIG_SIFIVE_U=y
> CONFIG_RISCV_VIRT=y
> +CONFIG_SERVER_PLATFORM_REF=y
> CONFIG_MICROCHIP_PFSOC=y
> CONFIG_SHAKTI_C=y
> diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
> index 5d644eb7b1..5674589e66 100644
> --- a/hw/riscv/Kconfig
> +++ b/hw/riscv/Kconfig
> @@ -48,6 +48,18 @@ config RISCV_VIRT
> select ACPI
> select ACPI_PCI
>
> +config SERVER_PLATFORM_REF
> +bool
> +select RISCV_NUMA
> +select GOLDFISH_RTC
> +select PCI
> +select PCI_EXPRESS_GENERIC_BRIDGE
> +select PFLASH_CFI01
> +select SERIAL
> +select RISCV_ACLINT
> +select RISCV_APLIC
> +select RISCV_IMSIC
> +
> config SHAKTI_C
> bool
> select RISCV_ACLINT
> diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build
> index 2f7ee81be3..bb3aff91ea 100644
> --- a/hw/riscv/meson.build
> +++ b/hw/riscv/meson.build
> @@ -4,6 +4,7 @@ riscv_ss.add(when: 'CONFIG_RISCV_NUMA', if_true:
> files('numa.c'))
> riscv_ss.add(files('riscv_hart.c'))
> riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c'))
> riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c'))
> +riscv_ss.add(when: 'CONFIG_SERVER_PLATFORM_REF', if_true:
> files('server_platform_ref.c'))
> riscv_ss.add(when: 'CONFIG_SHAKTI_C', if_true: files('shakti_c.c'))
> riscv_ss.add(when: 'CONFIG_SIFIVE_E', if_true: files('sifive_e.c'))
> riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u.c'))
> diff --git a/hw/riscv/server_platform_ref.c b/hw/riscv/server_platform_ref.c
> new file mode 100644
> index 00..b552650265
> --- /dev/null
> +++ b/hw/riscv/server_platform_ref.c
> @@ -0,0 +1,1276 @@
> +/*
> + * QEMU RISC-V Server Platform (RVSP) Reference Board
> + *
> + * Copyright (c) 2024 Intel, Inc.
> + *
> + * This board is compliant RISC-V Server platform specification and
> leveraging
> + * a lot of riscv virt code.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2 or later, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope 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
