[PATCH] platform: Drop qemu/sifive_u support

Bin Meng bmeng.cn at gmail.com
Wed Aug 7 08:58:07 PDT 2019


With recent QEMU RISC-V changes to improve the emulation fidelity
of 'sifive_u' machine, OpenSBI v0.4 / U-Boot v2019.10-rc1 / Linux
kernel v5.3-rc2 images built for the SiFive HiFive Unleashed board
can be used out of the box without any special hack. Hence there
is no need for us to continue supporting such a special target in
OpenSBI. Going forward, sifive/fu540 platform can be used on both
real hardware and QEMU 'sifive_u' machine.

Signed-off-by: Bin Meng <bmeng.cn at gmail.com>

---
See QEMU patch series:
http://patchwork.ozlabs.org/project/qemu-devel/list/?series=123725

This patch should be applied after QEMU patch series is merged.

 docs/firmware/fw_jump.md          |   7 +-
 docs/firmware/fw_payload.md       |   7 +-
 docs/platform/platform.md         |  10 +--
 docs/platform/qemu_sifive_u.md    |  52 -------------
 platform/qemu/sifive_u/config.mk  |  40 ----------
 platform/qemu/sifive_u/objects.mk |  10 ---
 platform/qemu/sifive_u/platform.c | 159 --------------------------------------
 scripts/create-binary-archive.sh  |   2 -
 8 files changed, 8 insertions(+), 279 deletions(-)
 delete mode 100644 docs/platform/qemu_sifive_u.md
 delete mode 100644 platform/qemu/sifive_u/config.mk
 delete mode 100644 platform/qemu/sifive_u/objects.mk
 delete mode 100644 platform/qemu/sifive_u/platform.c

diff --git a/docs/firmware/fw_jump.md b/docs/firmware/fw_jump.md
index 7fdeeb4..5e8a937 100644
--- a/docs/firmware/fw_jump.md
+++ b/docs/firmware/fw_jump.md
@@ -44,9 +44,8 @@ follows:
 *FW_JUMP* Example
 -----------------
 
-The *[qemu/virt]* and *[qemu/sifive_u]* platforms illustrate how to configure
-and use a *FW_JUMP* firmware. Detailed information regarding these platforms
-can be found in the platform documentation files.
+The *[qemu/virt]* platform illustrates how to configure and use a *FW_JUMP*
+firmware. Detailed information regarding these platforms can be found in the
+platform documentation files.
 
 [qemu/virt]: ../platform/qemu_virt.md
-[qemu/sifive_u]: ../platform/qemu_sifive_u.md
diff --git a/docs/firmware/fw_payload.md b/docs/firmware/fw_payload.md
index c9a9ad8..78204d8 100644
--- a/docs/firmware/fw_payload.md
+++ b/docs/firmware/fw_payload.md
@@ -78,12 +78,11 @@ file. The parameters currently defined are as follows:
 *FW_PAYLOAD* Example
 --------------------
 
-The *[qemu/virt]* and *[qemu/sifive_u]* platforms illustrate how to configure
-and use a *FW_PAYLOAD* firmware. Detailed information regarding these platforms
-can be found in the platform documentation files.
+The *[qemu/virt]* platforms illustrate how to configure and use a *FW_PAYLOAD*
+firmware. Detailed information regarding these platforms can be found in the
+platform documentation files.
 
 The *kendryte/k210* platform also enables a build of a *FW_PAYLOAD* using an
 internally defined device tree file (*FW_PAYLOAD_FDT*).
 
 [qemu/virt]: ../platform/qemu_virt.md
-[qemu/sifive_u]: ../platform/qemu_sifive_u.md
diff --git a/docs/platform/platform.md b/docs/platform/platform.md
index 49fa3e9..79b6fed 100644
--- a/docs/platform/platform.md
+++ b/docs/platform/platform.md
@@ -8,14 +8,9 @@ OpenSBI currently supports the following virtual and hardware platforms:
   development and tests. More details on this platform can be found in the
   file *[qemu_virt.md]*.
 
