media: apple: isp: Drop the DART mirroring stuff

Signed-off-by: Hector Martin <marcan@marcan.st>

Author: marcan

drivers/media/platform/apple/isp/isp-drv.c

@@ -126,8 +126,6 @@ static int apple_isp_init_iommu(struct apple_isp *isp)
 
 	drm_mm_init(&isp->iovad, isp->fw.heap_top, vm_size - heap_base);
 
-	apple_isp_iommu_sync_ttbr(isp);
-
 	return 0;
 }
 
@@ -140,7 +138,6 @@ static int apple_isp_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct apple_isp *isp;
-	struct resource *res;
 	int err;
 
 	isp = devm_kzalloc(dev, sizeof(*isp), GFP_KERNEL);
@@ -176,31 +173,6 @@ static int apple_isp_probe(struct platform_device *pdev)
 		goto detach_genpd;
 	}
 
-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dart0");
-	if (!res) {
-		err = -ENODEV;
-		goto detach_genpd;
-	}
-
-	/* Simply ioremap since it's a shared register zone */
-	isp->dart0 = devm_ioremap(dev, res->start, resource_size(res));
-	if (IS_ERR(isp->dart0)) {
-		err = PTR_ERR(isp->dart0);
-		goto detach_genpd;
-	}
-
-	isp->dart1 = devm_platform_ioremap_resource_byname(pdev, "dart1");
-	if (IS_ERR(isp->dart1)) {
-		err = PTR_ERR(isp->dart1);
-		goto detach_genpd;
-	}
-
-	isp->dart2 = devm_platform_ioremap_resource_byname(pdev, "dart2");
-	if (IS_ERR(isp->dart2)) {
-		err = PTR_ERR(isp->dart2);
-		goto detach_genpd;
-	}
-
 	isp->irq = platform_get_irq(pdev, 0);
 	if (isp->irq < 0) {
 		err = isp->irq;
@@ -270,12 +242,6 @@ static void apple_isp_remove(struct platform_device *pdev)
 	return 0;
 }
 
