]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
iommu: Map reserved memory as cacheable if device is coherent
authorLaurentiu Tudor <laurentiu.tudor@nxp.com>
Tue, 26 Sep 2023 15:26:00 +0000 (18:26 +0300)
committerJoerg Roedel <jroedel@suse.de>
Mon, 27 Nov 2023 09:22:46 +0000 (10:22 +0100)
Check if the device is marked as DMA coherent in the DT and if so,
map its reserved memory as cacheable in the IOMMU.
This fixes the recently added IOMMU reserved memory support which
uses IOMMU_RESV_DIRECT without properly building the PROT for the
mapping.

Fixes: a5bf3cfce8cb ("iommu: Implement of_iommu_get_resv_regions()")
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20230926152600.8749-1-laurentiu.tudor@nxp.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/of_iommu.c

index 157b286e36bf3a1ee1b312138c761d6e8dc97911..5b3631ba5a451c157c036b5c6420da8aa09bb197 100644 (file)
@@ -254,6 +254,9 @@ void of_iommu_get_resv_regions(struct device *dev, struct list_head *list)
                                phys_addr_t iova;
                                size_t length;
 
+                               if (of_dma_is_coherent(dev->of_node))
+                                       prot |= IOMMU_CACHE;
+
                                maps = of_translate_dma_region(np, maps, &iova, &length);
                                type = iommu_resv_region_get_type(dev, &phys, iova, length);