Unverified Commit fbdba60b authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Palmer Dabbelt
Browse files

riscv: implement ALTERNATIVE_2 macro 



When the alternatives were added the commit already provided a template
on how to implement 2 different alternatives for one piece of code.

Make this usable.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarPhilipp Tomsich <philipp.tomsich@vrull.eu>
Link: https://lore.kernel.org/r/20220511192921.2223629-5-heiko@sntech.de


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent a8e91016

arch/riscv/include/asm/alternative-macros.h

+58 −20
Original line number Diff line number Diff line
@@ -39,6 +39,24 @@ 
#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k) \

	__ALTERNATIVE_CFG old_c, new_c, vendor_id, errata_id, IS_ENABLED(CONFIG_k)



.macro __ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \

				  new_c_2, vendor_id_2, errata_id_2, enable_2

886 :

	\old_c

887 :

	ALT_NEW_CONTENT \vendor_id_1, \errata_id_1, \enable_1, \new_c_1

	ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2

.endm



#define _ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1,	\

					CONFIG_k_1,			\

				  new_c_2, vendor_id_2, errata_id_2,	\

					CONFIG_k_2)			\

	__ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1,	\

					IS_ENABLED(CONFIG_k_1),		\

				   new_c_2, vendor_id_2, errata_id_2,	\

					IS_ENABLED(CONFIG_k_2)



#else /* !__ASSEMBLY__ */



#include <asm/asm.h>
@@ -74,6 +92,25 @@ 
#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k)	\

	__ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, IS_ENABLED(CONFIG_k))



#define __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1,	\

					enable_1,			\

				   new_c_2, vendor_id_2, errata_id_2,	\

					enable_2)			\

	"886 :\n"							\

	old_c "\n"							\

	"887 :\n"							\

	ALT_NEW_CONTENT(vendor_id_1, errata_id_1, enable_1, new_c_1)	\

	ALT_NEW_CONTENT(vendor_id_2, errata_id_2, enable_2, new_c_2)



#define _ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1,	\

					CONFIG_k_1,			\

				  new_c_2, vendor_id_2, errata_id_2,	\

					CONFIG_k_2)			\

	__ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1,	\

					IS_ENABLED(CONFIG_k_1),		\

				   new_c_2, vendor_id_2, errata_id_2,	\

					IS_ENABLED(CONFIG_k_2))



#endif /* __ASSEMBLY__ */



#else /* CONFIG_RISCV_ALTERNATIVE */
@@ -86,6 +123,12 @@ 
#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k) \

	__ALTERNATIVE_CFG old_c



#define _ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1,	\

					CONFIG_k_1,			\

				  new_c_2, vendor_id_2, errata_id_2,	\

					CONFIG_k_2)			\

       __ALTERNATIVE_CFG old_c



#else /* !__ASSEMBLY__ */



#define __ALTERNATIVE_CFG(old_c)  \
@@ -94,6 +137,12 @@ 
#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k) \

	__ALTERNATIVE_CFG(old_c)



#define _ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1,	\

					CONFIG_k_1,			\

				  new_c_2, vendor_id_2, errata_id_2,	\

					CONFIG_k_2) \

       __ALTERNATIVE_CFG(old_c)



#endif /* __ASSEMBLY__ */

#endif /* CONFIG_RISCV_ALTERNATIVE */
@@ -119,25 +168,14 @@ 
 * 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.

 *

 * .macro __ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \

 *                                   new_c_2, vendor_id_2, errata_id_2, enable_2

 * 886 :

 *      \old_c

 * 887 :

 *      ALT_NEW_CONTENT \vendor_id_1, \errata_id_1, \enable_1, \new_c_1

 *      ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2

 * .endm

 *

 * #define _ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, CONFIG_k_1, \

 *                                   new_c_2, vendor_id_2, errata_id_2, CONFIG_k_2) \

 *        __ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1, IS_ENABLED(CONFIG_k_1), \

 *                                   new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2) \

 *

 * #define ALTERNATIVE_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \

 *                                    new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) \

 *         _ALTERNATIVE_CFG_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \

 *                                         new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2)

 *

 */

#define ALTERNATIVE_2(old_content, new_content_1, vendor_id_1,		\

					errata_id_1, CONFIG_k_1,	\

				   new_content_2, vendor_id_2,		\

					errata_id_2, CONFIG_k_2)	\

	_ALTERNATIVE_CFG_2(old_content, new_content_1, vendor_id_1,	\

					    errata_id_1, CONFIG_k_1,	\

					new_content_2, vendor_id_2,	\

					    errata_id_2, CONFIG_k_2)



#endif