-* **QEMU SiFive Unleashed Machine**: Platform support for the *sifive_u* QEMU
-  virtual RISC-V machine. This is an emulation machine of the HiFive Unleashed
-  board by SiFive. More details on this platform can be found in the file
-  *[qemu_sifive_u.md]*.
-
 * **SiFive FU540 SoC**: Platform support for SiFive FU540 SoC used on the
-  HiFive Unleashed board. This platform is very similar to the *QEMU sifive_u*
-  platform. More details on this platform can be found in the file
+  HiFive Unleashed board, as well as the *sifive_u* QEMU virtual RISC-V
+  machine. More details on this platform can be found in the file
   *[sifive_fu540.md]*.
 
 * **Kendryte K210 SoC**: Platform support for the Kendryte K210 SoC used on
@@ -31,6 +26,5 @@ template files for implementing support for a new platform. The *object.mk*,
 facilitate the implementation.
 
 [qemu_virt.md]: qemu_virt.md
-[qemu_sifive_u.md]: qemu_sifive_u.md
 [sifive_fu540.md]: sifive_fu540.md
 [ariane-fpga.md]: ariane-fpga.md
diff --git a/docs/platform/qemu_sifive_u.md b/docs/platform/qemu_sifive_u.md
deleted file mode 100644
index 48b30e4..0000000
--- a/docs/platform/qemu_sifive_u.md
+++ /dev/null
@@ -1,52 +0,0 @@
-QEMU SiFive Unleashed Machine Platform
-======================================
-
-The **QEMU SiFive Unleashed Machine** is an emulation of the SiFive Unleashed
-platform.
-
-To build this platform specific library and firmwares, provide the
-*PLATFORM=qemu/sifive_u* parameter to the top level `make` command line.
-
-Platform Options
-----------------
-
-The *QEMU SiFive Unleashed Machine* platform does not have any platform specific
-options.
-
-Executing on QEMU RISC-V 64-bit
--------------------------------
-
-**No Payload Case**
-
-Build:
-```
-make PLATFORM=qemu/sifive_u
-```
-
-Run:
-```
-qemu-system-riscv64 -M sifive_u -m 256M -display none -serial stdio \
-	-kernel build/platform/qemu/sifive_u/firmware/fw_payload.elf
-```
-
-**U-Boot as a Payload**
-
-Note: the command line examples here assume that U-Boot was compiled using
-the `sifive_fu540_defconfig` configuration.
-
-Build:
-```
-make PLATFORM=qemu/sifive_u FW_PAYLOAD_PATH=<uboot_build_directory>/u-boot.bin
-```
-
-Run:
-```
-qemu-system-riscv64 -M sifive_u -m 256M -display none -serial stdio \
-	-kernel build/platform/qemu/sifive_u/firmware/fw_payload.elf
-```
-or
-```
-qemu-system-riscv64 -M sifive_u -m 256M -display none -serial stdio \
-	-kernel build/platform/qemu/sifive_u/firmware/fw_jump.elf \
-	-device loader,file=<uboot_build_directory>/u-boot.bin,addr=0x80200000
-```
diff --git a/platform/qemu/sifive_u/config.mk b/platform/qemu/sifive_u/config.mk
deleted file mode 100644
index f66a555..0000000
--- a/platform/qemu/sifive_u/config.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# SPDX-License-Identifier: BSD-2-Clause
-#
-# Copyright (c) 2019 Western Digital Corporation or its affiliates.
-#
-# Authors:
-#   Anup Patel <anup.patel at wdc.com>
-#
-
-# Compiler flags
-platform-cppflags-y =
-platform-cflags-y =
-platform-asflags-y =
-platform-ldflags-y =
-
-# Command for platform specific "make run"
-platform-runcmd = qemu-system-riscv$(PLATFORM_RISCV_XLEN) -M sifive_u -m 256M \
-  -nographic -kernel $(build_dir)/platform/qemu/sifive_u/firmware/fw_payload.elf
-
-# Blobs to build
-FW_TEXT_START=0x80000000
-FW_DYNAMIC=y
-FW_JUMP=y
-ifeq ($(PLATFORM_RISCV_XLEN), 32)
-  # This needs to be 4MB alligned for 32-bit system
-  FW_JUMP_ADDR=0x80400000
-else
-  # This needs to be 2MB alligned for 64-bit system
-  FW_JUMP_ADDR=0x80200000
-endif
-FW_JUMP_FDT_ADDR=0x82200000
-FW_PAYLOAD=y
-ifeq ($(PLATFORM_RISCV_XLEN), 32)
-  # This needs to be 4MB alligned for 32-bit system
-  FW_PAYLOAD_OFFSET=0x400000
-else
-  # This needs to be 2MB alligned for 64-bit system
-  FW_PAYLOAD_OFFSET=0x200000
-endif
-FW_PAYLOAD_FDT_ADDR=0x82200000
diff --git a/platform/qemu/sifive_u/objects.mk b/platform/qemu/sifive_u/objects.mk
deleted file mode 100644
index c382cbf..0000000
--- a/platform/qemu/sifive_u/objects.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# SPDX-License-Identifier: BSD-2-Clause
-#
-# Copyright (c) 2019 Western Digital Corporation or its affiliates.
-#
-# Authors:
-#   Anup Patel <anup.patel at wdc.com>
-#
-
-platform-objs-y += platform.o
diff --git a/platform/qemu/sifive_u/platform.c b/platform/qemu/sifive_u/platform.c
deleted file mode 100644
index d8b586f..0000000
--- a/platform/qemu/sifive_u/platform.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2019 Western Digital Corporation or its affiliates.
- *
- * Authors:
- *   Anup Patel <anup.patel at wdc.com>
- */
-
-#include <sbi/riscv_encoding.h>
-#include <sbi/sbi_const.h>
-#include <sbi/sbi_hart.h>
-#include <sbi/sbi_platform.h>
-#include <sbi_utils/irqchip/plic.h>
-#include <sbi_utils/serial/sifive-uart.h>
-#include <sbi_utils/sys/clint.h>
-
-/* clang-format off */
-
-#define SIFIVE_U_HART_COUNT			4
-#define SIFIVE_U_HART_STACK_SIZE		8192
-
-#define SIFIVE_U_SYS_CLK			1000000000
-#define SIFIVE_U_PERIPH_CLK			(SIFIVE_U_SYS_CLK / 2)
-
-#define SIFIVE_U_CLINT_ADDR			0x2000000
-
-#define SIFIVE_U_PLIC_ADDR			0xc000000
-#define SIFIVE_U_PLIC_NUM_SOURCES		0x35
-#define SIFIVE_U_PLIC_NUM_PRIORITIES		7
-
-#define SIFIVE_U_UART0_ADDR			0x10013000
-#define SIFIVE_U_UART1_ADDR			0x10023000
-
-/* clang-format on */
-
-static int sifive_u_final_init(bool cold_boot)
-{
-	void *fdt;
-
-	if (!cold_boot)
-		return 0;
-
-	fdt = sbi_scratch_thishart_arg1_ptr();
-	plic_fdt_fixup(fdt, "riscv,plic0");
-
-	return 0;
-}
-
-static u32 sifive_u_pmp_region_count(u32 hartid)
-{
-	return 1;
-}
-
-static int sifive_u_pmp_region_info(u32 hartid, u32 index, ulong *prot,
-				    ulong *addr, ulong *log2size)
-{
-	int ret = 0;
-
-	switch (index) {
-	case 0:
-		*prot	  = PMP_R | PMP_W | PMP_X;
-		*addr	  = 0;
-		*log2size = __riscv_xlen;
-		break;
-	default:
-		ret = -1;
-		break;
-	};
-
-	return ret;
-}
-
-static int sifive_u_console_init(void)
-{
-	return sifive_uart_init(SIFIVE_U_UART0_ADDR, SIFIVE_U_PERIPH_CLK,
-				115200);
-}
-
-static int sifive_u_irqchip_init(bool cold_boot)
-{
-	int rc;
-	u32 hartid = sbi_current_hartid();
-
-	if (cold_boot) {
-		rc = plic_cold_irqchip_init(SIFIVE_U_PLIC_ADDR,
-					    SIFIVE_U_PLIC_NUM_SOURCES,
-					    SIFIVE_U_HART_COUNT);
-		if (rc)
-			return rc;
-	}
-
-	return plic_warm_irqchip_init(hartid, (2 * hartid), (2 * hartid + 1));
-}
-
-static int sifive_u_ipi_init(bool cold_boot)
-{
-	int rc;
-
-	if (cold_boot) {
-		rc = clint_cold_ipi_init(SIFIVE_U_CLINT_ADDR,
-					 SIFIVE_U_HART_COUNT);
-		if (rc)
-			return rc;
-	}
-
-	return clint_warm_ipi_init();
-}
-
-static int sifive_u_timer_init(bool cold_boot)
-{
-	int rc;
-
-	if (cold_boot) {
-		rc = clint_cold_timer_init(SIFIVE_U_CLINT_ADDR,
-					   SIFIVE_U_HART_COUNT);
-		if (rc)
-			return rc;
-	}
-
-	return clint_warm_timer_init();
-}
-
-static int sifive_u_system_down(u32 type)
-{
-	/* For now nothing to do. */
-	return 0;
-}
-
-const struct sbi_platform_operations platform_ops = {
-	.pmp_region_count	= sifive_u_pmp_region_count,
-	.pmp_region_info	= sifive_u_pmp_region_info,
-	.final_init		= sifive_u_final_init,
-	.console_putc		= sifive_uart_putc,
-	.console_getc		= sifive_uart_getc,
-	.console_init		= sifive_u_console_init,
-	.irqchip_init		= sifive_u_irqchip_init,
-	.ipi_send		= clint_ipi_send,
-	.ipi_sync		= clint_ipi_sync,
-	.ipi_clear		= clint_ipi_clear,
-	.ipi_init		= sifive_u_ipi_init,
-	.timer_value		= clint_timer_value,
-	.timer_event_stop	= clint_timer_event_stop,
-	.timer_event_start	= clint_timer_event_start,
-	.timer_init		= sifive_u_timer_init,
-	.system_reboot		= sifive_u_system_down,
-	.system_shutdown	= sifive_u_system_down
-};
-
-const struct sbi_platform platform = {
-	.opensbi_version	= OPENSBI_VERSION,
-	.platform_version	= SBI_PLATFORM_VERSION(0x0, 0x01),
-	.name			= "QEMU SiFive Unleashed",
-	.features		= SBI_PLATFORM_DEFAULT_FEATURES,
-	.hart_count		= SIFIVE_U_HART_COUNT,
-	.hart_stack_size	= SIFIVE_U_HART_STACK_SIZE,
-	.disabled_hart_mask	= 0,
-	.platform_ops_addr	= (unsigned long)&platform_ops
-};
diff --git a/scripts/create-binary-archive.sh b/scripts/create-binary-archive.sh
index 0a32709..5c72e8f 100755
--- a/scripts/create-binary-archive.sh
+++ b/scripts/create-binary-archive.sh
@@ -85,12 +85,10 @@ case "${BUILD_RISCV_XLEN}" in
 32)
 	# Setup 32-bit platform list
 	BUILD_PLATFORM_SUBDIR=("qemu/virt")
-	BUILD_PLATFORM_SUBDIR+=("qemu/sifive_u")
 	;;
 64)
 	# Setup 64-bit platform list
 	BUILD_PLATFORM_SUBDIR=("qemu/virt")
-	BUILD_PLATFORM_SUBDIR+=("qemu/sifive_u")
 	BUILD_PLATFORM_SUBDIR+=("sifive/fu540")
 	BUILD_PLATFORM_SUBDIR+=("kendryte/k210")
 	BUILD_PLATFORM_SUBDIR+=("ariane-fpga")
-- 
2.7.4




More information about the opensbi mailing list