-/* T8020/T6000 registers */
-#define DART_T8020_STREAM_COMMAND	     0x20
-#define DART_T8020_STREAM_SELECT	     0x34
-#define DART_T8020_TTBR			     0x200
-#define DART_T8020_STREAM_COMMAND_INVALIDATE BIT(20)
-
 static const struct apple_isp_hw apple_isp_hw_t8103 = {
 	.pmu_base = 0x23b704000,
 
@@ -296,11 +262,6 @@ static const struct apple_isp_hw apple_isp_hw_t8103 = {
 	.bandwidth_base = 0x23bc3c000,
 	.bandwidth_bit = 0x0,
 	.bandwidth_size = 0x4,
-
-	.stream_command = DART_T8020_STREAM_COMMAND,
-	.stream_select = DART_T8020_STREAM_SELECT,
-	.ttbr = DART_T8020_TTBR,
-	.stream_command_invalidate = DART_T8020_STREAM_COMMAND_INVALIDATE,
 };
 
 static const struct apple_isp_hw apple_isp_hw_t6000 = {
@@ -323,11 +284,6 @@ static const struct apple_isp_hw apple_isp_hw_t6000 = {
 	.bandwidth_base = 0x0,
 	.bandwidth_bit = 0x0,
 	.bandwidth_size = 0x8,
-
-	.stream_command = DART_T8020_STREAM_COMMAND,
-	.stream_select = DART_T8020_STREAM_SELECT,
-	.ttbr = DART_T8020_TTBR,
-	.stream_command_invalidate = DART_T8020_STREAM_COMMAND_INVALIDATE,
 };
 
 static const struct apple_isp_hw apple_isp_hw_t8110 = {
@@ -350,11 +306,6 @@ static const struct apple_isp_hw apple_isp_hw_t8110 = {
 	.bandwidth_base = 0x0,
 	.bandwidth_bit = 0x0,
 	.bandwidth_size = 0x8,
-
-	.stream_command = DART_T8020_STREAM_COMMAND, // TODO
-	.stream_select = DART_T8020_STREAM_SELECT,
-	.ttbr = DART_T8020_TTBR,
-	.stream_command_invalidate = DART_T8020_STREAM_COMMAND_INVALIDATE,
 };
 
 static const struct of_device_id apple_isp_of_match[] = {
@@ -366,19 +317,11 @@ MODULE_DEVICE_TABLE(of, apple_isp_of_match);
 
 static __maybe_unused int apple_isp_suspend(struct device *dev)
 {
-	struct apple_isp *isp = dev_get_drvdata(dev);
-
-	apple_isp_iommu_invalidate_tlb(isp);
-
 	return 0;
 }
 
 static __maybe_unused int apple_isp_resume(struct device *dev)
 {
-	struct apple_isp *isp = dev_get_drvdata(dev);
-
-	apple_isp_iommu_sync_ttbr(isp);
-
 	return 0;
 }
 DEFINE_RUNTIME_DEV_PM_OPS(apple_isp_pm_ops, apple_isp_suspend, apple_isp_resume, NULL);

drivers/media/platform/apple/isp/isp-drv.h

@@ -82,11 +82,6 @@ struct apple_isp_hw {
 	u64 bandwidth_base;
 	u8 bandwidth_bit;
 	u8 bandwidth_size;
-
-	u32 stream_command;
-	u32 stream_select;
-	u32 ttbr;
-	u32 stream_command_invalidate;
 };
 
 struct isp_resv {
@@ -187,9 +182,6 @@ struct apple_isp {
 	void __iomem *asc;
 	void __iomem *mbox;
 	void __iomem *gpio;
-	void __iomem *dart0;
-	void __iomem *dart1;
-	void __iomem *dart2;
 
 	struct iommu_domain *domain;
 	unsigned long shift;

drivers/media/platform/apple/isp/isp-iommu.c

@@ -6,23 +6,6 @@
 
 #include "isp-iommu.h"
 
-void apple_isp_iommu_sync_ttbr(struct apple_isp *isp)
-{
-	writel(readl(isp->dart0 + isp->hw->ttbr), isp->dart1 + isp->hw->ttbr);
-	writel(readl(isp->dart0 + isp->hw->ttbr), isp->dart2 + isp->hw->ttbr);
-}
-
-void apple_isp_iommu_invalidate_tlb(struct apple_isp *isp)
-{
-	iommu_flush_iotlb_all(isp->domain);
-	writel(0x1, isp->dart1 + isp->hw->stream_select);
-	writel(isp->hw->stream_command_invalidate,
-	       isp->dart1 + isp->hw->stream_command);
-	writel(0x1, isp->dart2 + isp->hw->stream_select);
-	writel(isp->hw->stream_command_invalidate,
-	       isp->dart2 + isp->hw->stream_command);
-}
-
 static void isp_surf_free_pages(struct isp_surf *surf)
 {
 	for (u32 i = 0; i < surf->num_pages && surf->pages[i] != NULL; i++) {
@@ -113,7 +96,6 @@ static int isp_surf_reserve_iova(struct apple_isp *isp, struct isp_surf *surf)
 static void isp_surf_iommu_unmap(struct apple_isp *isp, struct isp_surf *surf)
 {
 	iommu_unmap(isp->domain, surf->iova, surf->size);
-	apple_isp_iommu_invalidate_tlb(isp);
 	sg_free_table(&surf->sgt);
 }
 
@@ -270,6 +252,5 @@ int apple_isp_iommu_map_sgt(struct apple_isp *isp, struct isp_surf *surf,
 void apple_isp_iommu_unmap_sgt(struct apple_isp *isp, struct isp_surf *surf)
 {
 	iommu_unmap(isp->domain, surf->iova, surf->size);
-	apple_isp_iommu_invalidate_tlb(isp);
 	isp_surf_unreserve_iova(isp, surf);
 }

drivers/media/platform/apple/isp/isp-iommu.h

@@ -6,9 +6,6 @@
 
 #include "isp-drv.h"
 
-void apple_isp_iommu_sync_ttbr(struct apple_isp *isp);
-void apple_isp_iommu_invalidate_tlb(struct apple_isp *isp);
-
 struct isp_surf *__isp_alloc_surface(struct apple_isp *isp, u64 size, bool gc);
 #define isp_alloc_surface(isp, size)	(__isp_alloc_surface(isp, size, false))
 #define isp_alloc_surface_gc(isp, size) (__isp_alloc_surface(isp, size, true))