Unverified Commit 26fb4b90 authored by Andrew Jones's avatar Andrew Jones Committed by Palmer Dabbelt
Browse files

riscv: Don't duplicate _ALTERNATIVE_CFG* macros 



Reduce clutter by only defining the _ALTERNATIVE_CFG* macros once,
rather than once for assembly and once for C. To do that, we need to
add __ALTERNATIVE_CFG* macros to the assembly side, but those are
one-liners. Also take the opportunity to do a bit of reformatting,
taking full advantage of the fact checkpatch gives us 100 char lines.

Signed-off-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Tested-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Acked-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20221129150053.50464-5-ajones@ventanamicro.com


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

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

+17 −36
Original line number Diff line number Diff line
@@ -44,23 +44,14 @@ 
	ALT_NEW_CONTENT \vendor_id, \errata_id, \enable, \new_c

.endm



#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

	ALTERNATIVE_CFG \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_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_CFG(...)		ALTERNATIVE_CFG __VA_ARGS__

#define __ALTERNATIVE_CFG_2(...)	ALTERNATIVE_CFG_2 __VA_ARGS__



#else /* !__ASSEMBLY__ */
@@ -102,27 +93,21 @@ 
	"887 :\n"							\

	ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c)



#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)			\

#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)	\

	__ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, errata_id_1, enable_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__ */



#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, 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 /* CONFIG_RISCV_ALTERNATIVE */

#ifdef __ASSEMBLY__
@@ -173,13 +158,9 @@ 
 * on the following sample code and then replace ALTERNATIVE() with

 * ALTERNATIVE_2() to append its customized content.

 */

#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