media: apple: isp: Remove ioread/iowrite and stop doing raw address translation

Translating IOVAs via the DART and then trying to access physical memory
directly is slow and error-prone. We know what surfaces IOVAs are
supposed to be part of, so we can use the surface vmap to access the
contents. Where we get an IOVA from the firmware, assert that it is
within the expected range before accessing it.

Since we're using threaded IRQs now, this also lets us get rid of the
deferred vmap.

Signed-off-by: Asahi Lina <lina@asahilina.net>

Author: hoshinolina

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

@@ -323,7 +323,7 @@ static int isp_ch_load_setfile(struct apple_isp *isp, u32 ch)
 		return -EINVAL;
 	}
 
-	isp_iowrite(isp, isp->data_surf->iova, (void *)fw->data, setfile->size);
+	memcpy(isp->data_surf->virt, (void *)fw->data, setfile->size);
 	release_firmware(fw);
 
 	return isp_cmd_ch_set_file_load(isp, ch, isp->data_surf->iova,

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

@@ -24,7 +24,7 @@ static int cisp_send(struct apple_isp *isp, void *args, u32 insize, u32 outsize)
 	req->arg1 = insize;
 	req->arg2 = outsize;
 
-	isp_iowrite(isp, isp->cmd_iova, args, insize);
+	memcpy(isp->cmd_virt, args, insize);
 	err = ipc_chan_send(isp, chan, CISP_TIMEOUT);
 	if (err) {
 		u64 opcode;
@@ -45,7 +45,8 @@ static int cisp_send_read(struct apple_isp *isp, void *args, u32 insize,
 	int err = cisp_send(isp, args, insize, outsize);
 	if (err)
 		return err;
-	isp_ioread(isp, isp->cmd_iova, args, outsize);
+
+	memcpy(args, isp->cmd_virt, outsize);
 	return 0;
 }
 

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

@@ -32,6 +32,7 @@ struct isp_surf {
 	struct drm_mm_node *mm;
 	struct list_head head;
 	u64 size;
+	u64 type;
 	u32 num_pages;
 	struct page **pages;
 	struct sg_table sgt;
@@ -60,6 +61,7 @@ struct isp_channel {
 	u32 num;
 	u64 size;
 	dma_addr_t iova;
+	void *virt;
 	u32 doorbell;
 	u32 cursor;
 	spinlock_t lock;
@@ -210,6 +212,8 @@ struct apple_isp {
 	struct isp_surf *ipc_surf;
 	struct isp_surf *extra_surf;
 	struct isp_surf *data_surf;
+	struct isp_surf *log_surf;
+	struct isp_surf *bt_surf;
 	struct list_head gc;
 	struct workqueue_struct *wq;
 
@@ -225,6 +229,7 @@ struct apple_isp {
 
 	wait_queue_head_t wait;
 	dma_addr_t cmd_iova;
+	void *cmd_virt;
 
 	unsigned long state;
 	spinlock_t buf_lock;

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

@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /* Copyright 2023 Eileen Yoon <eyn@gmx.com> */
 
+#include "isp-fw.h"
+
+#include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/pm_runtime.h>
 #include <linux/types.h>
@@ -38,6 +41,35 @@ static inline void isp_gpio_write32(struct apple_isp *isp, u32 reg, u32 val)
 	writel(val, isp->gpio + reg);
 }
 
+void *apple_isp_translate(struct apple_isp *isp, struct isp_surf *surf,
+			  dma_addr_t iova, size_t size)
+{
+	dma_addr_t end = iova + size;
+	if (!surf) {
+		dev_err(isp->dev,
+			"Failed to translate IPC iova 0x%llx (0x%zx): No surface\n",
+			(long long)iova, size);
+		return NULL;
+	}
+
+	if (end < iova || iova < surf->iova ||
+	    end > (surf->iova + surf->size)) {
+		dev_err(isp->dev,
+			"Failed to translate IPC iova 0x%llx (0x%zx): Out of bounds\n",
+			(long long)iova, size);
+		return NULL;
+	}
+
+	if (!surf->virt) {
+		dev_err(isp->dev,
+			"Failed to translate IPC iova 0x%llx (0x%zx): No VMap\n",
+			(long long)iova, size);
+		return NULL;
+	}
+
+	return surf->virt + (iova - surf->iova);
+}
+
 struct isp_firmware_bootargs {
 	u32 pad_0[2];
 	u64 ipc_iova;
@@ -232,13 +264,17 @@ int apple_isp_alloc_firmware_surface(struct apple_isp *isp)
 		isp_err(isp, "failed to alloc shared surface for ipc\n");
 		return -ENOMEM;
 	}
+	dev_info(isp->dev, "IPC surface iova: 0x%llx\n",
+		 (long long)isp->ipc_surf->iova);
 
 	isp->data_surf = isp_alloc_surface_vmap(isp, ISP_FIRMWARE_DATA_SIZE);
 	if (!isp->data_surf) {
 		isp_err(isp, "failed to alloc shared surface for data files\n");
 		isp_free_surface(isp, isp->ipc_surf);
 		return -ENOMEM;
 	}
+	dev_info(isp->dev, "Data surface iova: 0x%llx\n",
+		 (long long)isp->data_surf->iova);
 
 	return 0;
 }
@@ -258,6 +294,7 @@ static int isp_firmware_boot_stage2(struct apple_isp *isp)
 {
 	struct isp_firmware_bootargs args;
 	dma_addr_t args_iova;
+	void *args_virt;
 	int err, retries;
 
 	u32 num_ipc_chans = isp_gpio_read32(isp, ISP_GPIO_0);
@@ -281,7 +318,9 @@ static int isp_firmware_boot_stage2(struct apple_isp *isp)
 	}
 
 	args_iova = isp->ipc_surf->iova + args_offset + 0x40;
+	args_virt = isp->ipc_surf->virt + args_offset + 0x40;
 	isp->cmd_iova = args_iova + sizeof(args) + 0x40;
+	isp->cmd_virt = args_virt + sizeof(args) + 0x40;
 
 	memset(&args, 0, sizeof(args));
 	args.ipc_iova = isp->ipc_surf->iova;
@@ -295,7 +334,7 @@ static int isp_firmware_boot_stage2(struct apple_isp *isp)
 	args.unk7 = 0x1; // 0?
 	args.unk_iova1 = args_iova + sizeof(args) - 0xc;
 	args.unk9 = 0x3;
-	isp_iowrite(isp, args_iova, &args, sizeof(args));
+	memcpy(args_virt, &args, sizeof(args));
 
 	isp_gpio_write32(isp, ISP_GPIO_0, args_iova);
 	isp_gpio_write32(isp, ISP_GPIO_1, args_iova >> 32);
@@ -355,7 +394,15 @@ static void isp_free_channel_info(struct apple_isp *isp)
 static int isp_fill_channel_info(struct apple_isp *isp)
 {
 	u64 table_iova = isp_gpio_read32(isp, ISP_GPIO_0) |
-		((u64)isp_gpio_read32(isp, ISP_GPIO_1)) << 32;
+			 ((u64)isp_gpio_read32(isp, ISP_GPIO_1)) << 32;
+	void *table_virt = apple_isp_ipc_translate(
+		isp, table_iova,
+		sizeof(struct isp_chan_desc) * isp->num_ipc_chans);
+
+	if (!table_virt) {
+		dev_err(isp->dev, "Failed to find channel table\n");
+		return -EIO;
+	}
 
 	isp->ipc_chans = kcalloc(isp->num_ipc_chans,
 				 sizeof(struct isp_channel *), GFP_KERNEL);
@@ -364,24 +411,31 @@ static int isp_fill_channel_info(struct apple_isp *isp)
 
 	for (int i = 0; i < isp->num_ipc_chans; i++) {
 		struct isp_chan_desc desc;
-		dma_addr_t desc_iova = table_iova + (i * sizeof(desc));
+		void *desc_virt = table_virt + (i * sizeof(desc));
 		struct isp_channel *chan =
 			kzalloc(sizeof(struct isp_channel), GFP_KERNEL);
 		if (!chan)
 			goto out;
 		isp->ipc_chans[i] = chan;
 
-		isp_ioread(isp, desc_iova, &desc, sizeof(desc));
+		memcpy(&desc, desc_virt, sizeof(desc));
 		chan->name = kstrdup(desc.name, GFP_KERNEL);
 		chan->type = desc.type;
 		chan->src = desc.src;
 		chan->doorbell = 1 << chan->src;
 		chan->num = desc.num;
 		chan->size = desc.num * ISP_IPC_MESSAGE_SIZE;
 		chan->iova = desc.iova;
+		chan->virt =
+			apple_isp_ipc_translate(isp, desc.iova, chan->size);
 		chan->cursor = 0;
 		spin_lock_init(&chan->lock);
 
+		if (!chan->virt) {
+			dev_err(isp->dev, "Failed to find channel buffer\n");
+			goto out;
+		}
+
 		if ((chan->type != ISP_IPC_CHAN_TYPE_COMMAND) &&
 		    (chan->type != ISP_IPC_CHAN_TYPE_REPLY) &&
 		    (chan->type != ISP_IPC_CHAN_TYPE_REPORT)) {
@@ -439,11 +493,11 @@ static int isp_firmware_boot_stage3(struct apple_isp *isp)
 			continue;
 		for (int j = 0; j < chan->num; j++) {
 			struct isp_message msg;
-			dma_addr_t msg_iova = chan->iova + (j * sizeof(msg));
+			void *msg_virt = chan->virt + (j * sizeof(msg));
 
 			memset(&msg, 0, sizeof(msg));
 			msg.arg0 = ISP_IPC_FLAG_ACK;
-			isp_iowrite(isp, msg_iova, &msg, sizeof(msg));
+			memcpy(msg_virt, &msg, sizeof(msg));
 		}
 	}
 	wmb();
@@ -547,6 +601,10 @@ static int isp_start_command_processor(struct apple_isp *isp)
 static void isp_collect_gc_surface(struct apple_isp *isp)
 {
 	struct isp_surf *tmp, *surf;
+
+	isp->log_surf = NULL;
+	isp->bt_surf = NULL;
+
 	list_for_each_entry_safe_reverse(surf, tmp, &isp->gc, head) {
 		isp_dbg(isp, "freeing iova: 0x%llx size: 0x%llx virt: %pS\n",
 			surf->iova, surf->size, (void *)surf->virt);

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

@@ -12,4 +12,13 @@ void apple_isp_free_firmware_surface(struct apple_isp *isp);
 int apple_isp_firmware_boot(struct apple_isp *isp);
 void apple_isp_firmware_shutdown(struct apple_isp *isp);
 
+void *apple_isp_translate(struct apple_isp *isp, struct isp_surf *surf,
+			  dma_addr_t iova, size_t size);
+
+static inline void *apple_isp_ipc_translate(struct apple_isp *isp,
+					    dma_addr_t iova, size_t size)
+{
+	return apple_isp_translate(isp, isp->ipc_surf, iova, size);
+}
+
 #endif /* __ISP_FW_H__ */

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

@@ -213,12 +213,6 @@ void isp_free_surface(struct apple_isp *isp, struct isp_surf *surf)
 	}
 }
 
-void *isp_iotranslate(struct apple_isp *isp, dma_addr_t iova)
-{
-	phys_addr_t phys = iommu_iova_to_phys(isp->domain, iova);
-	return phys_to_virt(phys);
-}
-
 int apple_isp_iommu_map_sgt(struct apple_isp *isp, struct isp_surf *surf,
 			    struct sg_table *sgt, u64 size)
 {

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

@@ -12,21 +12,6 @@ struct isp_surf *__isp_alloc_surface(struct apple_isp *isp, u64 size, bool gc);
 struct isp_surf *isp_alloc_surface_vmap(struct apple_isp *isp, u64 size);
 int isp_surf_vmap(struct apple_isp *isp, struct isp_surf *surf);
 void isp_free_surface(struct apple_isp *isp, struct isp_surf *surf);
-void *isp_iotranslate(struct apple_isp *isp, dma_addr_t iova);
-
-static inline void isp_ioread(struct apple_isp *isp, dma_addr_t iova,
-			      void *data, u64 size)
-{
-	void *virt = isp_iotranslate(isp, iova);
-	memcpy(data, virt, size);
-}
-
-static inline void isp_iowrite(struct apple_isp *isp, dma_addr_t iova,
-			       void *data, u64 size)
-{
-	void *virt = isp_iotranslate(isp, iova);
-	memcpy(virt, data, size);
-}
 
 int apple_isp_iommu_map_sgt(struct apple_isp *isp, struct isp_surf *surf,
 			    struct sg_table *sgt, u64 size);