]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
iommu/virtio: Drop IOVA cookie management
authorRobin Murphy <robin.murphy@arm.com>
Wed, 11 Aug 2021 12:21:25 +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.

Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/f05cd2d0a0f414de3180e2536c7656faf1e52418.1628682049.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/virtio-iommu.c

index 6abdcab7273be6de75cf80a732db0c75c8417d53..80930ce04a168156eb15c7137d713cddc587ca04 100644 (file)
@@ -598,12 +598,6 @@ static struct iommu_domain *viommu_domain_alloc(unsigned type)
        spin_lock_init(&vdomain->mappings_lock);
        vdomain->mappings = RB_ROOT_CACHED;
 
-       if (type == IOMMU_DOMAIN_DMA &&
-           iommu_get_dma_cookie(&vdomain->domain)) {
-               kfree(vdomain);
-               return NULL;
-       }
-
        return &vdomain->domain;
 }
 
@@ -643,8 +637,6 @@ static void viommu_domain_free(struct iommu_domain *domain)
 {
        struct viommu_domain *vdomain = to_viommu_domain(domain);
 
-       iommu_put_dma_cookie(domain);
-
        /* Free all remaining mappings (size 2^64) */
        viommu_del_mappings(vdomain, 0, 0);