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

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/648e74e7422caa6a7db7fb0c36813c7bd2007af8.1628682048.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/amd/iommu.c

index 52fe2326042a0e897fe0d4d63d53570b7e97051f..0fd98d35d73b76600f2225284eb605b4cb6f49be 100644 (file)
@@ -1918,16 +1918,7 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned type)
        domain->domain.geometry.aperture_end   = ~0ULL;
        domain->domain.geometry.force_aperture = true;
 
-       if (type == IOMMU_DOMAIN_DMA &&
-           iommu_get_dma_cookie(&domain->domain) == -ENOMEM)
-               goto free_domain;
-
        return &domain->domain;
-
-free_domain:
-       protection_domain_free(domain);
-
-       return NULL;
 }
 
 static void amd_iommu_domain_free(struct iommu_domain *dom)
@@ -1944,9 +1935,6 @@ static void amd_iommu_domain_free(struct iommu_domain *dom)
        if (!dom)
                return;
 
-       if (dom->type == IOMMU_DOMAIN_DMA)
-               iommu_put_dma_cookie(&domain->domain);
-
        if (domain->flags & PD_IOMMUV2_MASK)
                free_gcr3_table(domain);