Skip to contentSkip to conversation

riscv: Add QEMU virt board support

PATCH Superseded Bin Meng 3 participants 28 messages Sep 26, 2018 – Oct 4, 2018 1 message not in the archive RISC-V

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

v3 cover riscv: Add QEMU virt board support

This series adds QEMU RISC-V 'virt' board target support, with the hope of helping people easily test U-Boot on RISC-V.

Some existing RISC-V codes have been changed to make it easily to support new targets. Some spotted coding style issues are fixed.

This series is available at u-boot-x86/riscv-working for testing.

Changes in v3:
- net patch to print the relocation address in cmd 'bdinfo'
- new patch to imply DM support for some common drivers
- reword the reset message a little, and call hang() in the end

Changes in v2:
- Change Linux kernel entry parameters' type to support 32/64 bit
- new patch to remove CSR read/write defines in encoding.h
- new patch to pass mhartid CSR value to kernel
- new patch to move do_reset() to a common place

Bin Meng (17):
riscv: kconfig: Normalize architecture name spelling
riscv: Remove setup.h
riscv: bootm: Correct the 1st kernel argument to hart id
riscv: Remove mach type
riscv: cmd: bdinfo: Print the relocation address
riscv: Move the linker script to the CPU root directory
riscv: Fix coding style issues in the linker script
riscv: Explicitly pass -march and -mabi to the compiler
riscv: Add a helper routine to print CPU information
riscv: Remove CSR read/write defines in encoding.h
riscv: bootm: Pass mhartid CSR value to kernel
riscv: Make start.S available for all targets
riscv: ae350: Clean up mixed tabs and spaces in the dts
riscv: kconfig: Select DM and OF_CONTROL
riscv: kconfig: Imply DM support for some common drivers
riscv: Add QEMU virt board support
riscv: Move do_reset() to a common place

 arch/Kconfig                            |  14 ++-
 arch/riscv/Kconfig                      |  10 +-
 arch/riscv/Makefile                     |   3 +-
 arch/riscv/config.mk                    |   8 +-
 arch/riscv/cpu/Makefile                 |   7 ++
 arch/riscv/cpu/ax25/Makefile            |   2 -
 arch/riscv/cpu/ax25/cpu.c               |   9 --
 arch/riscv/cpu/cpu.c                    |  49 ++++++++
 arch/riscv/cpu/qemu/Makefile            |   6 +
 arch/riscv/cpu/qemu/cpu.c               |  21 ++++
 arch/riscv/cpu/qemu/dram.c              |  17 +++
 arch/riscv/cpu/{ax25 => }/start.S       |   0
 arch/riscv/cpu/{ax25 => }/u-boot.lds    |  60 +++++-----
 arch/riscv/dts/ae350.dts                | 177 +++++++++++++++--------------
 arch/riscv/include/asm/bootm.h          |  13 ---
 arch/riscv/include/asm/csr.h            | 124 ++++++++++++++++++++
 arch/riscv/include/asm/encoding.h       |  50 +-------
 arch/riscv/include/asm/mach-types.h     |  29 -----
 arch/riscv/include/asm/setup.h          | 194 --------------------------------
 arch/riscv/include/asm/u-boot.h         |   1 -
 arch/riscv/lib/Makefile                 |   1 +
 arch/riscv/lib/bootm.c                  |  20 +---
 arch/riscv/lib/reset.c                  |  17 +++
 board/AndesTech/ax25-ae350/ax25-ae350.c |   2 -
 board/emulation/qemu-riscv/Kconfig      |  22 ++++
 board/emulation/qemu-riscv/MAINTAINERS  |   7 ++
 board/emulation/qemu-riscv/Makefile     |   5 +
 board/emulation/qemu-riscv/qemu-riscv.c |  23 ++++
 cmd/bdinfo.c                            |   3 +-
 configs/ax25-ae350_defconfig            |  10 --
 configs/qemu-riscv32_defconfig          |   6 +
 configs/qemu-riscv64_defconfig          |   7 ++
 doc/README.qemu-riscv                   |  46 ++++++++
 include/configs/qemu-riscv.h            |  21 ++++
 34 files changed, 538 insertions(+), 446 deletions(-)
 create mode 100644 arch/riscv/cpu/Makefile
 create mode 100644 arch/riscv/cpu/cpu.c
 create mode 100644 arch/riscv/cpu/qemu/Makefile
 create mode 100644 arch/riscv/cpu/qemu/cpu.c
 create mode 100644 arch/riscv/cpu/qemu/dram.c
 rename arch/riscv/cpu/{ax25 => }/start.S (100%)
 rename arch/riscv/cpu/{ax25 => }/u-boot.lds (54%)
 delete mode 100644 arch/riscv/include/asm/bootm.h
 create mode 100644 arch/riscv/include/asm/csr.h
 delete mode 100644 arch/riscv/include/asm/mach-types.h
 delete mode 100644 arch/riscv/include/asm/setup.h
 create mode 100644 arch/riscv/lib/reset.c
 create mode 100644 board/emulation/qemu-riscv/Kconfig
 create mode 100644 board/emulation/qemu-riscv/MAINTAINERS
 create mode 100644 board/emulation/qemu-riscv/Makefile
 create mode 100644 board/emulation/qemu-riscv/qemu-riscv.c
 create mode 100644 configs/qemu-riscv32_defconfig
 create mode 100644 configs/qemu-riscv64_defconfig
 create mode 100644 doc/README.qemu-riscv
 create mode 100644 include/configs/qemu-riscv.h
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v3 1/17 riscv: kconfig: Normalize architecture name spelling

It's RISC-V that is the official name, not RISCV.

---

Changes in v3: None
Changes in v2: None

 arch/Kconfig       | 2 +-
 arch/riscv/Kconfig | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/Kconfig +1 -1
index 11900b0..cd424fd 100644
@@ -60,7 +60,7 @@ config PPC
 	select SYS_BOOT_GET_KBD
 
 config RISCV
-	bool "riscv architecture"
+	bool "RISC-V architecture"
 	select SUPPORT_OF_CONTROL
 
 config SANDBOX
arch/riscv/Kconfig +3 -3
index 20a43d8..49f87de 100644
@@ -1,4 +1,4 @@
-menu "RISCV architecture"
+menu "RISC-V architecture"
 	depends on RISCV
 
 config SYS_ARCH
@@ -20,13 +20,13 @@ choice
 	default CPU_RISCV_32
 
 config CPU_RISCV_32
-	bool "RISCV 32 bit"
+	bool "RISC-V 32-bit"
 	select 32BIT
 	help
 	  Choose this option to build an U-Boot for RISCV32 architecture.
 
 config CPU_RISCV_64
-	bool "RISCV 64 bit"
+	bool "RISC-V 64-bit"
 	select 64BIT
 	help
 	  Choose this option to build an U-Boot for RISCV64 architecture.
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH v3 2/17 riscv: Remove setup.h

In reply to Bin Meng

This was copied from ARM, and does not apply to RISC-V. While we are here, bootm.h is eventually removed as its content is only the inclusion of setup.h.

---

Changes in v3: None
Changes in v2: None

 arch/riscv/include/asm/bootm.h |  13 ---
 arch/riscv/include/asm/setup.h | 194 -----------------------------------------
 arch/riscv/lib/bootm.c         |   1 -
 3 files changed, 208 deletions(-)
 delete mode 100644 arch/riscv/include/asm/bootm.h
 delete mode 100644 arch/riscv/include/asm/setup.h
arch/riscv/include/asm/bootm.h deleted +0 -13
deleted file mode 100644
index 6786345..0000000
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) 2013, Google Inc.
- *
- * Copyright (C) 2011
- * Corscience GmbH & Co. KG - Simon Schwarz <[email protected]>
- */
-#ifndef NDS32_BOOTM_H
-#define NDS32_BOOTM_H
-
-#include <asm/setup.h>
-
-#endif
arch/riscv/include/asm/setup.h deleted +0 -194

