Unverified Commit 2ba8c7dc authored by Andrew Jones's avatar Andrew Jones Committed by Palmer Dabbelt
Browse files

riscv: Don't duplicate __ALTERNATIVE_CFG in __ALTERNATIVE_CFG_2 



Build __ALTERNATIVE_CFG_2 by adding on to __ALTERNATIVE_CFG rather
than duplicating it.

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-2-ajones@ventanamicro.com


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

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

+2 −16
Original line number Diff line number Diff line
@@ -49,14 +49,7 @@ 


.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 :

	.option push

	.option norvc

	.option norelax

	\old_c

	.option pop

887 :

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

	__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
@@ -116,14 +109,7 @@ 
					enable_1,			\

				   new_c_2, vendor_id_2, errata_id_2,	\

					enable_2)			\

	"886 :\n"							\

	".option push\n"						\

	".option norvc\n"						\

	".option norelax\n"						\

	old_c "\n"							\

	".option pop\n"							\

	"887 :\n"							\

	ALT_NEW_CONTENT(vendor_id_1, errata_id_1, enable_1, new_c_1)	\

	__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,	\