GuillaumeHemmen/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 04:53:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

LoongArch fixes for v6.11-rc6

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQJKBAABCAA0FiEEzOlt8mkP+tbeiYy5AoYrw/LiJnoFAmbMm6UWHGNoZW5odWFj
 YWlAa2VybmVsLm9yZwAKCRAChivD8uImeieCD/9pOPdS1A2KxBTugsQUz3ieRAY3
 TupZYbVfhCUjgbDtPJ6JUURXmx4poJW6h+LG/XtQx2lOEtKBBn0LJFrY/wF9hP2s
 enT2NL4DYjndio9/AImX175b77+LNpj+2dG+lH/MtUu+33gFomziSHDMeuVNSRJF
 bI+VtsDcjf4cvyfaEVAdC3OCtTBj+3ZmugpcBiC1mlbkQs2Y4+CDcCnENNuRByWN
 q+/XWK1RyqDd4m7JtCQQ2rSCgmMxCcUAIRNfdwP4dCZVvvZ8QFFqVm0FkUe6pjXl
 01efXps1KBHEcLdbKNZ/cE4YOiJ0SechE/6IPsU9TblTJyqwuY3Z2Q1IkSJ2Etil
 tXIeAK/eO+iWmH0UWB0c6TpNOn5nEZIs73tC9MrCYqQ1P5V1d8J+e9smxBIaDl3l
 3BRra64ayVMUWizC5xyCZeIoaFd+mHtBM9DSO8X8IjAHehwOYS+iquJlXxUJYxg8
 iM6vf7W1hfohX74yNTI8+UHftGC6a6aeBguZFYpawax9WkBm8DDO6a+Z08rFmiQe
 Swyc65ZBygdB9LFjx3VlJERY8II1j1W6+OXvi2io9XqYtO8oZ/Mn4sIWGaJiQW/h
 BFZ4SJ1GtPPcccDzMdSv+VcEomjMdalm/ouxy7j7tFl+J3X+HN+9LwGotuCL0eYD
 UD66Sj0oigCRo2J/pw==
 =rKbO
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-08-29 07:15:41 +12:00
commit 928f79a188
8 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/loongarch/include/asm/dma-direct.h
View file

@ -1,11 +0,0 @@
/* 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 */

2
arch/loongarch/include/asm/hw_irq.h
View file

@ -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 ...

1
arch/loongarch/include/asm/kvm_vcpu.h
View file

@ -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);

4
arch/loongarch/kernel/fpu.S
View file

@ -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

3
arch/loongarch/kernel/irq.c
View file

@ -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);

4
arch/loongarch/kvm/switch.S
View file

@ -277,6 +277,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

7
arch/loongarch/kvm/timer.c
View file

@ -188,10 +188,3 @@ void kvm_save_timer(struct kvm_vcpu *vcpu)
kvm_save_hw_gcsr(csr, LOONGARCH_CSR_ESTAT);
preempt_enable();
}
void kvm_reset_timer(struct kvm_vcpu *vcpu)
{
write_gcsr_timercfg(0);
kvm_write_sw_gcsr(vcpu->arch.csr, LOONGARCH_CSR_TCFG, 0);
hrtimer_cancel(&vcpu->arch.swtimer);
}

2
arch/loongarch/kvm/vcpu.c
View file

@ -647,7 +647,7 @@ static int kvm_set_one_reg(struct kvm_vcpu *vcpu,
vcpu->kvm->arch.time_offset = (signed long)(v - drdtime());
break;
case KVM_REG_LOONGARCH_VCPU_RESET:
kvm_reset_timer(vcpu);
vcpu->arch.st.guest_addr = 0;
memset(&vcpu->arch.irq_pending, 0, sizeof(vcpu->arch.irq_pending));
memset(&vcpu->arch.irq_clear, 0, sizeof(vcpu->arch.irq_clear));
break;