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

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

Merge tag 'iommu-fixes-v4.20-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 

Pull IOMMU fixes from Joerg Roedel:

 - Two fixes for the Intel VT-d driver to fix a NULL-ptr dereference and
   an unbalance in an allocate/free path (allocated with memremap, freed
   with iounmap)

 - Fix for a crash in the Renesas IOMMU driver

 - Fix for the Advanced Virtual Interrupt Controler (AVIC) code in the
   AMD IOMMU driver

* tag 'iommu-fixes-v4.20-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/vt-d: Use memunmap to free memremap
  amd/iommu: Fix Guest Virtual APIC Log Tail Address Register
  iommu/ipmmu-vmsa: Fix crash on early domain free
  iommu/vt-d: Fix NULL pointer dereference in prq_event_thread()
parents a03bac58 829383e1

drivers/iommu/amd_iommu_init.c

+2 −1
Original line number Diff line number Diff line
@@ -797,7 +797,8 @@ static int iommu_init_ga_log(struct amd_iommu *iommu) 
	entry = iommu_virt_to_phys(iommu->ga_log) | GA_LOG_SIZE_512;

	memcpy_toio(iommu->mmio_base + MMIO_GA_LOG_BASE_OFFSET,

		    &entry, sizeof(entry));

	entry = (iommu_virt_to_phys(iommu->ga_log) & 0xFFFFFFFFFFFFFULL) & ~7ULL;

	entry = (iommu_virt_to_phys(iommu->ga_log_tail) &

		 (BIT_ULL(52)-1)) & ~7ULL;

	memcpy_toio(iommu->mmio_base + MMIO_GA_LOG_TAIL_OFFSET,

		    &entry, sizeof(entry));

	writel(0x00, iommu->mmio_base + MMIO_GA_HEAD_OFFSET);

drivers/iommu/intel-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -3075,7 +3075,7 @@ static int copy_context_table(struct intel_iommu *iommu, 
			}



			if (old_ce)

				iounmap(old_ce);

				memunmap(old_ce);



			ret = 0;

			if (devfn < 0x80)

drivers/iommu/intel-svm.c

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ static irqreturn_t prq_event_thread(int irq, void *d) 
			pr_err("%s: Page request without PASID: %08llx %08llx\n",

			       iommu->name, ((unsigned long long *)req)[0],

			       ((unsigned long long *)req)[1]);

			goto bad_req;

			goto no_pasid;

		}



		if (!svm || svm->pasid != req->pasid) {

drivers/iommu/ipmmu-vmsa.c

+3 −0
Original line number Diff line number Diff line
@@ -498,6 +498,9 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain) 


static void ipmmu_domain_destroy_context(struct ipmmu_vmsa_domain *domain)

{

	if (!domain->mmu)

		return;



	/*

	 * Disable the context. Flush the TLB as required when modifying the

	 * context registers.