mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
Merge patch series "riscv: alternative/cpufeature related cleanups"
Andrew Jones <ajones@ventanamicro.com> says: This series has no intended functional change. These cleanups were found while renaming errata_id to patch_id in order to better convey that its purpose is larger than errata (it's also for cpufeatures). * b4-shazam-merge: riscv: cpufeature: Drop errata_list.h and other unused includes riscv: lib: Include hwcap.h directly riscv: alternatives: Rename errata_id to patch_id riscv: alternatives: Remove unnecessary define and unused struct riscv: Rename Kconfig.erratas to Kconfig.errata riscv: Clarify RISCV_ALTERNATIVE help text Link: https://lore.kernel.org/r/20230224154601.88163-1-ajones@ventanamicro.com Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
commit
73bde0ca0a
10 changed files with 54 additions and 69 deletions
|
@ -245,7 +245,7 @@ config AS_HAS_INSN
|
|||
def_bool $(as-instr,.insn r 51$(comma) 0$(comma) 0$(comma) t0$(comma) t0$(comma) zero)
|
||||
|
||||
source "arch/riscv/Kconfig.socs"
|
||||
source "arch/riscv/Kconfig.erratas"
|
||||
source "arch/riscv/Kconfig.errata"
|
||||
|
||||
menu "Platform type"
|
||||
|
||||
|
@ -378,9 +378,9 @@ config RISCV_ALTERNATIVE
|
|||
depends on !XIP_KERNEL
|
||||
help
|
||||
This Kconfig allows the kernel to automatically patch the
|
||||
errata required by the execution platform at run time. The
|
||||
code patching is performed once in the boot stages. It means
|
||||
that the overhead from this mechanism is just taken once.
|
||||
erratum or cpufeature required by the execution platform at run
|
||||
time. The code patching overhead is minimal, as it's only done
|
||||
once at boot and once on each module load.
|
||||
|
||||
config RISCV_ALTERNATIVE_EARLY
|
||||
bool
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <asm/errata_list.h>
|
||||
|
||||
struct errata_info_t {
|
||||
char name[ERRATA_STRING_LENGTH_MAX];
|
||||
char name[32];
|
||||
bool (*check_func)(unsigned long arch_id, unsigned long impid);
|
||||
};
|
||||
|
||||
|
@ -101,12 +101,12 @@ void __init_or_module sifive_errata_patch_func(struct alt_entry *begin,
|
|||
for (alt = begin; alt < end; alt++) {
|
||||
if (alt->vendor_id != SIFIVE_VENDOR_ID)
|
||||
continue;
|
||||
if (alt->errata_id >= ERRATA_SIFIVE_NUMBER) {
|
||||
WARN(1, "This errata id:%d is not in kernel errata list", alt->errata_id);
|
||||
if (alt->patch_id >= ERRATA_SIFIVE_NUMBER) {
|
||||
WARN(1, "This errata id:%d is not in kernel errata list", alt->patch_id);
|
||||
continue;
|
||||
}
|
||||
|
||||
tmp = (1U << alt->errata_id);
|
||||
tmp = (1U << alt->patch_id);
|
||||
if (cpu_req_errata & tmp) {
|
||||
mutex_lock(&text_mutex);
|
||||
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
|
|||
for (alt = begin; alt < end; alt++) {
|
||||
if (alt->vendor_id != THEAD_VENDOR_ID)
|
||||
continue;
|
||||
if (alt->errata_id >= ERRATA_THEAD_NUMBER)
|
||||
if (alt->patch_id >= ERRATA_THEAD_NUMBER)
|
||||
continue;
|
||||
|
||||
tmp = (1U << alt->errata_id);
|
||||
tmp = (1U << alt->patch_id);
|
||||
if (cpu_req_errata & tmp) {
|
||||
oldptr = ALT_OLD_PTR(alt);
|
||||
altptr = ALT_ALT_PTR(alt);
|
||||
|
|
|
@ -6,18 +6,18 @@
|
|||
|
||||
#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 \newptr - .
|
||||
.2byte \vendor_id
|
||||
.2byte \new_len
|
||||
.4byte \errata_id
|
||||
.4byte \patch_id
|
||||
.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
|
||||
.pushsection .alternative, "a"
|
||||
ALT_ENTRY 886b, 888f, \vendor_id, \errata_id, 889f - 888f
|
||||
ALT_ENTRY 886b, 888f, \vendor_id, \patch_id, 889f - 888f
|
||||
.popsection
|
||||
.subsection 1
|
||||
888 :
|
||||
|
@ -33,7 +33,7 @@
|
|||
.endif
|
||||
.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 :
|
||||
.option push
|
||||
.option norvc
|
||||
|
@ -41,13 +41,13 @@
|
|||
\old_c
|
||||
.option pop
|
||||
887 :
|
||||
ALT_NEW_CONTENT \vendor_id, \errata_id, \enable, \new_c
|
||||
ALT_NEW_CONTENT \vendor_id, \patch_id, \enable, \new_c
|
||||
.endm
|
||||
|
||||
.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
|
||||
.macro ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, patch_id_1, enable_1, \
|
||||
new_c_2, vendor_id_2, patch_id_2, enable_2
|
||||
ALTERNATIVE_CFG "\old_c", "\new_c_1", \vendor_id_1, \patch_id_1, \enable_1
|
||||
ALT_NEW_CONTENT \vendor_id_2, \patch_id_2, \enable_2, \new_c_2
|
||||
.endm
|
||||
|
||||
#define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__
|
||||
|
@ -58,17 +58,17 @@
|
|||
#include <asm/asm.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 ((" newptr ") - .) \n" \
|
||||
".2byte " vendor_id "\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" \
|
||||
".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" \
|
||||
".subsection 1\n" \
|
||||
"888 :\n" \
|
||||
|
@ -83,7 +83,7 @@
|
|||
".previous\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" \
|
||||
".option push\n" \
|
||||
".option norvc\n" \
|
||||
|
@ -91,22 +91,22 @@
|
|||
old_c "\n" \
|
||||
".option pop\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, \
|
||||
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, patch_id_1, enable_1, \
|
||||
new_c_2, vendor_id_2, patch_id_2, enable_2) \
|
||||
__ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, patch_id_1, enable_1) \
|
||||
ALT_NEW_CONTENT(vendor_id_2, patch_id_2, enable_2, new_c_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(old_c, new_c, vendor_id, patch_id, 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, \
|
||||
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_2(old_c, new_c_1, vendor_id_1, patch_id_1, CONFIG_k_1, \
|
||||
new_c_2, vendor_id_2, patch_id_2, CONFIG_k_2) \
|
||||
__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, patch_id_2, IS_ENABLED(CONFIG_k_2))
|
||||
|
||||
#else /* CONFIG_RISCV_ALTERNATIVE */
|
||||
#ifdef __ASSEMBLY__
|
||||
|
@ -137,19 +137,19 @@
|
|||
|
||||
/*
|
||||
* 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,
|
||||
* 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.
|
||||
* new_content: The new content.
|
||||
* vendor_id: The CPU vendor ID.
|
||||
* errata_id: The errata ID.
|
||||
* CONFIG_k: The Kconfig of this errata. When Kconfig is disabled, the old
|
||||
* patch_id: The patch ID (erratum ID or cpufeature ID).
|
||||
* CONFIG_k: The Kconfig of this patch ID. When Kconfig is disabled, the old
|
||||
* content will alwyas be executed.
|
||||
*/
|
||||
#define ALTERNATIVE(old_content, new_content, vendor_id, errata_id, CONFIG_k) \
|
||||
_ALTERNATIVE_CFG(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, patch_id, CONFIG_k)
|
||||
|
||||
/*
|
||||
* A vendor wants to replace an old_content, but another vendor has used
|
||||
|
@ -158,9 +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, patch_id_1, CONFIG_k_1, \
|
||||
new_content_2, vendor_id_2, patch_id_2, CONFIG_k_2) \
|
||||
_ALTERNATIVE_CFG_2(old_content, new_content_1, vendor_id_1, patch_id_1, CONFIG_k_1, \
|
||||
new_content_2, vendor_id_2, patch_id_2, CONFIG_k_2)
|
||||
|
||||
#endif
|
||||
|
|
|
@ -6,8 +6,6 @@
|
|||
#ifndef __ASM_ALTERNATIVE_H
|
||||
#define __ASM_ALTERNATIVE_H
|
||||
|
||||
#define ERRATA_STRING_LENGTH_MAX 32
|
||||
|
||||
#include <asm/alternative-macros.h>
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
@ -38,14 +36,9 @@ void riscv_alternative_fix_offsets(void *alt_ptr, unsigned int len,
|
|||
struct alt_entry {
|
||||
s32 old_offset; /* offset relative to original 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 */
|
||||
u32 errata_id; /* The errata id */
|
||||
};
|
||||
|
||||
struct errata_checkfunc_id {
|
||||
unsigned long vendor_id;
|
||||
bool (*func)(struct alt_entry *alt);
|
||||
u32 patch_id; /* The patch ID (erratum ID or cpufeature ID) */
|
||||
};
|
||||
|
||||
void sifive_errata_patch_func(struct alt_entry *begin, struct alt_entry *end,
|
||||
|
|
|
@ -8,20 +8,15 @@
|
|||
|
||||
#include <linux/bitmap.h>
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/libfdt.h>
|
||||
#include <linux/log2.h>
|
||||
#include <linux/memory.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
#include <asm/alternative.h>
|
||||
#include <asm/cacheflush.h>
|
||||
#include <asm/errata_list.h>
|
||||
#include <asm/hwcap.h>
|
||||
#include <asm/patch.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/smp.h>
|
||||
#include <asm/switch_to.h>
|
||||
|
||||
#define NUM_ALPHA_EXTS ('z' - 'a' + 1)
|
||||
|
||||
|
@ -283,13 +278,13 @@ void __init_or_module riscv_cpufeature_patch_func(struct alt_entry *begin,
|
|||
for (alt = begin; alt < end; alt++) {
|
||||
if (alt->vendor_id != 0)
|
||||
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",
|
||||
alt->errata_id);
|
||||
alt->patch_id);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!__riscv_isa_extension_available(NULL, alt->errata_id))
|
||||
if (!__riscv_isa_extension_available(NULL, alt->patch_id))
|
||||
continue;
|
||||
|
||||
oldptr = ALT_OLD_PTR(alt);
|
||||
|
|
|
@ -2,9 +2,8 @@
|
|||
|
||||
#include <linux/linkage.h>
|
||||
#include <asm/asm.h>
|
||||
#include <asm-generic/export.h>
|
||||
#include <asm/alternative-macros.h>
|
||||
#include <asm/errata_list.h>
|
||||
#include <asm/hwcap.h>
|
||||
|
||||
/* int strcmp(const char *cs, const char *ct) */
|
||||
SYM_FUNC_START(strcmp)
|
||||
|
|
|
@ -2,9 +2,8 @@
|
|||
|
||||
#include <linux/linkage.h>
|
||||
#include <asm/asm.h>
|
||||
#include <asm-generic/export.h>
|
||||
#include <asm/alternative-macros.h>
|
||||
#include <asm/errata_list.h>
|
||||
#include <asm/hwcap.h>
|
||||
|
||||
/* int strlen(const char *s) */
|
||||
SYM_FUNC_START(strlen)
|
||||
|
|
|
@ -2,9 +2,8 @@
|
|||
|
||||
#include <linux/linkage.h>
|
||||
#include <asm/asm.h>
|
||||
#include <asm-generic/export.h>
|
||||
#include <asm/alternative-macros.h>
|
||||
#include <asm/errata_list.h>
|
||||
#include <asm/hwcap.h>
|
||||
|
||||
/* int strncmp(const char *cs, const char *ct, size_t count) */
|
||||
SYM_FUNC_START(strncmp)
|
||||
|
|
Loading…
Reference in a new issue