iommu/sprd: Drop IOVA cookie management
authorRobin Murphy <robin.murphy@arm.com>
Wed, 11 Aug 2021 12:21:23 +0000 (13:21 +0100)
committerJoerg Roedel <jroedel@suse.de>
Wed, 18 Aug 2021 11:25:32 +0000 (13:25 +0200)
The core code bakes its own cookies now.

Acked-by: Chunyan Zhang <zhang.lyra@gmail.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/4e7fc6e523cb4b63fb13f5be10041eb24c0dcb1e.1628682048.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/sprd-iommu.c

index 73dfd99..27ac818 100644 (file)
@@ -8,7 +8,6 @@
 
 #include <linux/clk.h>
 #include <linux/device.h>
-#include <linux/dma-iommu.h>
 #include <linux/dma-mapping.h>
 #include <linux/errno.h>
 #include <linux/iommu.h>
@@ -144,11 +143,6 @@ static struct iommu_domain *sprd_iommu_domain_alloc(unsigned int domain_type)
        if (!dom)
                return NULL;
 
-       if (iommu_get_dma_cookie(&dom->domain)) {
-               kfree(dom);
-               return NULL;
-       }
-
        spin_lock_init(&dom->pgtlock);
 
        dom->domain.geometry.aperture_start = 0;
@@ -161,7 +155,6 @@ static void sprd_iommu_domain_free(struct iommu_domain *domain)
 {
        struct sprd_iommu_domain *dom = to_sprd_domain(domain);
 
-       iommu_put_dma_cookie(domain);
        kfree(dom);
 }