iommu/exynos: Add missing set_platform_dma_ops callback
authorMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 23 Jan 2023 09:31:01 +0000 (10:31 +0100)
committerJoerg Roedel <jroedel@suse.de>
Fri, 3 Feb 2023 09:41:24 +0000 (10:41 +0100)
Add set_platform_dma_ops() required for proper driver operation on ARM
32bit arch after recent changes in the IOMMU framework (detach ops
removal).

Fixes: c1fe9119ee70 ("iommu: Add set_platform_dma_ops callbacks")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20230123093102.12392-1-m.szyprowski@samsung.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/exynos-iommu.c

index 29ec713..7eaa58c 100644 (file)
@@ -1346,8 +1346,10 @@ static void exynos_iommu_release_device(struct device *dev)
                struct iommu_group *group = iommu_group_get(dev);
 
                if (group) {
+#ifndef CONFIG_ARM
                        WARN_ON(owner->domain !=
                                iommu_group_default_domain(group));
+#endif
                        exynos_iommu_detach_device(owner->domain, dev);
                        iommu_group_put(group);
                }
@@ -1398,6 +1400,9 @@ static int exynos_iommu_of_xlate(struct device *dev,
 static const struct iommu_ops exynos_iommu_ops = {
        .domain_alloc = exynos_iommu_domain_alloc,
        .device_group = generic_device_group,
+#ifdef CONFIG_ARM
+       .set_platform_dma_ops = exynos_iommu_release_device,
+#endif
        .probe_device = exynos_iommu_probe_device,
        .release_device = exynos_iommu_release_device,
        .pgsize_bitmap = SECT_SIZE | LPAGE_SIZE | SPAGE_SIZE,