]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
iommu/dma: Fix IOVA reserve dma ranges
authorSrinath Mannam <srinath.mannam@broadcom.com>
Mon, 14 Sep 2020 07:23:19 +0000 (12:53 +0530)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 13 Aug 2021 07:31:22 +0000 (09:31 +0200)
BugLink: https://bugs.launchpad.net/bugs/1938340
[ Upstream commit 571f316074a203e979ea90211d9acf423dfe5f46 ]

Fix IOVA reserve failure in the case when address of first memory region
listed in dma-ranges is equal to 0x0.

Fixes: aadad097cd46f ("iommu/dma: Reserve IOVA for PCIe inaccessible DMA address")
Signed-off-by: Srinath Mannam <srinath.mannam@broadcom.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Tested-by: Sven Peter <sven@svenpeter.dev>
Link: https://lore.kernel.org/r/20200914072319.6091-1-srinath.mannam@broadcom.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/iommu/dma-iommu.c

index 9d4a29796fe4671bc53cef196dedfeaff03eecb1..50de753f6b477d9839bb17738f3b7f227615d8ff 100644 (file)
@@ -252,9 +252,11 @@ resv_iova:
                        lo = iova_pfn(iovad, start);
                        hi = iova_pfn(iovad, end);
                        reserve_iova(iovad, lo, hi);
-               } else {
+               } else if (end < start) {
                        /* dma_ranges list should be sorted */
-                       dev_err(&dev->dev, "Failed to reserve IOVA\n");
+                       dev_err(&dev->dev,
+                               "Failed to reserve IOVA [%#010llx-%#010llx]\n",
+                               start, end);
                        return -EINVAL;
                }