From: Jisheng Zhang <jszhang@kernel.org>
Date: Sat, 28 Jan 2023 17:28:49 +0000 (+0800)
Subject: riscv: fpu: switch has_fpu() to riscv_has_extension_likely()
X-Git-Tag: v6.3-rc1~86^2~22^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=702e64550b12cf36089672af8f110660da7f847e;p=thirdparty%2Fkernel%2Flinux.git

riscv: fpu: switch has_fpu() to riscv_has_extension_likely()

Switch has_fpu() from static branch to the new helper
riscv_has_extension_likely().

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20230128172856.3814-7-jszhang@kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---

diff --git a/arch/riscv/include/asm/switch_to.h b/arch/riscv/include/asm/switch_to.h
index 11463489fec67..60f8ca01d36e4 100644
--- a/arch/riscv/include/asm/switch_to.h
+++ b/arch/riscv/include/asm/switch_to.h
@@ -59,7 +59,8 @@ static inline void __switch_to_aux(struct task_struct *prev,
 
 static __always_inline bool has_fpu(void)
 {
-	return static_branch_likely(&riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_FPU]);
+	return riscv_has_extension_likely(RISCV_ISA_EXT_f) ||
+		riscv_has_extension_likely(RISCV_ISA_EXT_d);
 }
 #else
 static __always_inline bool has_fpu(void) { return false; }