The core code bakes its own cookies now.

Signed-off-by: Robin Murphy <robin.mur...@arm.com>
---
 drivers/iommu/amd/iommu.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 52fe2326042a..0fd98d35d73b 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -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);
 
-- 
2.25.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to