| Message ID | 20250414120947.135173-2-ajones@ventanamicro.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fb53a9aa5f5b8bf302f3260a7f1f5a24345ce62a |
| Headers | show |
| Series | riscv: Provide all alternative macros all the time | expand |
| Context | Check | Description |
|---|---|---|
| bjorn/pre-ci_am | success | Success |
| bjorn/build-rv32-defconfig | success | build-rv32-defconfig |
| bjorn/build-rv64-clang-allmodconfig | success | build-rv64-clang-allmodconfig |
| bjorn/build-rv64-gcc-allmodconfig | success | build-rv64-gcc-allmodconfig |
| bjorn/build-rv64-nommu-k210-defconfig | success | build-rv64-nommu-k210-defconfig |
| bjorn/build-rv64-nommu-k210-virt | success | build-rv64-nommu-k210-virt |
| bjorn/checkpatch | fail | checkpatch |
| bjorn/dtb-warn-rv64 | success | dtb-warn-rv64 |
| bjorn/header-inline | success | header-inline |
| bjorn/kdoc | success | kdoc |
| bjorn/module-param | success | module-param |
| bjorn/verify-fixes | success | verify-fixes |
| bjorn/verify-signedoff | success | verify-signedoff |
Hi Drew, On 14/04/2025 14:09, Andrew Jones wrote: > We need to provide all six forms of the alternative macros > (ALTERNATIVE, ALTERNATIVE_2, _ALTERNATIVE_CFG, _ALTERNATIVE_CFG_2, > __ALTERNATIVE_CFG, __ALTERNATIVE_CFG_2) for all four cases derived > from the two ifdefs (RISCV_ALTERNATIVE, __ASSEMBLY__) in order to > ensure all configs can compile. Define this missing ones and ensure > all are defined to consume all parameters passed. > > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202504130710.3IKz6Ibs-lkp@intel.com/ > Signed-off-by: Andrew Jones <ajones@ventanamicro.com> > --- > arch/riscv/include/asm/alternative-macros.h | 19 +++++++------------ > 1 file changed, 7 insertions(+), 12 deletions(-) > > diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h > index 721ec275ce57..231d777d936c 100644 > --- a/arch/riscv/include/asm/alternative-macros.h > +++ b/arch/riscv/include/asm/alternative-macros.h > @@ -115,24 +115,19 @@ > \old_c > .endm > > -#define _ALTERNATIVE_CFG(old_c, ...) \ > - ALTERNATIVE_CFG old_c > - > -#define _ALTERNATIVE_CFG_2(old_c, ...) \ > - ALTERNATIVE_CFG old_c > +#define __ALTERNATIVE_CFG(old_c, ...) ALTERNATIVE_CFG old_c > +#define __ALTERNATIVE_CFG_2(old_c, ...) ALTERNATIVE_CFG old_c > > #else /* !__ASSEMBLY__ */ > > -#define __ALTERNATIVE_CFG(old_c) \ > - old_c "\n" > +#define __ALTERNATIVE_CFG(old_c, ...) old_c "\n" > +#define __ALTERNATIVE_CFG_2(old_c, ...) old_c "\n" > > -#define _ALTERNATIVE_CFG(old_c, ...) \ > - __ALTERNATIVE_CFG(old_c) > +#endif /* __ASSEMBLY__ */ > > -#define _ALTERNATIVE_CFG_2(old_c, ...) \ > - __ALTERNATIVE_CFG(old_c) > +#define _ALTERNATIVE_CFG(old_c, ...) __ALTERNATIVE_CFG(old_c) > +#define _ALTERNATIVE_CFG_2(old_c, ...) __ALTERNATIVE_CFG_2(old_c) > > -#endif /* __ASSEMBLY__ */ > #endif /* CONFIG_RISCV_ALTERNATIVE */ > > /* I could not find the right Fixes tag, so unless you have one, I'll add the commit pointed at by kernel test robot. You can add: Tested-by: Alexandre Ghiti <alexghiti@rivosinc.com> Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com> Thanks for looking into this! Alex
Hello: This patch was applied to riscv/linux.git (fixes) by Alexandre Ghiti <alexghiti@rivosinc.com>: On Mon, 14 Apr 2025 14:09:48 +0200 you wrote: > We need to provide all six forms of the alternative macros > (ALTERNATIVE, ALTERNATIVE_2, _ALTERNATIVE_CFG, _ALTERNATIVE_CFG_2, > __ALTERNATIVE_CFG, __ALTERNATIVE_CFG_2) for all four cases derived > from the two ifdefs (RISCV_ALTERNATIVE, __ASSEMBLY__) in order to > ensure all configs can compile. Define this missing ones and ensure > all are defined to consume all parameters passed. > > [...] Here is the summary with links: - riscv: Provide all alternative macros all the time https://git.kernel.org/riscv/c/fb53a9aa5f5b You are awesome, thank you!
diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h index 721ec275ce57..231d777d936c 100644 --- a/arch/riscv/include/asm/alternative-macros.h +++ b/arch/riscv/include/asm/alternative-macros.h @@ -115,24 +115,19 @@ \old_c .endm -#define _ALTERNATIVE_CFG(old_c, ...) \ - ALTERNATIVE_CFG old_c - -#define _ALTERNATIVE_CFG_2(old_c, ...) \ - ALTERNATIVE_CFG old_c +#define __ALTERNATIVE_CFG(old_c, ...) ALTERNATIVE_CFG old_c +#define __ALTERNATIVE_CFG_2(old_c, ...) ALTERNATIVE_CFG old_c #else /* !__ASSEMBLY__ */ -#define __ALTERNATIVE_CFG(old_c) \ - old_c "\n" +#define __ALTERNATIVE_CFG(old_c, ...) old_c "\n" +#define __ALTERNATIVE_CFG_2(old_c, ...) old_c "\n" -#define _ALTERNATIVE_CFG(old_c, ...) \ - __ALTERNATIVE_CFG(old_c) +#endif /* __ASSEMBLY__ */ -#define _ALTERNATIVE_CFG_2(old_c, ...) \ - __ALTERNATIVE_CFG(old_c) +#define _ALTERNATIVE_CFG(old_c, ...) __ALTERNATIVE_CFG(old_c) +#define _ALTERNATIVE_CFG_2(old_c, ...) __ALTERNATIVE_CFG_2(old_c) -#endif /* __ASSEMBLY__ */ #endif /* CONFIG_RISCV_ALTERNATIVE */ /*
We need to provide all six forms of the alternative macros (ALTERNATIVE, ALTERNATIVE_2, _ALTERNATIVE_CFG, _ALTERNATIVE_CFG_2, __ALTERNATIVE_CFG, __ALTERNATIVE_CFG_2) for all four cases derived from the two ifdefs (RISCV_ALTERNATIVE, __ASSEMBLY__) in order to ensure all configs can compile. Define this missing ones and ensure all are defined to consume all parameters passed. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202504130710.3IKz6Ibs-lkp@intel.com/ Signed-off-by: Andrew Jones <ajones@ventanamicro.com> --- arch/riscv/include/asm/alternative-macros.h | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)