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

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

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

Pull LoongArch fixes from Huacai Chen:
 "Fix some build and runtime issues after 32BIT Kconfig option enabled,
  improve the platform-specific PCI controller compatibility, drop
  custom __arch_vdso_hres_capable(), and fix a lot of KVM bugs"

* tag 'loongarch-fixes-7.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: KVM: Move unconditional delay into timer clear scenery
  LoongArch: KVM: Fix HW timer interrupt lost when inject interrupt by software
  LoongArch: KVM: Move AVEC interrupt injection into switch loop
  LoongArch: KVM: Use kvm_set_pte() in kvm_flush_pte()
  LoongArch: KVM: Fix missing EMULATE_FAIL in kvm_emu_mmio_read()
  LoongArch: KVM: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS
  LoongArch: KVM: Fix "unreliable stack" for kvm_exc_entry
  LoongArch: KVM: Compile switch.S directly into the kernel
  LoongArch: vDSO: Drop custom __arch_vdso_hres_capable()
  LoongArch: Fix potential ADE in loongson_gpu_fixup_dma_hang()
  LoongArch: Use per-root-bridge PCIH flag to skip mem resource fixup
  LoongArch: Fix SYM_SIGFUNC_START definition for 32BIT
  LoongArch: Specify -m32/-m64 explicitly for 32BIT/64BIT
  LoongArch: Make CONFIG_64BIT as the default option
parents 74fe02ce 5a873d77

arch/loongarch/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ obj-y += mm/ 
obj-y += net/

obj-y += vdso/



obj-$(CONFIG_KVM) += kvm/

obj-$(subst m,y,$(CONFIG_KVM)) += kvm/



# for cleaning

subdir- += boot

arch/loongarch/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ menu "Kernel type and options" 


choice

	prompt "Kernel type"

	default 64BIT # Keep existing behavior



config 32BIT

	bool "32-bit kernel"

arch/loongarch/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -55,9 +55,11 @@ endif 
ifdef CONFIG_32BIT

tool-archpref		= $(32bit-tool-archpref)

UTS_MACHINE		:= loongarch32

cflags-y		+= $(call cc-option,-m32)

else

tool-archpref		= $(64bit-tool-archpref)

UTS_MACHINE		:= loongarch64

cflags-y		+= $(call cc-option,-m64)

endif



ifneq ($(SUBARCH),$(ARCH))

arch/loongarch/include/asm/asm-prototypes.h

+20 −0
Original line number Diff line number Diff line
@@ -20,3 +20,23 @@ asmlinkage void noinstr __no_stack_protector ret_from_kernel_thread(struct task_ 
								    struct pt_regs *regs,

								    int (*fn)(void *),

								    void *fn_arg);



struct kvm_run;

struct kvm_vcpu;

struct loongarch_fpu;



void kvm_exc_entry(void);

int  kvm_enter_guest(struct kvm_run *run, struct kvm_vcpu *vcpu);



void kvm_save_fpu(struct loongarch_fpu *fpu);

void kvm_restore_fpu(struct loongarch_fpu *fpu);



#ifdef CONFIG_CPU_HAS_LSX

void kvm_save_lsx(struct loongarch_fpu *fpu);

void kvm_restore_lsx(struct loongarch_fpu *fpu);

#endif



#ifdef CONFIG_CPU_HAS_LASX

void kvm_save_lasx(struct loongarch_fpu *fpu);

void kvm_restore_lasx(struct loongarch_fpu *fpu);

#endif

arch/loongarch/include/asm/kvm_host.h

+0 −3
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ struct kvm_context { 
struct kvm_world_switch {

	int (*exc_entry)(void);

	int (*enter_guest)(struct kvm_run *run, struct kvm_vcpu *vcpu);

	unsigned long page_order;

};



#define MAX_PGTABLE_LEVELS	4
@@ -359,8 +358,6 @@ void kvm_exc_entry(void); 
int  kvm_enter_guest(struct kvm_run *run, struct kvm_vcpu *vcpu);



extern unsigned long vpid_mask;

extern const unsigned long kvm_exception_size;

extern const unsigned long kvm_enter_guest_size;

extern struct kvm_world_switch *kvm_loongarch_ops;



#define SW_GCSR		(1 << 0)