The patch series introduces the following:
v4 cover The patch series introduces the following:
---
Changes in V4:
- Patches "xen/riscv: introduce dummy asm/init.h" and "xen/riscv: introduce stack stuff" were removed from the patch series as they were merged separately into staging.
- Remove "depends on RISCV*" from Kconfig.debug as Kconfig.debug is located in arch specific folder.
- fix code style.
- Add "ifdef __riscv_cmodel_medany" to early_printk.c.
---
Changes in V3:
- Most of "[PATCH v2 7/8] xen/riscv: print hello message from C env" was merged with [PATCH v2 3/6] xen/riscv: introduce stack stuff.
- "[PATCH v2 7/8] xen/riscv: print hello message from C env" was merged with "[PATCH v2 6/8] xen/riscv: introduce early_printk basic stuff".
- "[PATCH v2 5/8] xen/include: include <asm/types.h> in <xen/early_printk.h>" was removed as it has been already merged to mainline staging.
- code style fixes.
---
Changes in V2:
- update commit patches commit messages according to the mailing list comments
- Remove unneeded types in <asm/types.h>
- Introduce definition of STACK_SIZE
- order the files alphabetically in Makefile
- Add license to early_printk.c
- Add RISCV_32 dependecy to config EARLY_PRINTK in Kconfig.debug
- Move dockerfile changes to separate config and sent them as separate patch to mailing list.
- Update test.yaml to wire up smoke test
---
Bobby Eshleman (1):
xen/riscv: introduce sbi call to putchar to console
Oleksii Kurochko (3):
xen/riscv: introduce asm/types.h header file
xen/riscv: introduce early_printk basic stuff
automation: add RISC-V smoke test
automation/gitlab-ci/test.yaml | 20 ++++++++++ automation/scripts/qemu-smoke-riscv64.sh | 20 ++++++++++ xen/arch/riscv/Kconfig.debug | 6 +++ xen/arch/riscv/Makefile | 2 + xen/arch/riscv/early_printk.c | 45 +++++++++++++++++++++++ xen/arch/riscv/include/asm/early_printk.h | 12 ++++++ xen/arch/riscv/include/asm/sbi.h | 34 +++++++++++++++++ xen/arch/riscv/include/asm/types.h | 43 ++++++++++++++++++++++ xen/arch/riscv/sbi.c | 45 +++++++++++++++++++++++ xen/arch/riscv/setup.c | 6 ++- 10 files changed, 232 insertions(+), 1 deletion(-) create mode 100755 automation/scripts/qemu-smoke-riscv64.sh create mode 100644 xen/arch/riscv/early_printk.c create mode 100644 xen/arch/riscv/include/asm/early_printk.h create mode 100644 xen/arch/riscv/include/asm/sbi.h create mode 100644 xen/arch/riscv/include/asm/types.h create mode 100644 xen/arch/riscv/sbi.c
Signature · 1 line
2.39.0
PATCH v4 2/4 xen/riscv: introduce sbi call to putchar to console
From: Bobby Eshleman <[email protected]>
Originally SBI implementation for Xen was introduced by Bobby Eshleman <[email protected]> but it was removed all the stuff for simplicity except SBI call for putting character to console.
The patch introduces sbi_putchar() SBI call which is necessary to implement initial early_printk.
---
Changes in V4:
- Nothing changed
---
Changes in V3:
- update copyright's year
- rename definition of __CPU_SBI_H__ to __ASM_RISCV_SBI_H__
- fix identations
- change an author of the commit
---
Changes in V2:
- add an explanatory comment about sbi_console_putchar() function.
- order the files alphabetically in Makefile
--- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/include/asm/sbi.h | 34 ++++++++++++++++++++++++ xen/arch/riscv/sbi.c | 45 ++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 xen/arch/riscv/include/asm/sbi.h create mode 100644 xen/arch/riscv/sbi.c
xen/arch/riscv/Makefile +1 -0
@@ -1,4 +1,5 @@ obj-$(CONFIG_RISCV_64) += riscv64/ +obj-y += sbi.o obj-y += setup.o $(TARGET): $(TARGET)-syms
xen/arch/riscv/include/asm/sbi.h new file +34 -0
@@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: (GPL-2.0-or-later) */ +/* +* Copyright (c) 2021-2023 Vates SAS. +* +* Taken from xvisor, modified by Bobby Eshleman ([email protected]). +* +* Taken/modified from Xvisor project with the following copyright: +* +* Copyright (c) 2019 Western Digital Corporation or its affiliates. +*/ + +#ifndef __ASM_RISCV_SBI_H__ +#define __ASM_RISCV_SBI_H__ + +#define SBI_EXT_0_1_CONSOLE_PUTCHAR 0x1 + +struct sbiret { +long error; +long value; +}; + +struct sbiret sbi_ecall (unsigned long ext,unsigned long fid, +unsigned long arg0,unsigned long arg1, +unsigned long arg2,unsigned long arg3, +unsigned long arg4,unsigned long arg5); + +/** +* Writes given character to the console device. +* +* @param ch The data to be written to the console. +*/ +void sbi_console_putchar (int ch); + +#endif /* __ASM_RISCV_SBI_H__ */
xen/arch/riscv/sbi.c new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
2.39.0
PATCH v4 1/4 xen/riscv: introduce asm/types.h header file
In reply to Oleksii Kurochko---
Changes in V4:
- Clean up types in <asm/types.h> and remain only necessary. The following types was removed as they are defined in <xen/types.h>:
{__|}{u|s}{8|16|32|64}
---
Changes in V3:
- Nothing changed
---
Changes in V2:
- Remove unneeded now types from <asm/types.h>
--- xen/arch/riscv/include/asm/types.h | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 xen/arch/riscv/include/asm/types.h
xen/arch/riscv/include/asm/types.h new file +43 -0
@@ -0,0 +1,43 @@ +#ifndef __RISCV_TYPES_H__ +#define __RISCV_TYPES_H__ + +#ifndef __ASSEMBLY__ + +#if defined(CONFIG_RISCV_32 ) +typedef unsigned long long u64 ; +typedef unsigned int u32 ; +typedef u32 vaddr_t ; +#define PRIvaddr PRIx32 +typedef u64 paddr_t ; +#define INVALID_PADDR (~0ULL) +#define PRIpaddr "016llx" +typedef u32 register_t ; +#define PRIregister "x" +#elif defined (CONFIG_RISCV_64 ) +typedef unsigned long u64 ; +typedef u64 vaddr_t ; +#define PRIvaddr PRIx64 +typedef u64 paddr_t ; +#define INVALID_PADDR (~0UL) +#define PRIpaddr "016lx" +typedef u64 register_t ; +#define PRIregister "lx" +#endif + +#if defined(__SIZE_TYPE__) +typedef __SIZE_TYPE__ size_t ; +#else +typedef unsigned long size_t ; +#endif + +#endif /* __ASSEMBLY__ */ + +#endif /* __RISCV_TYPES_H__ */ +/* +* Local variables: +* mode: C +* c-file-style: "BSD" +* c-basic-offset: 4 +* indent-tabs-mode: nil +* End: +*/
Signature · 1 line
2.39.0
PATCH v4 3/4 xen/riscv: introduce early_printk basic stuff
In reply to Oleksii KurochkoBecause printk() relies on a serial driver (like the ns16550 driver) and drivers require working virtual memory (ioremap()) there is not print functionality early in Xen boot.
The patch introduces the basic stuff of early_printk functionality which will be enough to print 'hello from C environment".
Originally early_printk.{c,h} was introduced by Bobby Eshleman
(https://github.com/glg-rv/xen/commit/a3c9916bbdff7ad6030055bbee7e53d1aab71384)
but some functionality was changed:early_printk() function was changed in comparison with the original as common isn't being built now so there is no vscnprintf.
This commit adds early printk implementation built on the putc SBI call.
As sbi_console_putchar() is already being planned for deprecation it is used temporarily now and will be removed or reworked after real uart will be ready.
---
Changes in V4:
- Remove "depends on RISCV*" from Kconfig.debug as it is located in arch specific folder so by default RISCV configs should be ebabled.
- Add "ifdef __riscv_cmodel_medany" to be sure that PC-relative addressing is used as early_*() functions can be called from head.S with MMU-off and before relocation (if it would be needed at all for RISC-V)
- fix code style
---
Changes in V3:
- reorder headers in alphabetical order
- merge changes related to start_xen() function from "[PATCH v2 7/8] xen/riscv: print hello message from C env" to this patch
- remove unneeded parentheses in definition of STACK_SIZE
---
Changes in V2:
- introduce STACK_SIZE define.
- use consistent padding between instruction mnemonic and operand(s)
---
--- xen/arch/riscv/Kconfig.debug | 6 +++ xen/arch/riscv/Makefile | 1 + xen/arch/riscv/early_printk.c | 45 +++++++++++++++++++++++ xen/arch/riscv/include/asm/early_printk.h | 12 ++++++ xen/arch/riscv/setup.c | 6 ++- 5 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 xen/arch/riscv/early_printk.c create mode 100644 xen/arch/riscv/include/asm/early_printk.h
xen/arch/riscv/Kconfig.debug +6 -0
@@ -0,0 +1,6 @@ +config EARLY_PRINTK + bool "Enable early printk" + default DEBUG + help + + Enables early printk debug messages
xen/arch/riscv/Makefile +1 -0
@@ -1,3 +1,4 @@ +obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_RISCV_64) += riscv64/ obj-y += sbi.o obj-y += setup.o
xen/arch/riscv/early_printk.c new file +45 -0
45 lines not on this page · raw message
xen/arch/riscv/include/asm/early_printk.h new file +12 -0
@@ -0,0 +1,12 @@ +#ifndef __EARLY_PRINTK_H__ +#define __EARLY_PRINTK_H__ + +#include <xen/early_printk.h> + +#ifdef CONFIG_EARLY_PRINTK +void early_printk (const char *str); +#else +static inline void early_printk (const char *s) {}; +#endif + +#endif /* __EARLY_PRINTK_H__ */
xen/arch/riscv/setup.c +5 -1
@@ -1,13 +1,17 @@#include <xen/compile.h> #include <xen/init.h> +#include <asm/early_printk.h> +/* Xen stack for bringing up the first CPU. */ unsigned char __initdata cpu0_boot_stack[STACK_SIZE ]__aligned(STACK_SIZE) ;void __init noreturnstart_xen (void ) { -for ( ;; ) +early_printk ("Hello from C env\n" ); + +for ( ; ; ) asmvolatile ("wfi" );unreachable ();
Signature · 1 line
2.39.0
PATCH v4 4/4 automation: add RISC-V smoke test
In reply to Oleksii KurochkoAdd check if there is a message 'Hello from C env' presents in log file to be sure that stack is set and C part of early printk is working.
---
Changes in V4:
- Nothing changed
---
Changes in V3:
- Nothing changed
- All mentioned comments by Stefano in Xen mailing list will be fixed as a separate patch out of this patch series.
--- automation/gitlab-ci/test.yaml | 20 ++++++++++++++++++++ automation/scripts/qemu-smoke-riscv64.sh | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100755 automation/scripts/qemu-smoke-riscv64.sh
automation/gitlab-ci/test.yaml +20 -0
@@ -54,6 +54,19 @@ tags: - x86_64 +.qemu-riscv64: + extends: .test-jobs-common + variables: + CONTAINER: archlinux:riscv64 + LOGFILE: qemu-smoke-riscv64.log + artifacts: + paths: + - smoke.serial + - '*.log' + when: always + tags: + - x86_64 + .yocto-test: extends: .test-jobs-common script:
@@ -234,6 +247,13 @@ qemu-smoke-x86-64-clang-pvh: needs: - debian-unstable-clang-debug +qemu-smoke-riscv64-gcc: + extends: .qemu-riscv64 + script: + - ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE} + needs: + - riscv64-cross-gcc + # Yocto test jobs yocto-qemuarm64: extends: .yocto-test-arm64
automation/scripts/qemu-smoke-riscv64.sh new file +20 -0
@@ -0,0 +1,20 @@ +#!/bin/bash + +set -ex + +# Run the test +rm -f smoke.serial +set +e + +timeout -k 1 2 \ +qemu-system-riscv64 \ + -M virt \ + -smp 1 \ + -nographic \ + -m 2g \ + -kernel binaries/xen \ + |& tee smoke.serial + +set -e +(grep -q "Hello from C env" smoke.serial) || exit 1 +exit 0
Signature · 1 line
2.39.0
Hi all,
Something went wrong with cover letter. I do not know if i have to make new patch series but cover letter should be the following:
Subject: [PATCH v4 0/4] Basic early_printk and smoke test implementation
The patch series introduces the following:
- the minimal set of headers and changes inside them.
- SBI (RISC-V Supervisor Binary Interface) things necessary for basic early_printk implementation.
- things needed to set up the stack.
- early_printk() function to print only strings.
- RISC-V smoke test which checks if "Hello from C env" message is present in serial.tmp
---
Changes in V4:
- Patches "xen/riscv: introduce dummy asm/init.h" and "xen/riscv:
introduce
stack stuff" were removed from the patch series as they were
merged separately
into staging.
- Remove "depends on RISCV*" from Kconfig.debug as Kconfig.debug is
located
in arch specific folder.
- fix code style.
- Add "ifdef __riscv_cmodel_medany" to early_printk.c.
---
Changes in V3:
- Most of "[PATCH v2 7/8] xen/riscv: print hello message from C
env"
was merged with [PATCH v2 3/6] xen/riscv: introduce stack stuff.
- "[PATCH v2 7/8] xen/riscv: print hello message from C env" was merged with "[PATCH v2 6/8] xen/riscv: introduce early_printk
basic
stuff".
- "[PATCH v2 5/8] xen/include: include <asm/types.h> in <xen/early_printk.h>" was removed as it has been already merged
to
mainline staging.
- code style fixes.
---
Changes in V2:
- update commit patches commit messages according to the mailing list comments
- Remove unneeded types in <asm/types.h>
- Introduce definition of STACK_SIZE
- order the files alphabetically in Makefile
- Add license to early_printk.c
- Add RISCV_32 dependecy to config EARLY_PRINTK in Kconfig.debug
- Move dockerfile changes to separate config and sent them as separate patch to mailing list.
- Update test.yaml to wire up smoke test
---
Bobby Eshleman (1):
xen/riscv: introduce sbi call to putchar to console
Oleksii Kurochko (3):
xen/riscv: introduce asm/types.h header file
xen/riscv: introduce early_printk basic stuff
automation: add RISC-V smoke test
automation/gitlab-ci/test.yaml | 20 ++++++++++ automation/scripts/qemu-smoke-riscv64.sh | 20 ++++++++++ xen/arch/riscv/Kconfig.debug | 6 +++ xen/arch/riscv/Makefile | 2 + xen/arch/riscv/early_printk.c | 45 +++++++++++++++++++++++ xen/arch/riscv/include/asm/early_printk.h | 12 ++++++ xen/arch/riscv/include/asm/sbi.h | 34 +++++++++++++++++ xen/arch/riscv/include/asm/types.h | 43 ++++++++++++++++++++++ xen/arch/riscv/sbi.c | 45 +++++++++++++++++++++++ xen/arch/riscv/setup.c | 6 ++- 10 files changed, 232 insertions(+), 1 deletion(-) create mode 100755 automation/scripts/qemu-smoke-riscv64.sh create mode 100644 xen/arch/riscv/early_printk.c create mode 100644 xen/arch/riscv/include/asm/early_printk.h create mode 100644 xen/arch/riscv/include/asm/sbi.h create mode 100644 xen/arch/riscv/include/asm/types.h create mode 100644 xen/arch/riscv/sbi.c
Signature · 1 line
2.39.0
Quoted 71 lines · Oleksii Kurochko
---
Changes in V4:
- Patches "xen/riscv: introduce dummyasm/init.h" and "xen/riscv:
introduce
stack stuff" were removed from the patch series as they were merged separately
into staging.
- Remove "depends on RISCV*" fromKconfig.debugasKconfig.debugis located
in arch specific folder.
- fix code style.
- Add "ifdef__riscv_cmodel_medany" toearly_printk.c.
---
Changes in V3:
- Most of "[PATCH v2 7/8] xen/riscv: print hello message from C env"
was merged with [PATCH v2 3/6] xen/riscv: introduce stack stuff.
- "[PATCH v2 7/8] xen/riscv: print hello message from C env" was merged with "[PATCH v2 6/8] xen/riscv: introduceearly_printkbasic
stuff".
- "[PATCH v2 5/8] xen/include: include <asm/types.h> in <xen/early_printk.h>" was removed as it has been already merged to
mainline staging.
- code style fixes.
---
Changes in V2:
- update commit patches commit messages according to the mailing list comments
- Remove unneeded types in <asm/types.h>
- Introduce definition ofSTACK_SIZE
- order the files alphabetically inMakefile
- Add license toearly_printk.c
- AddRISCV_32dependecy to configEARLY_PRINTKinKconfig.debug
- Move dockerfile changes to separate config and sent them as separate patch to mailing list.
- Updatetest.yamlto wire up smoke test
---Bobby Eshleman (1):
xen/riscv: introduce sbi call to putchar to consoleOleksii Kurochko (3):
xen/riscv: introduceasm/types.hheader file
xen/riscv: introduceearly_printkbasic stuff
automation: add RISC-V smoke testautomation/gitlab-ci/test.yaml | 20 ++++++++++ automation/scripts/qemu-smoke-riscv64.sh | 20 ++++++++++ xen/arch/riscv/Kconfig.debug | 6 +++ xen/arch/riscv/Makefile | 2 + xen/arch/riscv/early_printk.c | 45
+++++++++++++++++++++++
xen/arch/riscv/include/asm/early_printk.h | 12 ++++++ xen/arch/riscv/include/asm/sbi.h | 34 +++++++++++++++++ xen/arch/riscv/include/asm/types.h | 43
++++++++++++++++++++++
xen/arch/riscv/sbi.c | 45
+++++++++++++++++++++++
xen/arch/riscv/setup.c | 6 ++-10 files changed, 232 insertions(+), 1 deletion(-)create mode 100755
automation/scripts/qemu-smoke-riscv64.shcreate mode 100644xen/arch/riscv/early_printk.ccreate mode 100644xen/arch/riscv/include/asm/early_printk.hcreate mode 100644xen/arch/riscv/include/asm/sbi.hcreate mode 100644xen/arch/riscv/include/asm/types.hcreate mode 100644xen/arch/riscv/sbi.c
Re: [PATCH v4 1/4] xen/riscv: introduce asm/types.h header file
In reply to Oleksii KurochkoQuoted 6 lines · Oleksii Kurochko
Signed-off-by Oleksii Kurochko <[email protected]>---
Changes in V4:
- Clean up types in <asm/types.h> and remain only necessary. The following types was removed as they are defined in <xen/types.h>:
{__|}{u|s}{8|16|32|64}
For one you still typedef u32 and u64. And imo correctly so, until we get around to move the definition basic types into xen/types.h. Plus I can't see how things build for you: xen/types.h expects __{u,s}<N> to be defined in order to then derive {u,}int<N>_t from them.
Quoted 18 lines
xen/arch/riscv/include/asm/types.h new file +15
-0@@ -0,0 +1,43 @@ +#ifndef __RISCV_TYPES_H__ +#define __RISCV_TYPES_H__ + +#ifndef __ASSEMBLY__ + +#if defined(CONFIG_RISCV_32 ) +typedef unsigned long long u64 ; +typedef unsigned int u32 ; +typedef u32 vaddr_t ; +#define PRIvaddr PRIx32 +typedef u64 paddr_t ; +#define INVALID_PADDR (~0ULL) +#define PRIpaddr "016llx" +typedef u32 register_t ; +#define PRIregister "x"
xen/arch/riscv/include/asm/types.h line 25
Quoted 10 lines
xen/arch/riscv/include/asm/types.h new file +10
-0+#elif defined (CONFIG_RISCV_64 ) +typedef unsigned long u64 ; +typedef u64 vaddr_t ; +#define PRIvaddr PRIx64 +typedef u64 paddr_t ; +#define INVALID_PADDR (~0UL) +#define PRIpaddr "016lx" +typedef u64 register_t ; +#define PRIregister "lx" +#endif
Any chance you could insert blank lines after #if, around #elif, and before #endif?
xen/arch/riscv/include/asm/types.h line 31
Quoted 5 lines
xen/arch/riscv/include/asm/types.h new file +5
-0+#if defined(__SIZE_TYPE__) +typedef __SIZE_TYPE__ size_t ; +#else +typedef unsigned long size_t ; +#endif
I'd appreciate if this part was dropped by re-basing on top of my "include/types: move stddef.h-kind types to common header" [1], to avoid that (re-based) patch then needing to drop this from here again. I would have committed this already, if osstest wasn't completely broken right now.
Jan
[1] https://lists.xen.org/archives/html/xen-devel/2023-01/msg00720.html
(since you would not be able to find a patch of the quoted title, as in the submission I mistakenly referenced stdlib.h)
Re: [PATCH v4 1/4] xen/riscv: introduce asm/types.h header file
Quoted 9 lines · Jan Beulich
Quoted 7 lines · Oleksii Kurochko
Signed-off-by Oleksii Kurochko <[email protected]>---
Changes in V4:
- Clean up types in <asm/types.h> and remain only necessary. The following types was removed as they are defined in <xen/types.h>:
{__|}{u|s}{8|16|32|64}
Quoted 3 lines
For one you still typedef u32 and u64. And imo correctly so, until we get around to move the definition basic types into
xen/types.h. Plus I can't see how things build for you:xen/types.hexpects __{u,s}<N>
It builds because nothing is used <xen/types.h> now so that's why I missed them but you are right __{u,s}<N> should be backed. It looks like {__,}{u,s}{8,16,32} are the same for all available in Xen architectures so probably can I move them to <xen/types.h> instead of remain them in <asm/types.h>?
Quoted 25 lines
to be defined in order to then derive {u,}int<N>_t from them.
Quoted 23 lines
xen/arch/riscv/include/asm/types.h new file +20
-0@@ -0,0 +1,43 @@ +#ifndef __RISCV_TYPES_H__ +#define __RISCV_TYPES_H__ + +#ifndef __ASSEMBLY__ + +#if defined(CONFIG_RISCV_32 ) +typedef unsigned long long u64 ; +typedef unsigned int u32 ; +typedef u32 vaddr_t ; +#define PRIvaddr PRIx32 +typedef u64 paddr_t ; +#define INVALID_PADDR (~0ULL) +#define PRIpaddr "016llx" +typedef u32 register_t ; +#define PRIregister "x" +#elif defined (CONFIG_RISCV_64 ) +typedef unsigned long u64 ; +typedef u64 vaddr_t ; +#define PRIvaddr PRIx64 +typedef u64 paddr_t ;
Quoted 9 lines
xen/arch/riscv/include/asm/types.h line 25
Quoted 5 lines
xen/arch/riscv/include/asm/types.h new file +5
-0+#define INVALID_PADDR (~0UL) +#define PRIpaddr "016lx" +typedef u64 register_t ; +#define PRIregister "lx" +#endif Any chance you could insert blank lines after #if, around #elif, and before #endif?
Sure, I will fix that.
Quoted 12 lines
xen/arch/riscv/include/asm/types.h line 31
Quoted 5 lines
xen/arch/riscv/include/asm/types.h new file +5
-0+#if defined(__SIZE_TYPE__) +typedef __SIZE_TYPE__ size_t ; +#else +typedef unsigned long size_t ; +#endif I'd appreciate if this part was dropped by re-basing on top of my "
include/types: move stddef.h-kind types to common header" [1], to avoid that (re-based) patch then needing to drop this from here again. I would have committed this already, if osstest wasn't completely broken right now.
I'll take it into account for the next version of the patch series.
Quoted 6 lines
Jan
[1]
https://lists.xen.org/archives/html/xen-devel/2023-01/msg00720.html
(since you would not be able to find a patch of the quoted title, as in the submission I mistakenly referencedstdlib.h)
Thanks for the link.
~Oleksii
Re: [PATCH v4 1/4] xen/riscv: introduce asm/types.h header file
Quoted 10 lines · Oleksii
Quoted 9 lines · Jan Beulich
Quoted 7 lines · Oleksii Kurochko
Signed-off-by Oleksii Kurochko <[email protected]>---
Changes in V4:
- Clean up types in <asm/types.h> and remain only necessary. The following types was removed as they are defined in <xen/types.h>:
{__|}{u|s}{8|16|32|64}
Quoted 8 lines
Quoted 3 lines
For one you still typedef u32 and u64. And imo correctly so, until we get around to move the definition basic types into
xen/types.h. Plus I can't see how things build for you:xen/types.hexpects __{u,s}<N>It builds because nothing is used <
xen/types.h> now so that's why I missed them but you are right __{u,s}<N> should be backed. It looks like {__,}{u,s}{8,16,32} are the same for all available in Xen architectures so probably can I move them to <xen/types.h> instead of remain them in <asm/types.h>?
This next step isn't quite as obvious, i.e. has room for being contentious. In particular deriving fixed width types from C basic types is setting us up for future problems (especially in the context of RISC-V think of RV128). Therefore, if we touch and generalize this, I'd like to sanitize things at the same time.
I'd then prefer to typedef {u,}int<N>_t by using either the "mode" attribute (requiring us to settle on a prereq of there always being 8 bits per char) or the compiler supplied __{U,}INT<N>_TYPE__ (taking gcc 4.7 as a prereq; didn't check clang yet). Both would allow {u,}int64_t to also be put in the common header. Yet if e.g. a prereq assumption faced opposition, some other approach would need to be found. Plus using either of the named approaches has issues with the printf() format specifiers, for which I'm yet to figure out a solution (or maybe someone else knows a good way to deal with that; using compiler provided headers isn't an option afaict, as gcc provides stdint.h but not inttypes.h, but maybe glibc's simplistic approach is good enough - they're targeting far more architectures than we do and get away with that).
Jan
Re: [PATCH v4 2/4] xen/riscv: introduce sbi call to putchar to console
In reply to Oleksii KurochkoQuoted 138 lines · Oleksii Kurochko
From: Bobby Eshleman <[email protected]>
Originally SBI implementation for Xen was introduced by Bobby Eshleman <[email protected]> but it was removed all the stuff for simplicity except SBI call for putting character to console.
The patch introduces
sbi_putchar()SBI call which is necessary to implement initialearly_printk.Signed-off-by Bobby Eshleman <[email protected]>Signed-off-by Oleksii Kurochko <[email protected]>---
Changes in V4:
- Nothing changed
---
Changes in V3:
- update copyright's year
- rename definition of__CPU_SBI_H__to__ASM_RISCV_SBI_H__
- fix identations
- change an author of the commit
---
Changes in V2:
- add an explanatory comment aboutsbi_console_putchar()function.
- order the files alphabetically inMakefile--- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/include/asm/sbi.h | 34 ++++++++++++++++++++++++ xen/arch/riscv/sbi.c | 45 ++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 xen/arch/riscv/include/asm/sbi.h create mode 100644 xen/arch/riscv/sbi.cxen/arch/riscv/Makefile +1
-0@@ -1,4 +1,5 @@ obj-$(CONFIG_RISCV_64) += riscv64/ +obj-y += sbi.o obj-y += setup.o $(TARGET): $(TARGET)-symsxen/arch/riscv/include/asm/sbi.h new file +34
-0@@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: (GPL-2.0-or-later) */ +/* +* Copyright (c) 2021-2023 Vates SAS. +* +* Taken from xvisor, modified by Bobby Eshleman ([email protected]). +* +* Taken/modified from Xvisor project with the following copyright: +* +* Copyright (c) 2019 Western Digital Corporation or its affiliates. +*/ + +#ifndef __ASM_RISCV_SBI_H__ +#define __ASM_RISCV_SBI_H__ + +#define SBI_EXT_0_1_CONSOLE_PUTCHAR 0x1 + +struct sbiret { +long error; +long value; +}; + +struct sbiret sbi_ecall (unsigned long ext,unsigned long fid, +unsigned long arg0,unsigned long arg1, +unsigned long arg2,unsigned long arg3, +unsigned long arg4,unsigned long arg5); + +/** +* Writes given character to the console device. +* +* @param ch The data to be written to the console. +*/ +void sbi_console_putchar (int ch); + +#endif /* __ASM_RISCV_SBI_H__ */ xen/arch/riscv/sbi.c new file +45
-0@@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Taken and modified from the xvisor project with the copyright Copyright (c) +* 2019 Western Digital Corporation or its affiliates and author Anup Patel +* ([email protected]). +* +* Modified by Bobby Eshleman ([email protected]). +* +* Copyright (c) 2019 Western Digital Corporation or its affiliates. +* Copyright (c) 2021-2023 Vates SAS. +*/ + +#include <xen/errno.h> +#include <asm/sbi.h> + +struct sbiret sbi_ecall (unsigned long ext,unsigned long fid, +unsigned long arg0,unsigned long arg1, +unsigned long arg2,unsigned long arg3, +unsigned long arg4,unsigned long arg5) +{ +struct sbiret ret; + + register unsigned long a0 asm ("a0") = arg0; + register unsigned long a1 asm ("a1") = arg1; + register unsigned long a2 asm ("a2") = arg2; + register unsigned long a3 asm ("a3") = arg3; + register unsigned long a4 asm ("a4") = arg4; + register unsigned long a5 asm ("a5") = arg5; + register unsigned long a6 asm ("a6") = fid; + register unsigned long a7 asm ("a7") = ext; + + asmvolatile ("ecall" + :"+r" (a0),"+r" (a1) + :"r" (a2),"r" (a3),"r" (a4),"r" (a5),"r" (a6),"r" (a7) + :"memory" ); + ret.error = a0; + ret.value = a1; + +return ret; +} + +void sbi_console_putchar (int ch) +{ +sbi_ecall (SBI_EXT_0_1_CONSOLE_PUTCHAR ,0 , ch,0 ,0 ,0 ,0 ,0 ); +}Signature · 1 line
2.39.0
Re: [PATCH v4 3/4] xen/riscv: introduce early_printk basic stuff
In reply to Oleksii KurochkoQuoted 165 lines · Oleksii Kurochko
Because
printk()relies on a serial driver (like the ns16550 driver) and drivers require working virtual memory (ioremap()) there is not print functionality early in Xen boot.The patch introduces the basic stuff of
early_printkfunctionality which will be enough to print 'hello from C environment".Originally early_printk.{c,h} was introduced by Bobby Eshleman
(https://github.com/glg-rv/xen/commit/a3c9916bbdff7ad6030055bbee7e53d1aab71384)
but some functionality was changed:early_printk()function was changed in comparison with the original as common isn't being built now so there is no vscnprintf.This commit adds early printk implementation built on the putc SBI call.
As
sbi_console_putchar()is already being planned for deprecation it is used temporarily now and will be removed or reworked after real uart will be ready.Signed-off-by Bobby Eshleman <[email protected]>Signed-off-by Oleksii Kurochko <[email protected]>---
Changes in V4:
- Remove "depends on RISCV*" fromKconfig.debugas it is located in arch specific folder so by default RISCV configs should be ebabled.
- Add "ifdef__riscv_cmodel_medany" to be sure that PC-relative addressing is used as early_*() functions can be called fromhead.Swith MMU-off and before relocation (if it would be needed at all for RISC-V)
- fix code style
---
Changes in V3:
- reorder headers in alphabetical order
- merge changes related tostart_xen()function from "[PATCH v2 7/8] xen/riscv: print hello message from C env" to this patch
- remove unneeded parentheses in definition ofSTACK_SIZE
---
Changes in V2:
- introduceSTACK_SIZEdefine.
- use consistent padding between instruction mnemonic and operand(s)
------ xen/arch/riscv/Kconfig.debug | 6 +++ xen/arch/riscv/Makefile | 1 + xen/arch/riscv/early_printk.c | 45 +++++++++++++++++++++++ xen/arch/riscv/include/asm/early_printk.h | 12 ++++++ xen/arch/riscv/setup.c | 6 ++- 5 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 xen/arch/riscv/early_printk.c create mode 100644 xen/arch/riscv/include/asm/early_printk.hxen/arch/riscv/Kconfig.debug +6
-0@@ -0,0 +1,6 @@ +config EARLY_PRINTK + bool "Enable early printk" + default DEBUG + help + + Enables early printk debug messagesxen/arch/riscv/Makefile +1
-0@@ -1,3 +1,4 @@ +obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_RISCV_64) += riscv64/ obj-y += sbi.o obj-y += setup.oxen/arch/riscv/early_printk.c new file +45
-0@@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* RISC-V early printk using SBI +* +* Copyright (C) 2021 Bobby Eshleman <[email protected]> +*/ +#include <asm/early_printk.h> +#include <asm/sbi.h> + +/* +* early_*() can be called from head.S with MMU-off. +* +* The following requiremets should be honoured for early_*() to +* work correctly: +* It should use PC-relative addressing for accessing symbols. +* To achieve that GCC cmodel=medany should be used. +*/ +#ifndef __riscv_cmodel_medany +#error "early_*() can be called from head.S before relocate so it should not use absolute addressing." +#endif + +/* +* TODO: +* sbi_console_putchar is already planned for deprecation +* so it should be reworked to use UART directly. +*/ +void early_puts (const char *s,size_t nr) +{ +while ( nr-- >0 ) + { +if ( *s =='\n' ) +sbi_console_putchar ('\r' ); +sbi_console_putchar (*s); + s++; + } +} + +void early_printk (const char *str) +{ +while ( *str ) + { +early_puts (str,1 ); + str++; + } +}xen/arch/riscv/include/asm/early_printk.h new file +12
-0@@ -0,0 +1,12 @@ +#ifndef __EARLY_PRINTK_H__ +#define __EARLY_PRINTK_H__ + +#include <xen/early_printk.h> + +#ifdef CONFIG_EARLY_PRINTK +void early_printk (const char *str); +#else +static inline void early_printk (const char *s) {}; +#endif + +#endif /* __EARLY_PRINTK_H__ */ xen/arch/riscv/setup.c +5
-1@@ -1,13 +1,17 @@#include <xen/compile.h> #include <xen/init.h> +#include <asm/early_printk.h> +/* Xen stack for bringing up the first CPU. */ unsigned char __initdata cpu0_boot_stack[STACK_SIZE ]__aligned(STACK_SIZE) ;void __init noreturnstart_xen (void ) { -for ( ;; ) +early_printk ("Hello from C env\n" ); + +for ( ; ; ) asmvolatile ("wfi" );unreachable ();Signature · 1 line
2.39.0
Re: [PATCH v4 2/4] xen/riscv: introduce sbi call to putchar to console
In reply to Oleksii KurochkoQuoted 9 lines · Oleksii Kurochko
xen/arch/riscv/sbi.c new file +3
-0@@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Taken and modified from the xvisor project with the copyright Copyright (c)
xen/arch/riscv/sbi.c line 13
Quoted 10 lines
xen/arch/riscv/sbi.c new file +10
-0+* 2019 Western Digital Corporation or its affiliates and author Anup Patel +* ([email protected]). +* +* Modified by Bobby Eshleman ([email protected]). +* +* Copyright (c) 2019 Western Digital Corporation or its affiliates. +* Copyright (c) 2021-2023 Vates SAS. +*/ + +#include <xen/errno.h>
Unused header. All this file needs (in this form at least) is asm/sbi.h
Quoted 12 lines
xen/arch/riscv/sbi.c new file +12
-0+#include <asm/sbi.h> + +struct sbiret sbi_ecall (unsigned long ext,unsigned long fid, +unsigned long arg0,unsigned long arg1, +unsigned long arg2,unsigned long arg3, +unsigned long arg4,unsigned long arg5) +{ +struct sbiret ret; + + register unsigned long a0 asm ("a0") = arg0; + register unsigned long a1 asm ("a1") = arg1; + register unsigned long a2 asm ("a2") = arg2;
xen/arch/riscv/sbi.c line 35
Quoted 10 lines
xen/arch/riscv/sbi.c new file +10
-0+ register unsigned long a3 asm ("a3") = arg3; + register unsigned long a4 asm ("a4") = arg4; + register unsigned long a5 asm ("a5") = arg5; + register unsigned long a6 asm ("a6") = fid; + register unsigned long a7 asm ("a7") = ext; + + asmvolatile ("ecall" + :"+r" (a0),"+r" (a1) + :"r" (a2),"r" (a3),"r" (a4),"r" (a5),"r" (a6),"r" (a7) + :"memory" );
Indentation. Each colon wants 4 more spaces in front of it.
Both can be fixed on commit.
~Andrew
Re: [PATCH v4 3/4] xen/riscv: introduce early_printk basic stuff
In reply to Oleksii Kurochkoxen/arch/riscv/Kconfig.debug line 6
Quoted 11 lines · Oleksii Kurochko
xen/arch/riscv/Kconfig.debug +6
-0@@ -0,0 +1,6 @@ +config EARLY_PRINTK + bool "Enable early printk" + default DEBUG + help + + Enables early printk debug messages
Kconfig indentation is a little hard to get used to.
It's one tab for the main block, and one tab + 2 spaces for the help text.
Also, drop the blank line after help.
Quoted 25 lines
xen/arch/riscv/Makefile +1
-0@@ -1,3 +1,4 @@ +obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_RISCV_64) += riscv64/ obj-y += sbi.o obj-y += setup.oxen/arch/riscv/early_printk.c new file +10
-0@@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* RISC-V early printk using SBI +* +* Copyright (C) 2021 Bobby Eshleman <[email protected]> +*/ +#include <asm/early_printk.h> +#include <asm/sbi.h> + +/*
xen/arch/riscv/early_printk.c line 20
Quoted 10 lines
xen/arch/riscv/early_printk.c new file +10
-0+* early_*() can be called from head.S with MMU-off. +* +* The following requiremets should be honoured for early_*() to +* work correctly: +* It should use PC-relative addressing for accessing symbols. +* To achieve that GCC cmodel=medany should be used. +*/ +#ifndef __riscv_cmodel_medany +#error "early_*() can be called from head.S before relocate so it should not use absolute addressing." +#endif
This is incorrect.
What *this* file is compiled with has no bearing on how head.S calls us. The RISC-V documentation explaining __riscv_cmodel_medany vs __riscv_cmodel_medlow calls this point out specifically. There's nothing you can put here to check that head.S gets compiled with medany.
Right now, there's nothing in this file dependent on either mode, and it's not liable to change in the short term. Furthermore, Xen isn't doing any relocation in the first place.
We will want to support XIP in due course, and that will be compiled __riscv_cmodel_medlow, which is a fine and legitimate usecase.
The build system sets the model up consistently. All you are doing by putting this in is creating work that someone is going to have to delete for legitimate reasons in the future.
Quoted 10 lines
xen/arch/riscv/setup.c +2
-0@@ -1,13 +1,17 @@#include <xen/compile.h> #include <xen/init.h> +#include <asm/early_printk.h> +
xen/arch/riscv/setup.c line 14
Quoted 10 lines
xen/arch/riscv/setup.c +3
-1/* Xen stack for bringing up the first CPU. */ unsigned char __initdata cpu0_boot_stack[STACK_SIZE ]__aligned(STACK_SIZE) ;void __init noreturnstart_xen (void ) { -for ( ;; ) +early_printk ("Hello from C env\n" ); + +for ( ; ; )
Rebasing error?
~Andrew
Re: [PATCH v4 3/4] xen/riscv: introduce early_printk basic stuff
Quoted 55 lines · Andrew Cooper
xen/arch/riscv/Kconfig.debug line 6
Quoted 11 lines · Oleksii Kurochko
xen/arch/riscv/Kconfig.debug +6
-0@@ -0,0 +1,6 @@ +config EARLY_PRINTK + bool "Enable early printk" + default DEBUG + help + + Enables early printk debug messages
Kconfigindentation is a little hard to get used to.It's one tab for the main block, and one tab + 2 spaces for the help text.
Also, drop the blank line after help.
Review
Quoted 10 lines
xen/arch/riscv/Makefile +1
-0@@ -1,3 +1,4 @@ +obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_RISCV_64) += riscv64/ obj-y += sbi.o obj-y += setup.o(quoted diff) +0
-0
b/xen/arch/riscv/early_printk.cQuoted 14 lines
new file mode 100644
index 0000000000..6bc29a1942xen/arch/riscv/early_printk.c new file +9
-0@@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* RISC-V early printk using SBI +* +* Copyright (C) 2021 Bobby Eshleman <[email protected]> +*/ +#include <asm/early_printk.h> +#include <asm/sbi.h> +xen/arch/riscv/early_printk.c line 19
Quoted 10 lines
xen/arch/riscv/early_printk.c new file +10
-0+/* +* early_*() can be called from head.S with MMU-off. +* +* The following requiremets should be honoured for early_*() to +* work correctly: +* It should use PC-relative addressing for accessing symbols. +* To achieve that GCC cmodel=medany should be used. +*/ +#ifndef __riscv_cmodel_medany +#error "early_*() can be called from head.S before relocate so itshould not use absolute addressing."
Quoted 3 lines
xen/arch/riscv/early_printk.c line 20
Quoted 1 line
xen/arch/riscv/early_printk.c new file +1
-0+#endif This is incorrect.
Aside the part about the relocation, I do not see what is wrong with it (see below)
Quoted 6 lines
What *this* file is compiled with has no bearing on how
head.Scalls us. The RISC-V documentation explaining__riscv_cmodel_medanyvs__riscv_cmodel_medlowcalls this point out specifically. There's nothing you can put here to check thathead.Sgets compiled with medany.
I believe you misunderstood the goal here. It is not to check how head.S will call it but to ensure the function is safe to be called when the MMU is off (e.g VA != VA).
Quoted 3 lines
Right now, there's nothing in this file dependent on either mode, and it's not liable to change in the short term.
The whole point is to make sure this don’t change without us knowing.
Furthermore, Xen isn't
Quoted 9 lines
doing any relocation in the first place.
We will want to support XIP in due course, and that will be compiled
__riscv_cmodel_medlow, which is a fine and legitimate usecase.The build system sets the model up consistently. All you are doing by putting this in is creating work that someone is going to have to delete for legitimate reasons in the future.
Are you saying that a code compiled with medlow can also work with MMU off and no relocation needed?
If not, then the check is correct. It would avoid hours of debugging…
Cheers,
Quoted 26 lines
Quoted 11 lines
xen/arch/riscv/setup.c +2
-0@@ -1,13 +1,17 @@#include <xen/compile.h> #include <xen/init.h> +#include <asm/early_printk.h> +xen/arch/riscv/setup.c line 14
Quoted 10 lines
xen/arch/riscv/setup.c +3
-1/* Xen stack for bringing up the first CPU. */ unsigned char __initdata cpu0_boot_stack[STACK_SIZE ]__aligned(STACK_SIZE) ;void __init noreturnstart_xen (void ) { -for ( ;; ) +early_printk ("Hello from C env\n" ); + +for ( ; ; )Rebasing error?
~Andrew
Signature · 1 line
Julien Grall
Re: [PATCH v4 2/4] xen/riscv: introduce sbi call to putchar to console
In reply to Oleksii KurochkoQuoted 8 lines · Oleksii Kurochko
From: Bobby Eshleman <[email protected]>
Originally SBI implementation for Xen was introduced by Bobby Eshleman <[email protected]> but it was removed all the stuff for simplicity except SBI call for putting character to console.
Quoted 5 lines
The patch introduces
sbi_putchar()SBI call which is necessary to implement initialearly_printk.Signed-off-by Bobby Eshleman <[email protected]>Signed-off-by Oleksii Kurochko <[email protected]>
Alistair
Quoted 126 lines
---
Changes in V4:
- Nothing changed
---
Changes in V3:
- update copyright's year
- rename definition of__CPU_SBI_H__to__ASM_RISCV_SBI_H__
- fix identations
- change an author of the commit
---
Changes in V2:
- add an explanatory comment aboutsbi_console_putchar()function.
- order the files alphabetically inMakefile--- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/include/asm/sbi.h | 34 ++++++++++++++++++++++++ xen/arch/riscv/sbi.c | 45 ++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 xen/arch/riscv/include/asm/sbi.h create mode 100644 xen/arch/riscv/sbi.cxen/arch/riscv/Makefile +1
-0@@ -1,4 +1,5 @@ obj-$(CONFIG_RISCV_64) += riscv64/ +obj-y += sbi.o obj-y += setup.o $(TARGET): $(TARGET)-symsxen/arch/riscv/include/asm/sbi.h new file +34
-0@@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: (GPL-2.0-or-later) */ +/* +* Copyright (c) 2021-2023 Vates SAS. +* +* Taken from xvisor, modified by Bobby Eshleman ([email protected]). +* +* Taken/modified from Xvisor project with the following copyright: +* +* Copyright (c) 2019 Western Digital Corporation or its affiliates. +*/ + +#ifndef __ASM_RISCV_SBI_H__ +#define __ASM_RISCV_SBI_H__ + +#define SBI_EXT_0_1_CONSOLE_PUTCHAR 0x1 + +struct sbiret { +long error; +long value; +}; + +struct sbiret sbi_ecall (unsigned long ext,unsigned long fid, +unsigned long arg0,unsigned long arg1, +unsigned long arg2,unsigned long arg3, +unsigned long arg4,unsigned long arg5); + +/** +* Writes given character to the console device. +* +* @param ch The data to be written to the console. +*/ +void sbi_console_putchar (int ch); + +#endif /* __ASM_RISCV_SBI_H__ */ xen/arch/riscv/sbi.c new file +45
-1@@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Taken and modified from the xvisor project with the copyright Copyright (c) +* 2019 Western Digital Corporation or its affiliates and author Anup Patel +* ([email protected]). +* +* Modified by Bobby Eshleman ([email protected]). +* +* Copyright (c) 2019 Western Digital Corporation or its affiliates. +* Copyright (c) 2021-2023 Vates SAS. +*/ + +#include <xen/errno.h> +#include <asm/sbi.h> + +struct sbiret sbi_ecall (unsigned long ext,unsigned long fid, +unsigned long arg0,unsigned long arg1, +unsigned long arg2,unsigned long arg3, +unsigned long arg4,unsigned long arg5) +{ +struct sbiret ret; + + register unsigned long a0 asm ("a0") = arg0; + register unsigned long a1 asm ("a1") = arg1; + register unsigned long a2 asm ("a2") = arg2; + register unsigned long a3 asm ("a3") = arg3; + register unsigned long a4 asm ("a4") = arg4; + register unsigned long a5 asm ("a5") = arg5; + register unsigned long a6 asm ("a6") = fid; + register unsigned long a7 asm ("a7") = ext; + + asmvolatile ("ecall" + :"+r" (a0),"+r" (a1) + :"r" (a2),"r" (a3),"r" (a4),"r" (a5),"r" (a6),"r" (a7) + :"memory" ); + ret.error = a0; + ret.value = a1; + +return ret; +} + +void sbi_console_putchar (int ch) +{ +sbi_ecall (SBI_EXT_0_1_CONSOLE_PUTCHAR ,0 , ch,0 ,0 ,0 ,0 ,0 ); +} --2.39.0
Re: [PATCH v4 4/4] automation: add RISC-V smoke test
In reply to Oleksii KurochkoQuoted 7 lines · Oleksii Kurochko
Add check if there is a message 'Hello from C env' presents in log file to be sure that stack is set and C part of early printk is working.
Signed-off-by Oleksii Kurochko <[email protected]>
Alistair
Quoted 82 lines
---
Changes in V4:
- Nothing changed
---
Changes in V3:
- Nothing changed
- All mentioned comments by Stefano in Xen mailing list will be fixed as a separate patch out of this patch series.--- automation/gitlab-ci/test.yaml | 20 ++++++++++++++++++++ automation/scripts/qemu-smoke-riscv64.sh | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100755 automation/scripts/qemu-smoke-riscv64.shautomation/gitlab-ci/test.yaml +20
-0@@ -54,6 +54,19 @@ tags: - x86_64 +.qemu-riscv64: + extends: .test-jobs-common + variables: + CONTAINER: archlinux:riscv64 + LOGFILE: qemu-smoke-riscv64.log + artifacts: + paths: + - smoke.serial + - '*.log' + when: always + tags: + - x86_64 + .yocto-test: extends: .test-jobs-common script:@@ -234,6 +247,13 @@ qemu-smoke-x86-64-clang-pvh: needs: - debian-unstable-clang-debug +qemu-smoke-riscv64-gcc: + extends: .qemu-riscv64 + script: + - ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE} + needs: + - riscv64-cross-gcc + # Yocto test jobs yocto-qemuarm64: extends: .yocto-test-arm64automation/scripts/qemu-smoke-riscv64.sh new file +20
-1@@ -0,0 +1,20 @@ +#!/bin/bash + +set -ex + +# Run the test +rm -f smoke.serial +set +e + +timeout -k 1 2 \ +qemu-system-riscv64 \ + -M virt \ + -smp 1 \ + -nographic \ + -m 2g \ + -kernel binaries/xen \ + |& tee smoke.serial + +set -e +(grep -q "Hello from C env" smoke.serial) || exit 1 +exit 0 --2.39.0
Re: [PATCH v4 2/4] xen/riscv: introduce sbi call to putchar to console
In reply to Andrew CooperQuoted 15 lines · Andrew Cooper
Quoted 14 lines · Oleksii Kurochko
xen/arch/riscv/sbi.c new file +14
-0+struct sbiret sbi_ecall (unsigned long ext,unsigned long fid, +unsigned long arg0,unsigned long arg1, +unsigned long arg2,unsigned long arg3, +unsigned long arg4,unsigned long arg5) +{ +struct sbiret ret; + + register unsigned long a0 asm ("a0") = arg0; + register unsigned long a1 asm ("a1") = arg1; + register unsigned long a2 asm ("a2") = arg2; + register unsigned long a3 asm ("a3") = arg3; + register unsigned long a4 asm ("a4") = arg4; + register unsigned long a5 asm ("a5") = arg5; + register unsigned long a6 asm ("a6") = fid;
Quoted 8 lines
xen/arch/riscv/sbi.c line 35
Quoted 6 lines
xen/arch/riscv/sbi.c new file +6
-0+ register unsigned long a7 asm ("a7") = ext; + + asmvolatile ("ecall" + :"+r" (a0),"+r" (a1) + :"r" (a2),"r" (a3),"r" (a4),"r" (a5),"r" (a6),"r" (a7) + :"memory" );Indentation. Each colon wants 4 more spaces in front of it.
Plus, if we're already talking of style, blanks are missing immediately inside the outermost parentheses, requiring yet one more space of indentation on the subsequent lines.
Jan
Re: [PATCH v4 3/4] xen/riscv: introduce early_printk basic stuff
In reply to Andrew CooperQuoted 95 lines · Andrew Cooper
xen/arch/riscv/Kconfig.debug line 6
Quoted 12 lines · Oleksii Kurochko
xen/arch/riscv/Kconfig.debug +6
-0@@ -0,0 +1,6 @@ +config EARLY_PRINTK + bool "Enable early printk" + default DEBUG + help + + Enables early printk debug messages
Kconfigindentation is a little hard to get used to.It's one tab for the main block, and one tab + 2 spaces for the help text.
Also, drop the blank line after help.
Quoted 35 lines
xen/arch/riscv/Makefile +1
-0@@ -1,3 +1,4 @@ +obj-$(CONFIG_EARLY_PRINTK) += early_printk.oobj-$(CONFIG_RISCV_64) += riscv64/
obj-y += sbi.o
obj-y += setup.oxen/arch/riscv/early_printk.c new file +19
-0@@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* RISC-V early printk using SBI +* +* Copyright (C) 2021 Bobby Eshleman <[email protected]> +*/ +#include <asm/early_printk.h> +#include <asm/sbi.h> + +/* +* early_*() can be called from head.S with MMU-off. +* +* The following requiremets should be honoured for early_*() to +* work correctly: +* It should use PC-relative addressing for accessing symbols. +* To achieve that GCC cmodel=medany should be used. +*/ +#ifndef __riscv_cmodel_medany +#error "early_*() can be called from head.S before relocate so itQuoted 2 lines
should not use absolute addressing."
+#endifThis is incorrect.
What *this* file is compiled with has no bearing on how
head.Scalls us. The RISC-V documentation explaining__riscv_cmodel_medanyvs__riscv_cmodel_medlowcalls this point out specifically. There's nothing you can put here to check thathead.Sgets compiled with medany.Right now, there's nothing in this file dependent on either mode, and it's not liable to change in the short term. Furthermore, Xen isn't doing any relocation in the first place.
We will want to support XIP in due course, and that will be compiled
__riscv_cmodel_medlow, which is a fine and legitimate usecase.The build system sets the model up consistently. All you are doing by
putting this in is creating work that someone is going to have to delete
for legitimate reasons in the future.Quoted 14 lines
xen/arch/riscv/setup.c +0
-0@@ -1,13 +1,17 @@ #include <xen/compile.h> #include <xen/init.h>xen/arch/riscv/setup.c +2
-0+#include <asm/early_printk.h> +/* Xen stack for bringing up the first CPU. */ unsigned char
__initdatacpu0_boot_stack[STACK_SIZE]__aligned(STACK_SIZE);
Quoted 9 lines
Quoted 6 lines
void
__initnoreturnstart_xen(void)
{
- for ( ;; )
+early_printk("Hello from C env\n");
+
+ for ( ; ; )Rebasing error?
If you are not speaking about adding of the space between "; ;" than it is rebasing error. I will double-check it during work on new version of the patch series.
Quoted 1 line
~Andrew
~Oleksii
Re: [PATCH v4 1/4] xen/riscv: introduce asm/types.h header file
In reply to Jan BeulichQuoted 32 lines · Jan Beulich
Quoted 17 lines · Oleksii
Quoted 10 lines · Jan Beulich
Quoted 8 lines · Oleksii Kurochko
Signed-off-by Oleksii Kurochko <[email protected]>---
Changes in V4:
- Clean up types in <asm/types.h> and remain only necessary.
The following types was removed as they are defined in <xen/types.h>:
{__|}{u|s}{8|16|32|64}Quoted 6 lines
For one you still typedef u32 and u64. And imo correctly so, until we
get around to move the definition basic types intoxen/types.h. Plus
I can't see how things build for you:xen/types.hexpects __{u,s}<N>Quoted 7 lines
It builds because nothing is used <
xen/types.h> now so that's why I missed them but you are right __{u,s}<N> should be backed. It looks like {__,}{u,s}{8,16,32} are the same for all available in Xen
architectures so probably can I move them to <xen/types.h> instead of
remain them in <asm/types.h>?This next step isn't quite as obvious, i.e. has room for being contentious. In particular deriving fixed width types from C basic types is setting us up for future problems (especially in the context of RISC-V think of RV128). Therefore, if we touch and generalize this, I'd like to sanitize things at the same time.
Quoted 14 lines
I'd then prefer to typedef {u,}int<N>_t by using either the "mode" attribute (requiring us to settle on a prereq of there always being 8 bits per char) or the compiler supplied __{U,}INT<N>_TYPE__ (taking gcc 4.7 as a prereq; didn't check clang yet). Both would allow {u,}int64_t to also be put in the common header. Yet if e.g. a prereq assumption faced opposition, some other approach would need to be found. Plus using either of the named approaches has issues with the
printf()format specifiers, for which I'm yet to figure out a solution (or maybe someone else knows a good way to deal with that; using compiler provided headers isn't an option afaict, as gcc providesstdint.hbut notinttypes.h, but maybe glibc's simplistic approach is good enough - they're targeting far more architectures than we do and get away with that).
Thanks for the explanation.
If back to RISCV's <asm/types.h> it looks that the v2 of the patch
(https://lore.kernel.org/xen-devel/ca2674739cfa71cae0bf084a7b471ad4518026d3.1673278109.git.oleksii.kurochko@gmail.com/)
is the best one option now because as I can see some work is going on around <xen/types.h> and keeping the minimal set of types now will allow us to not remove unneeded types for RISCV's port from asm/types.h in the future.
Even more based on your patch [
https://lists.xen.org/archives/html/xen-devel/2023-01/msg00720.html ] RISCV's <asm/types.h> can be empty for this patch series.
Quoted 1 line
Jan
~Oleksii
Re: [PATCH v4 2/4] xen/riscv: introduce sbi call to putchar to console
In reply to Jan BeulichQuoted 26 lines · Jan Beulich
Quoted 16 lines · Andrew Cooper
Quoted 15 lines · Oleksii Kurochko
xen/arch/riscv/sbi.c new file +15
-0+struct sbiret sbi_ecall (unsigned long ext,unsigned long fid, + unsigned long arg0, unsigned long arg1, + unsigned long arg2, unsigned long arg3, + unsigned long arg4, unsigned long arg5) +{ + struct sbiret ret; + + register unsigned long a0 asm ("a0") = arg0; + register unsigned long a1 asm ("a1") = arg1; + register unsigned long a2 asm ("a2") = arg2; + register unsigned long a3 asm ("a3") = arg3; + register unsigned long a4 asm ("a4") = arg4; + register unsigned long a5 asm ("a5") = arg5; + register unsigned long a6 asm ("a6") = fid; + register unsigned long a7 asm ("a7") = ext;Quoted 8 lines
Quoted 6 lines
+
+ asm volatile ("ecall"
+ : "+r" (a0), "+r" (a1)
+ : "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6), "r" (a7)
+ : "memory");Indentation. Each colon wants 4 more spaces in front of it.
Quoted 6 lines
Plus, if we're already talking of style, blanks are missing immediately inside
the outermost parentheses, requiring yet one more space of indentation on the
subsequent lines.
Thanks Andrew and Jan for the comments. I'll take them into account.
Quoted 2 lines
Jan
Re: [PATCH v4 1/4] xen/riscv: introduce asm/types.h header file
In reply to OleksiiQuoted 47 lines · Oleksii
Quoted 32 lines · Jan Beulich
Quoted 17 lines · Oleksii
Quoted 10 lines · Jan Beulich
Quoted 8 lines · Oleksii Kurochko
Signed-off-by Oleksii Kurochko <[email protected]>---
Changes in V4:
- Clean up types in <asm/types.h> and remain only necessary.
The following types was removed as they are defined in <xen/types.h>:
{__|}{u|s}{8|16|32|64}Quoted 6 lines
For one you still typedef u32 and u64. And imo correctly so, until we
get around to move the definition basic types intoxen/types.h. Plus
I can't see how things build for you:xen/types.hexpects __{u,s}<N>Quoted 7 lines
It builds because nothing is used <
xen/types.h> now so that's why I missed them but you are right __{u,s}<N> should be backed. It looks like {__,}{u,s}{8,16,32} are the same for all available in Xen
architectures so probably can I move them to <xen/types.h> instead of
remain them in <asm/types.h>?This next step isn't quite as obvious, i.e. has room for being contentious. In particular deriving fixed width types from C basic types is setting us up for future problems (especially in the context of RISC-V think of RV128). Therefore, if we touch and generalize this, I'd like to sanitize things at the same time.
Quoted 14 lines
I'd then prefer to typedef {u,}int<N>_t by using either the "mode" attribute (requiring us to settle on a prereq of there always being 8 bits per char) or the compiler supplied __{U,}INT<N>_TYPE__ (taking gcc 4.7 as a prereq; didn't check clang yet). Both would allow {u,}int64_t to also be put in the common header. Yet if e.g. a prereq assumption faced opposition, some other approach would need to be found. Plus using either of the named approaches has issues with the
printf()format specifiers, for which I'm yet to figure out a solution (or maybe someone else knows a good way to deal with that; using compiler provided headers isn't an option afaict, as gcc providesstdint.hbut notinttypes.h, but maybe glibc's simplistic approach is good enough - they're targeting far more architectures than we do and get away with that).
Quoted 8 lines
Thanks for the explanation.
If back to RISCV's <
asm/types.h> it looks that the v2 of the patch
(https://lore.kernel.org/xen-devel/ca2674739cfa71cae0bf084a7b471ad4518026d3.1673278109.git.oleksii.kurochko@gmail.com/)
is the best one option now because as I can see some work is going on around <xen/types.h> and keeping the minimal set of types now will allow us to not remove unneeded types for RISCV's port fromasm/types.hin the future.
Well, as said before, I'd prefer if that header wasn't populated piecemeal, but ...
Quoted 3 lines
Even more based on your patch [
https://lists.xen.org/archives/html/xen-devel/2023-01/msg00720.html ] RISCV's <asm/types.h> can be empty for this patch series.
... leaving it empty for now would of course be fine. Once the basic fixed width types are needed, imo they ought to be populated all in one got. But maybe by then we've managed to have that stuff in xen/types.h.
Jan
Re: [PATCH v4 0/4] Basic early_printk and smoke test implementation
In reply to Oleksii KurochkoQuoted 9 lines · Oleksii Kurochko
The patch series introduces the following:
- the minimal set of headers and changes inside them.
- SBI (RISC-V Supervisor Binary Interface) things necessary for basicearly_printkimplementation.
- things needed to set up the stack.
-early_printk()function to print only strings.
- RISC-V smoke test which checks if "Hello from C env" message is present in serial.tmp
Quoted 9 lines
---
Changes in V4:
- Patches "xen/riscv: introduce dummyasm/init.h" and "xen/riscv: introduce stack stuff" were removed from the patch series as they were merged separately into staging.
- Remove "depends on RISCV*" fromKconfig.debugasKconfig.debugis located in arch specific folder.
- fix code style.
- Add "ifdef__riscv_cmodel_medany" toearly_printk.c.
Did you really mean to send v4 another time?
Jan