the line: (s && (*s == '1' || *s == 'y' || *s == 'Y')) is used in a few places add a macro for it and its 'n' counterpart.
Add a copy of Linux's IS_ENABLED macro to be used in GET_ENV_OR_CONFIG. Add GET_ENV_OR_CONFIG for CONFIG values which can be overridden by the environment.
Signed-off-by: Jesse Taube jesse@rivosinc.com --- V1 -> V2: - New commit V2 -> V3: - Add IS_ENABLED so CONFIG_##name can be undefined - Change GET_ENV_OR_CONFIG to GET_CONFIG_OR_ENV - Fix it's to its --- lib/argv.h | 38 ++++++++++++++++++++++++++++++++++++++ lib/errata.h | 7 ++++--- riscv/sbi-tests.h | 3 ++- 3 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/lib/argv.h b/lib/argv.h index 0fa77725..111af078 100644 --- a/lib/argv.h +++ b/lib/argv.h @@ -14,4 +14,42 @@ extern void setup_args_progname(const char *args); extern void setup_env(char *env, int size); extern void add_setup_arg(const char *arg);
+/* + * Helper macros to use CONFIG_ options in C/CPP expressions. Note that + * these only work with boolean and tristate options. + */ + +/* + * Getting something that works in C and CPP for an arg that may or may + * not be defined is tricky. Here, if we have "#define CONFIG_BOOGER 1" + * we match on the placeholder define, insert the "0," for arg1 and generate + * the triplet (0, 1, 0). Then the last step cherry picks the 2nd arg (a one). + * When CONFIG_BOOGER is not defined, we generate a (... 1, 0) pair, and when + * the last step cherry picks the 2nd arg, we get a zero. + */ +#define __ARG_PLACEHOLDER_1 0, +#define __take_second_arg(__ignored, val, ...) val +#define __is_defined(x) ___is_defined(x) +#define ___is_defined(val) ____is_defined(__ARG_PLACEHOLDER_##val) +#define ____is_defined(arg1_or_junk) __take_second_arg(arg1_or_junk 1, 0) + +/* + * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to '1', 0 + * otherwise. + */ +#define IS_ENABLED(option) __is_defined(option) + +#define STR_IS_Y(s) (s && (*s == '1' || *s == 'y' || *s == 'Y')) +#define STR_IS_N(s) (s && (*s == '0' || *s == 'n' || *s == 'N')) + +/* + * Get the boolean value of CONFIG_{name} + * which can be overridden by the {name} + * variable in the environment if present. + */ +#define GET_ENV_OR_CONFIG(name) ({ \ + const char *genv_s = getenv(#name); \ + genv_s ? STR_IS_Y(genv_s) : IS_ENABLED(CONFIG_##name); \ +}) + #endif diff --git a/lib/errata.h b/lib/errata.h index de8205d8..78007243 100644 --- a/lib/errata.h +++ b/lib/errata.h @@ -7,6 +7,7 @@ #ifndef _ERRATA_H_ #define _ERRATA_H_ #include <libcflat.h> +#include <argv.h>
#include "config.h"
@@ -28,7 +29,7 @@ static inline bool errata_force(void) return true;
s = getenv("ERRATA_FORCE"); - return s && (*s == '1' || *s == 'y' || *s == 'Y'); + return STR_IS_Y(s); }
static inline bool errata(const char *erratum) @@ -40,7 +41,7 @@ static inline bool errata(const char *erratum)
s = getenv(erratum);
- return s && (*s == '1' || *s == 'y' || *s == 'Y'); + return STR_IS_Y(s); }
static inline bool errata_relaxed(const char *erratum) @@ -52,7 +53,7 @@ static inline bool errata_relaxed(const char *erratum)
s = getenv(erratum);
- return !(s && (*s == '0' || *s == 'n' || *s == 'N')); + return !STR_IS_N(s); }
#endif diff --git a/riscv/sbi-tests.h b/riscv/sbi-tests.h index c1ebf016..4e051dca 100644 --- a/riscv/sbi-tests.h +++ b/riscv/sbi-tests.h @@ -37,6 +37,7 @@
#ifndef __ASSEMBLER__ #include <libcflat.h> +#include <argv.h> #include <asm/sbi.h>
#define __sbiret_report(kfail, ret, expected_error, expected_value, \ @@ -94,7 +95,7 @@ static inline bool env_enabled(const char *env) { char *s = getenv(env);
- return s && (*s == '1' || *s == 'y' || *s == 'Y'); + return STR_IS_Y(s); }
void split_phys_addr(phys_addr_t paddr, unsigned long *hi, unsigned long *lo);
Add --[enable|disable]-sbi-exit-code to configure script. With the default value as disabled. Add a check for SBI_EXIT_CODE in the environment, so that passing of the test status is configurable from both the environment and the configure script
Signed-off-by: Jesse Taube jesse@rivosinc.com Reviewed-by: Andrew Jones andrew.jones@linux.dev --- V1 -> V2: - Factor out commonly used macros to new commit - Use ternary operator over if V2 -> V3: - No changes --- configure | 11 +++++++++++ lib/riscv/io.c | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/configure b/configure index 20bf5042..7c949bdc 100755 --- a/configure +++ b/configure @@ -67,6 +67,7 @@ earlycon= console= efi= efi_direct= +sbi_exit_code=0 target_cpu=
# Enable -Werror by default for git repositories only (i.e. developer builds) @@ -141,6 +142,9 @@ usage() { system and run from the UEFI shell. Ignored when efi isn't enabled and defaults to enabled when efi is enabled for riscv64. (arm64 and riscv64 only) + --[enable|disable]-sbi-exit-code + Enable or disable sending pass/fail exit code to SBI SRST. + (disabled by default, riscv only) EOF exit 1 } @@ -236,6 +240,12 @@ while [[ $optno -le $argc ]]; do --disable-efi-direct) efi_direct=n ;; + --enable-sbi-exit-code) + sbi_exit_code=1 + ;; + --disable-sbi-exit-code) + sbi_exit_code=0 + ;; --enable-werror) werror=-Werror ;; @@ -551,6 +561,7 @@ EOF elif [ "$arch" = "riscv32" ] || [ "$arch" = "riscv64" ]; then echo "#define CONFIG_UART_EARLY_BASE ${uart_early_addr}" >> lib/config.h [ "$console" = "sbi" ] && echo "#define CONFIG_SBI_CONSOLE" >> lib/config.h + echo "#define CONFIG_SBI_EXIT_CODE ${sbi_exit_code}" >> lib/config.h echo >> lib/config.h fi echo "#endif" >> lib/config.h diff --git a/lib/riscv/io.c b/lib/riscv/io.c index b1163404..c46845de 100644 --- a/lib/riscv/io.c +++ b/lib/riscv/io.c @@ -6,6 +6,7 @@ * Copyright (C) 2023, Ventana Micro Systems Inc., Andrew Jones ajones@ventanamicro.com */ #include <libcflat.h> +#include <argv.h> #include <bitops.h> #include <config.h> #include <devicetree.h> @@ -163,7 +164,8 @@ void halt(int code); void exit(int code) { printf("\nEXIT: STATUS=%d\n", ((code) << 1) | 1); - sbi_shutdown(code == 0); + + sbi_shutdown(GET_CONFIG_OR_ENV(SBI_EXIT_CODE) ? code == 0 : true); halt(code); __builtin_unreachable(); }
On Wed, Jul 09, 2025 at 06:47:06AM -0700, Jesse Taube wrote:
the line: (s && (*s == '1' || *s == 'y' || *s == 'Y')) is used in a few places add a macro for it and its 'n' counterpart.
Add a copy of Linux's IS_ENABLED macro to be used in GET_ENV_OR_CONFIG. Add GET_ENV_OR_CONFIG for CONFIG values which can be overridden by the environment.
Signed-off-by: Jesse Taube jesse@rivosinc.com
V1 -> V2:
- New commit
V2 -> V3:
- Add IS_ENABLED so CONFIG_##name can be undefined
- Change GET_ENV_OR_CONFIG to GET_CONFIG_OR_ENV
- Fix it's to its
lib/argv.h | 38 ++++++++++++++++++++++++++++++++++++++ lib/errata.h | 7 ++++--- riscv/sbi-tests.h | 3 ++- 3 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/lib/argv.h b/lib/argv.h index 0fa77725..111af078 100644 --- a/lib/argv.h +++ b/lib/argv.h @@ -14,4 +14,42 @@ extern void setup_args_progname(const char *args); extern void setup_env(char *env, int size); extern void add_setup_arg(const char *arg); +/*
- Helper macros to use CONFIG_ options in C/CPP expressions. Note that
- these only work with boolean and tristate options.
- */
+/*
- Getting something that works in C and CPP for an arg that may or may
- not be defined is tricky. Here, if we have "#define CONFIG_BOOGER 1"
- we match on the placeholder define, insert the "0," for arg1 and generate
- the triplet (0, 1, 0). Then the last step cherry picks the 2nd arg (a one).
- When CONFIG_BOOGER is not defined, we generate a (... 1, 0) pair, and when
- the last step cherry picks the 2nd arg, we get a zero.
- */
+#define __ARG_PLACEHOLDER_1 0, +#define __take_second_arg(__ignored, val, ...) val +#define __is_defined(x) ___is_defined(x) +#define ___is_defined(val) ____is_defined(__ARG_PLACEHOLDER_##val) +#define ____is_defined(arg1_or_junk) __take_second_arg(arg1_or_junk 1, 0)
+/*
- IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to '1', 0
- otherwise.
- */
+#define IS_ENABLED(option) __is_defined(option)
I'm tempted to say this belongs in lib/linux/kconfig.h, but since we don't have any other kconfig stuff, then I guess argv.h is fine.
+#define STR_IS_Y(s) (s && (*s == '1' || *s == 'y' || *s == 'Y')) +#define STR_IS_N(s) (s && (*s == '0' || *s == 'n' || *s == 'N'))
+/*
- Get the boolean value of CONFIG_{name}
- which can be overridden by the {name}
- variable in the environment if present.
- */
+#define GET_ENV_OR_CONFIG(name) ({ \
- const char *genv_s = getenv(#name); \
- genv_s ? STR_IS_Y(genv_s) : IS_ENABLED(CONFIG_##name); \
+})
#endif diff --git a/lib/errata.h b/lib/errata.h index de8205d8..78007243 100644 --- a/lib/errata.h +++ b/lib/errata.h @@ -7,6 +7,7 @@ #ifndef _ERRATA_H_ #define _ERRATA_H_ #include <libcflat.h> +#include <argv.h> #include "config.h" @@ -28,7 +29,7 @@ static inline bool errata_force(void) return true; s = getenv("ERRATA_FORCE");
- return s && (*s == '1' || *s == 'y' || *s == 'Y');
- return STR_IS_Y(s);
} static inline bool errata(const char *erratum) @@ -40,7 +41,7 @@ static inline bool errata(const char *erratum) s = getenv(erratum);
- return s && (*s == '1' || *s == 'y' || *s == 'Y');
- return STR_IS_Y(s);
} static inline bool errata_relaxed(const char *erratum) @@ -52,7 +53,7 @@ static inline bool errata_relaxed(const char *erratum) s = getenv(erratum);
- return !(s && (*s == '0' || *s == 'n' || *s == 'N'));
- return !STR_IS_N(s);
} #endif diff --git a/riscv/sbi-tests.h b/riscv/sbi-tests.h index c1ebf016..4e051dca 100644 --- a/riscv/sbi-tests.h +++ b/riscv/sbi-tests.h @@ -37,6 +37,7 @@ #ifndef __ASSEMBLER__ #include <libcflat.h> +#include <argv.h> #include <asm/sbi.h> #define __sbiret_report(kfail, ret, expected_error, expected_value, \ @@ -94,7 +95,7 @@ static inline bool env_enabled(const char *env) { char *s = getenv(env);
- return s && (*s == '1' || *s == 'y' || *s == 'Y');
- return STR_IS_Y(s);
} void split_phys_addr(phys_addr_t paddr, unsigned long *hi, unsigned long *lo); -- 2.43.0
Reviewed-by: Andrew Jones andrew.jones@linux.dev
linux-kselftest-mirror@lists.linaro.org
-
Andrew Jones -
Jesse Taube