194 lines not on this page · raw message

arch/riscv/lib/bootm.c +0 -1
index 2610a57..6662aff 100644
@@ -11,7 +11,6 @@
 #include <image.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
-#include <asm/bootm.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
Signature · 1 line
2.7.4
author
#3 lore raw

PATCH v3 3/17 riscv: bootm: Correct the 1st kernel argument to hart id

In reply to Bin Meng

The first argument of Linux kernel is the risc-v core hart id, from which the kernel is booted from. It is not the mach_id, which seems to be copied from arm.

While we are here, this also changes the Linux kernel entry parameters' type to support both 32-bit and 64-bit.

Note the hart id is hardcoded to zero for now, and we should change to fill in it with the value read from mhartid CSR of the hart which this routine is currently running on.

---

Changes in v3: None
Changes in v2:
- Change Linux kernel entry parameters' type to support 32/64 bit

 arch/riscv/lib/bootm.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)
arch/riscv/lib/bootm.c +5 -13
index 6662aff..6893108 100644
@@ -25,10 +25,7 @@ int arch_fixup_fdt(void *blob)
 
 int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
-	bd_t	*bd = gd->bd;
-	char	*s;
-	int	machid = bd->bi_arch_number;
-	void	(*theKernel)(int arch, uint params);
+	void	(*kernel)(ulong hart, void *dtb);
 
 	/*
 	 * allow the PREP bootm subcommand, it is required for bootm to work
@@ -39,18 +36,12 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 	if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
 		return 1;
 
-	theKernel = (void (*)(int, uint))images->ep;
-
-	s = env_get("machid");
-	if (s) {
-		machid = simple_strtoul(s, NULL, 16);
-		printf("Using machid 0x%x from environment\n", machid);
-	}
+	kernel = (void (*)(ulong, void *))images->ep;
 
 	bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
 	debug("## Transferring control to Linux (at address %08lx) ...\n",
-	       (ulong)theKernel);
+	       (ulong)kernel);
 
 	if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len) {
 #ifdef CONFIG_OF_LIBFDT
@@ -66,8 +57,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 	printf("\nStarting kernel ...\n\n");
 
 	cleanup_before_linux();
+	/* TODO: hardcode the hart id to zero for now */
 	if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len)
-		theKernel(machid, (unsigned long)images->ft_addr);
+		kernel(0, images->ft_addr);
 
 	/* does not return */
 
Signature · 1 line
2.7.4
author
#4 lore raw

PATCH v3 4/17 riscv: Remove mach type

In reply to Bin Meng

Since the mach_id is not used by RISC-V, remove it.

---

Changes in v3: None
Changes in v2: None

 arch/riscv/include/asm/mach-types.h     | 29 -----------------------------
 arch/riscv/include/asm/u-boot.h         |  1 -
 board/AndesTech/ax25-ae350/ax25-ae350.c |  2 --
 cmd/bdinfo.c                            |  1 -
 4 files changed, 33 deletions(-)
 delete mode 100644 arch/riscv/include/asm/mach-types.h
