Commit ff19a8de authored by Andrew Jones's avatar Andrew Jones Committed by Palmer Dabbelt

riscv: alternatives: Rename errata_id to patch_id

Alternatives are used for both errata and cpufeatures. Use a more
generic name, 'patch_id', as in "ID of code patching site", to
avoid confusion when alternatives are used for cpufeatures.
Signed-off-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Reviewed-by: default avatarHeiko Stuebner <heiko.stuebner@vrull.eu>
Link: https://lore.kernel.org/r/20230224154601.88163-5-ajones@ventanamicro.comSigned-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent ce06b42a
...@@ -378,9 +378,9 @@ config RISCV_ALTERNATIVE ...@@ -378,9 +378,9 @@ config RISCV_ALTERNATIVE
depends on !XIP_KERNEL depends on !XIP_KERNEL
help help
This Kconfig allows the kernel to automatically patch the This Kconfig allows the kernel to automatically patch the
errata required by the execution platform at run time. The erratum or cpufeature required by the execution platform at run
code patching overhead is minimal, as it's only done once time. The code patching overhead is minimal, as it's only done
at boot and once on each module load. once at boot and once on each module load.
config RISCV_ALTERNATIVE_EARLY config RISCV_ALTERNATIVE_EARLY
bool bool
......
...@@ -101,12 +101,12 @@ void __init_or_module sifive_errata_patch_func(struct alt_entry *begin, ...@@ -101,12 +101,12 @@ void __init_or_module sifive_errata_patch_func(struct alt_entry *begin,
for (alt = begin; alt < end; alt++) { for (alt = begin; alt < end; alt++) {
if (alt->vendor_id != SIFIVE_VENDOR_ID) if (alt->vendor_id != SIFIVE_VENDOR_ID)
continue; continue;
if (alt->errata_id >= ERRATA_SIFIVE_NUMBER) { if (alt->patch_id >= ERRATA_SIFIVE_NUMBER) {
WARN(1, "This errata id:%d is not in kernel errata list", alt->errata_id); WARN(1, "This errata id:%d is not in kernel errata list", alt->patch_id);
continue; continue;
} }
tmp = (1U << alt->errata_id); tmp = (1U << alt->patch_id);
if (cpu_req_errata & tmp) { if (cpu_req_errata & tmp) {
mutex_lock(&text_mutex); mutex_lock(&text_mutex);
patch_text_nosync(ALT_OLD_PTR(alt), ALT_ALT_PTR(alt), patch_text_nosync(ALT_OLD_PTR(alt), ALT_ALT_PTR(alt),
......
...@@ -93,10 +93,10 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct al ...@@ -93,10 +93,10 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct al
for (alt = begin; alt < end; alt++) { for (alt = begin; alt < end; alt++) {
if (alt->vendor_id != THEAD_VENDOR_ID) if (alt->vendor_id != THEAD_VENDOR_ID)
continue; continue;
if (alt->errata_id >= ERRATA_THEAD_NUMBER) if (alt->patch_id >= ERRATA_THEAD_NUMBER)
continue; continue;
tmp = (1U << alt->errata_id); tmp = (1U << alt->patch_id);
if (cpu_req_errata & tmp) { if (cpu_req_errata & tmp) {
oldptr = ALT_OLD_PTR(alt); oldptr = ALT_OLD_PTR(alt);
altptr = ALT_ALT_PTR(alt); altptr = ALT_ALT_PTR(alt);
......
...@@ -6,18 +6,18 @@ ...@@ -6,18 +6,18 @@
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
.macro ALT_ENTRY oldptr newptr vendor_id errata_id new_len .macro ALT_ENTRY oldptr newptr vendor_id patch_id new_len
.4byte \oldptr - . .4byte \oldptr - .
.4byte \newptr - . .4byte \newptr - .
.2byte \vendor_id .2byte \vendor_id
.2byte \new_len .2byte \new_len
.4byte \errata_id .4byte \patch_id
.endm .endm
.macro ALT_NEW_CONTENT vendor_id, errata_id, enable = 1, new_c : vararg .macro ALT_NEW_CONTENT vendor_id, patch_id, enable = 1, new_c : vararg
.if \enable .if \enable
.pushsection .alternative, "a" .pushsection .alternative, "a"
ALT_ENTRY 886b, 888f, \vendor_id, \errata_id, 889f - 888f ALT_ENTRY 886b, 888f, \vendor_id, \patch_id, 889f - 888f
.popsection .popsection
.subsection 1 .subsection 1
888 : 888 :
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
.endif .endif
.endm .endm
.macro ALTERNATIVE_CFG old_c, new_c, vendor_id, errata_id, enable .macro ALTERNATIVE_CFG old_c, new_c, vendor_id, patch_id, enable
886 : 886 :
.option push .option push
.option norvc .option norvc
...@@ -41,13 +41,13 @@ ...@@ -41,13 +41,13 @@
\old_c \old_c
.option pop .option pop
887 : 887 :
ALT_NEW_CONTENT \vendor_id, \errata_id, \enable, \new_c ALT_NEW_CONTENT \vendor_id, \patch_id, \enable, \new_c
.endm .endm
.macro ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ .macro ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, patch_id_1, enable_1, \
new_c_2, vendor_id_2, errata_id_2, enable_2 new_c_2, vendor_id_2, patch_id_2, enable_2
ALTERNATIVE_CFG "\old_c", "\new_c_1", \vendor_id_1, \errata_id_1, \enable_1 ALTERNATIVE_CFG "\old_c", "\new_c_1", \vendor_id_1, \patch_id_1, \enable_1
ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2 ALT_NEW_CONTENT \vendor_id_2, \patch_id_2, \enable_2, \new_c_2
.endm .endm
#define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__
...@@ -58,17 +58,17 @@ ...@@ -58,17 +58,17 @@
#include <asm/asm.h> #include <asm/asm.h>
#include <linux/stringify.h> #include <linux/stringify.h>
#define ALT_ENTRY(oldptr, newptr, vendor_id, errata_id, newlen) \ #define ALT_ENTRY(oldptr, newptr, vendor_id, patch_id, newlen) \
".4byte ((" oldptr ") - .) \n" \ ".4byte ((" oldptr ") - .) \n" \
".4byte ((" newptr ") - .) \n" \ ".4byte ((" newptr ") - .) \n" \
".2byte " vendor_id "\n" \ ".2byte " vendor_id "\n" \
".2byte " newlen "\n" \ ".2byte " newlen "\n" \
".4byte " errata_id "\n" ".4byte " patch_id "\n"
#define ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c) \ #define ALT_NEW_CONTENT(vendor_id, patch_id, enable, new_c) \
".if " __stringify(enable) " == 1\n" \ ".if " __stringify(enable) " == 1\n" \
".pushsection .alternative, \"a\"\n" \ ".pushsection .alternative, \"a\"\n" \
ALT_ENTRY("886b", "888f", __stringify(vendor_id), __stringify(errata_id), "889f - 888f") \ ALT_ENTRY("886b", "888f", __stringify(vendor_id), __stringify(patch_id), "889f - 888f") \
".popsection\n" \ ".popsection\n" \
".subsection 1\n" \ ".subsection 1\n" \
"888 :\n" \ "888 :\n" \
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
".previous\n" \ ".previous\n" \
".endif\n" ".endif\n"
#define __ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, enable) \ #define __ALTERNATIVE_CFG(old_c, new_c, vendor_id, patch_id, enable) \
"886 :\n" \ "886 :\n" \
".option push\n" \ ".option push\n" \
".option norvc\n" \ ".option norvc\n" \
...@@ -91,22 +91,22 @@ ...@@ -91,22 +91,22 @@
old_c "\n" \ old_c "\n" \
".option pop\n" \ ".option pop\n" \
"887 :\n" \ "887 :\n" \
ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c) ALT_NEW_CONTENT(vendor_id, patch_id, enable, new_c)
#define __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ #define __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, patch_id_1, enable_1, \
new_c_2, vendor_id_2, errata_id_2, enable_2) \ new_c_2, vendor_id_2, patch_id_2, enable_2) \
__ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1) \ __ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, patch_id_1, enable_1) \
ALT_NEW_CONTENT(vendor_id_2, errata_id_2, enable_2, new_c_2) ALT_NEW_CONTENT(vendor_id_2, patch_id_2, enable_2, new_c_2)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k) \ #define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, patch_id, CONFIG_k) \
__ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, IS_ENABLED(CONFIG_k)) __ALTERNATIVE_CFG(old_c, new_c, vendor_id, patch_id, IS_ENABLED(CONFIG_k))
#define _ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ #define _ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, patch_id_1, CONFIG_k_1, \
new_c_2, vendor_id_2, errata_id_2, CONFIG_k_2) \ new_c_2, vendor_id_2, patch_id_2, CONFIG_k_2) \
__ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, IS_ENABLED(CONFIG_k_1), \ __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, errata_id_2, IS_ENABLED(CONFIG_k_2)) new_c_2, vendor_id_2, patch_id_2, IS_ENABLED(CONFIG_k_2))
#else /* CONFIG_RISCV_ALTERNATIVE */ #else /* CONFIG_RISCV_ALTERNATIVE */
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
...@@ -137,19 +137,19 @@ ...@@ -137,19 +137,19 @@
/* /*
* Usage: * Usage:
* ALTERNATIVE(old_content, new_content, vendor_id, errata_id, CONFIG_k) * ALTERNATIVE(old_content, new_content, vendor_id, patch_id, CONFIG_k)
* in the assembly code. Otherwise, * in the assembly code. Otherwise,
* asm(ALTERNATIVE(old_content, new_content, vendor_id, errata_id, CONFIG_k)); * asm(ALTERNATIVE(old_content, new_content, vendor_id, patch_id, CONFIG_k));
* *
* old_content: The old content which is probably replaced with new content. * old_content: The old content which is probably replaced with new content.
* new_content: The new content. * new_content: The new content.
* vendor_id: The CPU vendor ID. * vendor_id: The CPU vendor ID.
* errata_id: The errata ID. * patch_id: The patch ID (erratum ID or cpufeature ID).
* CONFIG_k: The Kconfig of this errata. When Kconfig is disabled, the old * CONFIG_k: The Kconfig of this patch ID. When Kconfig is disabled, the old
* content will alwyas be executed. * content will alwyas be executed.
*/ */
#define ALTERNATIVE(old_content, new_content, vendor_id, errata_id, CONFIG_k) \ #define ALTERNATIVE(old_content, new_content, vendor_id, patch_id, CONFIG_k) \
_ALTERNATIVE_CFG(old_content, new_content, vendor_id, errata_id, CONFIG_k) _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 * A vendor wants to replace an old_content, but another vendor has used
...@@ -158,9 +158,9 @@ ...@@ -158,9 +158,9 @@
* on the following sample code and then replace ALTERNATIVE() with * on the following sample code and then replace ALTERNATIVE() with
* ALTERNATIVE_2() to append its customized content. * ALTERNATIVE_2() to append its customized content.
*/ */
#define ALTERNATIVE_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ #define ALTERNATIVE_2(old_content, new_content_1, vendor_id_1, patch_id_1, CONFIG_k_1, \
new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) \ new_content_2, vendor_id_2, patch_id_2, CONFIG_k_2) \
_ALTERNATIVE_CFG_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ _ALTERNATIVE_CFG_2(old_content, new_content_1, vendor_id_1, patch_id_1, CONFIG_k_1, \
new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) new_content_2, vendor_id_2, patch_id_2, CONFIG_k_2)
#endif #endif
...@@ -36,9 +36,9 @@ void riscv_alternative_fix_offsets(void *alt_ptr, unsigned int len, ...@@ -36,9 +36,9 @@ void riscv_alternative_fix_offsets(void *alt_ptr, unsigned int len,
struct alt_entry { struct alt_entry {
s32 old_offset; /* offset relative to original instruction or data */ s32 old_offset; /* offset relative to original instruction or data */
s32 alt_offset; /* offset relative to replacement instruction or data */ s32 alt_offset; /* offset relative to replacement instruction or data */
u16 vendor_id; /* cpu vendor id */ u16 vendor_id; /* CPU vendor ID */
u16 alt_len; /* The replacement size */ u16 alt_len; /* The replacement size */
u32 errata_id; /* The errata id */ u32 patch_id; /* The patch ID (erratum ID or cpufeature ID) */
}; };
void sifive_errata_patch_func(struct alt_entry *begin, struct alt_entry *end, void sifive_errata_patch_func(struct alt_entry *begin, struct alt_entry *end,
......
...@@ -282,13 +282,13 @@ void __init_or_module riscv_cpufeature_patch_func(struct alt_entry *begin, ...@@ -282,13 +282,13 @@ void __init_or_module riscv_cpufeature_patch_func(struct alt_entry *begin,
for (alt = begin; alt < end; alt++) { for (alt = begin; alt < end; alt++) {
if (alt->vendor_id != 0) if (alt->vendor_id != 0)
continue; continue;
if (alt->errata_id >= RISCV_ISA_EXT_MAX) { if (alt->patch_id >= RISCV_ISA_EXT_MAX) {
WARN(1, "This extension id:%d is not in ISA extension list", WARN(1, "This extension id:%d is not in ISA extension list",
alt->errata_id); alt->patch_id);
continue; continue;
} }
if (!__riscv_isa_extension_available(NULL, alt->errata_id)) if (!__riscv_isa_extension_available(NULL, alt->patch_id))
continue; continue;
oldptr = ALT_OLD_PTR(alt); oldptr = ALT_OLD_PTR(alt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment