mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] RISC-V: hwprobe: Remove __init on probe_vendor_features()
@ 2023-04-20 19:49 Evan Green
  2023-04-21 17:48 ` Conor Dooley
  2023-04-26 14:27 ` Palmer Dabbelt
  0 siblings, 2 replies; 3+ messages in thread
From: Evan Green @ 2023-04-20 19:49 UTC (permalink / raw)
  To: Palmer Dabbelt
  Cc: Evan Green, Albert Ou, Andrew Jones, Conor Dooley, Guo Ren,
	Heiko Stuebner, Jisheng Zhang, Palmer Dabbelt, Paul Walmsley,
	Philipp Tomsich, Samuel Holland, linux-kernel, linux-riscv

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: 62a31d6e38bd ("RISC-V: hwprobe: Support probing of misaligned access performance")

Signed-off-by: Evan Green <evan@rivosinc.com>
---

 arch/riscv/errata/thead/errata.c     | 6 +++---
 arch/riscv/include/asm/alternative.h | 2 +-
 arch/riscv/kernel/alternative.c      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/riscv/errata/thead/errata.c b/arch/riscv/errata/thead/errata.c
index 1036b8f933ec..a86c4facc2a6 100644
--- a/arch/riscv/errata/thead/errata.c
+++ b/arch/riscv/errata/thead/errata.c
@@ -118,9 +118,9 @@ 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,
-					       unsigned long archid,
-					       unsigned long impid)
+void thead_feature_probe_func(unsigned int cpu,
+			      unsigned long archid,
+			      unsigned long impid)
 {
 	if ((archid == 0) && (impid == 0))
 		per_cpu(misaligned_access_speed, cpu) = RISCV_HWPROBE_MISALIGNED_FAST;
diff --git a/arch/riscv/include/asm/alternative.h b/arch/riscv/include/asm/alternative.h
index a8f5cf6694a1..6a41537826a7 100644
--- a/arch/riscv/include/asm/alternative.h
+++ b/arch/riscv/include/asm/alternative.h
@@ -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);
diff --git a/arch/riscv/kernel/alternative.c b/arch/riscv/kernel/alternative.c
index fc65c9293ac5..6b75788c18e6 100644
--- a/arch/riscv/kernel/alternative.c
+++ b/arch/riscv/kernel/alternative.c
@@ -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;
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] RISC-V: hwprobe: Remove __init on probe_vendor_features()
  2023-04-20 19:49 [PATCH] RISC-V: hwprobe: Remove __init on probe_vendor_features() Evan Green
@ 2023-04-21 17:48 ` Conor Dooley
  2023-04-26 14:27 ` Palmer Dabbelt
  1 sibling, 0 replies; 3+ messages in thread
From: Conor Dooley @ 2023-04-21 17:48 UTC (permalink / raw)
  To: Evan Green
  Cc: Palmer Dabbelt, Albert Ou, Andrew Jones, Conor Dooley, Guo Ren,
	Heiko Stuebner, Jisheng Zhang, Palmer Dabbelt, Paul Walmsley,
	Philipp Tomsich, Samuel Holland, linux-kernel, linux-riscv

[-- Attachment #1: Type: text/plain, Size: 607 bytes --]

Yo Evan,

On Thu, Apr 20, 2023 at 12:49:34PM -0700, Evan Green wrote:
> 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: 62a31d6e38bd ("RISC-V: hwprobe: Support probing of misaligned access performance")
>

BTW, in the future, no empty line between trailers.

> Signed-off-by: Evan Green <evan@rivosinc.com>

Otherwise,
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>

Thanks,
Conor.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] RISC-V: hwprobe: Remove __init on probe_vendor_features()
  2023-04-20 19:49 [PATCH] RISC-V: hwprobe: Remove __init on probe_vendor_features() Evan Green
  2023-04-21 17:48 ` Conor Dooley
@ 2023-04-26 14:27 ` Palmer Dabbelt
  1 sibling, 0 replies; 3+ messages in thread
From: Palmer Dabbelt @ 2023-04-26 14:27 UTC (permalink / raw)
  To: Evan Green
  Cc: Albert Ou, Andrew Jones, Conor Dooley, Guo Ren, Heiko Stuebner,
	Jisheng Zhang, Palmer Dabbelt, Paul Walmsley, Philipp Tomsich,
	Samuel Holland, linux-kernel, linux-riscv


On Thu, 20 Apr 2023 12:49:34 -0700, Evan Green wrote:
> 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: 62a31d6e38bd ("RISC-V: hwprobe: Support probing of misaligned access performance")
> 
> [...]

Applied, thanks!

[1/1] RISC-V: hwprobe: Remove __init on probe_vendor_features()
      https://git.kernel.org/palmer/c/bb3f89487fd9

Best regards,
-- 
Palmer Dabbelt <palmer@rivosinc.com>


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-04-26 14:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-20 19:49 [PATCH] RISC-V: hwprobe: Remove __init on probe_vendor_features() Evan Green
2023-04-21 17:48 ` Conor Dooley
2023-04-26 14:27 ` Palmer Dabbelt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®