arch/riscv/include/asm/mach-types.h deleted +0 -29
deleted file mode 100644
index f219ced..0000000
@@ -1,29 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2017 Andes Technology Corporation
- * Rick Chen, Andes Technology Corporation <[email protected]>
- */
-
-#ifndef __ASM_RISCV_MACH_TYPE_H
-#define __ASM_RISCV_MACH_TYPE_H
-
-#ifndef __ASSEMBLY__
-/* The type of machine we're running on */
-extern unsigned int __machine_arch_type;
-#endif
-
-#define MACH_TYPE_AE350		1
-
-#ifdef CONFIG_ARCH_AE350
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type __machine_arch_type
-# else
-#  define machine_arch_type MACH_TYPE_AE350
-# endif
-# define machine_is_ae350() (machine_arch_type == MACH_TYPE_AE350)
-#else
-# define machine_is_ae350() (1)
-#endif
-
-#endif /* __ASM_RISCV_MACH_TYPE_H */
arch/riscv/include/asm/u-boot.h +0 -1
index 9e5b32d..3186835 100644
@@ -23,7 +23,6 @@
 #include <environment.h>
 
 typedef struct bd_info {
-	unsigned long	bi_arch_number;	/* unique id for this board */
 	unsigned long	bi_boot_params;	/* where this board expects params */
 	unsigned long	bi_memstart;	/* start of DRAM memory */
 	unsigned long	bi_memsize;	/* size	 of DRAM memory in bytes */
board/AndesTech/ax25-ae350/ax25-ae350.c +0 -2
index fd5aaa1..5f4ca0f 100644
@@ -4,7 +4,6 @@
  * Rick Chen, Andes Technology Corporation <[email protected]>
  */
 
-#include <asm/mach-types.h>
 #include <common.h>
 #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH)
 #include <netdev.h>
@@ -21,7 +20,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-	gd->bd->bi_arch_number = MACH_TYPE_AE350;
 	gd->bd->bi_boot_params = PHYS_SDRAM_0 + 0x400;
 
 	return 0;
cmd/bdinfo.c +0 -1
index 397dd15..bc440e4 100644
@@ -424,7 +424,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	bd_t *bd = gd->bd;
 
-	print_num("arch_number", bd->bi_arch_number);
 	print_bi_boot_params(bd);
 	print_bi_dram(bd);
 	print_eth_ip_addr();
Signature · 1 line
2.7.4
author
#5 lore raw

PATCH v3 5/17 riscv: cmd: bdinfo: Print the relocation address

In reply to Bin Meng

Add printing of U-Boot relocation address.

---

Changes in v3:
- net patch to print the relocation address in cmd 'bdinfo'

Changes in v2: None

 cmd/bdinfo.c | 2 ++
 1 file changed, 2 insertions(+)
cmd/bdinfo.c +2 -0
index bc440e4..60b4387 100644
@@ -426,6 +426,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	print_bi_boot_params(bd);
 	print_bi_dram(bd);
+	print_num("relocaddr", gd->relocaddr);
+	print_num("reloc off", gd->reloc_off);
 	print_eth_ip_addr();
 	print_baudrate();
 
Signature · 1 line
2.7.4
#6 lore raw

PATCH v3 5/17 riscv: cmd: bdinfo: Print the relocation address

Quoted 6 lines · Bin Meng

Add printing of U-Boot relocation address.

---

Quoted 9 lines

Changes in v3:
- net patch to print the relocation address in cmd 'bdinfo'

Changes in v2: None

 cmd/bdinfo.c | 2 ++
 1 file changed, 2 insertions(+)
author
#7 lore raw

PATCH v3 6/17 riscv: Move the linker script to the CPU root directory

In reply to Bin Meng

The linker script can be shared by all RISC-V targets. Move it to a common place.

---

Changes in v3: None
Changes in v2: None

 arch/riscv/cpu/{ax25 => }/u-boot.lds | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename arch/riscv/cpu/{ax25 => }/u-boot.lds (100%)
arch/riscv/cpu/u-boot.lds renamed from arch/riscv/cpu/ax25/u-boot.lds +0 -0
similarity index 100%
rename from arch/riscv/cpu/ax25/u-boot.lds
rename to arch/riscv/cpu/u-boot.lds
Signature · 1 line
2.7.4
author
#8 lore raw

PATCH v3 7/17 riscv: Fix coding style issues in the linker script

In reply to Bin Meng

There are several coding style issues in the linker script. Fix them.

---

Changes in v3: None
Changes in v2: None

 arch/riscv/cpu/u-boot.lds | 58 +++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 30 deletions(-)
arch/riscv/cpu/u-boot.lds +28 -30
index c50b964..f414473 100644
@@ -3,28 +3,27 @@
  * Copyright (C) 2017 Andes Technology Corporation
  * Rick Chen, Andes Technology Corporation <[email protected]>
  */
+
 OUTPUT_ARCH("riscv")
 ENTRY(_start)
 
 SECTIONS
 {
 	. = ALIGN(4);
-	.text :
-	{
+	.text : {
 		arch/riscv/cpu/ax25/start.o	(.text)
 	}
 
 	/* This needs to come before *(.text*) */
 	.efi_runtime : {
-                __efi_runtime_start = .;
+		__efi_runtime_start = .;
 		*(.text.efi_runtime*)
 		*(.rodata.efi_runtime*)
 		*(.data.efi_runtime*)
-                __efi_runtime_stop = .;
+		__efi_runtime_stop = .;
 	}
 
-	.text_rest :
-	{
+	.text_rest : {
 		*(.text*)
 	}
 
@@ -39,10 +38,10 @@ SECTIONS
 	. = ALIGN(4);
 
 	.got : {
-	   __got_start = .;
-	   *(.got.plt) *(.got)
-	   __got_end = .;
-    }
+		__got_start = .;
+		*(.got.plt) *(.got)
+		__got_end = .;
+	}
 
 	. = ALIGN(4);
 
@@ -50,41 +49,40 @@ SECTIONS
 		KEEP(*(SORT(.u_boot_list*)));
 	}
 
-    . = ALIGN(4);
+	. = ALIGN(4);
 
 	.efi_runtime_rel : {
-                __efi_runtime_rel_start = .;
+		__efi_runtime_rel_start = .;
 		*(.rel*.efi_runtime)
 		*(.rel*.efi_runtime.*)
-                __efi_runtime_rel_stop = .;
+		__efi_runtime_rel_stop = .;
 	}
 
-    . = ALIGN(4);
+	. = ALIGN(4);
 
-    /DISCARD/ : { *(.rela.plt*) }
-    .rela.dyn : {
-        __rel_dyn_start = .;
-        *(.rela*)
-        __rel_dyn_end = .;
-    }
+	/DISCARD/ : { *(.rela.plt*) }
+	.rela.dyn : {
+		__rel_dyn_start = .;
+		*(.rela*)
+		__rel_dyn_end = .;
+	}
 
-    . = ALIGN(4);
+	. = ALIGN(4);
 
-    .dynsym : {
-        __dyn_sym_start = .;
-        *(.dynsym)
-        __dyn_sym_end = .;
-    }
+	.dynsym : {
+		__dyn_sym_start = .;
+		*(.dynsym)
+		__dyn_sym_end = .;
+	}
 
-    . = ALIGN(4);
+	. = ALIGN(4);
 
 	_end = .;
 
 	.bss : {
-        __bss_start = .;
-        *(.bss*)
+		__bss_start = .;
+		*(.bss*)
 		. = ALIGN(4);
 		__bss_end = .;
 	}
-
 }
Signature · 1 line
2.7.4
author
#9 lore raw

PATCH v3 8/17 riscv: Explicitly pass -march and -mabi to the compiler

In reply to Bin Meng

At present the compiler flag against which architecture and abi variant the riscv image is built for is not explicitly indicated which means the default compiler configuration is used. But this does not work if we want to build a different target (eg: 32-bit riscv images using a toolchain configured for 64-bit riscv).

Fix this by explicitly passing -march and -mabi to the compiler. Since generically we don't use floating point in U-Boot, specify the RV[32|64]IMA ISA and software floating ABI.

This also fix some alignment coding style issues.

---

Changes in v3: None
Changes in v2: None

 arch/riscv/config.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
arch/riscv/config.mk +6 -2
index c0b3858..b235ae1 100644
@@ -18,12 +18,16 @@ endif
 64bit-emul		:= elf64lriscv
 
 ifdef CONFIG_32BIT
+PLATFORM_CPPFLAGS	+= -march=rv32ima -mabi=ilp32
 PLATFORM_LDFLAGS	+= -m $(32bit-emul)
+CFLAGS_EFI		+= -march=rv32ima -mabi=ilp32
 EFI_LDS			:= elf_riscv32_efi.lds
 endif
 
 ifdef CONFIG_64BIT
+PLATFORM_CPPFLAGS	+= -march=rv64ima -mabi=lp64
 PLATFORM_LDFLAGS	+= -m $(64bit-emul)
+CFLAGS_EFI		+= -march=rv64ima -mabi=lp64
 EFI_LDS			:= elf_riscv64_efi.lds
 endif
 
@@ -31,8 +35,8 @@ CONFIG_STANDALONE_LOAD_ADDR = 0x00000000 \
 			      -T $(srctree)/examples/standalone/riscv.lds
 
 PLATFORM_CPPFLAGS	+= -ffixed-gp -fpic
-PLATFORM_RELFLAGS += -fno-common -gdwarf-2 -ffunction-sections
-LDFLAGS_u-boot += --gc-sections -static -pie
+PLATFORM_RELFLAGS	+= -fno-common -gdwarf-2 -ffunction-sections
+LDFLAGS_u-boot		+= --gc-sections -static -pie
 
 EFI_CRT0		:= crt0_riscv_efi.o
 EFI_RELOC		:= reloc_riscv_efi.o
Signature · 1 line
2.7.4
author
#10 lore raw

PATCH v3 9/17 riscv: Add a helper routine to print CPU information

In reply to Bin Meng

This adds a helper routine to print CPU information. Currently it prints all the instruction set extensions that the processor core supports.

---

Changes in v3: None
Changes in v2: None

 arch/riscv/Makefile          |   1 +
 arch/riscv/cpu/Makefile      |   5 ++
 arch/riscv/cpu/cpu.c         |  49 +++++++++++++++++
 arch/riscv/include/asm/csr.h | 124 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 179 insertions(+)
 create mode 100644 arch/riscv/cpu/Makefile
 create mode 100644 arch/riscv/cpu/cpu.c
 create mode 100644 arch/riscv/include/asm/csr.h
arch/riscv/Makefile +1 -0
index 084888a..af432e1 100644
@@ -5,5 +5,6 @@
 
 head-y := arch/riscv/cpu/$(CPU)/start.o
 
+libs-y += arch/riscv/cpu/
 libs-y += arch/riscv/cpu/$(CPU)/
 libs-y += arch/riscv/lib/
arch/riscv/cpu/Makefile new file +5 -0
new file mode 100644
index 0000000..63de163
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2018, Bin Meng <[email protected]>
+
+obj-y += cpu.o
arch/riscv/cpu/cpu.c new file +49 -0

49 lines not on this page · raw message

arch/riscv/include/asm/csr.h new file +124 -0

124 lines not on this page · raw message

Signature · 1 line
2.7.4
author
#11 lore raw

PATCH v3 10/17 riscv: Remove CSR read/write defines in encoding.h

In reply to Bin Meng

There is no reason to keep two versions of CSR read/write defines in encoding.h. We already have one set of defines in csr.h, which is from Linux kernel, and let's drop the one in encoding.h.

---

Changes in v3: None
Changes in v2:
- new patch to remove CSR read/write defines in encoding.h

 arch/riscv/include/asm/encoding.h | 50 ++++-----------------------------------
 1 file changed, 4 insertions(+), 46 deletions(-)
arch/riscv/include/asm/encoding.h +4 -46
index f237a72..9ea50ce 100644
@@ -128,6 +128,7 @@
 	((SUPERVISOR) ? PTE_SR(PTE) : PTE_UR(PTE)))
 
 #ifdef __riscv
+
 #ifdef CONFIG_64BIT
 # define MSTATUS_SD MSTATUS64_SD
 # define SSTATUS_SD SSTATUS64_SD
@@ -141,53 +142,10 @@
 # define MCAUSE_INT MCAUSE32_INT
 # define MCAUSE_CAUSE MCAUSE32_CAUSE
 #endif
+
 #define RISCV_PGSHIFT 12
 #define RISCV_PGSIZE BIT(RISCV_PGSHIFT)
 
