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

gregkh · gregkh · commit c307aaf3eb47 · 2018-09-26T13:09:18.000+02:00
Joerg writes:
  "IOMMU Fixes for Linux v4.19-rc5

   Three fixes queued up:

	- Warning fix for Rockchip IOMMU where there were IRQ handlers
	  for offlined hardware.

	- Fix for Intel VT-d because recent changes caused boot failures
	  on some machines because it tried to allocate to much
	  contiguous memory.

	- Fix for AMD IOMMU to handle eMMC devices correctly that appear
	  as ACPI HID devices."

* tag 'iommu-fixes-v4.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: Return devid as alias for ACPI HID devices
  iommu/vt-d: Handle memory shortage on pasid table allocation
  iommu/rockchip: Free irqs in shutdown handler
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
@@ -246,7 +246,13 @@ static u16 get_alias(struct device *dev)
 
 	/* The callers make sure that get_device_id() does not fail here */
 	devid = get_device_id(dev);
+
+	/* For ACPI HID devices, we simply return the devid as such */
+	if (!dev_is_pci(dev))
+		return devid;
+
 	ivrs_alias = amd_iommu_alias_table[devid];
+
 	pci_for_each_dma_alias(pdev, __last_alias, &pci_alias);
 
 	if (ivrs_alias == pci_alias)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
@@ -2540,9 +2540,9 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
 	if (dev && dev_is_pci(dev) && info->pasid_supported) {
 		ret = intel_pasid_alloc_table(dev);
 		if (ret) {
-			__dmar_remove_one_dev_info(info);
-			spin_unlock_irqrestore(&device_domain_lock, flags);
-			return NULL;
+			pr_warn("No pasid table for %s, pasid disabled\n",
+				dev_name(dev));
+			info->pasid_supported = 0;
 		}
 	}
 	spin_unlock_irqrestore(&device_domain_lock, flags);
diff --git a/drivers/iommu/intel-pasid.h b/drivers/iommu/intel-pasid.h
@@ -11,7 +11,7 @@
 #define __INTEL_PASID_H
 
 #define PASID_MIN			0x1
-#define PASID_MAX			0x100000
+#define PASID_MAX			0x20000
 
 struct pasid_entry {
 	u64 val;
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
@@ -1241,6 +1241,12 @@ static int rk_iommu_probe(struct platform_device *pdev)
 
 static void rk_iommu_shutdown(struct platform_device *pdev)
 {
+	struct rk_iommu *iommu = platform_get_drvdata(pdev);
+	int i = 0, irq;
+
+	while ((irq = platform_get_irq(pdev, i++)) != -ENXIO)
+		devm_free_irq(iommu->dev, irq, iommu);
+
 	pm_runtime_force_suspend(&pdev->dev);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2540,9 +2540,9 @@ static struct dmar_domain dmar_insert_one_dev_info(struct intel_iommu iommu,`
`2540`	`2540`	`if (dev && dev_is_pci(dev) && info->pasid_supported) {`
`2541`	`2541`	`ret = intel_pasid_alloc_table(dev);`
`2542`	`2542`	`if (ret) {`
`2543`		`- __dmar_remove_one_dev_info(info);`
`2544`		`- spin_unlock_irqrestore(&device_domain_lock, flags);`
`2545`		`- return NULL;`
	`2543`	`+ pr_warn("No pasid table for %s, pasid disabled\n",`
	`2544`	`+ dev_name(dev));`
	`2545`	`+ info->pasid_supported = 0;`
`2546`	`2546`	`}`
`2547`	`2547`	`}`
`2548`	`2548`	`spin_unlock_irqrestore(&device_domain_lock, flags);`
Original file line number	Diff line number	Diff line change
`@@ -1241,6 +1241,12 @@ static int rk_iommu_probe(struct platform_device *pdev)`
`1241`	`1241`
`1242`	`1242`	`static void rk_iommu_shutdown(struct platform_device *pdev)`
`1243`	`1243`	`{`
	`1244`	`+ struct rk_iommu *iommu = platform_get_drvdata(pdev);`
	`1245`	`+ int i = 0, irq;`
	`1246`	`+`
	`1247`	`+ while ((irq = platform_get_irq(pdev, i++)) != -ENXIO)`
	`1248`	`+ devm_free_irq(iommu->dev, irq, iommu);`
	`1249`	`+`
`1244`	`1250`	`pm_runtime_force_suspend(&pdev->dev);`
`1245`	`1251`	`}`
`1246`	`1252`