| Message ID | 5cc86b540faeb0367df9bd6901a15974f0e31c52.1628094601.git.robin.murphy@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iommu: Refactor DMA domain strictness | expand |
On Thu, Aug 5, 2021 at 1:18 AM Robin Murphy <robin.murphy@arm.com> wrote: > > The core code bakes its own cookies now. > > CC: Chunyan Zhang <chunyan.zhang@unisoc.com> > Signed-off-by: Robin Murphy <robin.murphy@arm.com> Thank you for the patch! Acked-by: Chunyan Zhang <zhang.lyra@gmail.com> > > --- > > v3: Also remove unneeded include > --- > drivers/iommu/sprd-iommu.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/drivers/iommu/sprd-iommu.c b/drivers/iommu/sprd-iommu.c > index 73dfd9946312..27ac818b0354 100644 > --- a/drivers/iommu/sprd-iommu.c > +++ b/drivers/iommu/sprd-iommu.c > @@ -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); > } > > -- > 2.25.1 >
diff --git a/drivers/iommu/sprd-iommu.c b/drivers/iommu/sprd-iommu.c index 73dfd9946312..27ac818b0354 100644 --- a/drivers/iommu/sprd-iommu.c +++ b/drivers/iommu/sprd-iommu.c @@ -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); }
The core code bakes its own cookies now. CC: Chunyan Zhang <chunyan.zhang@unisoc.com> Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- v3: Also remove unneeded include --- drivers/iommu/sprd-iommu.c | 7 ------- 1 file changed, 7 deletions(-)