Thread (65 messages) 65 messages, 8 authors, 2021-08-03

Re: [PATCH v2 13/24] iommu/dma: Remove redundant "!dev" checks

From: Lu Baolu <baolu.lu@linux.intel.com>
Date: 2021-07-30 06:10:25
Also in: linux-iommu, lkml

On 7/28/21 11:58 PM, Robin Murphy wrote:
quoted hunk ↗ jump to hunk
iommu_dma_init_domain() is now only called from iommu_setup_dma_ops(),
which has already assumed dev to be non-NULL.

Reviewed-by: John Garry <redacted>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
  drivers/iommu/dma-iommu.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 10067fbc4309..e28396cea6eb 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -363,7 +363,7 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base,
  
  	init_iova_domain(iovad, 1UL << order, base_pfn);
  
-	if (!cookie->fq_domain && (!dev || !dev_is_untrusted(dev)) &&
+	if (!cookie->fq_domain && !dev_is_untrusted(dev) &&
  	    domain->ops->flush_iotlb_all && !iommu_get_dma_strict(domain)) {
  		if (init_iova_flush_queue(iovad, iommu_dma_flush_iotlb_all,
  					  iommu_dma_entry_dtor))
@@ -372,9 +372,6 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base,
  			cookie->fq_domain = domain;
  	}
  
-	if (!dev)
-		return 0;
-
  	return iova_reserve_iommu_regions(dev, domain);
  }
  

Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>

Best regards,
baolu

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help