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

Merge tag 'powerpc-5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 - Fix VM debug warnings on boot triggered via __set_fixmap().

 - Fix a debug warning in the 64-bit Book3S PMU handling code.

 - Fix nested guest HFSCR handling with multiple vCPUs on Power9 or
   later.

 - Fix decrementer storm caused by a recent change, seen with some
   configs.

Thanks to Alexey Kardashevskiy, Athira Rajeev, Christophe Leroy,
Fabiano Rosas, Maxime Bizon, Nicholas Piggin, and Sachin Sant.

* tag 'powerpc-5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64s/interrupt: Fix decrementer storm
  KVM: PPC: Book3S HV Nested: Fix nested HFSCR being clobbered with multiple vCPUs
  powerpc/perf: Fix power_pmu_disable to call clear_pmi_irq_pending only if PMI is pending
  powerpc/fixmap: Fix VM debug warning on unmap
parents 216e2aed 8defc2a5

arch/powerpc/include/asm/book3s/32/pgtable.h

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ static inline bool pte_user(pte_t pte) 
#ifndef __ASSEMBLY__



int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);

void unmap_kernel_page(unsigned long va);



#endif /* !__ASSEMBLY__ */

arch/powerpc/include/asm/book3s/64/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -1082,6 +1082,8 @@ static inline int map_kernel_page(unsigned long ea, unsigned long pa, pgprot_t p 
	return hash__map_kernel_page(ea, pa, prot);

}



void unmap_kernel_page(unsigned long va);



static inline int __meminit vmemmap_create_mapping(unsigned long start,

						   unsigned long page_size,

						   unsigned long phys)

arch/powerpc/include/asm/fixmap.h

+4 −2
Original line number Diff line number Diff line
@@ -111,8 +111,10 @@ static inline void __set_fixmap(enum fixed_addresses idx, 
		BUILD_BUG_ON(idx >= __end_of_fixed_addresses);

	else if (WARN_ON(idx >= __end_of_fixed_addresses))

		return;



	if (pgprot_val(flags))

		map_kernel_page(__fix_to_virt(idx), phys, flags);

	else

		unmap_kernel_page(__fix_to_virt(idx));

}



#define __early_set_fixmap	__set_fixmap

arch/powerpc/include/asm/kvm_book3s_64.h

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ struct kvm_nested_guest { 
	pgd_t *shadow_pgtable;		/* our page table for this guest */

	u64 l1_gr_to_hr;		/* L1's addr of part'n-scoped table */

	u64 process_table;		/* process table entry for this guest */

	u64 hfscr;			/* HFSCR that the L1 requested for this nested guest */

	long refcnt;			/* number of pointers to this struct */

	struct mutex tlb_lock;		/* serialize page faults and tlbies */

	struct kvm_nested_guest *next;

arch/powerpc/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -818,6 +818,7 @@ struct kvm_vcpu_arch { 


	/* For support of nested guests */

	struct kvm_nested_guest *nested;

	u64 nested_hfscr;	/* HFSCR that the L1 requested for the nested guest */

	u32 nested_vcpu_id;

	gpa_t nested_io_gpr;

#endif