On Fri, Nov 01, 2024 at 05:08:02PM -0700, Samuel Holland wrote: > ALT_FIXUP_PMA() is already using ALTERNATIVE_2(), but needs to be > extended to handle a fourth case. Add ALTERNATIVE_3(), which extends > ALTERNATIVE_2() with another block of new content. > > Signed-off-by: Samuel Holland <samuel.holland@xxxxxxxxxx> > --- > > arch/riscv/include/asm/alternative-macros.h | 45 ++++++++++++++++++--- > 1 file changed, 40 insertions(+), 5 deletions(-) > > diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h > index 721ec275ce57..b6027a8b6b50 100644 > --- a/arch/riscv/include/asm/alternative-macros.h > +++ b/arch/riscv/include/asm/alternative-macros.h > @@ -50,8 +50,17 @@ > ALT_NEW_CONTENT \vendor_id_2, \patch_id_2, \enable_2, "\new_c_2" > .endm > > +.macro ALTERNATIVE_CFG_3 old_c, new_c_1, vendor_id_1, patch_id_1, enable_1, \ > + new_c_2, vendor_id_2, patch_id_2, enable_2, \ > + new_c_3, vendor_id_3, patch_id_3, enable_3 > + ALTERNATIVE_CFG_2 "\old_c", "\new_c_1", \vendor_id_1, \patch_id_1, \enable_1 \ > + "\new_c_2", \vendor_id_2, \patch_id_2, \enable_2 \ We don't want the '\' on the end of the above line. > + ALT_NEW_CONTENT \vendor_id_3, \patch_id_3, \enable_3, "\new_c_3" > +.endm > + > #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ > #define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__ > +#define __ALTERNATIVE_CFG_3(...) ALTERNATIVE_CFG_3 __VA_ARGS__ > > #else /* !__ASSEMBLY__ */ > > @@ -98,6 +107,13 @@ > __ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, patch_id_1, enable_1) \ > ALT_NEW_CONTENT(vendor_id_2, patch_id_2, enable_2, new_c_2) > > +#define __ALTERNATIVE_CFG_3(old_c, new_c_1, vendor_id_1, patch_id_1, enable_1, \ > + new_c_2, vendor_id_2, patch_id_2, enable_2, \ > + new_c_3, vendor_id_3, patch_id_3, enable_3) \ > + __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, patch_id_1, enable_1, \ > + new_c_2, vendor_id_2, patch_id_2, enable_2) \ > + ALT_NEW_CONTENT(vendor_id_3, patch_id_3, enable_3, new_c_3) > + > #endif /* __ASSEMBLY__ */ > > #define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, patch_id, CONFIG_k) \ > @@ -108,6 +124,13 @@ > __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, patch_id_1, IS_ENABLED(CONFIG_k_1), \ > new_c_2, vendor_id_2, patch_id_2, IS_ENABLED(CONFIG_k_2)) > > +#define _ALTERNATIVE_CFG_3(old_c, new_c_1, vendor_id_1, patch_id_1, CONFIG_k_1, \ > + new_c_2, vendor_id_2, patch_id_2, CONFIG_k_2, \ > + new_c_3, vendor_id_3, patch_id_3, CONFIG_k_3) \ > + __ALTERNATIVE_CFG_3(old_c, new_c_1, vendor_id_1, patch_id_1, IS_ENABLED(CONFIG_k_1), \ > + new_c_2, vendor_id_2, patch_id_2, IS_ENABLED(CONFIG_k_2), \ > + new_c_3, vendor_id_3, patch_id_3, IS_ENABLED(CONFIG_k_3)) > + > #else /* CONFIG_RISCV_ALTERNATIVE */ > #ifdef __ASSEMBLY__ > > @@ -121,6 +144,9 @@ > #define _ALTERNATIVE_CFG_2(old_c, ...) \ > ALTERNATIVE_CFG old_c > > +#define _ALTERNATIVE_CFG_3(old_c, ...) \ > + ALTERNATIVE_CFG old_c > + > #else /* !__ASSEMBLY__ */ > > #define __ALTERNATIVE_CFG(old_c) \ > @@ -132,6 +158,9 @@ > #define _ALTERNATIVE_CFG_2(old_c, ...) \ > __ALTERNATIVE_CFG(old_c) > > +#define _ALTERNATIVE_CFG_3(old_c, ...) \ > + __ALTERNATIVE_CFG(old_c) > + > #endif /* __ASSEMBLY__ */ > #endif /* CONFIG_RISCV_ALTERNATIVE */ > > @@ -152,15 +181,21 @@ > _ALTERNATIVE_CFG(old_content, new_content, vendor_id, patch_id, CONFIG_k) > > /* > - * A vendor wants to replace an old_content, but another vendor has used > - * ALTERNATIVE() to patch its customized content at the same location. In > - * this case, this vendor can create a new macro ALTERNATIVE_2() based > - * on the following sample code and then replace ALTERNATIVE() with > - * ALTERNATIVE_2() to append its customized content. > + * Variant of ALTERNATIVE() that supports two sets of replacement content. > */ > #define ALTERNATIVE_2(old_content, new_content_1, vendor_id_1, patch_id_1, CONFIG_k_1, \ > new_content_2, vendor_id_2, patch_id_2, CONFIG_k_2) \ > _ALTERNATIVE_CFG_2(old_content, new_content_1, vendor_id_1, patch_id_1, CONFIG_k_1, \ > new_content_2, vendor_id_2, patch_id_2, CONFIG_k_2) > > +/* > + * Variant of ALTERNATIVE() that supports three sets of replacement content. > + */ > +#define ALTERNATIVE_3(old_content, new_content_1, vendor_id_1, patch_id_1, CONFIG_k_1, \ > + new_content_2, vendor_id_2, patch_id_2, CONFIG_k_2, \ > + new_content_3, vendor_id_3, patch_id_3, CONFIG_k_3) \ > + _ALTERNATIVE_CFG_3(old_content, new_content_1, vendor_id_1, patch_id_1, CONFIG_k_1, \ > + new_content_2, vendor_id_2, patch_id_2, CONFIG_k_2, \ > + new_content_3, vendor_id_3, patch_id_3, CONFIG_k_3) > + > #endif > -- > 2.45.1 > Otherwise, Reviewed-by: Andrew Jones <ajones@xxxxxxxxxxxxxxxx>
