Commit 96588687 authored by Tiezhu Yang's avatar Tiezhu Yang
Browse files

LoongArch: Add ifdefs to fix LSX and LASX related warnings 

mainline inclusion
from mainline-v6.11
commit 80376323e2b6a4559f86b2b4d864848ac25cb054
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IB3IRE

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=80376323e2b6a4559f86b2b4d864848ac25cb054



---------------------------------------------------------------------------

There exist some warnings when building kernel if CONFIG_CPU_HAS_LBT is
set but CONFIG_CPU_HAS_LSX and CONFIG_CPU_HAS_LASX are not set. In this
case, there are no definitions of _restore_lsx & _restore_lasx and there
are also no definitions of kvm_restore_lsx & kvm_restore_lasx in fpu.S
and switch.S respectively, just add some ifdefs to fix these warnings.

  AS      arch/loongarch/kernel/fpu.o
arch/loongarch/kernel/fpu.o: warning: objtool: unexpected relocation symbol type in .rela.discard.func_stack_frame_non_standard: 0
arch/loongarch/kernel/fpu.o: warning: objtool: unexpected relocation symbol type in .rela.discard.func_stack_frame_non_standard: 0

  AS [M]  arch/loongarch/kvm/switch.o
arch/loongarch/kvm/switch.o: warning: objtool: unexpected relocation symbol type in .rela.discard.func_stack_frame_non_standard: 0
arch/loongarch/kvm/switch.o: warning: objtool: unexpected relocation symbol type in .rela.discard.func_stack_frame_non_standard: 0

  MODPOST Module.symvers
ERROR: modpost: "kvm_restore_lsx" [arch/loongarch/kvm/kvm.ko] undefined!
ERROR: modpost: "kvm_restore_lasx" [arch/loongarch/kvm/kvm.ko] undefined!

Cc: stable@vger.kernel.org # 6.9+
Fixes: cb8a2ef0848c ("LoongArch: Add ORC stack unwinder support")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202408120955.qls5oNQY-lkp@intel.com/


Signed-off-by: default avatarTiezhu Yang <yangtiezhu@loongson.cn>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
parent 6d9346bc

arch/loongarch/kernel/fpu.S

+4 −0
Original line number Diff line number Diff line
@@ -530,6 +530,10 @@ SYM_FUNC_END(_restore_lasx_context) 


#ifdef CONFIG_CPU_HAS_LBT

STACK_FRAME_NON_STANDARD _restore_fp

#ifdef CONFIG_CPU_HAS_LSX

STACK_FRAME_NON_STANDARD _restore_lsx

#endif

#ifdef CONFIG_CPU_HAS_LASX

STACK_FRAME_NON_STANDARD _restore_lasx

#endif

#endif

arch/loongarch/kvm/switch.S

+4 −0
Original line number Diff line number Diff line
@@ -283,6 +283,10 @@ SYM_DATA(kvm_enter_guest_size, .quad kvm_enter_guest_end - kvm_enter_guest) 


#ifdef CONFIG_CPU_HAS_LBT

STACK_FRAME_NON_STANDARD kvm_restore_fpu

#ifdef CONFIG_CPU_HAS_LSX

STACK_FRAME_NON_STANDARD kvm_restore_lsx

#endif

#ifdef CONFIG_CPU_HAS_LASX

STACK_FRAME_NON_STANDARD kvm_restore_lasx

#endif

#endif