Commit e742bd19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'loongarch-fixes-6.15-1' of... 

Merge tag 'loongarch-fixes-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

Pull LoongArch fixes from Huacai Chen:
 "Add a missing Kconfig option, fix some bugs in exception handlers,
  memory management and KVM"

* tag 'loongarch-fixes-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: KVM: Fix PMU pass-through issue if VM exits to host finally
  LoongArch: KVM: Fully clear some CSRs when VM reboot
  LoongArch: KVM: Fix multiple typos of KVM code
  LoongArch: Return NULL from huge_pte_offset() for invalid PMD
  LoongArch: Remove a bogus reference to ZONE_DMA
  LoongArch: Handle fp, lsx, lasx and lbt assembly symbols
  LoongArch: Make do_xyz() exception handlers more robust
  LoongArch: Make regs_irqs_disabled() more clear
  LoongArch: Select ARCH_USE_MEMTEST
parents ec0c2d53 5add0dbb

arch/loongarch/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ config LOONGARCH 
	select ARCH_SUPPORTS_RT

	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_USE_MEMTEST

	select ARCH_USE_QUEUED_RWLOCKS

	select ARCH_USE_QUEUED_SPINLOCKS

	select ARCH_WANT_DEFAULT_BPF_JIT

arch/loongarch/include/asm/fpu.h

+23 −16
Original line number Diff line number Diff line
@@ -22,22 +22,29 @@ 
struct sigcontext;



#define kernel_fpu_available() cpu_has_fpu

extern void kernel_fpu_begin(void);

extern void kernel_fpu_end(void);



extern void _init_fpu(unsigned int);

extern void _save_fp(struct loongarch_fpu *);

extern void _restore_fp(struct loongarch_fpu *);



extern void _save_lsx(struct loongarch_fpu *fpu);

extern void _restore_lsx(struct loongarch_fpu *fpu);

extern void _init_lsx_upper(void);

extern void _restore_lsx_upper(struct loongarch_fpu *fpu);



extern void _save_lasx(struct loongarch_fpu *fpu);

extern void _restore_lasx(struct loongarch_fpu *fpu);

extern void _init_lasx_upper(void);

extern void _restore_lasx_upper(struct loongarch_fpu *fpu);



void kernel_fpu_begin(void);

void kernel_fpu_end(void);



asmlinkage void _init_fpu(unsigned int);

asmlinkage void _save_fp(struct loongarch_fpu *);

asmlinkage void _restore_fp(struct loongarch_fpu *);

asmlinkage int _save_fp_context(void __user *fpregs, void __user *fcc, void __user *csr);

asmlinkage int _restore_fp_context(void __user *fpregs, void __user *fcc, void __user *csr);



asmlinkage void _save_lsx(struct loongarch_fpu *fpu);

asmlinkage void _restore_lsx(struct loongarch_fpu *fpu);

asmlinkage void _init_lsx_upper(void);

asmlinkage void _restore_lsx_upper(struct loongarch_fpu *fpu);

asmlinkage int _save_lsx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);

asmlinkage int _restore_lsx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);



asmlinkage void _save_lasx(struct loongarch_fpu *fpu);

asmlinkage void _restore_lasx(struct loongarch_fpu *fpu);

asmlinkage void _init_lasx_upper(void);

asmlinkage void _restore_lasx_upper(struct loongarch_fpu *fpu);

asmlinkage int _save_lasx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);

asmlinkage int _restore_lasx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);



static inline void enable_lsx(void);

static inline void disable_lsx(void);

arch/loongarch/include/asm/lbt.h

+7 −3
Original line number Diff line number Diff line
@@ -12,9 +12,13 @@ 
#include <asm/loongarch.h>

#include <asm/processor.h>



extern void _init_lbt(void);

extern void _save_lbt(struct loongarch_lbt *);

extern void _restore_lbt(struct loongarch_lbt *);

asmlinkage void _init_lbt(void);

asmlinkage void _save_lbt(struct loongarch_lbt *);

asmlinkage void _restore_lbt(struct loongarch_lbt *);

asmlinkage int _save_lbt_context(void __user *regs, void __user *eflags);

asmlinkage int _restore_lbt_context(void __user *regs, void __user *eflags);

asmlinkage int _save_ftop_context(void __user *ftop);

asmlinkage int _restore_ftop_context(void __user *ftop);



static inline int is_lbt_enabled(void)

{

arch/loongarch/include/asm/ptrace.h

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ struct pt_regs { 
	unsigned long __last[];

} __aligned(8);



static inline int regs_irqs_disabled(struct pt_regs *regs)

static __always_inline bool regs_irqs_disabled(struct pt_regs *regs)

{

	return arch_irqs_disabled_flags(regs->csr_prmd);

	return !(regs->csr_prmd & CSR_PRMD_PIE);

}



static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)

arch/loongarch/kernel/fpu.S

+6 −0
Original line number Diff line number Diff line
@@ -458,6 +458,7 @@ SYM_FUNC_START(_save_fp_context) 
	li.w		a0, 0				# success

	jr		ra

SYM_FUNC_END(_save_fp_context)

EXPORT_SYMBOL_GPL(_save_fp_context)



/*

 * a0: fpregs
@@ -471,6 +472,7 @@ SYM_FUNC_START(_restore_fp_context) 
	li.w		a0, 0				# success

	jr		ra

SYM_FUNC_END(_restore_fp_context)

EXPORT_SYMBOL_GPL(_restore_fp_context)



/*

 * a0: fpregs
@@ -484,6 +486,7 @@ SYM_FUNC_START(_save_lsx_context) 
	li.w	a0, 0					# success

	jr	ra

SYM_FUNC_END(_save_lsx_context)

EXPORT_SYMBOL_GPL(_save_lsx_context)



/*

 * a0: fpregs
@@ -497,6 +500,7 @@ SYM_FUNC_START(_restore_lsx_context) 
	li.w	a0, 0					# success

	jr	ra

SYM_FUNC_END(_restore_lsx_context)

EXPORT_SYMBOL_GPL(_restore_lsx_context)



/*

 * a0: fpregs
@@ -510,6 +514,7 @@ SYM_FUNC_START(_save_lasx_context) 
	li.w	a0, 0					# success

	jr	ra

SYM_FUNC_END(_save_lasx_context)

EXPORT_SYMBOL_GPL(_save_lasx_context)



/*

 * a0: fpregs
@@ -523,6 +528,7 @@ SYM_FUNC_START(_restore_lasx_context) 
	li.w	a0, 0					# success

	jr	ra

SYM_FUNC_END(_restore_lasx_context)

EXPORT_SYMBOL_GPL(_restore_lasx_context)



.L_fpu_fault:

	li.w	a0, -EFAULT				# failure