riscv: Add QEMU virt board support
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.
Bin Meng (12):
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: 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: 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: Add QEMU virt board support
arch/Kconfig | 5 +-
arch/riscv/Kconfig | 10 +-
arch/riscv/Makefile | 3 +-
arch/riscv/config.mk | 9 +-
arch/riscv/cpu/Makefile | 7 ++
arch/riscv/cpu/ax25/Makefile | 2 -
arch/riscv/cpu/cpu.c | 49 ++++++++
arch/riscv/cpu/qemu/Makefile | 6 +
arch/riscv/cpu/qemu/cpu.c | 29 +++++
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/mach-types.h | 29 -----
arch/riscv/include/asm/setup.h | 194 --------------------------------
arch/riscv/include/asm/u-boot.h | 1 -
arch/riscv/lib/bootm.c | 19 +---
board/AndesTech/ax25-ae350/ax25-ae350.c | 2 -
board/emulation/qemu-riscv/Kconfig | 21 ++++
board/emulation/qemu-riscv/MAINTAINERS | 7 ++
board/emulation/qemu-riscv/Makefile | 5 +
board/emulation/qemu-riscv/qemu-riscv.c | 23 ++++
cmd/bdinfo.c | 1 -
configs/ax25-ae350_defconfig | 2 -
configs/qemu-riscv32_defconfig | 10 ++
configs/qemu-riscv64_defconfig | 11 ++
doc/README.qemu-riscv | 46 ++++++++
include/configs/qemu-riscv.h | 21 ++++
30 files changed, 520 insertions(+), 383 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 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.hSignature · 1 line
2.7.4
PATCH 1/12 riscv: kconfig: Normalize architecture name spelling
It's RISC-V that is the official name, not RISCV.
---
arch/Kconfig | 2 +- arch/riscv/Kconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/Kconfig +1 -1
@@ -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
@@ -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
PATCH 2/12 riscv: Remove setup.h
In reply to Bin MengThis 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.
---
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
@@ -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
@@ -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
PATCH 3/12 riscv: bootm: Correct the 1st kernel argument to hart id
In reply to Bin MengThe 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.
---
arch/riscv/lib/bootm.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
arch/riscv/lib/bootm.c +5 -13
@@ -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)(int hart,uint 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 (*)(int ,uint ))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 , (unsigned long )images->ft_addr);/* does not return */
Signature · 1 line
2.7.4
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 3/12 riscv: bootm: Correct the 1st kernel argument to hart id
Quoted 4 lines
From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: Thursday, August 30, 2018 3:54 PM
To: Rick Jian-Zhi Chen(陳建志); U-Boot Mailing List
Subject: [PATCH 03/12] riscv: bootm: Correct the 1st kernel
argument to hart id
Quoted 2 lines
The first argument of Linux kernel is the risc-v core hart id, from
which the kernel
arch/riscv/lib/bootm.c index
Quoted 9 lines
is booted from. It is not the
mach_id, which seems to be copied from arm.Signed-off-by Bin Meng <[email protected]>---
arch/riscv/lib/bootm.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)arch/riscv/lib/bootm.c index renamed from arch/riscv/lib/bootm.c +0
-0
6662aff..754bbff
arch/riscv/lib/bootm.c int arch_fixup_fdt(void *blob) · line 26
Quoted 6 lines
100644
arch/riscv/lib/bootm.c +0
-0@@ -25,10 +25,7 @@ int arch_fixup_fdt(void *blob) int do_bootm_linux(int flag, int argc, char *argv[],
bootm_headers_t *images)
Quoted 10 lines
arch/riscv/lib/bootm.c +1
-4{ -bd_t *bd = gd->bd; -char *s; -int machid = bd->bi_arch_number; -void (*theKernel)(int arch,uint params); +void (*kernel)(int hart,uint dtb);/* * allow the PREP bootm subcommand, it is required for bootm to work
arch/riscv/lib/bootm.c int do_bootm_linux(int flag, int argc, char *argv[], · line 45
Quoted 7 lines
arch/riscv/lib/bootm.c +0
-3@@ -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" );
Hi Bin
Actually I have check this earlier.
It was changed to hartid and pass to kernel when execute enter_supervisor_mode( ) by bbl
enter_supervisor_mode(entry, hartid, dtb_output());
But I have no time to solve it.
I was trapped and busy about linux drivers porting currently. And planed to fix it when I switch back to u-boot jobs later.
Thank you for fix it.
Rick
Quoted 27 lines
arch/riscv/lib/bootm.c +2
-5-if (s) { - machid =simple_strtoul (s,NULL ,16 ); -printf ("Using machid 0x%x from environment\n" , machid); - } + kernel = (void (*)(int ,uint ))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 @@ intdo_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf("\nStarting kernel ...\n\n"); cleanup_before_linux();arch/riscv/lib/bootm.c +2
-2+/* 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 , (unsigned long )images->ft_addr);/* does not return */ --2.7.4
Auer
PATCH 3/12 riscv: bootm: Correct the 1st kernel argument to hart id
In reply to Bin MengQuoted 15 lines · 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.Signed-off-by Bin Meng <[email protected]>---
arch/riscv/lib/bootm.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)arch/riscv/lib/bootm.c +0
-0
arch/riscv/lib/bootm.c int arch_fixup_fdt(void *blob) · line 29
Quoted 9 lines
arch/riscv/lib/bootm.c +1
-4@@ -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)(int hart,uint dtb);
This probably does not cause any issues in u-boot, but the second parameter should be 32 bit or 64 bit depending on the architecture. Since you are already changing the kernel arguments it would make sense to also change dtb from uint to ulong or void *.
Quoted 28 lines
arch/riscv/lib/bootm.c +0
-0/* * allow the PREP bootm subcommand, it is required for bootm to work
arch/riscv/lib/bootm.c +2
-8@@ -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 (*)(int ,uint ))images->ep;bootstage_mark (BOOTSTAGE_ID_RUN_OS );debug ("## Transferring control to Linux (at address %08lx) ...\n", - (ulong )theKernel); + (ulong )kernel);arch/riscv/lib/bootm.c +0
-0if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len) {#ifdef CONFIG_OF_LIBFDT
arch/riscv/lib/bootm.c int do_bootm_linux(int flag, int argc, char · line 64
Quoted 9 lines
arch/riscv/lib/bootm.c +2
-1@@ -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 , (unsigned long )images->ft_addr);
You can use the mhartid CSR to get the hart id. This will limit u-boot to running in machine mode however. Alternatively you can also use the hart id, which is passed in a0 by the bootloader.
Thanks,
Lukas
Quoted 2 lines
arch/riscv/lib/bootm.c +0
-0/* does not return */
PATCH 3/12 riscv: bootm: Correct the 1st kernel argument to hart id
Hi Lukas,
Quoted 18 lines · Lukas
Quoted 16 lines · 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.Signed-off-by Bin Meng <[email protected]>---
arch/riscv/lib/bootm.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)arch/riscv/lib/bootm.c +0
-0@@ -25,10 +25,7 @@ int arch_fixup_fdt(void *blob)
Quoted 14 lines
arch/riscv/lib/bootm.c int arch_fixup_fdt(void *blob) · line 28
Quoted 8 lines
arch/riscv/lib/bootm.c +1
-4int 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)(int hart,uint dtb);This probably does not cause any issues in u-boot, but the second parameter should be 32 bit or 64 bit depending on the architecture. Since you are already changing the kernel arguments it would make sense to also change dtb from uint to ulong or void *.
Yes. Will address this in v2.
Quoted 31 lines
Quoted 31 lines
arch/riscv/lib/bootm.c +0
-0/* * allow the PREP bootm subcommand, it is required for bootm to work
arch/riscv/lib/bootm.c +2
-8@@ -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 (*)(int ,uint ))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_LIBFDTarch/riscv/lib/bootm.c +0
-0@@ -66,8 +57,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf ("\nStarting kernel ...\n\n" );
Quoted 11 lines
arch/riscv/lib/bootm.c int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) · line 63
Quoted 6 lines
arch/riscv/lib/bootm.c +2
-1cleanup_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 , (unsigned long )images->ft_addr);You can use the mhartid CSR to get the hart id. This will limit u-boot to running in machine mode however. Alternatively you can also use the hart id, which is passed in a0 by the bootloader.
If the goal is to use U-Boot to directly boot Linux, I think we need more changes. I believe we should allow only one hart to execute this function. For other harts, they should be waked up and jump to kernel directly.
Regards,
Bin
Auer
PATCH 3/12 riscv: bootm: Correct the 1st kernel argument to hart id
Hi Bin,
Quoted 88 lines · Bin Meng
Hi Lukas,
Quoted 18 lines · Lukas
Quoted 16 lines · 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.Signed-off-by Bin Meng <[email protected]>---
arch/riscv/lib/bootm.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)arch/riscv/lib/bootm.c +0
-0@@ -25,10 +25,7 @@ int arch_fixup_fdt(void *blob)Quoted 16 lines
arch/riscv/lib/bootm.c int arch_fixup_fdt(void *blob) · line 28
Quoted 9 lines
arch/riscv/lib/bootm.c +0
-0int do_bootm_linux(int flag, int argc, char *argv[],
bootm_headers_t
*images)
{arch/riscv/lib/bootm.c +1
-4-bd_t *bd = gd->bd; -char *s; -int machid = bd->bi_arch_number; -void (*theKernel)(int arch,uint params); +void (*kernel)(int hart,uint dtb);This probably does not cause any issues in u-boot, but the second parameter should be 32 bit or 64 bit depending on the architecture. Since you are already changing the kernel arguments it would make sense
to also change dtb from uint to ulong or void *.Yes. Will address this in v2.
Quoted 33 lines
Quoted 33 lines
/*
* allow the PREP bootm subcommand, it is required for
bootm to
workarch/riscv/lib/bootm.c +2
-8@@ -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 (*)(int ,uint ))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_LIBFDTarch/riscv/lib/bootm.c +0
-0@@ -66,8 +57,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)printf ("\nStarting kernel ...\n\n" );Quoted 13 lines
arch/riscv/lib/bootm.c int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) · line 63
Quoted 6 lines
arch/riscv/lib/bootm.c +2
-1cleanup_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 , (unsigned long )images->ft_addr);You can use the mhartid CSR to get the hart id. This will limit u- boot
to running in machine mode however. Alternatively you can also use the
hart id, which is passed in a0 by the bootloader.
Quoted 5 lines
If the goal is to use U-Boot to directly boot Linux, I think we need more changes. I believe we should allow only one hart to execute this function. For other harts, they should be waked up and jump to kernel directly.
Yes, that's true. We should be able to pick which hart executes it though. This is useful for chips like SiFive's U54, where hart 0 is a smaller hart for monitoring tasks. Here it would make sense to run u-boot on one of the other harts.
Thanks,
Lukas
PATCH 4/12 riscv: Remove mach type
In reply to Bin MengSince the mach_id is not used by RISC-V, remove it.
---
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
@@ -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
@@ -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
@@ -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
@@ -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
PATCH 5/12 riscv: Move the linker script to the CPU root directory
In reply to Bin MengThe linker script can be shared by all RISC-V targets. Move it to a common place.
---
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
Signature · 1 line
2.7.4
PATCH 6/12 riscv: Fix coding style issues in the linker script
In reply to Bin MengThere are several coding style issues in the linker script. Fix them.
---
arch/riscv/cpu/u-boot.lds | 58 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 30 deletions(-)
arch/riscv/cpu/u-boot.lds +28 -30
@@ -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
PATCH 7/12 riscv: Explicitly pass -march and -mabi to the compiler
In reply to Bin MengAt 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.
---
arch/riscv/config.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/riscv/config.mk +7 -2
@@ -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,9 @@ CONFIG_STANDALONE_LOAD_ADDR = 0x00000000 \ -T $(srctree)/examples/standalone/riscv.lds PLATFORM_CPPFLAGS += -ffixed-gp -fpic -PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -gdwarf-2 -ffunction-sections -LDFLAGS_u-boot += --gc-sections -static -pie +PLATFORM_RELFLAGS += -fno-strict-aliasing -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
PATCH 8/12 riscv: Add a helper routine to print CPU information
In reply to Bin MengThis adds a helper routine to print CPU information. Currently it prints all the instruction set extensions that the processor core supports.
---
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
@@ -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
@@ -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
Auer
PATCH 8/12 riscv: Add a helper routine to print CPU information
Quoted 226 lines · Bin Meng
This adds a helper routine to print CPU information. Currently it prints all the instruction set extensions that the processor core supports.
Signed-off-by Bin Meng <[email protected]>---
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.harch/riscv/Makefile +1
-0@@ -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@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2018, Bin Meng <[email protected]> + +obj-y += cpu.oarch/riscv/cpu/cpu.c new file +49
-0@@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2018, Bin Meng <[email protected]> +*/ + +#include <common.h> +#include <asm/csr.h> + +enum { +ISA_INVALID =0 , +ISA_32BIT , +ISA_64BIT , +ISA_128BIT +}; + +static const char *const isa_bits[] = { + [ISA_INVALID ] =NULL , + [ISA_32BIT ] ="32" , + [ISA_64BIT ] ="64" , + [ISA_128BIT ] ="128" +}; + +static inline bool supports_extension (char ext) +{ +return csr_read (misa) & (1 << (ext -'a' )); +} + +int print_cpuinfo (void ) +{ +char name[32 ]; +char *s = name; +int bit; + + s +=sprintf (name,"rv" ); + bit =csr_read (misa) >> (sizeof (long ) *8 -2 ); + s +=sprintf (s, isa_bits[bit]); + +supports_extension ('i' ) ? *s++ ='i' :'r' ; +supports_extension ('m' ) ? *s++ ='m' :'i' ; +supports_extension ('a' ) ? *s++ ='a' :'s' ; +supports_extension ('f' ) ? *s++ ='f' :'c' ; +supports_extension ('d' ) ? *s++ ='d' :'-' ; +supports_extension ('c' ) ? *s++ ='c' :'v' ; + *s++ ='\0' ; + +printf ("CPU: %s\n" , name); + +return 0 ; +}arch/riscv/include/asm/csr.h new file +12
-0@@ -0,0 +1,124 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2015 Regents of the University of California +* +* Taken from Linux arch/riscv/include/asm/csr.h +*/ + +#ifndef _ASM_RISCV_CSR_H +#define _ASM_RISCV_CSR_H + +/* Status register flags */ +#define SR_SIE _AC(0x00000002, UL)/* Supervisor Interrupt Enable */
+#defineSR_SPIE_AC(0x00000020, UL)/* Previous
Supervisor IE */
+#defineSR_SPP_AC(0x00000100, UL)/* Previously
Supervisor */
+#defineSR_SUM_AC(0x00040000, UL)/* Supervisor
access User Memory */arch/riscv/include/asm/csr.h new file +2
-0+ +#define SR_FS _AC(0x00006000, UL)/* Floating-point Status */
arch/riscv/include/asm/csr.h new file +6
-0+#define SR_FS_OFF _AC(0x00000000, UL) +#define SR_FS_INITIAL _AC(0x00002000, UL) +#define SR_FS_CLEAN _AC(0x00004000, UL) +#define SR_FS_DIRTY _AC(0x00006000, UL) + +#define SR_XS _AC(0x00018000, UL)/* Extension Status */
arch/riscv/include/asm/csr.h new file +9
-0+#define SR_XS_OFF _AC(0x00000000, UL) +#define SR_XS_INITIAL _AC(0x00008000, UL) +#define SR_XS_CLEAN _AC(0x00010000, UL) +#define SR_XS_DIRTY _AC(0x00018000, UL) + +#ifndef CONFIG_64BIT +#define SR_SD _AC(0x80000000, UL)/* FS/XS dirty */ +#else +#define SR_SD _AC(0x8000000000000000, UL)/* FS/XS dirty */
arch/riscv/include/asm/csr.h new file +15
-0+#endif + +/* SATP flags */ +#if __riscv_xlen ==32 +#define SATP_PPN _AC(0x003FFFFF, UL) +#define SATP_MODE_32 _AC(0x80000000, UL) +#define SATP_MODE SATP_MODE_32 +#else +#define SATP_PPN _AC(0x00000FFFFFFFFFFF, UL) +#define SATP_MODE_39 _AC(0x8000000000000000, UL) +#define SATP_MODE SATP_MODE_39 +#endif + +/* Interrupt Enable and Interrupt Pending flags */ +#define SIE_SSIE _AC(0x00000002, UL)/* Software Interrupt Enable */
+#defineSIE_STIE_AC(0x00000020, UL)/* Timer Interrupt Enable
*/arch/riscv/include/asm/csr.h new file +23
-0+ +#define EXC_INST_MISALIGNED 0 +#define EXC_INST_ACCESS 1 +#define EXC_BREAKPOINT 3 +#define EXC_LOAD_ACCESS 5 +#define EXC_STORE_ACCESS 7 +#define EXC_SYSCALL 8 +#define EXC_INST_PAGE_FAULT 12 +#define EXC_LOAD_PAGE_FAULT 13 +#define EXC_STORE_PAGE_FAULT 15 + +#ifndef __ASSEMBLY__ + +#define csr_swap (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrrw %0, " #csr ", %1" \ + : "=r" (__v) : "rK" (__v) \ + : "memory"); \ + __v; \ +}) + +#define csr_read (csr)\
arch/riscv/include/asm/csr.h new file +17
-0+({ \ + registerunsigned long __v; \ + __asm__ __volatile__ ("csrr %0, " #csr \ + :"=r" (__v) : \ + :"memory" ); \ + __v; \ +}) + +#define csr_write (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrw " #csr ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) + +#define csr_read_set (csr, val)\
arch/riscv/include/asm/csr.h new file +26
-0+({ \ +unsigned long __v = (unsigned long )(val); \ + __asm__ __volatile__ ("csrrs %0, " #csr ", %1" \ + :"=r" (__v) :"rK" (__v) \ + :"memory" ); \ + __v; \ +}) + +#define csr_set (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrs " #csr ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) + +#define csr_read_clear (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrrc %0, " #csr ", %1" \ + : "=r" (__v) : "rK" (__v) \ + : "memory"); \ + __v; \ +}) + +#define csr_clear (csr, val) \
arch/riscv/include/asm/csr.h line 124
Quoted 10 lines
arch/riscv/include/asm/csr.h new file +10
-0+({ \ +unsigned long __v = (unsigned long )(val); \ + __asm__ __volatile__ ("csrc " #csr ", %0" \ + : :"rK" (__v) \ + :"memory" ); \ +}) + +#endif /* __ASSEMBLY__ */ + +#endif /* _ASM_RISCV_CSR_H */
The RISC-V arch already has functions for accessing CSRs in encoding.h. I don't think it makes sense to keep both versions. I would tend towards keeping this version since this allows us to just sync with the Linux kernel if there are any changes.
Thanks,
Lukas
PATCH 8/12 riscv: Add a helper routine to print CPU information
Hi Lukas,
Quoted 235 lines · Lukas
Quoted 233 lines · Bin Meng
This adds a helper routine to print CPU information. Currently it prints all the instruction set extensions that the processor core supports.
Signed-off-by Bin Meng <[email protected]>---
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.harch/riscv/Makefile +1
-0@@ -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@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2018, Bin Meng <[email protected]> + +obj-y += cpu.oarch/riscv/cpu/cpu.c new file +49
-0@@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2018, Bin Meng <[email protected]> +*/ + +#include <common.h> +#include <asm/csr.h> + +enum { +ISA_INVALID =0 , +ISA_32BIT , +ISA_64BIT , +ISA_128BIT +}; + +static const char *const isa_bits[] = { + [ISA_INVALID ] =NULL , + [ISA_32BIT ] ="32" , + [ISA_64BIT ] ="64" , + [ISA_128BIT ] ="128" +}; + +static inline bool supports_extension (char ext) +{ +return csr_read (misa) & (1 << (ext -'a' )); +} + +int print_cpuinfo (void ) +{ +char name[32 ]; +char *s = name; +int bit; + + s +=sprintf (name,"rv" ); + bit =csr_read (misa) >> (sizeof (long ) *8 -2 ); + s +=sprintf (s, isa_bits[bit]); + +supports_extension ('i' ) ? *s++ ='i' :'r' ; +supports_extension ('m' ) ? *s++ ='m' :'i' ; +supports_extension ('a' ) ? *s++ ='a' :'s' ; +supports_extension ('f' ) ? *s++ ='f' :'c' ; +supports_extension ('d' ) ? *s++ ='d' :'-' ; +supports_extension ('c' ) ? *s++ ='c' :'v' ; + *s++ ='\0' ; + +printf ("CPU: %s\n" , name); + +return 0 ; +}arch/riscv/include/asm/csr.h new file +12
-0@@ -0,0 +1,124 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2015 Regents of the University of California +* +* Taken from Linux arch/riscv/include/asm/csr.h +*/ + +#ifndef _ASM_RISCV_CSR_H +#define _ASM_RISCV_CSR_H + +/* Status register flags */ +#define SR_SIE _AC(0x00000002, UL)/* Supervisor Interrupt Enable */
+#defineSR_SPIE_AC(0x00000020, UL)/* Previous
Supervisor IE */
+#defineSR_SPP_AC(0x00000100, UL)/* Previously
Supervisor */
+#defineSR_SUM_AC(0x00040000, UL)/* Supervisor
access User Memory */arch/riscv/include/asm/csr.h new file +2
-0+ +#define SR_FS _AC(0x00006000, UL)/* Floating-point Status */
arch/riscv/include/asm/csr.h new file +6
-0+#define SR_FS_OFF _AC(0x00000000, UL) +#define SR_FS_INITIAL _AC(0x00002000, UL) +#define SR_FS_CLEAN _AC(0x00004000, UL) +#define SR_FS_DIRTY _AC(0x00006000, UL) + +#define SR_XS _AC(0x00018000, UL)/* Extension Status */
arch/riscv/include/asm/csr.h new file +9
-0+#define SR_XS_OFF _AC(0x00000000, UL) +#define SR_XS_INITIAL _AC(0x00008000, UL) +#define SR_XS_CLEAN _AC(0x00010000, UL) +#define SR_XS_DIRTY _AC(0x00018000, UL) + +#ifndef CONFIG_64BIT +#define SR_SD _AC(0x80000000, UL)/* FS/XS dirty */ +#else +#define SR_SD _AC(0x8000000000000000, UL)/* FS/XS dirty */
arch/riscv/include/asm/csr.h new file +15
-0+#endif + +/* SATP flags */ +#if __riscv_xlen ==32 +#define SATP_PPN _AC(0x003FFFFF, UL) +#define SATP_MODE_32 _AC(0x80000000, UL) +#define SATP_MODE SATP_MODE_32 +#else +#define SATP_PPN _AC(0x00000FFFFFFFFFFF, UL) +#define SATP_MODE_39 _AC(0x8000000000000000, UL) +#define SATP_MODE SATP_MODE_39 +#endif + +/* Interrupt Enable and Interrupt Pending flags */ +#define SIE_SSIE _AC(0x00000002, UL)/* Software Interrupt Enable */
+#defineSIE_STIE_AC(0x00000020, UL)/* Timer Interrupt Enable
*/arch/riscv/include/asm/csr.h new file +23
-0+ +#define EXC_INST_MISALIGNED 0 +#define EXC_INST_ACCESS 1 +#define EXC_BREAKPOINT 3 +#define EXC_LOAD_ACCESS 5 +#define EXC_STORE_ACCESS 7 +#define EXC_SYSCALL 8 +#define EXC_INST_PAGE_FAULT 12 +#define EXC_LOAD_PAGE_FAULT 13 +#define EXC_STORE_PAGE_FAULT 15 + +#ifndef __ASSEMBLY__ + +#define csr_swap (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrrw %0, " #csr ", %1" \ + : "=r" (__v) : "rK" (__v) \ + : "memory"); \ + __v; \ +}) + +#define csr_read (csr)\
arch/riscv/include/asm/csr.h new file +17
-0+({ \ + registerunsigned long __v; \ + __asm__ __volatile__ ("csrr %0, " #csr \ + :"=r" (__v) : \ + :"memory" ); \ + __v; \ +}) + +#define csr_write (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrw " #csr ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) + +#define csr_read_set (csr, val)\
arch/riscv/include/asm/csr.h new file +33
-0+({ \ +unsigned long __v = (unsigned long )(val); \ + __asm__ __volatile__ ("csrrs %0, " #csr ", %1" \ + :"=r" (__v) :"rK" (__v) \ + :"memory" ); \ + __v; \ +}) + +#define csr_set (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrs " #csr ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) + +#define csr_read_clear (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrrc %0, " #csr ", %1" \ + : "=r" (__v) : "rK" (__v) \ + : "memory"); \ + __v; \ +}) + +#define csr_clear (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrc " #csr ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) +
Quoted 8 lines
arch/riscv/include/asm/csr.h line 124
Quoted 3 lines
arch/riscv/include/asm/csr.h new file +3
-0+#endif /* __ASSEMBLY__ */ + +#endif /* _ASM_RISCV_CSR_H */ The RISC-V arch already has functions for accessing CSRs in
encoding.h. I don't think it makes sense to keep both versions. I would tend towards keeping this version since this allows us to just sync with the Linux kernel if there are any changes.
Thanks for pointing out. But I checked current Linux tree, and there is no encoding.h. Maybe encoding.h was from some old kernel tree? I can clean this up and leaving only csr.h in v2.
Regards,
Bin
Auer
PATCH 8/12 riscv: Add a helper routine to print CPU information
Hi Bin,
Quoted 255 lines · Bin Meng
Hi Lukas,
Quoted 242 lines · Lukas
Quoted 240 lines · Bin Meng
This adds a helper routine to print CPU information. Currently it prints all the instruction set extensions that the processor core supports.
Signed-off-by Bin Meng <[email protected]>---
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.harch/riscv/Makefile +1
-0@@ -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@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2018, Bin Meng <[email protected]> + +obj-y += cpu.oarch/riscv/cpu/cpu.c new file +49
-0@@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2018, Bin Meng <[email protected]> +*/ + +#include <common.h> +#include <asm/csr.h> + +enum { +ISA_INVALID =0 , +ISA_32BIT , +ISA_64BIT , +ISA_128BIT +}; + +static const char *const isa_bits[] = { + [ISA_INVALID ] =NULL , + [ISA_32BIT ] ="32" , + [ISA_64BIT ] ="64" , + [ISA_128BIT ] ="128" +}; + +static inline bool supports_extension (char ext) +{ +return csr_read (misa) & (1 << (ext -'a' )); +} + +int print_cpuinfo (void ) +{ +char name[32 ]; +char *s = name; +int bit; + + s +=sprintf (name,"rv" ); + bit =csr_read (misa) >> (sizeof (long ) *8 -2 ); + s +=sprintf (s, isa_bits[bit]); + +supports_extension ('i' ) ? *s++ ='i' :'r' ; +supports_extension ('m' ) ? *s++ ='m' :'i' ; +supports_extension ('a' ) ? *s++ ='a' :'s' ; +supports_extension ('f' ) ? *s++ ='f' :'c' ; +supports_extension ('d' ) ? *s++ ='d' :'-' ; +supports_extension ('c' ) ? *s++ ='c' :'v' ; + *s++ ='\0' ; + +printf ("CPU: %s\n" , name); + +return 0 ; +}arch/riscv/include/asm/csr.h new file +12
-0@@ -0,0 +1,124 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2015 Regents of the University of California +* +* Taken from Linux arch/riscv/include/asm/csr.h +*/ + +#ifndef _ASM_RISCV_CSR_H +#define _ASM_RISCV_CSR_H + +/* Status register flags */ +#define SR_SIE _AC(0x00000002, UL)/* Supervisor Interrupt Enable */
+#defineSR_SPIE_AC(0x00000020, UL)/* Previous
Supervisor IE */
+#defineSR_SPP_AC(0x00000100, UL)/* Previously
Supervisor */
+#defineSR_SUM_AC(0x00040000, UL)/* Supervisor
access User Memory */arch/riscv/include/asm/csr.h new file +2
-0+ +#define SR_FS _AC(0x00006000, UL)/* Floating- point
Status */arch/riscv/include/asm/csr.h new file +6
-0+#define SR_FS_OFF _AC(0x00000000, UL) +#define SR_FS_INITIAL _AC(0x00002000, UL) +#define SR_FS_CLEAN _AC(0x00004000, UL) +#define SR_FS_DIRTY _AC(0x00006000, UL) + +#define SR_XS _AC(0x00018000, UL)/* Extension Status
*/arch/riscv/include/asm/csr.h new file +7
-0+#define SR_XS_OFF _AC(0x00000000, UL) +#define SR_XS_INITIAL _AC(0x00008000, UL) +#define SR_XS_CLEAN _AC(0x00010000, UL) +#define SR_XS_DIRTY _AC(0x00018000, UL) + +#ifndef CONFIG_64BIT +#define SR_SD _AC(0x80000000, UL)/* FS/XS dirty */
arch/riscv/include/asm/csr.h new file +2
-0+#else +#define SR_SD _AC(0x8000000000000000, UL)/* FS/XS
dirty */arch/riscv/include/asm/csr.h new file +15
-0+#endif + +/* SATP flags */ +#if __riscv_xlen ==32 +#define SATP_PPN _AC(0x003FFFFF, UL) +#define SATP_MODE_32 _AC(0x80000000, UL) +#define SATP_MODE SATP_MODE_32 +#else +#define SATP_PPN _AC(0x00000FFFFFFFFFFF, UL) +#define SATP_MODE_39 _AC(0x8000000000000000, UL) +#define SATP_MODE SATP_MODE_39 +#endif + +/* Interrupt Enable and Interrupt Pending flags */ +#define SIE_SSIE _AC(0x00000002, UL)/* Software Interrupt Enable */
+#defineSIE_STIE_AC(0x00000020, UL)/* Timer Interrupt
Enable
*/arch/riscv/include/asm/csr.h new file +23
-0+ +#define EXC_INST_MISALIGNED 0 +#define EXC_INST_ACCESS 1 +#define EXC_BREAKPOINT 3 +#define EXC_LOAD_ACCESS 5 +#define EXC_STORE_ACCESS 7 +#define EXC_SYSCALL 8 +#define EXC_INST_PAGE_FAULT 12 +#define EXC_LOAD_PAGE_FAULT 13 +#define EXC_STORE_PAGE_FAULT 15 + +#ifndef __ASSEMBLY__ + +#define csr_swap (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrrw %0, " #csr ", %1" \ + : "=r" (__v) : "rK" (__v) \ + : "memory"); \ + __v; \ +}) + +#define csr_read (csr)\
arch/riscv/include/asm/csr.h new file +17
-0+({ \ + registerunsigned long __v; \ + __asm__ __volatile__ ("csrr %0, " #csr \ + :"=r" (__v) : \ + :"memory" ); \ + __v; \ +}) + +#define csr_write (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrw " #csr ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) + +#define csr_read_set (csr, val)\
arch/riscv/include/asm/csr.h new file +35
-0+({ \ +unsigned long __v = (unsigned long )(val); \ + __asm__ __volatile__ ("csrrs %0, " #csr ", %1" \ + :"=r" (__v) :"rK" (__v) \ + :"memory" ); \ + __v; \ +}) + +#define csr_set (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrs " #csr ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) + +#define csr_read_clear (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrrc %0, " #csr ", %1" \ + : "=r" (__v) : "rK" (__v) \ + : "memory"); \ + __v; \ +}) + +#define csr_clear (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrc " #csr ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) + +#endif /* __ASSEMBLY__ */ +Quoted 8 lines
Quoted 1 line
+#endif /*
_ASM_RISCV_CSR_H*/The RISC-V arch already has functions for accessing CSRs in
encoding.h.
I don't think it makes sense to keep both versions. I would tend towards keeping this version since this allows us to just sync with the
Linux kernel if there are any changes.
Quoted 6 lines
Thanks for pointing out. But I checked current Linux tree, and there is no
encoding.h. Maybeencoding.hwas from some old kernel tree? I can clean this up and leaving onlycsr.hin v2.Regards,
Bin
Sorry, I meant that encoding.h is in the u-boot RISC-V arch ( arch/riscv/include/asm/encoding.h). I think it's from bbl.
Thanks,
Lukas
PATCH 8/12 riscv: Add a helper routine to print CPU information
Hi Lucas,
Quoted 263 lines · Lukas
Hi Bin,
Quoted 259 lines · Bin Meng
Hi Lukas,
Quoted 242 lines · Lukas
Quoted 240 lines · Bin Meng
This adds a helper routine to print CPU information. Currently it prints all the instruction set extensions that the processor core supports.
Signed-off-by Bin Meng <[email protected]>---
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.harch/riscv/Makefile +1
-0@@ -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@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2018, Bin Meng <[email protected]> + +obj-y += cpu.oarch/riscv/cpu/cpu.c new file +49
-0@@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2018, Bin Meng <[email protected]> +*/ + +#include <common.h> +#include <asm/csr.h> + +enum { +ISA_INVALID =0 , +ISA_32BIT , +ISA_64BIT , +ISA_128BIT +}; + +static const char *const isa_bits[] = { + [ISA_INVALID ] =NULL , + [ISA_32BIT ] ="32" , + [ISA_64BIT ] ="64" , + [ISA_128BIT ] ="128" +}; + +static inline bool supports_extension (char ext) +{ +return csr_read (misa) & (1 << (ext -'a' )); +} + +int print_cpuinfo (void ) +{ +char name[32 ]; +char *s = name; +int bit; + + s +=sprintf (name,"rv" ); + bit =csr_read (misa) >> (sizeof (long ) *8 -2 ); + s +=sprintf (s, isa_bits[bit]); + +supports_extension ('i' ) ? *s++ ='i' :'r' ; +supports_extension ('m' ) ? *s++ ='m' :'i' ; +supports_extension ('a' ) ? *s++ ='a' :'s' ; +supports_extension ('f' ) ? *s++ ='f' :'c' ; +supports_extension ('d' ) ? *s++ ='d' :'-' ; +supports_extension ('c' ) ? *s++ ='c' :'v' ; + *s++ ='\0' ; + +printf ("CPU: %s\n" , name); + +return 0 ; +}arch/riscv/include/asm/csr.h new file +12
-0@@ -0,0 +1,124 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2015 Regents of the University of California +* +* Taken from Linux arch/riscv/include/asm/csr.h +*/ + +#ifndef _ASM_RISCV_CSR_H +#define _ASM_RISCV_CSR_H + +/* Status register flags */ +#define SR_SIE _AC(0x00000002, UL)/* Supervisor Interrupt Enable */
+#defineSR_SPIE_AC(0x00000020, UL)/* Previous
Supervisor IE */
+#defineSR_SPP_AC(0x00000100, UL)/* Previously
Supervisor */
+#defineSR_SUM_AC(0x00040000, UL)/* Supervisor
access User Memory */arch/riscv/include/asm/csr.h new file +2
-0+ +#define SR_FS _AC(0x00006000, UL)/* Floating- point
Status */arch/riscv/include/asm/csr.h new file +6
-0+#define SR_FS_OFF _AC(0x00000000, UL) +#define SR_FS_INITIAL _AC(0x00002000, UL) +#define SR_FS_CLEAN _AC(0x00004000, UL) +#define SR_FS_DIRTY _AC(0x00006000, UL) + +#define SR_XS _AC(0x00018000, UL)/* Extension Status
*/arch/riscv/include/asm/csr.h new file +7
-0+#define SR_XS_OFF _AC(0x00000000, UL) +#define SR_XS_INITIAL _AC(0x00008000, UL) +#define SR_XS_CLEAN _AC(0x00010000, UL) +#define SR_XS_DIRTY _AC(0x00018000, UL) + +#ifndef CONFIG_64BIT +#define SR_SD _AC(0x80000000, UL)/* FS/XS dirty */
arch/riscv/include/asm/csr.h new file +2
-0+#else +#define SR_SD _AC(0x8000000000000000, UL)/* FS/XS
dirty */arch/riscv/include/asm/csr.h new file +15
-0+#endif + +/* SATP flags */ +#if __riscv_xlen ==32 +#define SATP_PPN _AC(0x003FFFFF, UL) +#define SATP_MODE_32 _AC(0x80000000, UL) +#define SATP_MODE SATP_MODE_32 +#else +#define SATP_PPN _AC(0x00000FFFFFFFFFFF, UL) +#define SATP_MODE_39 _AC(0x8000000000000000, UL) +#define SATP_MODE SATP_MODE_39 +#endif + +/* Interrupt Enable and Interrupt Pending flags */ +#define SIE_SSIE _AC(0x00000002, UL)/* Software Interrupt Enable */
+#defineSIE_STIE_AC(0x00000020, UL)/* Timer Interrupt
Enable
*/arch/riscv/include/asm/csr.h new file +23
-0+ +#define EXC_INST_MISALIGNED 0 +#define EXC_INST_ACCESS 1 +#define EXC_BREAKPOINT 3 +#define EXC_LOAD_ACCESS 5 +#define EXC_STORE_ACCESS 7 +#define EXC_SYSCALL 8 +#define EXC_INST_PAGE_FAULT 12 +#define EXC_LOAD_PAGE_FAULT 13 +#define EXC_STORE_PAGE_FAULT 15 + +#ifndef __ASSEMBLY__ + +#define csr_swap (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrrw %0, " #csr ", %1" \ + : "=r" (__v) : "rK" (__v) \ + : "memory"); \ + __v; \ +}) + +#define csr_read (csr)\
arch/riscv/include/asm/csr.h new file +17
-0+({ \ + registerunsigned long __v; \ + __asm__ __volatile__ ("csrr %0, " #csr \ + :"=r" (__v) : \ + :"memory" ); \ + __v; \ +}) + +#define csr_write (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrw " #csr ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) + +#define csr_read_set (csr, val)\
arch/riscv/include/asm/csr.h new file +35
-0+({ \ +unsigned long __v = (unsigned long )(val); \ + __asm__ __volatile__ ("csrrs %0, " #csr ", %1" \ + :"=r" (__v) :"rK" (__v) \ + :"memory" ); \ + __v; \ +}) + +#define csr_set (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrs " #csr ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) + +#define csr_read_clear (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrrc %0, " #csr ", %1" \ + : "=r" (__v) : "rK" (__v) \ + : "memory"); \ + __v; \ +}) + +#define csr_clear (csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrc " #csr ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) + +#endif /* __ASSEMBLY__ */ +Quoted 8 lines
Quoted 1 line
+#endif /*
_ASM_RISCV_CSR_H*/The RISC-V arch already has functions for accessing CSRs in
encoding.h.
I don't think it makes sense to keep both versions. I would tend towards keeping this version since this allows us to just sync with the
Linux kernel if there are any changes.Thanks for pointing out. But I checked current Linux tree, and there is no
encoding.h. Maybeencoding.hwas from some old kernel tree? I can clean this up and leaving onlycsr.hin v2.
Quoted 5 lines
Quoted 2 lines
Regards,
BinSorry, I meant that
encoding.his in the u-boot RISC-V arch (arch/riscv/include/asm/encoding.h). I think it's from bbl.
Thanks. I believe we will just need the Linux version of csr.h and drop the bbl one.
Regards,
Bin
PATCH 9/12 riscv: Make start.S available for all targets
In reply to Bin MengCurrently start.S is inside arch/riscv/cpu/ax25/, but it can be common for all RISC-V targets.
---
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
@@ -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
@@ -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
@@ -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
arch/riscv/cpu/u-boot.lds +1 -1
@@ -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
PATCH 10/12 riscv: ae350: Clean up mixed tabs and spaces in the dts
In reply to Bin MengThere are quite a lot of mixed tabs and spaces in the ae350.dts. Clean them up.
---
arch/riscv/dts/ae350.dts | 177 ++++++++++++++++++++++++----------------------- 1 file changed, 90 insertions(+), 87 deletions(-)
arch/riscv/dts/ae350.dts +90 -87
@@ -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
PATCH 11/12 riscv: kconfig: Select DM and OF_CONTROL
In reply to Bin MengRISC-V is a pretty new architecture and should support DM and OF_CONTROL by default.
---
arch/Kconfig | 3 +++ configs/ax25-ae350_defconfig | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-)
arch/Kconfig +3 -0
@@ -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
@@ -16,11 +16,9 @@ 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_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
PATCH 12/12 riscv: Add QEMU virt board support
In reply to Bin MengThis 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.
---
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 | 21 +++++++++++++++ board/emulation/qemu-riscv/MAINTAINERS | 7 +++++ board/emulation/qemu-riscv/Makefile | 5 ++++ board/emulation/qemu-riscv/qemu-riscv.c | 23 +++++++++++++++++ configs/qemu-riscv32_defconfig | 10 +++++++ configs/qemu-riscv64_defconfig | 11 ++++++++ doc/README.qemu-riscv | 46 +++++++++++++++++++++++++++++++++ include/configs/qemu-riscv.h | 21 +++++++++++++++ 12 files changed, 200 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
@@ -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
@@ -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
@@ -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
@@ -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 +21 -0
@@ -0,0 +1,21 @@ +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 + +endif
board/emulation/qemu-riscv/MAINTAINERS new file +7 -0
@@ -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
@@ -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
@@ -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 +10 -0
@@ -0,0 +1,10 @@ +CONFIG_RISCV=y +CONFIG_TARGET_QEMU_VIRT=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_BOOTDELAY=3 +CONFIG_DISPLAY_CPUINFO=y +CONFIG_DISPLAY_BOARDINFO=y +CONFIG_OF_BOARD=y +CONFIG_DM_SERIAL=y +CONFIG_SYS_NS16550=y +CONFIG_TIMER=y
configs/qemu-riscv64_defconfig new file +11 -0
@@ -0,0 +1,11 @@ +CONFIG_RISCV=y +CONFIG_TARGET_QEMU_VIRT=y +CONFIG_CPU_RISCV_64=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_BOOTDELAY=3 +CONFIG_DISPLAY_CPUINFO=y +CONFIG_DISPLAY_BOARDINFO=y +CONFIG_OF_BOARD=y +CONFIG_DM_SERIAL=y +CONFIG_SYS_NS16550=y +CONFIG_TIMER=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
@@ -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
Auer
PATCH 12/12 riscv: Add QEMU virt board support
Quoted 9 lines · 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.
Quoted 4 lines
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.
For your information and to avoid duplicate work, I am working on a patch set that improves RISC-V support in u-boot. I am currently able to boot Linux on a multi-core setup in QEMU, but they are not quite ready to submit yet.
Thank you for your patches, it's great to see better support for RISC-V in u-boot! I will add a few comments based on what I have learned so far from working with u-boot on RISC-V.
Quoted 92 lines
Signed-off-by Bin Meng <[email protected]>---
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 | 21 +++++++++++++++ board/emulation/qemu-riscv/MAINTAINERS | 7 +++++ board/emulation/qemu-riscv/Makefile | 5 ++++ board/emulation/qemu-riscv/qemu-riscv.c | 23 +++++++++++++++++ configs/qemu-riscv32_defconfig | 10 +++++++ configs/qemu-riscv64_defconfig | 11 ++++++++ doc/README.qemu-riscv | 46 +++++++++++++++++++++++++++++++++ include/configs/qemu-riscv.h | 21 +++++++++++++++ 12 files changed, 200 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.harch/riscv/Kconfig +4
-0@@ -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@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2018, Bin Meng <[email protected]> + +obj-y += dram.o +obj-y += cpu.oarch/riscv/cpu/qemu/cpu.c new file +24
-0@@ -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 * constargv[])
arch/riscv/cpu/qemu/cpu.c line 29
Quoted 5 lines
arch/riscv/cpu/qemu/cpu.c new file +5
-0+{ +printf ("reset unsupported yet\n" ); + +return 0 ; +}
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).
Quoted 84 lines
arch/riscv/cpu/qemu/dram.c new file +17
-0@@ -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 +21
-0@@ -0,0 +1,21 @@ +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 + +endifboard/emulation/qemu-riscv/MAINTAINERS new file +7
-0@@ -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_defconfigboard/emulation/qemu-riscv/Makefile new file +5
-0@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2018, Bin Meng <[email protected]> + +obj-y += qemu-riscv.oboard/emulation/qemu-riscv/qemu-riscv.c new file +0
-0
board/emulation/qemu-riscv/qemu-riscv.c line 9
Quoted 9 lines
board/emulation/qemu-riscv/qemu-riscv.c new file +9
-0@@ -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
This value is not specified anywhere, so it could change without prior warning. The value is also passed in a1 by ROM. If you want I can update the code to use this value when I submit my patches.
Thanks,
Lukas
Quoted 136 lines
board/emulation/qemu-riscv/qemu-riscv.c new file +14
-0+ +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- renamed from configs/qemu-riscv32_defconfig +0
-0
riscv32_defconfig
new file mode 100644
index 0000000..cbd2c91configs/qemu-riscv32_defconfig new file +10
-0@@ -0,0 +1,10 @@ +CONFIG_RISCV=y +CONFIG_TARGET_QEMU_VIRT=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_BOOTDELAY=3 +CONFIG_DISPLAY_CPUINFO=y +CONFIG_DISPLAY_BOARDINFO=y +CONFIG_OF_BOARD=y +CONFIG_DM_SERIAL=y +CONFIG_SYS_NS16550=y +CONFIG_TIMER=yconfigs/qemu- renamed from configs/qemu-riscv64_defconfig +0
-0
riscv64_defconfig
new file mode 100644
index 0000000..af8b307configs/qemu-riscv64_defconfig new file +11
-0@@ -0,0 +1,11 @@ +CONFIG_RISCV=y +CONFIG_TARGET_QEMU_VIRT=y +CONFIG_CPU_RISCV_64=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_BOOTDELAY=3 +CONFIG_DISPLAY_CPUINFO=y +CONFIG_DISPLAY_BOARDINFO=y +CONFIG_OF_BOARD=y +CONFIG_DM_SERIAL=y +CONFIG_SYS_NS16550=y +CONFIG_TIMER=ydoc/README.qemu-riscv new file +8
-0@@ -0,0 +1,46 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2018, Bin Meng <[email protected]> + +U-Boot on QEMU's 'virt' machine on RISC-V +========================================= + +QEMU for RISC-V supports a special 'virt' machine designed foremulation and
+virtualization purposes. This document describes how to run U-Boot under it.doc/README.qemu-riscv new file +3
-0+Both 32-bit 64-bit targets are supported. + +The QEMU virt machine models a generic RISC-V virtual machine withsupport 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 privilegeddoc/README.qemu-riscv new file +31
-0+architecture spec v1.10. + +Building U-Boot +--------------- +Set the CROSS_COMPILE environment variable as usual, and run: + +- For 32-bit RISC-V: + make qemu-riscv32_defconfig + make + +- For 64-bit RISC-V: + make qemu-riscv64_defconfig + make + +Running U-Boot +-------------- +The minimal QEMU command line to get U-Boot up and running is: + +- For 32-bit RISC-V: + qemu-system-riscv32 -nographic -machine virt -kernel u-boot + +- For 64-bit RISC-V: + qemu-system-riscv64 -nographic -machine virt -kernel u-boot + +The commands above create targets with 128MiB memory by default. +A freely configurable amount of RAM can be created via the '-m' +parameter. For example, '-m 2G' creates 2GiB memory for the target, +and the memory node in the embedded DTB created by QEMU reflects +the new setting. + +These have been tested in QEMU 3.0.0.include/configs/qemu- renamed from include/configs/qemu-riscv.h +0
-0
riscv.h
new file mode 100644
index 0000000..d279c23include/configs/qemu-riscv.h new file +22
-0@@ -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 */
PATCH 12/12 riscv: Add QEMU virt board support
Hi Lukas,
Quoted 16 lines · Lukas
Quoted 9 lines · 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.
Quoted 4 lines
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.
Quoted 5 lines
For your information and to avoid duplicate work, I am working on a patch set that improves RISC-V support in u-boot. I am currently able to boot Linux on a multi-core setup in QEMU, but they are not quite ready to submit yet.
This is great! My next step is to work on virtio driver support in U-Boot as qemu-riscv virt machine has these devices but we don't have corresponding drivers in U-Boot. Then I will try to boot Linux after that. Good to hear you already boot Linux with qemu-riscv! Have you already supported virtio drivers in your port? If yes, I will just hold on and wait for your patch series :-)
Quoted 4 lines
Thank you for your patches, it's great to see better support for RISC-V in u-boot! I will add a few comments based on what I have learned so far from working with u-boot on RISC-V.
It's a good start. RISC-V is pretty new and needs more developers :-)
Quoted 94 lines
Quoted 94 lines
Signed-off-by Bin Meng <[email protected]>---
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 | 21 +++++++++++++++ board/emulation/qemu-riscv/MAINTAINERS | 7 +++++ board/emulation/qemu-riscv/Makefile | 5 ++++ board/emulation/qemu-riscv/qemu-riscv.c | 23 +++++++++++++++++ configs/qemu-riscv32_defconfig | 10 +++++++ configs/qemu-riscv64_defconfig | 11 ++++++++ doc/README.qemu-riscv | 46 +++++++++++++++++++++++++++++++++ include/configs/qemu-riscv.h | 21 +++++++++++++++ 12 files changed, 200 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.harch/riscv/Kconfig +4
-0@@ -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@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2018, Bin Meng <[email protected]> + +obj-y += dram.o +obj-y += cpu.oarch/riscv/cpu/qemu/cpu.c new file +24
-0@@ -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 * constargv[])
arch/riscv/cpu/qemu/cpu.c new file +2
-0+{ +printf ("reset unsupported yet\n" );
Quoted 9 lines
arch/riscv/cpu/qemu/cpu.c line 22
Quoted 3 lines
arch/riscv/cpu/qemu/cpu.c new file +3
-0+ +return 0 ; +}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_resetfunction for all CPU variants tolib/, similar to the one for ARM (arch/arm/lib/reset.c).
Agreed. I can address this in v2.
Quoted 89 lines
Quoted 89 lines
arch/riscv/cpu/qemu/dram.c new file +17
-0@@ -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 +21
-0@@ -0,0 +1,21 @@ +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 + +endifboard/emulation/qemu-riscv/MAINTAINERS new file +7
-0@@ -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_defconfigboard/emulation/qemu-riscv/Makefile new file +5
-0@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2018, Bin Meng <[email protected]> + +obj-y += qemu-riscv.oboard/emulation/qemu-riscv/qemu-riscv.c new file +5
-0@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2018, Bin Meng <[email protected]> +*/ +
Quoted 9 lines
board/emulation/qemu-riscv/qemu-riscv.c line 9
Quoted 4 lines
board/emulation/qemu-riscv/qemu-riscv.c new file +4
-0+#include <common.h> +#include <fdtdec.h> + +#define MROM_FDT_ADDR 0x1020This value is not specified anywhere, so it could change without prior warning. The value is also passed in a1 by ROM. If you want I can update the code to use this value when I submit my patches.
Yes, it's not specified *explicitly* anywhere. I got this after reading the code logic in QEMU's source codes :) I agree with you that hardcode this is not good. I am OK to have your patch to update this.
[snip]
Regards,
Bin
Auer
PATCH 12/12 riscv: Add QEMU virt board support
Quoted 33 lines · Bin Meng
Hi Lukas,
Quoted 22 lines · Lukas
Quoted 14 lines · 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.Quoted 5 lines
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.Quoted 6 lines
For your information and to avoid duplicate work, I am working on a patch set that improves RISC-V support in u-boot. I am currently able
to boot Linux on a multi-core setup in QEMU, but they are not quite ready to submit yet.
Quoted 7 lines
This is great! My next step is to work on virtio driver support in U-Boot as qemu-riscv virt machine has these devices but we don't have corresponding drivers in U-Boot. Then I will try to boot Linux after that. Good to hear you already boot Linux with qemu-riscv! Have you already supported virtio drivers in your port? If yes, I will just hold on and wait for your patch series :-)
Hi Bin,
Support for the virtio devices would be great! I don't support them in my port, I can only boot a kernel image from RAM.
I only have a driver for the clint0 (core local interrupt controller), which I need for software interrupts to other cores and as a timer. Software interrupts also work over the supervisor binary interface (SBI), which allows u-boot to run in supervisor mode with bbl running in machine mode to handle the SBI calls.
Quoted 9 lines
Quoted 6 lines
Thank you for your patches, it's great to see better support for RISC-V
in u-boot! I will add a few comments based on what I have learned so
far from working with u-boot on RISC-V.It's a good start. RISC-V is pretty new and needs more developers :-)
Exactly :)
Thanks,
Lukas
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 12/12 riscv: Add QEMU virt board support
Quoted 45 lines
Quoted 45 lines
From: Auer, Lukas [mailto:lukas.auer at aisec.fraunhofer.de]
Sent: Wednesday, September 05, 2018 5:53 AM
To: bmeng.cn at gmail.com
Cc: Rick Jian-Zhi Chen(陳建志); u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH 12/12] riscv: Add QEMU virt board supportQuoted 28 lines · Bin Meng
Hi Lukas,
Quoted 18 lines · Lukas
Quoted 11 lines · 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.Quoted 4 lines
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.
Quoted 5 lines
For your information and to avoid duplicate work, I am working on a patch set that improves RISC-V support in u-boot. I am currently able to boot Linux on a multi-core setup in QEMU, but they are not quite ready to submit yet.
Quoted 7 lines
This is great! My next step is to work on virtio driver support in U-Boot as qemu-riscv virt machine has these devices but we don't have corresponding drivers in U-Boot. Then I will try to boot Linux after that. Good to hear you already boot Linux with qemu-riscv! Have you already supported virtio drivers in your port? If yes, I will just hold on and wait for your patch series :-)
Hi Bin,
Quoted 8 lines
Quoted 8 lines
Support for the virtio devices would be great! I don't support them in my port, I can only boot a kernel image from RAM.
I only have a driver for the clint0 (core local interrupt controller), which I need for software interrupts to other cores and as a timer. Software interrupts also work over the supervisor binary interface (SBI), which allows u-boot to run in supervisor mode with bbl running in machine mode to handle the SBI calls.
Hi Bin and Auer
I have already boot bbl run in S-mode and riscv-linux in M-mode via u-boot from SD card or FLASH.
It mean after booting riscv-linux, u-boot will be dead. And no matter about kernel.
Please refer to doc/README.ae350
May I figure out more clearly what are you going to do ? What are you going to do is let u-boot run in S-mode and boot bbl and riscv-linux in M-mode, right ?
It mean after booting bbl and riscv-linux, u-boot will still alive and handle SBI calls and somethings in S-mode.
Or u-boot is going to replace the role of bbl ?
Rick
Quoted 13 lines
Quoted 13 lines
Quoted 8 lines
Quoted 4 lines
Thank you for your patches, it's great to see better support for RISC-V in u-boot! I will add a few comments based on what I have learned so far from working with u-boot on RISC-V.
It's a good start. RISC-V is pretty new and needs more developers :-)
Exactly :)
Thanks,
Lukas
PATCH 12/12 riscv: Add QEMU virt board support
Rick Chen <[email protected]> 於 2018年9月5日 週三 上午9:28寫道:
Quoted 55 lines
Quoted 46 lines
Quoted 46 lines
From: Auer, Lukas [mailto:lukas.auer at aisec.fraunhofer.de]
Sent: Wednesday, September 05, 2018 5:53 AM
To: bmeng.cn at gmail.com
Cc: Rick Jian-Zhi Chen(陳建志); u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH 12/12] riscv: Add QEMU virt board supportQuoted 28 lines · Bin Meng
Hi Lukas,
Quoted 18 lines · Lukas
Quoted 11 lines · 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.Quoted 4 lines
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.
Quoted 5 lines
For your information and to avoid duplicate work, I am working on a patch set that improves RISC-V support in u-boot. I am currently able to boot Linux on a multi-core setup in QEMU, but they are not quite ready to submit yet.
Quoted 7 lines
This is great! My next step is to work on virtio driver support in U-Boot as qemu-riscv virt machine has these devices but we don't have corresponding drivers in U-Boot. Then I will try to boot Linux after that. Good to hear you already boot Linux with qemu-riscv! Have you already supported virtio drivers in your port? If yes, I will just hold on and wait for your patch series :-)
Hi Bin,
Quoted 8 lines
Quoted 8 lines
Support for the virtio devices would be great! I don't support them in my port, I can only boot a kernel image from RAM.
I only have a driver for the clint0 (core local interrupt controller), which I need for software interrupts to other cores and as a timer. Software interrupts also work over the supervisor binary interface (SBI), which allows u-boot to run in supervisor mode with bbl running in machine mode to handle the SBI calls.
Quoted 3 lines
Hi Bin and Auer
I have already boot bbl run in S-mode and riscv-linux in M-mode via
Sorry ! Correct some descriptions about S-mode and M-mode I have already boot bbl run in M-mode and riscv-linux in S-mode via u-boot from SD card or FLASH.
Quoted 33 lines
u-boot from SD card or FLASH.
It mean after booting riscv-linux, u-boot will be dead. And no matter about kernel.
Please refer to doc/README.ae350May I figure out more clearly what are you going to do ? What are you going to do is let u-boot run in S-mode and boot bbl and riscv-linux in M-mode, right ?
It mean after booting bbl and riscv-linux, u-boot will still alive and handle SBI calls and somethings in S-mode.Or u-boot is going to replace the role of bbl ?
Rick
Quoted 13 lines
Quoted 13 lines
Quoted 8 lines
Quoted 4 lines
Thank you for your patches, it's great to see better support for RISC-V in u-boot! I will add a few comments based on what I have learned so far from working with u-boot on RISC-V.
It's a good start. RISC-V is pretty new and needs more developers :-)
Exactly :)
Thanks,
Lukas
PATCH 12/12 riscv: Add QEMU virt board support
In reply to Rick ChenHi Rick,
Quoted 55 lines · Rick Chen
Quoted 46 lines
Quoted 46 lines
From: Auer, Lukas [mailto:lukas.auer at aisec.fraunhofer.de]
Sent: Wednesday, September 05, 2018 5:53 AM
To: bmeng.cn at gmail.com
Cc: Rick Jian-Zhi Chen(陳建志); u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH 12/12] riscv: Add QEMU virt board supportQuoted 28 lines · Bin Meng
Hi Lukas,
Quoted 18 lines · Lukas
Quoted 11 lines · 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.Quoted 4 lines
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.
Quoted 5 lines
For your information and to avoid duplicate work, I am working on a patch set that improves RISC-V support in u-boot. I am currently able to boot Linux on a multi-core setup in QEMU, but they are not quite ready to submit yet.
Quoted 7 lines
This is great! My next step is to work on virtio driver support in U-Boot as qemu-riscv virt machine has these devices but we don't have corresponding drivers in U-Boot. Then I will try to boot Linux after that. Good to hear you already boot Linux with qemu-riscv! Have you already supported virtio drivers in your port? If yes, I will just hold on and wait for your patch series :-)
Hi Bin,
Quoted 8 lines
Quoted 8 lines
Support for the virtio devices would be great! I don't support them in my port, I can only boot a kernel image from RAM.
I only have a driver for the clint0 (core local interrupt controller), which I need for software interrupts to other cores and as a timer. Software interrupts also work over the supervisor binary interface (SBI), which allows u-boot to run in supervisor mode with bbl running in machine mode to handle the SBI calls.
Quoted 8 lines
Hi Bin and Auer
I have already boot bbl run in S-mode and riscv-linux in M-mode via u-boot from SD card or FLASH.
It mean after booting riscv-linux, u-boot will be dead. And no matter about kernel.
Please refer to doc/README.ae350
Thanks for pointing out the doc for ae350. I just read it, and have one question. There is a chapter in that doc "Boot bbl and riscv-linux via U-Boot on QEMU", yet I don't see what QEMU command is invoked. Can you please clarify? AFAIK mainline QEMU does not have support to ae350 board. Also there is no instructions on how bbl was built. Is that the mainline bbl that can work on every riscv board? I doubt that.
Quoted 3 lines
May I figure out more clearly what are you going to do ? What are you going to do is let u-boot run in S-mode and boot bbl and riscv-linux in M-mode, right ?
I want to use U-Boot to directly boot Linux, but seems Lukas is using bbl for SBI implementation.
Quoted 5 lines
It mean after booting bbl and riscv-linux, u-boot will still alive and handle SBI calls and somethings in S-mode.
Or u-boot is going to replace the role of bbl ?
That's my plan. I don't see a need to use bbl which is quite feature limited.
Regards,
Bin
PATCH 12/12 riscv: Add QEMU virt board support
Bin Meng <[email protected]> 於 2018年9月5日 週三 上午10:34寫道:
Quoted 68 lines
Hi Rick,
Quoted 55 lines · Rick Chen
Quoted 46 lines
Quoted 46 lines
From: Auer, Lukas [mailto:lukas.auer at aisec.fraunhofer.de]
Sent: Wednesday, September 05, 2018 5:53 AM
To: bmeng.cn at gmail.com
Cc: Rick Jian-Zhi Chen(陳建志); u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH 12/12] riscv: Add QEMU virt board supportQuoted 28 lines · Bin Meng
Hi Lukas,
Quoted 18 lines · Lukas
Quoted 11 lines · 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.Quoted 4 lines
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.
Quoted 5 lines
For your information and to avoid duplicate work, I am working on a patch set that improves RISC-V support in u-boot. I am currently able to boot Linux on a multi-core setup in QEMU, but they are not quite ready to submit yet.
Quoted 7 lines
This is great! My next step is to work on virtio driver support in U-Boot as qemu-riscv virt machine has these devices but we don't have corresponding drivers in U-Boot. Then I will try to boot Linux after that. Good to hear you already boot Linux with qemu-riscv! Have you already supported virtio drivers in your port? If yes, I will just hold on and wait for your patch series :-)
Hi Bin,
Quoted 8 lines
Quoted 8 lines
Support for the virtio devices would be great! I don't support them in my port, I can only boot a kernel image from RAM.
I only have a driver for the clint0 (core local interrupt controller), which I need for software interrupts to other cores and as a timer. Software interrupts also work over the supervisor binary interface (SBI), which allows u-boot to run in supervisor mode with bbl running in machine mode to handle the SBI calls.Quoted 8 lines
Hi Bin and Auer
I have already boot bbl run in S-mode and riscv-linux in M-mode via u-boot from SD card or FLASH.
It mean after booting riscv-linux, u-boot will be dead. And no matter about kernel.
Please refer to doc/README.ae350
Quoted 7 lines
Thanks for pointing out the doc for ae350. I just read it, and have one question. There is a chapter in that doc "Boot bbl and riscv-linux via U-Boot on QEMU", yet I don't see what QEMU command is invoked. Can you please clarify? AFAIK mainline QEMU does not have support to ae350 board. Also there is no instructions on how bbl was built. Is that the mainline bbl that can work on every riscv board? I doubt that.
There are some teammates who are responsible for bbl, riscv-linux, u-boot, qemu individually.
As I know they just pull source from mainline and have relative hooks for ax25-ae350.
I am in charge of booting kernel via u-boot.
And drivers (timer, serial, spi flash, smc flash, sd, mac, rtc, wdt,i2c, sound, lcd) verification on u-boot and kernel. That is why I am pending u-boot for a while.
When I finish booting riscv-linux via u-boot function. Then I have pushed them to u-boot upstream.
And describe simply the build and run flow in doc/README.ae350. As I know, the implementations about bbl and qemu still not been pushed to upstream yet.
Maybe I can ask them how about the upstream schedule !
Hope this can answer your question !
Quoted 7 lines
Quoted 3 lines
May I figure out more clearly what are you going to do ? What are you going to do is let u-boot run in S-mode and boot bbl and riscv-linux in M-mode, right ?
I want to use U-Boot to directly boot Linux, but seems Lukas is using bbl for SBI implementation.
Quoted 8 lines
Quoted 5 lines
It mean after booting bbl and riscv-linux, u-boot will still alive and handle SBI calls and somethings in S-mode.
Or u-boot is going to replace the role of bbl ?
That's my plan. I don't see a need to use bbl which is quite feature limited.
Sounds great !
Very looking forward to this achievement !
Rick
Quoted 2 lines
Regards,
Bin
Auer
PATCH 12/12 riscv: Add QEMU virt board support
In reply to Bin MengQuoted 103 lines · Bin Meng
Hi Rick,
Quoted 78 lines · Rick Chen
Quoted 6 lines
Quoted 6 lines
From: Auer, Lukas [mailto:lukas.auer at aisec.fraunhofer.de]
Sent: Wednesday, September 05, 2018 5:53 AM
To: bmeng.cn at gmail.com
Cc: Rick Jian-Zhi Chen(陳建志); u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH 12/12] riscv: Add QEMU virt boardsupport
Quoted 9 lines
Quoted 9 lines · Bin Meng
Quoted 7 lines
Hi Lukas,
Quoted 3 lines · Lukas
Quoted 1 line · Bin Meng
This adds QEMU RISC-V 'virt' board target support, with
the hope
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
of helping people easily test U-Boot on RISC-V.
The QEMU virt machine models a generic RISC-V virtual
machine
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
with support for the VirtIO standard networking and
block
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
storage devices.
It has CLINT, PLIC, 16550A UART devices in addition toVirtIO
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
and it also uses device-tree to pass configuration
information
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
to guest software. It implements RISC-V privileged
architecture
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
spec v1.10.
Both 32-bit and 64-bit builds are supported. Support is
pretty
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
much preliminary, only booting to U-Boot shell with the
UART
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
driver on a single core. Booting Linux is not supported
yet.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
For your information and to avoid duplicate work, I am
working on
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
a patch set that improves RISC-V support in u-boot. I am
currently
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
able to boot Linux on a multi-core setup in QEMU, but they
are not
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
quite ready to submit yet.
This is great! My next step is to work on virtio driver
support in
Quoted 1 line
Quoted 1 line
Quoted 1 line
U-Boot as qemu-riscv virt machine has these devices but we
don't
Quoted 1 line
Quoted 1 line
Quoted 1 line
have corresponding drivers in U-Boot. Then I will try to
boot Linux
Quoted 1 line
Quoted 1 line
Quoted 1 line
after that. Good to hear you already boot Linux with qemu-
riscv!
Quoted 1 line
Quoted 1 line
Quoted 1 line
Have you already supported virtio drivers in your port? If
yes, I
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
will just hold on and wait for your patch series :-)
Hi Bin,
Support for the virtio devices would be great! I don't support
them in
Quoted 2 lines
Quoted 2 lines
my port, I can only boot a kernel image from RAM. I only have a driver for the clint0 (core local interrupt
controller),
Quoted 1 line
Quoted 1 line
which I need for software interrupts to other cores and as a
timer.
Quoted 1 line
Quoted 1 line
Software interrupts also work over the supervisor binary
interface
Quoted 1 line
Quoted 1 line
(SBI), which allows u-boot to run in supervisor mode with bbl
running
Quoted 2 lines
Quoted 2 lines
in machine mode to handle the SBI calls.
Quoted 9 lines
Hi Bin and Auer
I have already boot bbl run in S-mode and riscv-linux in M-mode via u-boot from SD card or FLASH.
It mean after booting riscv-linux, u-boot will be dead. And no matter
about kernel.
Please refer to doc/README.ae350Thanks for pointing out the doc for ae350. I just read it, and have one question. There is a chapter in that doc "Boot bbl and riscv- linux
via U-Boot on QEMU", yet I don't see what QEMU command is invoked. Can
you please clarify? AFAIK mainline QEMU does not have support to ae350
board. Also there is no instructions on how bbl was built. Is that the
mainline bbl that can work on every riscv board? I doubt that.
Quoted 8 lines
Quoted 4 lines
May I figure out more clearly what are you going to do ? What are you going to do is let u-boot run in S-mode and boot bbl and
riscv-linux in M-mode, right ?I want to use U-Boot to directly boot Linux, but seems Lukas is using bbl for SBI implementation.
Hi Bin,
I don't really need bbl to run u-boot. I use it for Linux, which expects the SBI to be present.
Quoted 10 lines
Quoted 6 lines
It mean after booting bbl and riscv-linux, u-boot will still alive and
handle SBI calls and somethings in S-mode.Or u-boot is going to replace the role of bbl ?
That's my plan. I don't see a need to use bbl which is quite feature limited.
That's a good idea! At the very least, all the device initialization in bbl should be moved into u-boot.
I do think a bootloader-independent SBI implementation makes sense though. That way all bootloaders can use the same implementation, which should make adding new SBI calls easier.
Thanks,
Lukas
Quoted 2 lines
Regards,
Bin
PATCH 12/12 riscv: Add QEMU virt board support
Hi Lukas,
Quoted 130 lines · Lukas
Quoted 103 lines · Bin Meng
Hi Rick,
Quoted 78 lines · Rick Chen
Quoted 6 lines
Quoted 6 lines
From: Auer, Lukas [mailto:lukas.auer at aisec.fraunhofer.de]
Sent: Wednesday, September 05, 2018 5:53 AM
To: bmeng.cn at gmail.com
Cc: Rick Jian-Zhi Chen(陳建志); u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH 12/12] riscv: Add QEMU virt boardsupport
Quoted 9 lines
Quoted 9 lines · Bin Meng
Quoted 7 lines
Hi Lukas,
Quoted 3 lines · Lukas
Quoted 1 line · Bin Meng
This adds QEMU RISC-V 'virt' board target support, with
the hope
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
of helping people easily test U-Boot on RISC-V.
The QEMU virt machine models a generic RISC-V virtual
machine
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
with support for the VirtIO standard networking and
block
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
storage devices.
It has CLINT, PLIC, 16550A UART devices in addition toVirtIO
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
and it also uses device-tree to pass configuration
information
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
to guest software. It implements RISC-V privileged
architecture
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
spec v1.10.
Both 32-bit and 64-bit builds are supported. Support is
pretty
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
much preliminary, only booting to U-Boot shell with the
UART
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
driver on a single core. Booting Linux is not supported
yet.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
For your information and to avoid duplicate work, I am
working on
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
a patch set that improves RISC-V support in u-boot. I am
currently
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
able to boot Linux on a multi-core setup in QEMU, but they
are not
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
quite ready to submit yet.
This is great! My next step is to work on virtio driver
support in
Quoted 1 line
Quoted 1 line
Quoted 1 line
U-Boot as qemu-riscv virt machine has these devices but we
don't
Quoted 1 line
Quoted 1 line
Quoted 1 line
have corresponding drivers in U-Boot. Then I will try to
boot Linux
Quoted 1 line
Quoted 1 line
Quoted 1 line
after that. Good to hear you already boot Linux with qemu-
riscv!
Quoted 1 line
Quoted 1 line
Quoted 1 line
Have you already supported virtio drivers in your port? If
yes, I
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
will just hold on and wait for your patch series :-)
Hi Bin,
Support for the virtio devices would be great! I don't support
them in
Quoted 2 lines
Quoted 2 lines
my port, I can only boot a kernel image from RAM. I only have a driver for the clint0 (core local interrupt
controller),
Quoted 1 line
Quoted 1 line
which I need for software interrupts to other cores and as a
timer.
Quoted 1 line
Quoted 1 line
Software interrupts also work over the supervisor binary
interface
Quoted 1 line
Quoted 1 line
(SBI), which allows u-boot to run in supervisor mode with bbl
running
Quoted 2 lines
Quoted 2 lines
in machine mode to handle the SBI calls.
Quoted 9 lines
Hi Bin and Auer
I have already boot bbl run in S-mode and riscv-linux in M-mode via u-boot from SD card or FLASH.
It mean after booting riscv-linux, u-boot will be dead. And no matter
about kernel.
Please refer to doc/README.ae350Thanks for pointing out the doc for ae350. I just read it, and have one question. There is a chapter in that doc "Boot bbl and riscv- linux
via U-Boot on QEMU", yet I don't see what QEMU command is invoked. Can
you please clarify? AFAIK mainline QEMU does not have support to ae350
board. Also there is no instructions on how bbl was built. Is that the
mainline bbl that can work on every riscv board? I doubt that.Quoted 8 lines
Quoted 4 lines
May I figure out more clearly what are you going to do ? What are you going to do is let u-boot run in S-mode and boot bbl and
riscv-linux in M-mode, right ?I want to use U-Boot to directly boot Linux, but seems Lukas is using bbl for SBI implementation.
Hi Bin,
I don't really need bbl to run u-boot. I use it for Linux, which expects the SBI to be present.
Quoted 10 lines
Quoted 6 lines
It mean after booting bbl and riscv-linux, u-boot will still alive and
handle SBI calls and somethings in S-mode.Or u-boot is going to replace the role of bbl ?
That's my plan. I don't see a need to use bbl which is quite feature limited.
Quoted 5 lines
That's a good idea! At the very least, all the device initialization in bbl should be moved into u-boot.
I do think a bootloader-independent SBI implementation makes sense though. That way all bootloaders can use the same implementation, which should make adding new SBI calls easier.
But I doubt we can have a generic SBI implementation. At least the console I/O SBI call can vary from board to board due to different UART devices are used.
Regards,
Bin
Auer
PATCH 12/12 riscv: Add QEMU virt board support
Hi Bin,
Quoted 165 lines · Bin Meng
Hi Lukas,
Quoted 153 lines · Lukas
Quoted 128 lines · Bin Meng
Hi Rick,
Quoted 95 lines · Rick Chen
Quoted 6 lines
Quoted 6 lines
From: Auer, Lukas [mailto:lukas.auer at aisec.fraunhofer.de]
Sent: Wednesday, September 05, 2018 5:53 AM
To: bmeng.cn at gmail.com
Cc: Rick Jian-Zhi Chen(陳建志); u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH 12/12] riscv: Add QEMU virtboard
supportQuoted 9 lines
Quoted 9 lines · Bin Meng
Quoted 7 lines
Hi Lukas,
Quoted 3 lines · Lukas
Quoted 1 line · Bin Meng
This adds QEMU RISC-V 'virt' board target support,
with
the hopeQuoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
of helping people easily test U-Boot on RISC-V.
The QEMU virt machine models a generic RISC-V
virtual
machineQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
with support for the VirtIO standard networking and
block
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
storage devices.
It has CLINT, PLIC, 16550A UART devices in additionto
VirtIOQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
and it also uses device-tree to pass configuration
information
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
to guest software. It implements RISC-V privileged
architecture
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
spec v1.10.
Both 32-bit and 64-bit builds are supported. Support
is
prettyQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
much preliminary, only booting to U-Boot shell with
the
UARTQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
driver on a single core. Booting Linux is not
supported
yet.Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
For your information and to avoid duplicate work, I am
working on
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
a patch set that improves RISC-V support in u-boot. I
am
currentlyQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
able to boot Linux on a multi-core setup in QEMU, but
they
are notQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
quite ready to submit yet.
This is great! My next step is to work on virtio driver
support in
Quoted 1 line
Quoted 1 line
Quoted 1 line
U-Boot as qemu-riscv virt machine has these devices but
we
don'tQuoted 1 line
Quoted 1 line
Quoted 1 line
have corresponding drivers in U-Boot. Then I will try to
boot Linux
Quoted 1 line
Quoted 1 line
Quoted 1 line
after that. Good to hear you already boot Linux with
qemu-
riscv!Quoted 1 line
Quoted 1 line
Quoted 1 line
Have you already supported virtio drivers in your port?
If
yes, IQuoted 6 lines
Quoted 6 lines
Quoted 2 lines
will just hold on and wait for your patch series :-)
Hi Bin,
Support for the virtio devices would be great! I don't
support
them inQuoted 2 lines
Quoted 2 lines
my port, I can only boot a kernel image from RAM. I only have a driver for the clint0 (core local interrupt
controller),
Quoted 1 line
Quoted 1 line
which I need for software interrupts to other cores and as
a
timer.Quoted 1 line
Quoted 1 line
Software interrupts also work over the supervisor binary
interface
Quoted 1 line
Quoted 1 line
(SBI), which allows u-boot to run in supervisor mode with
bbl
runningQuoted 2 lines
Quoted 2 lines
in machine mode to handle the SBI calls.
Hi Bin and Auer
Quoted 8 lines
I have already boot bbl run in S-mode and riscv-linux in M-mode via
u-boot from SD card or FLASH.
It mean after booting riscv-linux, u-boot will be dead. And no matter
about kernel.
Please refer to doc/README.ae350Thanks for pointing out the doc for ae350. I just read it, and have
one question. There is a chapter in that doc "Boot bbl and riscv- linux
via U-Boot on QEMU", yet I don't see what QEMU command is invoked.
Can
you please clarify? AFAIK mainline QEMU does not have support to ae350
board. Also there is no instructions on how bbl was built. Is that
the
mainline bbl that can work on every riscv board? I doubt that.Quoted 5 lines
May I figure out more clearly what are you going to do ? What are you going to do is let u-boot run in S-mode and boot bbl
and
riscv-linux in M-mode, right ?Quoted 4 lines
I want to use U-Boot to directly boot Linux, but seems Lukas is using
bbl for SBI implementation.Hi Bin,
I don't really need bbl to run u-boot. I use it for Linux, which expects the SBI to be present.
Quoted 5 lines
Quoted 5 lines
It mean after booting bbl and riscv-linux, u-boot will still alive
and
handle SBI calls and somethings in S-mode.Quoted 7 lines
Quoted 2 lines
Or u-boot is going to replace the role of bbl ?
That's my plan. I don't see a need to use bbl which is quite feature
limited.Quoted 7 lines
That's a good idea! At the very least, all the device initialization in
bbl should be moved into u-boot.
I do think a bootloader-independent SBI implementation makes sense though. That way all bootloaders can use the same implementation, which
should make adding new SBI calls easier.
Quoted 6 lines
But I doubt we can have a generic SBI implementation. At least the console I/O SBI call can vary from board to board due to different UART devices are used.
Regards,
Bin
hm yes, you are right that wouldn't really work. At the same time, console I/O in the SBI is probably not that important.
It would be good to have a proper specification for the SBI / machine mode firmware. At the moment there is only the documentation on Github [1]. As far as I know, the instruction emulation in bbl is also not specified anywhere.
Thanks,
Lukas
[1]: https://github.com/riscv/riscv-sbi-doc/blob/master/riscv-sbi.md
Auer
PATCH 12/12 riscv: Add QEMU virt board support
In reply to Rick ChenQuoted 91 lines · Rick Chen
Quoted 5 lines
Quoted 5 lines
From: Auer, Lukas [mailto:lukas.auer at aisec.fraunhofer.de]
Sent: Wednesday, September 05, 2018 5:53 AM
To: bmeng.cn at gmail.com
Cc: Rick Jian-Zhi Chen(陳建志); u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH 12/12] riscv: Add QEMU virt boardsupport
Quoted 9 lines
Quoted 9 lines · Bin Meng
Quoted 7 lines
Hi Lukas,
Quoted 3 lines · Lukas
Quoted 1 line · Bin Meng
This adds QEMU RISC-V 'virt' board target support, with
the hope
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
of helping people easily test U-Boot on RISC-V.
The QEMU virt machine models a generic RISC-V virtual
machine
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
with support for the VirtIO standard networking and block storage devices.
It has CLINT, PLIC, 16550A UART devices in addition toVirtIO
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
and it also uses device-tree to pass configuration
information
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
to guest software. It implements RISC-V privileged
architecture
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
spec v1.10.
Both 32-bit and 64-bit builds are supported. Support is
pretty
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
much preliminary, only booting to U-Boot shell with the
UART
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
driver on a single core. Booting Linux is not supported
yet.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
For your information and to avoid duplicate work, I am
working on
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
a patch set that improves RISC-V support in u-boot. I am
currently
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
able to boot Linux on a multi-core setup in QEMU, but they
are not
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
quite ready to submit yet.
This is great! My next step is to work on virtio driver
support in
Quoted 1 line
Quoted 1 line
Quoted 1 line
U-Boot as qemu-riscv virt machine has these devices but we
don't
Quoted 1 line
Quoted 1 line
Quoted 1 line
have corresponding drivers in U-Boot. Then I will try to boot
Linux
Quoted 1 line
Quoted 1 line
Quoted 1 line
after that. Good to hear you already boot Linux with qemu-
riscv!
Quoted 1 line
Quoted 1 line
Quoted 1 line
Have you already supported virtio drivers in your port? If
yes, I
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
will just hold on and wait for your patch series :-)
Hi Bin,
Support for the virtio devices would be great! I don't support
them in
Quoted 2 lines
Quoted 2 lines
my port, I can only boot a kernel image from RAM. I only have a driver for the clint0 (core local interrupt
controller),
Quoted 1 line
Quoted 1 line
which I need for software interrupts to other cores and as a
timer.
Quoted 1 line
Quoted 1 line
Software interrupts also work over the supervisor binary
interface
Quoted 1 line
Quoted 1 line
(SBI), which allows u-boot to run in supervisor mode with bbl
running
Quoted 2 lines
Quoted 2 lines
in machine mode to handle the SBI calls.
Hi Bin and Auer
I have already boot bbl run in S-mode and riscv-linux in M-mode via u-boot from SD card or FLASH.
It mean after booting riscv-linux, u-boot will be dead. And no matter about kernel.
Please refer to doc/README.ae350May I figure out more clearly what are you going to do ? What are you going to do is let u-boot run in S-mode and boot bbl and riscv-linux in M-mode, right ?
It mean after booting bbl and riscv-linux, u-boot will still alive and
handle SBI calls and somethings in S-mode.
Quoted 4 lines
Or u-boot is going to replace the role of bbl ?
Rick
Hi Rick,
Not exactly, my current boot flow is as follows.
1. u-boot SPL starts in machine mode and jumps to bbl
2. bbl starts u-boot proper in supervisor mode
3. u-boot boots the kernel
bbl is still active once Linux has booted and is used there for its SBI implementation. Hope this helps.
Thanks,
Lukas
Quoted 18 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Thank you for your patches, it's great to see better support
for
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
RISC-V in u-boot! I will add a few comments based on what I
have
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
learned so far from working with u-boot on RISC-V.
It's a good start. RISC-V is pretty new and needs more
developers
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines
:-)
Exactly :)
Thanks,
Lukas
PATCH 12/12 riscv: Add QEMU virt board support
Hi Lukas,
Quoted 98 lines · Lukas
Quoted 91 lines · Rick Chen
Quoted 5 lines
Quoted 5 lines
From: Auer, Lukas [mailto:lukas.auer at aisec.fraunhofer.de]
Sent: Wednesday, September 05, 2018 5:53 AM
To: bmeng.cn at gmail.com
Cc: Rick Jian-Zhi Chen(陳建志); u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH 12/12] riscv: Add QEMU virt boardsupport
Quoted 9 lines
Quoted 9 lines · Bin Meng
Quoted 7 lines
Hi Lukas,
Quoted 3 lines · Lukas
Quoted 1 line · Bin Meng
This adds QEMU RISC-V 'virt' board target support, with
the hope
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
of helping people easily test U-Boot on RISC-V.
The QEMU virt machine models a generic RISC-V virtual
machine
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
with support for the VirtIO standard networking and block storage devices.
It has CLINT, PLIC, 16550A UART devices in addition toVirtIO
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
and it also uses device-tree to pass configuration
information
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
to guest software. It implements RISC-V privileged
architecture
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
spec v1.10.
Both 32-bit and 64-bit builds are supported. Support is
pretty
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
much preliminary, only booting to U-Boot shell with the
UART
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
driver on a single core. Booting Linux is not supported
yet.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
For your information and to avoid duplicate work, I am
working on
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
a patch set that improves RISC-V support in u-boot. I am
currently
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
able to boot Linux on a multi-core setup in QEMU, but they
are not
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
quite ready to submit yet.
This is great! My next step is to work on virtio driver
support in
Quoted 1 line
Quoted 1 line
Quoted 1 line
U-Boot as qemu-riscv virt machine has these devices but we
don't
Quoted 1 line
Quoted 1 line
Quoted 1 line
have corresponding drivers in U-Boot. Then I will try to boot
Linux
Quoted 1 line
Quoted 1 line
Quoted 1 line
after that. Good to hear you already boot Linux with qemu-
riscv!
Quoted 1 line
Quoted 1 line
Quoted 1 line
Have you already supported virtio drivers in your port? If
yes, I
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
will just hold on and wait for your patch series :-)
Hi Bin,
Support for the virtio devices would be great! I don't support
them in
Quoted 2 lines
Quoted 2 lines
my port, I can only boot a kernel image from RAM. I only have a driver for the clint0 (core local interrupt
controller),
Quoted 1 line
Quoted 1 line
which I need for software interrupts to other cores and as a
timer.
Quoted 1 line
Quoted 1 line
Software interrupts also work over the supervisor binary
interface
Quoted 1 line
Quoted 1 line
(SBI), which allows u-boot to run in supervisor mode with bbl
running
Quoted 2 lines
Quoted 2 lines
in machine mode to handle the SBI calls.
Hi Bin and Auer
I have already boot bbl run in S-mode and riscv-linux in M-mode via u-boot from SD card or FLASH.
It mean after booting riscv-linux, u-boot will be dead. And no matter about kernel.
Please refer to doc/README.ae350May I figure out more clearly what are you going to do ? What are you going to do is let u-boot run in S-mode and boot bbl and riscv-linux in M-mode, right ?
It mean after booting bbl and riscv-linux, u-boot will still alive and
handle SBI calls and somethings in S-mode.Quoted 4 lines
Or u-boot is going to replace the role of bbl ?
Rick
Quoted 8 lines
Hi Rick,
Not exactly, my current boot flow is as follows.
1. u-boot SPL starts in machine mode and jumps to bbl
2. bbl starts u-boot proper in supervisor mode
3. u-boot boots the kernel
If this is QEMU virt target, there is no need to boot from SPL then U-Boot proper.
Quoted 2 lines
bbl is still active once Linux has booted and is used there for its SBI implementation. Hope this helps.
Yes, I am not quite convinced why Linux kernel was designed this way. This is something like x86's SMM or EFI runtime services...
Regards,
Bin
Auer
PATCH 12/12 riscv: Add QEMU virt board support
Hi Bin,
Quoted 120 lines · Bin Meng
Hi Lukas,
Quoted 116 lines · Lukas
Quoted 105 lines · Rick Chen
Quoted 5 lines
Quoted 5 lines
From: Auer, Lukas [mailto:lukas.auer at aisec.fraunhofer.de]
Sent: Wednesday, September 05, 2018 5:53 AM
To: bmeng.cn at gmail.com
Cc: Rick Jian-Zhi Chen(陳建志); u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH 12/12] riscv: Add QEMU virtboard
supportQuoted 9 lines
Quoted 9 lines · Bin Meng
Quoted 7 lines
Hi Lukas,
Quoted 3 lines · Lukas
Quoted 1 line · Bin Meng
This adds QEMU RISC-V 'virt' board target support,
with
the hopeQuoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
of helping people easily test U-Boot on RISC-V.
The QEMU virt machine models a generic RISC-V virtual
machine
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
with support for the VirtIO standard networking and
block
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
storage devices.
It has CLINT, PLIC, 16550A UART devices in addition toVirtIO
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
and it also uses device-tree to pass configuration
information
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
to guest software. It implements RISC-V privileged
architecture
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
spec v1.10.
Both 32-bit and 64-bit builds are supported. Support
is
prettyQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
much preliminary, only booting to U-Boot shell with
the
UARTQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
driver on a single core. Booting Linux is not
supported
yet.Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
For your information and to avoid duplicate work, I am
working on
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
a patch set that improves RISC-V support in u-boot. I am
currently
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
able to boot Linux on a multi-core setup in QEMU, but
they
are notQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
quite ready to submit yet.
This is great! My next step is to work on virtio driver
support in
Quoted 1 line
Quoted 1 line
Quoted 1 line
U-Boot as qemu-riscv virt machine has these devices but we
don't
Quoted 1 line
Quoted 1 line
Quoted 1 line
have corresponding drivers in U-Boot. Then I will try to
boot
LinuxQuoted 1 line
Quoted 1 line
Quoted 1 line
after that. Good to hear you already boot Linux with qemu-
riscv!
Quoted 1 line
Quoted 1 line
Quoted 1 line
Have you already supported virtio drivers in your port? If
yes, I
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
will just hold on and wait for your patch series :-)
Hi Bin,
Support for the virtio devices would be great! I don't
support
them inQuoted 2 lines
Quoted 2 lines
my port, I can only boot a kernel image from RAM. I only have a driver for the clint0 (core local interrupt
controller),
Quoted 1 line
Quoted 1 line
which I need for software interrupts to other cores and as a
timer.
Quoted 1 line
Quoted 1 line
Software interrupts also work over the supervisor binary
interface
Quoted 1 line
Quoted 1 line
(SBI), which allows u-boot to run in supervisor mode with
bbl
runningQuoted 2 lines
Quoted 2 lines
in machine mode to handle the SBI calls.
Hi Bin and Auer
I have already boot bbl run in S-mode and riscv-linux in M-mode via
u-boot from SD card or FLASH.
It mean after booting riscv-linux, u-boot will be dead. And no matter
about kernel.
Please refer to doc/README.ae350May I figure out more clearly what are you going to do ? What are you going to do is let u-boot run in S-mode and boot bbl and
riscv-linux in M-mode, right ?
It mean after booting bbl and riscv-linux, u-boot will still alive
and
handle SBI calls and somethings in S-mode.Quoted 4 lines
Or u-boot is going to replace the role of bbl ?
Rick
Hi Rick,
Not exactly, my current boot flow is as follows.
Quoted 8 lines
Quoted 4 lines
1. u-boot SPL starts in machine mode and jumps to bbl
2. bbl starts u-boot proper in supervisor mode
3. u-boot boots the kernelIf this is QEMU virt target, there is no need to boot from SPL then U-Boot proper.
That's true. My goal was to load bbl without having to embed either u-boot or Linux in it. That boot flow is similar to armv8, where ARM trusted firmware can be loaded by SPL.
With an SBI implementation in u-boot this is not required of course. I think I'll simplify my boot flow for now and remove SPL. Either u-boot or Linux must then be embedded into bbl until we have our own SBI implementation.
Thanks,
Lukas
Quoted 9 lines
Quoted 3 lines
bbl is still active once Linux has booted and is used there for its SBI
implementation. Hope this helps.Yes, I am not quite convinced why Linux kernel was designed this way. This is something like x86's SMM or EFI runtime services...
Regards,
Bin
PATCH 12/12 riscv: Add QEMU virt board support
In reply to Bin MengHi Bin,
Quoted 26 lines · Bin Meng
Hi Lukas,
Quoted 16 lines · Lukas
Quoted 9 lines · 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.
Quoted 4 lines
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.
Quoted 5 lines
For your information and to avoid duplicate work, I am working on a patch set that improves RISC-V support in u-boot. I am currently able to boot Linux on a multi-core setup in QEMU, but they are not quite ready to submit yet.
Quoted 3 lines
This is great! My next step is to work on virtio driver support in U-Boot as qemu-riscv virt machine has these devices but we don't have corresponding drivers in U-Boot.
At some point I was working on porting the virtio stack from Linux to U-Boot and IIRC got virtio-blk and virtio-net working on ARM. But other things consumed my time and I never quite finished that work. Let me know if you want to take a look.
- Tuomas
PATCH 12/12 riscv: Add QEMU virt board support
Hi Tuomas,
Quoted 30 lines · Tuomas Tynkkynen
Hi Bin,
Quoted 26 lines · Bin Meng
Hi Lukas,
Quoted 21 lines · Lukas
Quoted 9 lines · 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.
Quoted 4 lines
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.
For your information and to avoid duplicate work, I am working on a patch set that improves RISC-V support in u-boot. I am currently able to boot Linux on a multi-core setup in QEMU, but they are not quite ready to submit yet.
Quoted 7 lines
Quoted 3 lines
This is great! My next step is to work on virtio driver support in U-Boot as qemu-riscv virt machine has these devices but we don't have corresponding drivers in U-Boot.
At some point I was working on porting the virtio stack from Linux to U-Boot and IIRC got virtio-blk and virtio-net working on ARM. But other things consumed my time and I never quite finished that work. Let me know if you want to take a look.
This is great. I just finished reading the virtio 1.0 spec and was about to start the work. My interest was to add virtio-blk and virtio-net driver to U-Boot too since they are most common devices (others are not used too much I believe). If you already have the drivers working, I can help to bring them upstream.
Regards,
Bin
PATCH 12/12 riscv: Add QEMU virt board support
Hi Bin,
Quoted 43 lines · On Fri, 7 Sep 2018 09:49:24 +0800 Bin Meng <[email protected]> wrote:
Hi Tuomas,
Quoted 31 lines · Tuomas Tynkkynen
Hi Bin,
Quoted 27 lines · Bin Meng
Hi Lukas,
Quoted 22 lines · Lukas
Quoted 10 lines · 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.
Quoted 4 lines
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.
For your information and to avoid duplicate work, I am working on a patch set that improves RISC-V support in u-boot. I am currently able to boot Linux on a multi-core setup in QEMU, but they are not quite ready to submit yet.
Quoted 7 lines
Quoted 3 lines
This is great! My next step is to work on virtio driver support in U-Boot as qemu-riscv virt machine has these devices but we don't have corresponding drivers in U-Boot.
At some point I was working on porting the virtio stack from Linux to U-Boot and IIRC got virtio-blk and virtio-net working on ARM. But other things consumed my time and I never quite finished that work. Let me know if you want to take a look.
Quoted 5 lines
This is great. I just finished reading the virtio 1.0 spec and was about to start the work. My interest was to add virtio-blk and virtio-net driver to U-Boot too since they are most common devices (others are not used too much I believe). If you already have the drivers working, I can help to bring them upstream.
You can find my branch here:
https://github.com/dezgeg/u-boot/tree/virtio
It should work under qemu_arm64_defconfig as follows:
qemu-system-aarch64 -machine virt -cpu cortex-a57 -m 512 \
-bios u-boot.bin -s -nographic \
-netdev user,id=net0 -device virtio-net-device,netdev=net0 \
-drive if=none,file=disk.img,id=disk0 \
-device virtio-blk-device,drive=disk0
I tried with Fedora-Server-netinst-aarch64-28-1.1.iso I had lying around and letting it auto-boot worked fine.
Also interrupting the boot and doing 'virtio scan; dhcp' gets a successful DHCP lease from QEMU's internal server.
I took a brief look and these things still need work:
- Some of the virtio headers imported verbatim cause compiler warnings because we don't disable strict aliasing.
- Architectures need to import various definitions from Linux. At least PAGE_SIZE & PAGE_SHIFT and wmb() & rmb(). (currently there are just gross hacks around this)
- Feature negotiation (needed for virtio-net to be able to set/get a MAC address) is not implemented yet.
- The virtio-pci transport is not implemented, only virtio-mmio.
- Error handling is missing in many places.
- Resource cleanup in some places, like virtio-net which needs to remove live buffers from the RX virtqueue on shutdown and I haven't looked into how to do that.
- Lots of small things like removing debug/commented out code, wrong kerneldoc comments, dead/uneeded code etc. to be cleaned up.
Have fun and let me know if you have questions.
- Tuomas
PATCH 12/12 riscv: Add QEMU virt board support
Hi Tuomas,
Quoted 67 lines · Tuomas Tynkkynen
Hi Bin,
Quoted 43 lines · On Fri, 7 Sep 2018 09:49:24 +0800 Bin Meng <[email protected]> wrote:
Hi Tuomas,
Quoted 31 lines · Tuomas Tynkkynen
Hi Bin,
Quoted 27 lines · Bin Meng
Hi Lukas,
Quoted 22 lines · Lukas
Quoted 10 lines · 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.
Quoted 4 lines
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.
For your information and to avoid duplicate work, I am working on a patch set that improves RISC-V support in u-boot. I am currently able to boot Linux on a multi-core setup in QEMU, but they are not quite ready to submit yet.
Quoted 7 lines
Quoted 3 lines
This is great! My next step is to work on virtio driver support in U-Boot as qemu-riscv virt machine has these devices but we don't have corresponding drivers in U-Boot.
At some point I was working on porting the virtio stack from Linux to U-Boot and IIRC got virtio-blk and virtio-net working on ARM. But other things consumed my time and I never quite finished that work. Let me know if you want to take a look.
Quoted 5 lines
This is great. I just finished reading the virtio 1.0 spec and was about to start the work. My interest was to add virtio-blk and virtio-net driver to U-Boot too since they are most common devices (others are not used too much I believe). If you already have the drivers working, I can help to bring them upstream.
You can find my branch here:
https://github.com/dezgeg/u-boot/tree/virtio
It should work under
qemu_arm64_defconfigas follows:qemu-system-aarch64 -machine virt -cpu cortex-a57 -m 512 \
-bios u-boot.bin -s -nographic \
-netdev user,id=net0 -device virtio-net-device,netdev=net0 \
-drive if=none,file=disk.img,id=disk0 \
-device virtio-blk-device,drive=disk0
Quoted 6 lines
I tried with Fedora-Server-netinst-aarch64-28-1.1.iso I had lying around and letting it auto-boot worked fine.
Also interrupting the boot and doing 'virtio scan; dhcp' gets a successful DHCP lease from QEMU's internal server.
Thank you for sharing your WIP. I just did a quick look and it seems that you implemented the virtio uclass in a similar way like pci uclass. My implementation is slightly different. I don't introduce VIRTIO_GENERIC device and a complex driver matching logci like PCI. I just did simple driver matching based on virtio device id. I wrote some skeleton drivers to verify this can work with both virtio-mmio and virtio-pci devices.
Quoted 16 lines
I took a brief look and these things still need work:
- Some of the virtio headers imported verbatim cause compiler warnings because we don't disable strict aliasing.
- Architectures need to import various definitions from Linux. At least
PAGE_SIZE&PAGE_SHIFTandwmb()&rmb(). (currently there are just gross hacks around this)- Feature negotiation (needed for virtio-net to be able to set/get a MAC address) is not implemented yet.
- The virtio-pci transport is not implemented, only virtio-mmio.
- Error handling is missing in many places.
Quoted 9 lines
- Resource cleanup in some places, like virtio-net which needs to remove live buffers from the RX virtqueue on shutdown and I haven't looked into how to do that.
- Lots of small things like removing debug/commented out code, wrong kerneldoc comments, dead/uneeded code etc. to be cleaned up.
Have fun and let me know if you have questions.
Thanks for all these details! I will try integrating some of your WIP with mine. I think I can directly use the virtio-blk and virtio-net drivers from your tree as a start.
Regards,
Bin
PATCH 12/12 riscv: Add QEMU virt board support
Quoted 3 lines · Bin Meng
Hi Tuomas,
On Sat, Sep 8, 2018 at 7:14 AM Tuomas Tynkkynen <[email protected]> wrote:
[...]
Quoted 16 lines
Quoted 16 lines
You can find my branch here:
https://github.com/dezgeg/u-boot/tree/virtio
It should work under
qemu_arm64_defconfigas follows:qemu-system-aarch64 -machine virt -cpu cortex-a57 -m 512 \ -bios u-boot.bin -s -nographic \ -netdev user,id=net0 -device virtio-net-device,netdev=net0 \ -drive if=none,file=disk.img,id=disk0 \ -device virtio-blk-device,drive=disk0I tried with Fedora-Server-netinst-aarch64-28-1.1.iso I had lying around and letting it auto-boot worked fine.
Quoted 8 lines
Quoted 3 lines
Also interrupting the boot and doing 'virtio scan; dhcp' gets a successful DHCP lease from QEMU's internal server.
Thank you for sharing your WIP. I just did a quick look and it seems that you implemented the virtio uclass in a similar way like pci uclass. My implementation is slightly different. I don't introduce
VIRTIO_GENERICdevice and a complex driver matching logci like PCI. I
Yeah, VIRTIO_GENERIC ended up looking quite weird. It's not even used normally, e.g. virtio-net doesn't end up using it at all:
=> dm tree
Class index Probed Driver Name
-----------------------------------------
virtio 31 [ + ] virtio_mmi |-- virtio_mmio at a003e00 eth 1 [ + ] virtio_net | `-- virtio_net
It does get used for virtio-blk though:
virtio 30 [ + ] virtio_mmi |-- virtio_mmio at a003c00 virtio_gen 0 [ + ] virtio_blk | `-- virtio_blk blk 0 [ + ] virtblk | `-- virtio_blk.blk
But that is only because I couldn't make the block device (i.e. the one with UCLASS_BLK) without introducing some device in the middle. All of the functions like blk_create_device() seem to be designed for the use cases of say, an AHCI controller having multiple SATA ports or an SCSI device having multiple LUNs.
I guess the right thing to do would be to split blk_create_device() so that it would be possible to have a tree like this:
virtio 30 [ + ] virtio_mmi |-- virtio_mmio at a003c00 blk 0 [ + ] virtio_blk | `-- virtio_blk
Then the need for UCLASS_VIRTIO_GENERIC would go away.
Quoted 41 lines
just did simple driver matching based on virtio device id. I wrote some skeleton drivers to verify this can work with both virtio-mmio and virtio-pci devices.
Quoted 16 lines
I took a brief look and these things still need work:
- Some of the virtio headers imported verbatim cause compiler warnings because we don't disable strict aliasing.
- Architectures need to import various definitions from Linux. At least
PAGE_SIZE&PAGE_SHIFTandwmb()&rmb(). (currently there are just gross hacks around this)- Feature negotiation (needed for virtio-net to be able to set/get a MAC address) is not implemented yet.
- The virtio-pci transport is not implemented, only virtio-mmio.
- Error handling is missing in many places.
Quoted 9 lines
- Resource cleanup in some places, like virtio-net which needs to remove live buffers from the RX virtqueue on shutdown and I haven't looked into how to do that.
- Lots of small things like removing debug/commented out code, wrong kerneldoc comments, dead/uneeded code etc. to be cleaned up.
Have fun and let me know if you have questions.
Thanks for all these details! I will try integrating some of your WIP with mine. I think I can directly use the virtio-blk and virtio-net drivers from your tree as a start.
Regards,
Bin
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH 12/12 riscv: Add QEMU virt board support
Hi Tuomas,
Quoted 52 lines · Tuomas Tynkkynen
Quoted 3 lines · Bin Meng
Hi Tuomas,
On Sat, Sep 8, 2018 at 7:14 AM Tuomas Tynkkynen <[email protected]> wrote:
[...]
Quoted 16 lines
Quoted 16 lines
You can find my branch here:
https://github.com/dezgeg/u-boot/tree/virtio
It should work under
qemu_arm64_defconfigas follows:qemu-system-aarch64 -machine virt -cpu cortex-a57 -m 512 \ -bios u-boot.bin -s -nographic \ -netdev user,id=net0 -device virtio-net-device,netdev=net0 \ -drive if=none,file=disk.img,id=disk0 \ -device virtio-blk-device,drive=disk0I tried with Fedora-Server-netinst-aarch64-28-1.1.iso I had lying around and letting it auto-boot worked fine.
Quoted 8 lines
Quoted 3 lines
Also interrupting the boot and doing 'virtio scan; dhcp' gets a successful DHCP lease from QEMU's internal server.
Thank you for sharing your WIP. I just did a quick look and it seems that you implemented the virtio uclass in a similar way like pci uclass. My implementation is slightly different. I don't introduce
VIRTIO_GENERICdevice and a complex driver matching logci like PCI. IYeah,
VIRTIO_GENERICended up looking quite weird. It's not even used normally, e.g. virtio-net doesn't end up using it at all:=> dm tree
Class index Probed Driver Name
-----------------------------------------virtio 31 [ + ] virtio_mmi |-- virtio_mmio at a003e00 eth 1 [ + ] virtio_net | `-- virtio_netIt does get used for virtio-blk though:
virtio 30 [ + ] virtio_mmi |-- virtio_mmio at a003c00 virtio_gen 0 [ + ] virtio_blk | `-- virtio_blk blk 0 [ + ] virtblk | `-- virtio_blk.blkBut that is only because I couldn't make the block device (i.e. the one with
UCLASS_BLK) without introducing some device in the middle. All of the functions likeblk_create_device()seem to be designed for the use cases of say, an AHCI controller having multiple SATA ports or an SCSI device having multiple LUNs.
Quoted 7 lines
I guess the right thing to do would be to split
blk_create_device()so that it would be possible to have a tree like this:virtio 30 [ + ] virtio_mmi |-- virtio_mmio at a003c00 blk 0 [ + ] virtio_blk | `-- virtio_blkThen the need for
UCLASS_VIRTIO_GENERICwould go away.
I used another way to do this, by not calling blk_create_device API and some other changes. I now get the virtio-blk driver working with my uclass implementation. Stay tuned :)
Quoted 28 lines
Quoted 28 lines
just did simple driver matching based on virtio device id. I wrote some skeleton drivers to verify this can work with both virtio-mmio and virtio-pci devices.
Quoted 23 lines
I took a brief look and these things still need work:
- Some of the virtio headers imported verbatim cause compiler warnings because we don't disable strict aliasing.
- Architectures need to import various definitions from Linux. At least
PAGE_SIZE&PAGE_SHIFTandwmb()&rmb(). (currently there are just gross hacks around this)- Feature negotiation (needed for virtio-net to be able to set/get a MAC address) is not implemented yet.
- The virtio-pci transport is not implemented, only virtio-mmio.
- Error handling is missing in many places.
- Resource cleanup in some places, like virtio-net which needs to remove live buffers from the RX virtqueue on shutdown and I haven't looked into how to do that.
- Lots of small things like removing debug/commented out code, wrong kerneldoc comments, dead/uneeded code etc. to be cleaned up.
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
Have fun and let me know if you have questions.
Thanks for all these details! I will try integrating some of your WIP with mine. I think I can directly use the virtio-blk and virtio-net drivers from your tree as a start.
Regards,
Bin
A message that is not in the archive (sent off-list or not yet received): [email protected]
cover riscv: Add QEMU virt board support
Quoted 37 lines
From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: Thursday, August 30, 2018 3:54 PM
To: Rick Jian-Zhi Chen(陳建志); U-Boot Mailing List
Subject: [PATCH 00/12] riscv: Add QEMU virt board supportThis 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.
Bin Meng (12):
riscv: kconfig: Normalize architecture name spelling
riscv: Removesetup.h
riscv: bootm: Correct the 1st kernel argument to hart id
riscv: Remove mach type
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: Makestart.Savailable for all targets
riscv: ae350: Clean up mixed tabs and spaces in the dts
riscv: kconfig: Select DM andOF_CONTROL
riscv: Add QEMU virt board supportarch/Kconfig | 5 +- arch/riscv/Kconfig | 10 +- arch/riscv/Makefile | 3 +- arch/riscv/config.mk | 9 +- arch/riscv/cpu/Makefile | 7 ++ arch/riscv/cpu/ax25/Makefile | 2 - arch/riscv/cpu/cpu.c | 49 ++++++++ arch/riscv/cpu/qemu/Makefile | 6 + arch/riscv/cpu/qemu/cpu.c | 29 +++++
Quoted 8 lines
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/mach-types.h | 29 -----
arch/riscv/include/asm/setup.h | 194--------------------------------
Quoted 27 lines
arch/riscv/include/asm/u-boot.h | 1 - arch/riscv/lib/bootm.c | 19 +--- board/AndesTech/ax25-ae350/ax25-ae350.c | 2 - board/emulation/qemu-riscv/Kconfig | 21 ++++ board/emulation/qemu-riscv/MAINTAINERS | 7 ++ board/emulation/qemu-riscv/Makefile | 5 + board/emulation/qemu-riscv/qemu-riscv.c | 23 ++++ cmd/bdinfo.c | 1 - configs/ax25-ae350_defconfig | 2 - configs/qemu-riscv32_defconfig | 10 ++ configs/qemu-riscv64_defconfig | 11 ++ doc/README.qemu-riscv | 46 ++++++++ include/configs/qemu-riscv.h | 21 ++++ 30 files changed, 520 insertions(+), 383 deletions(-) create mode 100644
arch/riscv/cpu/Makefilecreate mode 100644arch/riscv/cpu/cpu.ccreate mode 100644arch/riscv/cpu/qemu/Makefilecreate mode 100644arch/riscv/cpu/qemu/cpu.ccreate mode 100644arch/riscv/cpu/qemu/dram.crenamearch/riscv/cpu/{ax25=>}/start.S(100%) renamearch/riscv/cpu/{ax25=>}/u-boot.lds(54%) delete mode 100644arch/riscv/include/asm/bootm.hcreate mode 100644arch/riscv/include/asm/csr.hdelete mode 100644arch/riscv/include/asm/mach-types.hdelete mode 100644 arch/riscv/include/asm/setup.h 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
Quoted 6 lines
configs/qemu-riscv64_defconfig create mode 100644 doc/README.qemu-riscv create mode 100644
include/configs/qemu-riscv.h--
2.7.4
Hi Bin
Thanks for your reviewing for code clean and make it easier to support new targets.
I will merge this series to u-boot-riscv when next merge window open. :)
B.R
Rick