Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'powerpc-4.18-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Two regression fixes, one for xmon disassembly formatting and the
  other to fix the E500 build.

  Two commits to fix a potential security issue in the VFIO code under
  obscure circumstances.

  And finally a fix to the Power9 idle code to restore SPRG3, which is
  user visible and used for sched_getcpu().

  Thanks to: Alexey Kardashevskiy, David Gibson. Gautham R. Shenoy,
  James Clarke"

* tag 'powerpc-4.18-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/powernv: Fix save/restore of SPRG3 on entry/exit from stop (idle)
  powerpc/Makefile: Assemble with -me500 when building for E500
  KVM: PPC: Check if IOMMU page is contained in the pinned physical page
  vfio/spapr: Use IOMMU pageshift rather than pagesize
  powerpc/xmon: Fix disassembly since printf changes
parents 55b636b4 b03897cf

arch/powerpc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ endif 
cpu-as-$(CONFIG_4xx)		+= -Wa,-m405

cpu-as-$(CONFIG_ALTIVEC)	+= $(call as-option,-Wa$(comma)-maltivec)

cpu-as-$(CONFIG_E200)		+= -Wa,-me200

cpu-as-$(CONFIG_E500)		+= -Wa,-me500

cpu-as-$(CONFIG_PPC_BOOK3S_64)	+= -Wa,-mpower4

cpu-as-$(CONFIG_PPC_E500MC)	+= $(call as-option,-Wa$(comma)-me500mc)

arch/powerpc/include/asm/mmu_context.h

+2 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ extern struct mm_iommu_table_group_mem_t *mm_iommu_lookup_rm( 
extern struct mm_iommu_table_group_mem_t *mm_iommu_find(struct mm_struct *mm,

		unsigned long ua, unsigned long entries);

extern long mm_iommu_ua_to_hpa(struct mm_iommu_table_group_mem_t *mem,

		unsigned long ua, unsigned long *hpa);

		unsigned long ua, unsigned int pageshift, unsigned long *hpa);

extern long mm_iommu_ua_to_hpa_rm(struct mm_iommu_table_group_mem_t *mem,

		unsigned long ua, unsigned long *hpa);

		unsigned long ua, unsigned int pageshift, unsigned long *hpa);

extern long mm_iommu_mapped_inc(struct mm_iommu_table_group_mem_t *mem);

extern void mm_iommu_mapped_dec(struct mm_iommu_table_group_mem_t *mem);

#endif

arch/powerpc/kernel/idle_book3s.S

+2 −0
Original line number Diff line number Diff line
@@ -144,7 +144,9 @@ power9_restore_additional_sprs: 
	mtspr	SPRN_MMCR1, r4



	ld	r3, STOP_MMCR2(r13)

	ld	r4, PACA_SPRG_VDSO(r13)

	mtspr	SPRN_MMCR2, r3

	mtspr	SPRN_SPRG3, r4

	blr



/*

arch/powerpc/kvm/book3s_64_vio.c

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ long kvmppc_tce_iommu_do_map(struct kvm *kvm, struct iommu_table *tbl, 
		/* This only handles v2 IOMMU type, v1 is handled via ioctl() */

		return H_TOO_HARD;



	if (WARN_ON_ONCE(mm_iommu_ua_to_hpa(mem, ua, &hpa)))

	if (WARN_ON_ONCE(mm_iommu_ua_to_hpa(mem, ua, tbl->it_page_shift, &hpa)))

		return H_HARDWARE;



	if (mm_iommu_mapped_inc(mem))

arch/powerpc/kvm/book3s_64_vio_hv.c

+4 −2
Original line number Diff line number Diff line
@@ -279,7 +279,8 @@ static long kvmppc_rm_tce_iommu_do_map(struct kvm *kvm, struct iommu_table *tbl, 
	if (!mem)

		return H_TOO_HARD;



	if (WARN_ON_ONCE_RM(mm_iommu_ua_to_hpa_rm(mem, ua, &hpa)))

	if (WARN_ON_ONCE_RM(mm_iommu_ua_to_hpa_rm(mem, ua, tbl->it_page_shift,

			&hpa)))

		return H_HARDWARE;



	pua = (void *) vmalloc_to_phys(pua);
@@ -469,7 +470,8 @@ long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu, 


		mem = mm_iommu_lookup_rm(vcpu->kvm->mm, ua, IOMMU_PAGE_SIZE_4K);

		if (mem)

			prereg = mm_iommu_ua_to_hpa_rm(mem, ua, &tces) == 0;

			prereg = mm_iommu_ua_to_hpa_rm(mem, ua,

					IOMMU_PAGE_SHIFT_4K, &tces) == 0;

	}



	if (!prereg) {