-#ifndef __ASSEMBLER__
-
-#ifdef __GNUC__
-
-#define read_csr(reg) ({ unsigned long __tmp; \
-	asm volatile ("csrr %0, " #reg : "=r"(__tmp)); \
-	__tmp; })
-
-#define write_csr(reg, _val) ({ \
-typeof(_val) (val) = (_val); \
-if (__builtin_constant_p(val) && (unsigned long)(val) < 32) \
-	asm volatile ("csrw " #reg ", %0" :: "i"(val)); \
-else \
-	asm volatile ("csrw " #reg ", %0" :: "r"(val)); })
-
-#define swap_csr(reg, _val) ({ unsigned long __tmp; \
-typeof(_val) (val) = (_val); \
-if (__builtin_constant_p(val) && (unsigned long)(val) < 32) \
-	asm volatile ("csrrw %0, " #reg ", %1" : "=r"(__tmp) : "i"(val)); \
-else \
-	asm volatile ("csrrw %0, " #reg ", %1" : "=r"(__tmp) : "r"(val)); \
-	__tmp; })
-
-#define set_csr(reg, _bit) ({ unsigned long __tmp; \
-typeof(_bit) (bit) = (_bit); \
-if (__builtin_constant_p(bit) && (unsigned long)(bit) < 32) \
-	asm volatile ("csrrs %0, " #reg ", %1" : "=r"(__tmp) : "i"(bit)); \
-else \
-	asm volatile ("csrrs %0, " #reg ", %1" : "=r"(__tmp) : "r"(bit)); \
-	__tmp; })
-
-#define clear_csr(reg, _bit) ({ unsigned long __tmp; \
-typeof(_bit) (bit) = (_bit); \
-if (__builtin_constant_p(bit) && (unsigned long)(bit) < 32) \
-	asm volatile ("csrrc %0, " #reg ", %1" : "=r"(__tmp) : "i"(bit)); \
-else \
-	asm volatile ("csrrc %0, " #reg ", %1" : "=r"(__tmp) : "r"(bit)); \
-	__tmp; })
-
-#define rdtime() read_csr(time)
-#define rdcycle() read_csr(cycle)
-#define rdinstret() read_csr(instret)
+#endif /* __riscv */
 
-#endif
-#endif
-#endif
-#endif
+#endif /* RISCV_CSR_ENCODING_H */
Signature · 1 line
2.7.4
author
#12 lore raw

PATCH v3 11/17 riscv: bootm: Pass mhartid CSR value to kernel

In reply to Bin Meng

So far this is hardcoded to zero, and we should read the value from mhartid CSR and pass it to Linux kernel.

---

Changes in v3: None
Changes in v2:
- new patch to pass mhartid CSR value to kernel

 arch/riscv/lib/bootm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/riscv/lib/bootm.c +3 -2
index 6893108..a7a9fb9 100644
@@ -11,6 +11,7 @@
 #include <image.h>
 #include <u-boot/zlib.h>
 #include <asm/byteorder.h>
+#include <asm/csr.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -57,9 +58,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 	printf("\nStarting kernel ...\n\n");
 
 	cleanup_before_linux();
-	/* TODO: hardcode the hart id to zero for now */
+
 	if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len)
-		kernel(0, images->ft_addr);
+		kernel(csr_read(mhartid), images->ft_addr);
 
 	/* does not return */
 
Signature · 1 line
2.7.4
author
#13 lore raw

PATCH v3 12/17 riscv: Make start.S available for all targets

In reply to Bin Meng

Currently start.S is inside arch/riscv/cpu/ax25/, but it can be common for all RISC-V targets.

---

Changes in v3: None
Changes in v2: None

 arch/riscv/Makefile               | 2 +-
 arch/riscv/cpu/Makefile           | 2 ++
 arch/riscv/cpu/ax25/Makefile      | 2 --
 arch/riscv/cpu/{ax25 => }/start.S | 0
 arch/riscv/cpu/u-boot.lds         | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename arch/riscv/cpu/{ax25 => }/start.S (100%)
arch/riscv/Makefile +1 -1
index af432e1..8fb6a88 100644
@@ -3,7 +3,7 @@
 # Copyright (C) 2017 Andes Technology Corporation.
 # Rick Chen, Andes Technology Corporation <[email protected]>
 
-head-y := arch/riscv/cpu/$(CPU)/start.o
+head-y := arch/riscv/cpu/start.o
 
 libs-y += arch/riscv/cpu/
 libs-y += arch/riscv/cpu/$(CPU)/
arch/riscv/cpu/Makefile +2 -0
index 63de163..2cc6757 100644
@@ -2,4 +2,6 @@
 #
 # Copyright (C) 2018, Bin Meng <[email protected]>
 
+extra-y = start.o
+
 obj-y += cpu.o
arch/riscv/cpu/ax25/Makefile +0 -2
index c3f164c..2ab0342 100644
@@ -3,6 +3,4 @@
 # Copyright (C) 2017 Andes Technology Corporation
 # Rick Chen, Andes Technology Corporation <[email protected]>
 
-extra-y	= start.o
-
 obj-y	:= cpu.o
arch/riscv/cpu/start.S renamed from arch/riscv/cpu/ax25/start.S +0 -0
similarity index 100%
rename from arch/riscv/cpu/ax25/start.S
rename to arch/riscv/cpu/start.S
arch/riscv/cpu/u-boot.lds +1 -1
index f414473..11bc4a7 100644
@@ -11,7 +11,7 @@ SECTIONS
 {
 	. = ALIGN(4);
 	.text : {
-		arch/riscv/cpu/ax25/start.o	(.text)
+		arch/riscv/cpu/start.o	(.text)
 	}
 
 	/* This needs to come before *(.text*) */
Signature · 1 line
2.7.4
author
#14 lore raw

PATCH v3 13/17 riscv: ae350: Clean up mixed tabs and spaces in the dts

In reply to Bin Meng

There are quite a lot of mixed tabs and spaces in the ae350.dts. Clean them up.

---

Changes in v3: None
Changes in v2: None

 arch/riscv/dts/ae350.dts | 177 ++++++++++++++++++++++++-----------------------
 1 file changed, 90 insertions(+), 87 deletions(-)
arch/riscv/dts/ae350.dts +90 -87
index 2927e41..4717ae8 100644
@@ -1,144 +1,147 @@
 /dts-v1/;
 
 / {
-  #address-cells = <2>;
-  #size-cells = <2>;
-  compatible = "andestech,ax25";
-  model = "andestech,ax25";
+	#address-cells = <2>;
+	#size-cells = <2>;
+	compatible = "andestech,ax25";
+	model = "andestech,ax25";
 
 	aliases {
 		uart0 = &serial0;
 		spi0 = &spi;
-	} ;
+	};
 
 	chosen {
 		bootargs = "console=ttyS0,38400n8 earlyprintk=uart8250-32bit,0xf0300000 debug loglevel=7";
 		stdout-path = "uart0:38400n8";
-  };
-
-  cpus {
-    #address-cells = <1>;
-    #size-cells = <0>;
-    timebase-frequency = <10000000>;
-    CPU0: cpu at 0 {
-      device_type = "cpu";
-      reg = <0>;
-      status = "okay";
-      compatible = "riscv";
-      riscv,isa = "rv64imafdc";
-      mmu-type = "riscv,sv39";
-      clock-frequency = <60000000>;
-      CPU0_intc: interrupt-controller {
-        #interrupt-cells = <1>;
-        interrupt-controller;
-        compatible = "riscv,cpu-intc";
-      };
-    };
+	};
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		timebase-frequency = <10000000>;
+
+		CPU0: cpu at 0 {
+			device_type = "cpu";
+			reg = <0>;
+			status = "okay";
+			compatible = "riscv";
+			riscv,isa = "rv64imafdc";
+			mmu-type = "riscv,sv39";
+			clock-frequency = <60000000>;
+
+			CPU0_intc: interrupt-controller {
+				#interrupt-cells = <1>;
+				interrupt-controller;
+				compatible = "riscv,cpu-intc";
+			};
+		};
 	};
 
 	memory at 0 {
 		device_type = "memory";
-    reg = <0x0 0x00000000 0x0 0x40000000>;
+		reg = <0x0 0x00000000 0x0 0x40000000>;
 	};
 
-  soc {
-    #address-cells = <2>;
-    #size-cells = <2>;
-    compatible = "andestech,riscv-ae350-soc";
-    ranges;
+	soc {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		compatible = "andestech,riscv-ae350-soc";
+		ranges;
 	};
 
-  plmt0 at e6000000 {
-    compatible = "riscv,plmt0";
-    interrupts-extended = <&CPU0_intc 7>;
-    reg = <0x0 0xe6000000 0x0 0x100000>;
-		};
+	plmt0 at e6000000 {
+		compatible = "riscv,plmt0";
+		interrupts-extended = <&CPU0_intc 7>;
+		reg = <0x0 0xe6000000 0x0 0x100000>;
+	};
 
-  plic0: interrupt-controller at e4000000 {
-    compatible = "riscv,plic0";
-    #address-cells = <2>;
-    #interrupt-cells = <2>;
-    interrupt-controller;
-    reg = <0x0 0xe4000000 0x0 0x2000000>;
-    riscv,ndev=<31>;
-    interrupts-extended = <&CPU0_intc 11 &CPU0_intc 9>;
+	plic0: interrupt-controller at e4000000 {
+		compatible = "riscv,plic0";
+		#address-cells = <2>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		reg = <0x0 0xe4000000 0x0 0x2000000>;
+		riscv,ndev=<31>;
+		interrupts-extended = <&CPU0_intc 11 &CPU0_intc 9>;
 	};
 
-  plic1: interrupt-controller at e6400000 {
-    compatible = "riscv,plic1";
-    #address-cells = <2>;
-    #interrupt-cells = <2>;
+	plic1: interrupt-controller at e6400000 {
+		compatible = "riscv,plic1";
+		#address-cells = <2>;
+		#interrupt-cells = <2>;
 		interrupt-controller;
-    reg = <0x0 0xe6400000 0x0 0x400000>;
-    riscv,ndev=<1>;
-    interrupts-extended = <&CPU0_intc 3>;
-  };
+		reg = <0x0 0xe6400000 0x0 0x400000>;
+		riscv,ndev=<1>;
+		interrupts-extended = <&CPU0_intc 3>;
+	};
 
-  spiclk: virt_100mhz {
-    #clock-cells = <0>;
-    compatible = "fixed-clock";
-    clock-frequency = <100000000>;
-  };
+	spiclk: virt_100mhz {
+		#clock-cells = <0>;
+		compatible = "fixed-clock";
+		clock-frequency = <100000000>;
+	};
 
-  timer0: timer at f0400000 {
-    compatible = "andestech,atcpit100";
-    reg = <0x0 0xf0400000 0x0 0x1000>;
-    clock-frequency = <40000000>;
-    interrupts = <3 4>;
-    interrupt-parent = <&plic0>;
+	timer0: timer at f0400000 {
+		compatible = "andestech,atcpit100";
+		reg = <0x0 0xf0400000 0x0 0x1000>;
+		clock-frequency = <40000000>;
+		interrupts = <3 4>;
+		interrupt-parent = <&plic0>;
 	};
 
 	serial0: serial at f0300000 {
 		compatible = "andestech,uart16550", "ns16550a";
-    reg = <0x0 0xf0300000 0x0 0x1000>;
-    interrupts = <9 4>;
+		reg = <0x0 0xf0300000 0x0 0x1000>;
+		interrupts = <9 4>;
 		clock-frequency = <19660800>;
 		reg-shift = <2>;
 		reg-offset = <32>;
 		no-loopback-test = <1>;
-    interrupt-parent = <&plic0>;
+		interrupt-parent = <&plic0>;
 	};
 
 	mac0: mac at e0100000 {
 		compatible = "andestech,atmac100";
-    reg = <0x0 0xe0100000 0x0 0x1000>;
-    interrupts = <19 4>;
-    interrupt-parent = <&plic0>;
+		reg = <0x0 0xe0100000 0x0 0x1000>;
+		interrupts = <19 4>;
+		interrupt-parent = <&plic0>;
 	};
 
 	mmc0: mmc at f0e00000 {
-    compatible = "andestech,atfsdc010";
+		compatible = "andestech,atfsdc010";
 		max-frequency = <100000000>;
-    clock-freq-min-max = <400000 100000000>;
+		clock-freq-min-max = <400000 100000000>;
 		fifo-depth = <0x10>;
-    reg = <0x0 0xf0e00000 0x0 0x1000>;
-    interrupts = <18 4>;
+		reg = <0x0 0xf0e00000 0x0 0x1000>;
+		interrupts = <18 4>;
 		cap-sd-highspeed;
-    interrupt-parent = <&plic0>;
+		interrupt-parent = <&plic0>;
 	};
 
-  smc0: smc at e0400000 {
-    compatible = "andestech,atfsmc020";
-    reg = <0x0 0xe0400000 0x0 0x1000>;
-  };
+	smc0: smc at e0400000 {
+		compatible = "andestech,atfsmc020";
+		reg = <0x0 0xe0400000 0x0 0x1000>;
+	};
 
-  nor at 0,0 {
-    compatible = "cfi-flash";
-    reg = <0x0 0x88000000 0x0 0x1000>;
-    bank-width = <2>;
-    device-width = <1>;
-  };
+	nor at 0,0 {
+		compatible = "cfi-flash";
+		reg = <0x0 0x88000000 0x0 0x1000>;
+		bank-width = <2>;
+		device-width = <1>;
+	};
 
 	spi: spi at f0b00000 {
 		compatible = "andestech,atcspi200";
-    reg = <0x0 0xf0b00000 0x0 0x1000>;
+		reg = <0x0 0xf0b00000 0x0 0x1000>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 		num-cs = <1>;
 		clocks = <&spiclk>;
 		interrupts = <3 4>;
-    interrupt-parent = <&plic0>;
-			flash at 0 {
+		interrupt-parent = <&plic0>;
+
+		flash at 0 {
 			compatible = "spi-flash";
 			spi-max-frequency = <50000000>;
 			reg = <0>;
Signature · 1 line
2.7.4
author
#15 lore raw

PATCH v3 14/17 riscv: kconfig: Select DM and OF_CONTROL

In reply to Bin Meng

RISC-V is a pretty new architecture and should support DM and OF_CONTROL by default.

---

Changes in v3: None
Changes in v2: None

 arch/Kconfig                 | 3 +++
 configs/ax25-ae350_defconfig | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
arch/Kconfig +3 -0
index cd424fd..e62c3cb 100644
@@ -62,6 +62,9 @@ config PPC
 config RISCV
 	bool "RISC-V architecture"
 	select SUPPORT_OF_CONTROL
+	select OF_CONTROL
+	select DM
+	imply CMD_DM
 
 config SANDBOX
 	bool "Sandbox"
configs/ax25-ae350_defconfig +0 -2
index d64f078..ebcc52e 100644
@@ -15,12 +15,10 @@ CONFIG_CMD_SF_TEST=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_CMD_CACHE=y
-CONFIG_OF_CONTROL=y
 CONFIG_OF_BOARD=y
 CONFIG_DEFAULT_DEVICE_TREE="ae350"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_DM=y
 CONFIG_CLK=y
 CONFIG_MMC=y
 CONFIG_DM_MMC=y
Signature · 1 line
2.7.4
author
#16 lore raw

PATCH v3 15/17 riscv: kconfig: Imply DM support for some common drivers

In reply to Bin Meng

This implies DM support for some common drivers that are used on RISC-V.

---

Changes in v3:
- new patch to imply DM support for some common drivers

Changes in v2: None

 arch/Kconfig                 | 9 +++++++++
 configs/ax25-ae350_defconfig | 8 --------
 2 files changed, 9 insertions(+), 8 deletions(-)
arch/Kconfig +9 -0
index e62c3cb..ce183fa 100644
@@ -64,6 +64,15 @@ config RISCV
 	select SUPPORT_OF_CONTROL
 	select OF_CONTROL
 	select DM
+	imply DM_SERIAL
+	imply DM_ETH
+	imply DM_MMC
+	imply DM_SPI
+	imply DM_SPI_FLASH
+	imply BLK
+	imply CLK
+	imply MTD
+	imply TIMER
 	imply CMD_DM
 
 config SANDBOX
configs/ax25-ae350_defconfig +0 -8
index ebcc52e..614ef15 100644
@@ -19,24 +19,16 @@ CONFIG_OF_BOARD=y
 CONFIG_DEFAULT_DEVICE_TREE="ae350"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_CLK=y
 CONFIG_MMC=y
-CONFIG_DM_MMC=y
 CONFIG_FTSDC010=y
 CONFIG_FTSDC010_SDIO=y
-CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_CFI_FLASH=y
-CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_DM_ETH=y
 CONFIG_FTMAC100=y
 CONFIG_BAUDRATE=38400
-CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
-CONFIG_DM_SPI=y
 CONFIG_ATCSPI200_SPI=y
-CONFIG_TIMER=y
 CONFIG_ATCPIT100_TIMER=y
Signature · 1 line
2.7.4
#17 lore raw

PATCH v3 15/17 riscv: kconfig: Imply DM support for some common drivers

Quoted 7 lines · Bin Meng

This implies DM support for some common drivers that are used on RISC-V.

---

Quoted 10 lines

Changes in v3:
- new patch to imply DM support for some common drivers

Changes in v2: None

 arch/Kconfig                 | 9 +++++++++
 configs/ax25-ae350_defconfig | 8 --------
 2 files changed, 9 insertions(+), 8 deletions(-)
author
#18 lore raw

PATCH v3 16/17 riscv: Add QEMU virt board support

In reply to Bin Meng

This adds QEMU RISC-V 'virt' board target support, with the hope of helping people easily test U-Boot on RISC-V.

The QEMU virt machine models a generic RISC-V virtual machine with support for the VirtIO standard networking and block storage devices. It has CLINT, PLIC, 16550A UART devices in addition to VirtIO and it also uses device-tree to pass configuration information to guest software. It implements RISC-V privileged architecture spec v1.10.

Both 32-bit and 64-bit builds are supported. Support is pretty much preliminary, only booting to U-Boot shell with the UART driver on a single core. Booting Linux is not supported yet.

---

Changes in v3: None
Changes in v2: None

 arch/riscv/Kconfig                      |  4 +++
 arch/riscv/cpu/qemu/Makefile            |  6 +++++
 arch/riscv/cpu/qemu/cpu.c               | 29 +++++++++++++++++++++
 arch/riscv/cpu/qemu/dram.c              | 17 ++++++++++++
 board/emulation/qemu-riscv/Kconfig      | 22 ++++++++++++++++
 board/emulation/qemu-riscv/MAINTAINERS  |  7 +++++
 board/emulation/qemu-riscv/Makefile     |  5 ++++
 board/emulation/qemu-riscv/qemu-riscv.c | 23 +++++++++++++++++
 configs/qemu-riscv32_defconfig          |  6 +++++
 configs/qemu-riscv64_defconfig          |  7 +++++
 doc/README.qemu-riscv                   | 46 +++++++++++++++++++++++++++++++++
 include/configs/qemu-riscv.h            | 21 +++++++++++++++
 12 files changed, 193 insertions(+)
 create mode 100644 arch/riscv/cpu/qemu/Makefile
 create mode 100644 arch/riscv/cpu/qemu/cpu.c
 create mode 100644 arch/riscv/cpu/qemu/dram.c
 create mode 100644 board/emulation/qemu-riscv/Kconfig
 create mode 100644 board/emulation/qemu-riscv/MAINTAINERS
 create mode 100644 board/emulation/qemu-riscv/Makefile
 create mode 100644 board/emulation/qemu-riscv/qemu-riscv.c
 create mode 100644 configs/qemu-riscv32_defconfig
 create mode 100644 configs/qemu-riscv64_defconfig
 create mode 100644 doc/README.qemu-riscv
 create mode 100644 include/configs/qemu-riscv.h
arch/riscv/Kconfig +4 -0
index 49f87de..168ca3d 100644
@@ -11,9 +11,13 @@ choice
 config TARGET_AX25_AE350
 	bool "Support ax25-ae350"
 
+config TARGET_QEMU_VIRT
+	bool "Support QEMU Virt Board"
+
 endchoice
 
 source "board/AndesTech/ax25-ae350/Kconfig"
+source "board/emulation/qemu-riscv/Kconfig"
 
 choice
 	prompt "CPU selection"
arch/riscv/cpu/qemu/Makefile new file +6 -0
new file mode 100644
index 0000000..258e462
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2018, Bin Meng <[email protected]>
+
+obj-y += dram.o
+obj-y += cpu.o
arch/riscv/cpu/qemu/cpu.c new file +29 -0
new file mode 100644
index 0000000..a064639
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018, Bin Meng <[email protected]>
+ */
+
+#include <common.h>
+#include <command.h>
+
+/*
+ * cleanup_before_linux() is called just before we call linux
+ * it prepares the processor for linux
+ *
+ * we disable interrupt and caches.
+ */
+int cleanup_before_linux(void)
+{
+	disable_interrupts();
+
+	/* turn off I/D-cache */
+
+	return 0;
+}
+
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+	printf("reset unsupported yet\n");
+
+	return 0;
+}
arch/riscv/cpu/qemu/dram.c new file +17 -0
new file mode 100644
index 0000000..84d87d2
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018, Bin Meng <[email protected]>
+ */
+
+#include <common.h>
+#include <fdtdec.h>
+
+int dram_init(void)
+{
+	return fdtdec_setup_mem_size_base();
+}
+
+int dram_init_banksize(void)
+{
+	return fdtdec_setup_memory_banksize();
+}
board/emulation/qemu-riscv/Kconfig new file +22 -0
new file mode 100644
index 0000000..af23363
@@ -0,0 +1,22 @@
+if TARGET_QEMU_VIRT
+
+config SYS_BOARD
+	default "qemu-riscv"
+
+config SYS_VENDOR
+	default "emulation"
+
+config SYS_CPU
+	default "qemu"
+
+config SYS_CONFIG_NAME
+	default "qemu-riscv"
+
+config SYS_TEXT_BASE
+	default 0x80000000
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+	imply SYS_NS16550
+
+endif
board/emulation/qemu-riscv/MAINTAINERS new file +7 -0
new file mode 100644
index 0000000..3c6eb4f
@@ -0,0 +1,7 @@
+QEMU RISC-V 'VIRT' BOARD
+M:	Bin Meng <[email protected]>
+S:	Maintained
+F:	board/emulation/qemu-riscv/
+F:	include/configs/qemu-riscv.h
+F:	configs/qemu-riscv32_defconfig
+F:	configs/qemu-riscv64_defconfig
board/emulation/qemu-riscv/Makefile new file +5 -0
new file mode 100644
index 0000000..3f29b90
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2018, Bin Meng <[email protected]>
+
+obj-y	+= qemu-riscv.o
board/emulation/qemu-riscv/qemu-riscv.c new file +23 -0
new file mode 100644
index 0000000..041e716
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018, Bin Meng <[email protected]>
+ */
+
+#include <common.h>
+#include <fdtdec.h>
+
+#define MROM_FDT_ADDR	0x1020
+
+int board_init(void)
+{
+	return 0;
+}
+
+void *board_fdt_blob_setup(void)
+{
+	/*
+	 * QEMU loads a generated DTB for us immediately
+	 * after the reset vectors in the MROM
+	 */
+	return (void *)MROM_FDT_ADDR;
+}
configs/qemu-riscv32_defconfig new file +6 -0
new file mode 100644
index 0000000..ff1fb1f
@@ -0,0 +1,6 @@
+CONFIG_RISCV=y
+CONFIG_TARGET_QEMU_VIRT=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+CONFIG_OF_BOARD=y
configs/qemu-riscv64_defconfig new file +7 -0
new file mode 100644
index 0000000..d6c1a5d
@@ -0,0 +1,7 @@
+CONFIG_RISCV=y
+CONFIG_TARGET_QEMU_VIRT=y
+CONFIG_CPU_RISCV_64=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+CONFIG_OF_BOARD=y
doc/README.qemu-riscv new file +46 -0

46 lines not on this page · raw message

include/configs/qemu-riscv.h new file +21 -0
new file mode 100644
index 0000000..d279c23
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2018, Bin Meng <[email protected]>
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <linux/sizes.h>
+
+#define CONFIG_SYS_SDRAM_BASE		0x80000000
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + SZ_2M)
+
+#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + SZ_2M)
+
+#define CONFIG_SYS_MALLOC_LEN		SZ_8M
+
+/* Environment options */
+#define CONFIG_ENV_SIZE			SZ_4K
+
+#endif /* __CONFIG_H */
Signature · 1 line
2.7.4
author
#19 lore raw

PATCH v3 17/17 riscv: Move do_reset() to a common place

In reply to Bin Meng

We don't have a reset method on any RISC-V board yet. Instead of adding the same 'unsupported' message for each CPU variant it might make more sense to add a generic do_reset function for all CPU variants to lib/, similar to the one for ARM (arch/arm/lib/reset.c).

---

Changes in v3:
- reword the reset message a little, and call hang() in the end

Changes in v2:
- new patch to move do_reset() to a common place

 arch/riscv/cpu/ax25/cpu.c |  9 ---------
 arch/riscv/cpu/qemu/cpu.c |  8 --------
 arch/riscv/lib/Makefile   |  1 +
 arch/riscv/lib/reset.c    | 17 +++++++++++++++++
 4 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 arch/riscv/lib/reset.c
arch/riscv/cpu/ax25/cpu.c +0 -9
index ab05b57..fddcc15 100644
@@ -6,9 +6,6 @@
 
 /* CPU specific code */
 #include <common.h>
-#include <command.h>
-#include <watchdog.h>
-#include <asm/cache.h>
 
 /*
  * cleanup_before_linux() is called just before we call linux
@@ -24,9 +21,3 @@ int cleanup_before_linux(void)
 
 	return 0;
 }
-
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-	disable_interrupts();
-	panic("ax25-ae350 wdt not support yet.\n");
-}
arch/riscv/cpu/qemu/cpu.c +0 -8
index a064639..6c7a327 100644
@@ -4,7 +4,6 @@
  */
 
 #include <common.h>
-#include <command.h>
 
 /*
  * cleanup_before_linux() is called just before we call linux
@@ -20,10 +19,3 @@ int cleanup_before_linux(void)
 
 	return 0;
 }
-
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-	printf("reset unsupported yet\n");
-
-	return 0;
-}
arch/riscv/lib/Makefile +1 -0
index cc562f9..b58db89 100644
@@ -10,6 +10,7 @@ obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-$(CONFIG_CMD_GO) += boot.o
 obj-y	+= cache.o
 obj-y	+= interrupts.o
+obj-y	+= reset.o
 obj-y   += setjmp.o
 
 # For building EFI apps
arch/riscv/lib/reset.c new file +17 -0
new file mode 100644
index 0000000..a6aa8e2
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018, Bin Meng <[email protected]>
+ */
+
+#include <common.h>
+#include <command.h>
+
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+	printf("resetting ...\n");
+
+	printf("reset unsupported yet\n");
+	hang();
+
+	return 0;
+}
Signature · 1 line
2.7.4
#20 lore raw

PATCH v3 17/17 riscv: Move do_reset() to a common place

Hi Bin,

Quoted 100 lines · Bin Meng

We don't have a reset method on any RISC-V board yet. Instead of adding the same 'unsupported' message for each CPU variant it might make more sense to add a generic do_reset function for all CPU variants to lib/, similar to the one for ARM (arch/arm/lib/reset.c).

---

Changes in v3:
- reword the reset message a little, and call hang() in the end

Changes in v2:
- new patch to move do_reset() to a common place

 arch/riscv/cpu/ax25/cpu.c |  9 ---------
 arch/riscv/cpu/qemu/cpu.c |  8 --------
 arch/riscv/lib/Makefile   |  1 +
 arch/riscv/lib/reset.c    | 17 +++++++++++++++++
 4 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 arch/riscv/lib/reset.c
arch/riscv/cpu/ax25/cpu.c +0 -5
index ab05b57..fddcc15 100644
@@ -6,9 +6,6 @@
 
 /* CPU specific code */
 #include <common.h>
-#include <command.h>
-#include <watchdog.h>
-#include <asm/cache.h>
 
 /*
  * cleanup_before_linux() is called just before we call linux
@@ -24,9 +21,3 @@ int cleanup_before_linux(void)
 
 	return 0;
 }
-
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const

argv[])

arch/riscv/cpu/ax25/cpu.c +0 -4
-{
-	disable_interrupts();
-	panic("ax25-ae350 wdt not support yet.\n");
-}
arch/riscv/cpu/qemu/cpu.c +0 -3
index a064639..6c7a327 100644
@@ -4,7 +4,6 @@
  */
 
 #include <common.h>
-#include <command.h>
 
 /*
  * cleanup_before_linux() is called just before we call linux
@@ -20,10 +19,3 @@ int cleanup_before_linux(void)
 
 	return 0;
 }
-
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const

argv[])

arch/riscv/cpu/qemu/cpu.c +0 -5
-{
-	printf("reset unsupported yet\n");
-
-	return 0;
-}
arch/riscv/lib/Makefile +1 -0
index cc562f9..b58db89 100644
@@ -10,6 +10,7 @@ obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-$(CONFIG_CMD_GO) += boot.o
 obj-y	+= cache.o
 obj-y	+= interrupts.o
+obj-y	+= reset.o
 obj-y   += setjmp.o
 
 # For building EFI apps
arch/riscv/lib/reset.c new file +9 -0
new file mode 100644
index 0000000..a6aa8e2
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018, Bin Meng <[email protected]>
+ */
+
+#include <common.h>
+#include <command.h>
+
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const

argv[])

arch/riscv/lib/reset.c line 17

Quoted 8 lines
arch/riscv/lib/reset.c new file +8 -0
+{
+	printf("resetting ...\n");
+
+	printf("reset unsupported yet\n");
+	hang();
+
+	return 0;
+}

Small nit here. The Sentence "reset unsupported yet" is not grammatically correct and should say "reset not supported yet" instead.

Everything else looks great, so it probably doesn't make sense to resend the whole series to fix this.

Thanks,
Lukas

author
#21 lore raw

v3 cover riscv: Add QEMU virt board support

In reply to Bin Meng

Hi Rick,

Quoted 14 lines · Bin Meng

This series adds QEMU RISC-V 'virt' board target support, with the hope of helping people easily test U-Boot on RISC-V.

Some existing RISC-V codes have been changed to make it easily to support new targets. Some spotted coding style issues are fixed.

This series is available at u-boot-x86/riscv-working for testing.

Changes in v3:
- net patch to print the relocation address in cmd 'bdinfo'
- new patch to imply DM support for some common drivers
- reword the reset message a little, and call hang() in the end

Quoted 6 lines

Changes in v2:
- Change Linux kernel entry parameters' type to support 32/64 bit
- new patch to remove CSR read/write defines in encoding.h
- new patch to pass mhartid CSR value to kernel
- new patch to move do_reset() to a common place

Any comments for v3?

Regards,
Bin

author
#22 lore raw

v3 cover riscv: Add QEMU virt board support

Quoted 18 lines · Bin Meng

Hi Rick,

Quoted 14 lines · Bin Meng

This series adds QEMU RISC-V 'virt' board target support, with the hope of helping people easily test U-Boot on RISC-V.

Some existing RISC-V codes have been changed to make it easily to support new targets. Some spotted coding style issues are fixed.

This series is available at u-boot-x86/riscv-working for testing.

Changes in v3:
- net patch to print the relocation address in cmd 'bdinfo'
- new patch to imply DM support for some common drivers
- reword the reset message a little, and call hang() in the end

Quoted 8 lines
Quoted 6 lines

Changes in v2:
- Change Linux kernel entry parameters' type to support 32/64 bit
- new patch to remove CSR read/write defines in encoding.h
- new patch to pass mhartid CSR value to kernel
- new patch to move do_reset() to a common place

Any comments for v3?

Ping?

A message that is not in the archive (sent off-list or not yet received): [email protected]

#24 lore raw

v3 cover riscv: Add QEMU virt board support

Quoted 24 lines
Quoted 24 lines
Quoted 24 lines

Hi Rick,

Quoted 20 lines · Bin Meng

This series adds QEMU RISC-V 'virt' board target support, with the hope of helping people easily test U-Boot on RISC-V.

Some existing RISC-V codes have been changed to make it easily to support new targets. Some spotted coding style issues are fixed.

This series is available at u-boot-x86/riscv-working for testing.

Changes in v3:
- net patch to print the relocation address in cmd 'bdinfo'
- new patch to imply DM support for some common drivers
- reword the reset message a little, and call hang() in the end

Changes in v2:
- Change Linux kernel entry parameters' type to support 32/64 bit
- new patch to remove CSR read/write defines in encoding.h
- new patch to pass mhartid CSR value to kernel
- new patch to move do_reset() to a common place

Quoted 3 lines
Quoted 3 lines
Quoted 1 line

Any comments for v3?

Ping?

Hi Bin

Sorry! I was busy last week.
Yes. The V3 patch-sets looks fine.

But the merge window is closed. I miss it.
I will sync u-boot-riscv.git to u-boot.git and merge the v3 patch-sets to u-boot-riscv.git this week.

I am not sure if I can send pull request to Tom about those merges after the merge window was closed?
Or I shall wait for next time merge window opening ?

Rick

author
#25 lore raw

v3 cover riscv: Add QEMU virt board support

Hi Rick,

Quoted 34 lines · Rick Chen
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines

Hi Rick,

Quoted 20 lines · Bin Meng

This series adds QEMU RISC-V 'virt' board target support, with the hope of helping people easily test U-Boot on RISC-V.

Some existing RISC-V codes have been changed to make it easily to support new targets. Some spotted coding style issues are fixed.

This series is available at u-boot-x86/riscv-working for testing.

Changes in v3:
- net patch to print the relocation address in cmd 'bdinfo'
- new patch to imply DM support for some common drivers
- reword the reset message a little, and call hang() in the end

Changes in v2:
- Change Linux kernel entry parameters' type to support 32/64 bit
- new patch to remove CSR read/write defines in encoding.h
- new patch to pass mhartid CSR value to kernel
- new patch to move do_reset() to a common place

Quoted 3 lines
Quoted 3 lines
Quoted 1 line

Any comments for v3?

Ping?

Hi Bin

Sorry! I was busy last week.
Yes. The V3 patch-sets looks fine.

Quoted 7 lines

But the merge window is closed. I miss it.
I will sync u-boot-riscv.git to u-boot.git and merge the v3 patch-sets to u-boot-riscv.git this week.

I am not sure if I can send pull request to Tom about those merges after the merge window was closed?
Or I shall wait for next time merge window opening ?

Per my experience, this PR can be accepted even after PR. After all, the changes are purely limited in the risc-v domain, so its risk to breaks other stuff are low.

Regards,
Bin

#26 lore raw

v3 cover riscv: Add QEMU virt board support

In reply to Bin Meng

Hi Bin,

Quoted 13 lines · Bin Meng

This series adds QEMU RISC-V 'virt' board target support, with the hope of helping people easily test U-Boot on RISC-V.

Some existing RISC-V codes have been changed to make it easily to support new targets. Some spotted coding style issues are fixed.

This series is available at u-boot-x86/riscv-working for testing.

Changes in v3:
- net patch to print the relocation address in cmd 'bdinfo'
- new patch to imply DM support for some common drivers
- reword the reset message a little, and call hang() in the end

Quoted 6 lines

Changes in v2:
- Change Linux kernel entry parameters' type to support 32/64 bit
- new patch to remove CSR read/write defines in encoding.h
- new patch to pass mhartid CSR value to kernel
- new patch to move do_reset() to a common place

One more thing, I wanted to let you know about. I am already able to boot Linux in QEMU with this patch series, and u-boot master now. I had to make minor changes to the board config / environment to enable FIT images, though jumping directly to bbl + Linux with 'go' should work as well.
I did modify QEMU slightly so that it also loads binaries instead of just ELF files. I am planning to start sending my patches to u-boot and QEMU next week.

Thanks,
Lukas

author
#27 lore raw

v3 cover riscv: Add QEMU virt board support

Hi Lukas,

Quoted 24 lines · Lukas

Hi Bin,

Quoted 13 lines · Bin Meng

This series adds QEMU RISC-V 'virt' board target support, with the hope of helping people easily test U-Boot on RISC-V.

Some existing RISC-V codes have been changed to make it easily to support new targets. Some spotted coding style issues are fixed.

This series is available at u-boot-x86/riscv-working for testing.

Changes in v3:
- net patch to print the relocation address in cmd 'bdinfo'
- new patch to imply DM support for some common drivers
- reword the reset message a little, and call hang() in the end

Quoted 6 lines

Changes in v2:
- Change Linux kernel entry parameters' type to support 32/64 bit
- new patch to remove CSR read/write defines in encoding.h
- new patch to pass mhartid CSR value to kernel
- new patch to move do_reset() to a common place

Quoted 5 lines

One more thing, I wanted to let you know about. I am already able to boot Linux in QEMU with this patch series, and u-boot master now. I had to make minor changes to the board config / environment to enable FIT images, though jumping directly to bbl + Linux with 'go' should work as well.

Good to know.

Quoted 3 lines

I did modify QEMU slightly so that it also loads binaries instead of just ELF files. I am planning to start sending my patches to u-boot and QEMU next week.

Do you mean QEMU's -kernel parameter?

Regards,
Bin

#28 lore raw

v3 cover riscv: Add QEMU virt board support

Hi Bin,

Quoted 47 lines · Bin Meng

Hi Lukas,

Quoted 25 lines · Lukas

Hi Bin,

Quoted 14 lines · Bin Meng

This series adds QEMU RISC-V 'virt' board target support, with the
hope of helping people easily test U-Boot on RISC-V.

Some existing RISC-V codes have been changed to make it easily to support new targets. Some spotted coding style issues are fixed.

This series is available at u-boot-x86/riscv-working for testing.

Changes in v3:
- net patch to print the relocation address in cmd 'bdinfo'
- new patch to imply DM support for some common drivers
- reword the reset message a little, and call hang() in the end

Quoted 6 lines

Changes in v2:
- Change Linux kernel entry parameters' type to support 32/64 bit
- new patch to remove CSR read/write defines in encoding.h
- new patch to pass mhartid CSR value to kernel
- new patch to move do_reset() to a common place

Quoted 9 lines

One more thing, I wanted to let you know about. I am already able to
boot Linux in QEMU with this patch series, and u-boot master now. I had
to make minor changes to the board config / environment to enable FIT
images, though jumping directly to bbl + Linux with 'go' should work as
well.

Good to know.

Quoted 5 lines

I did modify QEMU slightly so that it also loads binaries instead of
just ELF files. I am planning to start sending my patches to u-boot and
QEMU next week.

Quoted 4 lines

Do you mean QEMU's -kernel parameter?

Regards,
Bin

Yes. I also modified the -bios parameter, though that's not strictly needed.

Thanks,
Lukas