riscv: extend concatenated alternatives-lines to the
From: Heiko Stuebner <heiko@...> Date: Mon, 10 Jan 2022 19:10:37 +0100
Commit-Message
ALT_NEW_CONTENT already uses same-length assembler lines, so extend this to the other elements as well. This makes it more readable when these elements need to be extended in the future. Signed-off-by: Heiko Stuebner <heiko@...> Reviewed-by: Philipp Tomsich <philipp.tomsich@...>
Patch-Comment
arch/riscv/include/asm/alternative-macros.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
Statistics
- 10 lines added
- 10 lines removed
Changes
----------------- arch/riscv/include/asm/alternative-macros.h ------------------
index 9e04cd53afc8..8c2bbc7bbe50 100644
@@ -62,14 +62,14 @@
#include <asm/asm.h>
#include <linux/stringify.h>
+#define ALT_ENTRY(oldptr, newptr, vendor_id, errata_id, newlen) \
+ RISCV_PTR " " oldptr "\n" \
+ RISCV_PTR " " newptr "\n" \
+ REG_ASM " " vendor_id "\n" \
+ REG_ASM " " newlen "\n" \
".word " errata_id "\n"
+#define ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c) \
".if " __stringify(enable) " == 1\n" \
".pushsection .alternative, \"a\"\n" \
ALT_ENTRY("886b", "888f", __stringify(vendor_id), __stringify(errata_id), "889f - 888f") \
@@ -83,10 +83,10 @@
".org . - (889b - 888b) + (887b - 886b)\n" \
".endif\n"
+#define __ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, enable) \
+ "886 :\n" \
+ old_c "\n" \
+ "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) \