Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 00:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

RISC-V: hwprobe: Remove __init on probe_vendor_features()

Browse Source 
probe_vendor_features() is now called from smp_callin(), which is not
__init code and runs during cpu hotplug events. Remove the
__init_or_module decoration from it and the functions it calls to avoid
walking into outer space.

Fixes: 62a31d6e38 ("RISC-V: hwprobe: Support probing of misaligned access performance")
Signed-off-by: Evan Green <evan@rivosinc.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20230420194934.1871356-1-evan@rivosinc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Evan Green 2023-04-20 12:49:34 -07:00 committed by Palmer Dabbelt
parent 310c33dc7a
commit bb3f89487f
No known key found for this signature in database
GPG Key ID: 2E1319F35FBB1889
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/riscv/errata/thead/errata.c
View File

@ -118,9 +118,9 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct al
local_flush_icache_all(); local_flush_icache_all();
} }
void __init_or_module thead_feature_probe_func(unsigned int cpu, void thead_feature_probe_func(unsigned int cpu,
unsigned long archid, unsigned long archid,
unsigned long impid) unsigned long impid)
{ {
if ((archid == 0) && (impid == 0)) if ((archid == 0) && (impid == 0))
per_cpu(misaligned_access_speed, cpu) = RISCV_HWPROBE_MISALIGNED_FAST; per_cpu(misaligned_access_speed, cpu) = RISCV_HWPROBE_MISALIGNED_FAST;

2
arch/riscv/include/asm/alternative.h
View File

@ -30,7 +30,7 @@
#define ALT_OLD_PTR(a) __ALT_PTR(a, old_offset) #define ALT_OLD_PTR(a) __ALT_PTR(a, old_offset)
#define ALT_ALT_PTR(a) __ALT_PTR(a, alt_offset) #define ALT_ALT_PTR(a) __ALT_PTR(a, alt_offset)
void __init probe_vendor_features(unsigned int cpu); void probe_vendor_features(unsigned int cpu);
void __init apply_boot_alternatives(void); void __init apply_boot_alternatives(void);
void __init apply_early_boot_alternatives(void); void __init apply_early_boot_alternatives(void);
void apply_module_alternatives(void *start, size_t length); void apply_module_alternatives(void *start, size_t length);

4
arch/riscv/kernel/alternative.c
View File

@ -31,7 +31,7 @@ struct cpu_manufacturer_info_t {
unsigned long impid); unsigned long impid);
}; };
static void __init_or_module riscv_fill_cpu_mfr_info(struct cpu_manufacturer_info_t *cpu_mfr_info) static void riscv_fill_cpu_mfr_info(struct cpu_manufacturer_info_t *cpu_mfr_info)
{ {
#ifdef CONFIG_RISCV_M_MODE #ifdef CONFIG_RISCV_M_MODE
cpu_mfr_info->vendor_id = csr_read(CSR_MVENDORID); cpu_mfr_info->vendor_id = csr_read(CSR_MVENDORID);
@ -144,7 +144,7 @@ void riscv_alternative_fix_offsets(void *alt_ptr, unsigned int len,
} }
/* Called on each CPU as it starts */ /* Called on each CPU as it starts */
void __init_or_module probe_vendor_features(unsigned int cpu) void probe_vendor_features(unsigned int cpu)
{ {
struct cpu_manufacturer_info_t cpu_mfr_info; struct cpu_manufacturer_info_t cpu_mfr_info;