Commit 928f79a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'loongarch-fixes-6.11-2' of... 

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

Pull LoongArch fixes from Huacai Chen:
 "Remove the unused dma-direct.h, and some bug & warning fixes"

* tag 'loongarch-fixes-6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: KVM: Invalidate guest steal time address on vCPU reset
  LoongArch: Add ifdefs to fix LSX and LASX related warnings
  LoongArch: Define ARCH_IRQ_INIT_FLAGS as IRQ_NOPROBE
  LoongArch: Remove the unused dma-direct.h
parents f9a59dd0 4956e07f

arch/loongarch/include/asm/dma-direct.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2020-2022 Loongson Technology Corporation Limited

 */

#ifndef _LOONGARCH_DMA_DIRECT_H

#define _LOONGARCH_DMA_DIRECT_H



dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);

phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);



#endif /* _LOONGARCH_DMA_DIRECT_H */

arch/loongarch/include/asm/hw_irq.h

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 


extern atomic_t irq_err_count;



#define ARCH_IRQ_INIT_FLAGS	IRQ_NOPROBE



/*

 * interrupt-retrigger: NOP for now. This may not be appropriate for all

 * machines, we'll see ...

arch/loongarch/include/asm/kvm_vcpu.h

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ static inline void kvm_restore_lasx(struct loongarch_fpu *fpu) { } 
#endif



void kvm_init_timer(struct kvm_vcpu *vcpu, unsigned long hz);

void kvm_reset_timer(struct kvm_vcpu *vcpu);

void kvm_save_timer(struct kvm_vcpu *vcpu);

void kvm_restore_timer(struct kvm_vcpu *vcpu);

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/kernel/irq.c

+0 −3
Original line number Diff line number Diff line
@@ -102,9 +102,6 @@ void __init init_IRQ(void) 
	mp_ops.init_ipi();

#endif



	for (i = 0; i < NR_IRQS; i++)

		irq_set_noprobe(i);



	for_each_possible_cpu(i) {

		page = alloc_pages_node(cpu_to_node(i), GFP_KERNEL, order);