Unverified Commit bb3f8948 authored by Evan Green's avatar Evan Green Committed by Palmer Dabbelt
Browse files

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



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: 62a31d6e ("RISC-V: hwprobe: Support probing of misaligned access performance")
Signed-off-by: default avatarEvan Green <evan@rivosinc.com>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20230420194934.1871356-1-evan@rivosinc.com


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

arch/riscv/errata/thead/errata.c

+3 −3
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void __init_or_module thead_errata_patch_func(struct alt_entry *begin, struct al 
		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 impid)

{

arch/riscv/include/asm/alternative.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#define ALT_OLD_PTR(a)			__ALT_PTR(a, old_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_early_boot_alternatives(void);

void apply_module_alternatives(void *start, size_t length);

arch/riscv/kernel/alternative.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct cpu_manufacturer_info_t { 
				   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

	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 */

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;