Commit 213e4eb2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull IOMMU fixes from Joerg Roedel:
 "A few fixes piled up:

   - fix a NULL-ptr dereference that happens in VT-d on some platforms

   - a fix for ARM MSI region reporting, so that a sane interface makes
     it to a released kernel

   - fixes for leaf-checking in ARM io-page-table code

   - two fixes for IO/TLB flushing code on ARM Exynos platforms"

* tag 'iommu-fixes-v4.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu: Disambiguate MSI region types
  iommu/exynos: Workaround FLPD cache flush issues for SYSMMU v5
  iommu/exynos: Block SYSMMU while invalidating FLPD cache
  iommu/vt-d: Fix NULL pointer dereference in device_to_iommu
  iommu/io-pgtable-arm-v7s: Check for leaf entry before dereferencing it
  iommu/io-pgtable-arm: Check for leaf entry before dereferencing it
parents 9a31328f 11cd3386

drivers/iommu/amd_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -3202,7 +3202,7 @@ static void amd_iommu_get_resv_regions(struct device *dev, 


	region = iommu_alloc_resv_region(MSI_RANGE_START,

					 MSI_RANGE_END - MSI_RANGE_START + 1,

					 0, IOMMU_RESV_RESERVED);

					 0, IOMMU_RESV_MSI);

	if (!region)

		return;

	list_add_tail(&region->list, head);

drivers/iommu/arm-smmu-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -1888,7 +1888,7 @@ static void arm_smmu_get_resv_regions(struct device *dev, 
	int prot = IOMMU_WRITE | IOMMU_NOEXEC | IOMMU_MMIO;



	region = iommu_alloc_resv_region(MSI_IOVA_BASE, MSI_IOVA_LENGTH,

					 prot, IOMMU_RESV_MSI);

					 prot, IOMMU_RESV_SW_MSI);

	if (!region)

		return;

drivers/iommu/arm-smmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1608,7 +1608,7 @@ static void arm_smmu_get_resv_regions(struct device *dev, 
	int prot = IOMMU_WRITE | IOMMU_NOEXEC | IOMMU_MMIO;



	region = iommu_alloc_resv_region(MSI_IOVA_BASE, MSI_IOVA_LENGTH,

					 prot, IOMMU_RESV_MSI);

					 prot, IOMMU_RESV_SW_MSI);

	if (!region)

		return;

drivers/iommu/exynos-iommu.c

+7 −1
Original line number Diff line number Diff line
@@ -512,7 +512,13 @@ static void sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data, 
	spin_lock_irqsave(&data->lock, flags);

	if (data->active && data->version >= MAKE_MMU_VER(3, 3)) {

		clk_enable(data->clk_master);

		if (sysmmu_block(data)) {

			if (data->version >= MAKE_MMU_VER(5, 0))

				__sysmmu_tlb_invalidate(data);

			else

				__sysmmu_tlb_invalidate_entry(data, iova, 1);

			sysmmu_unblock(data);

		}

		clk_disable(data->clk_master);

	}

	spin_unlock_irqrestore(&data->lock, flags);

drivers/iommu/intel-iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -916,7 +916,7 @@ static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devf 
				 * which we used for the IOMMU lookup. Strictly speaking

				 * we could do this for all PCI devices; we only need to

				 * get the BDF# from the scope table for ACPI matches. */

				if (pdev->is_virtfn)

				if (pdev && pdev->is_virtfn)

					goto got_pdev;



				*bus = drhd->devices[i].bus;
@@ -5249,7 +5249,7 @@ static void intel_iommu_get_resv_regions(struct device *device, 


	reg = iommu_alloc_resv_region(IOAPIC_RANGE_START,

				      IOAPIC_RANGE_END - IOAPIC_RANGE_START + 1,

				      0, IOMMU_RESV_RESERVED);

				      0, IOMMU_RESV_MSI);

	if (!reg)

		return;

	list_add_tail(&reg->list, head);

CRA Git | Maintained and supported by SUSTech CRA and CCSE