media: apple: isp: alloc static surfaces only once

Signed-off-by: Eileen Yoon <eyn@gmx.com>

Author: eiln

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

@@ -19,6 +19,7 @@
 #include <linux/workqueue.h>
 
 #include "isp-cam.h"
+#include "isp-fw.h"
 #include "isp-iommu.h"
 #include "isp-v4l2.h"
 
@@ -202,26 +203,34 @@ static int apple_isp_probe(struct platform_device *pdev)
 		goto destroy_wq;
 	}
 
+	err = apple_isp_alloc_firmware_surface(isp);
+	if (err) {
+		dev_err(dev, "failed to alloc firmware surface: %d\n", err);
+		goto free_iommu;
+	}
+
 	pm_runtime_enable(dev);
 
 	err = apple_isp_detect_camera(isp);
 	if (err) {
 		dev_err(dev, "failed to detect camera: %d\n", err);
-		goto free_iommu;
+		goto free_surface;
 	}
 
 	err = apple_isp_setup_video(isp);
 	if (err) {
 		dev_err(dev, "failed to register video device: %d\n", err);
-		goto free_iommu;
+		goto free_surface;
 	}
 
 	dev_info(dev, "apple-isp probe!\n");
 
 	return 0;
 
-free_iommu:
+free_surface:
 	pm_runtime_disable(dev);
+	apple_isp_free_firmware_surface(isp);
+free_iommu:
 	apple_isp_free_iommu(isp);
 destroy_wq:
 	destroy_workqueue(isp->wq);
@@ -236,6 +245,7 @@ static int apple_isp_remove(struct platform_device *pdev)
 
 	apple_isp_remove_video(isp);
 	pm_runtime_disable(isp->dev);
+	apple_isp_free_firmware_surface(isp);
 	apple_isp_free_iommu(isp);
 	destroy_workqueue(isp->wq);
 	apple_isp_detach_genpd(isp);

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

@@ -212,13 +212,36 @@ static int isp_firmware_boot_stage1(struct apple_isp *isp)
 	return 0;
 }
 
-static void isp_firmware_shutdown_stage2(struct apple_isp *isp)
+int apple_isp_alloc_firmware_surface(struct apple_isp *isp)
+{
+	/* These are static, so let's do it once and for all */
+	isp->ipc_surf = isp_alloc_surface_vmap(isp, ISP_FIRMWARE_IPC_SIZE);
+	if (!isp->ipc_surf) {
+		isp_err(isp, "failed to alloc shared surface for ipc\n");
+		return -ENOMEM;
+	}
+
+	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;
+	}
+
+	return 0;
+}
+
+void apple_isp_free_firmware_surface(struct apple_isp *isp)
 {
 	isp_free_surface(isp, isp->data_surf);
-	isp_free_surface(isp, isp->extra_surf);
 	isp_free_surface(isp, isp->ipc_surf);
 }
 
+static void isp_firmware_shutdown_stage2(struct apple_isp *isp)
+{
+	isp_free_surface(isp, isp->extra_surf);
+}
+
 static int isp_firmware_boot_stage2(struct apple_isp *isp)
 {
 	struct isp_firmware_bootargs args;
@@ -239,22 +262,10 @@ static int isp_firmware_boot_stage2(struct apple_isp *isp)
 		dev_warn(isp->dev, "unexpected channel count (%d)\n",
 			 num_ipc_chans);
 
-	isp->ipc_surf = isp_alloc_surface_vmap(isp, ISP_FIRMWARE_IPC_SIZE);
-	if (!isp->ipc_surf) {
-		isp_err(isp, "failed to alloc surface for ipc\n");
-		return -ENOMEM;
-	}
-
 	isp->extra_surf = isp_alloc_surface_vmap(isp, extra_size);
 	if (!isp->extra_surf) {
 		isp_err(isp, "failed to alloc surface for extra heap\n");
-		goto free_ipc;
-	}
-
-	isp->data_surf = isp_alloc_surface_vmap(isp, ISP_FIRMWARE_DATA_SIZE);
-	if (!isp->data_surf) {
-		isp_err(isp, "failed to alloc surface for data files\n");
-		goto free_extra;
+		return -ENOMEM;
 	}
 
 	args_iova = isp->ipc_surf->iova + args_offset + 0x40;
@@ -295,17 +306,13 @@ static int isp_firmware_boot_stage2(struct apple_isp *isp)
 		isp_err(isp,
 			"never received second magic number from firmware\n");
 		err = -ENODEV;
-		goto free_file;
+		goto free_extra;
 	}
 
 	return 0;
 
-free_file:
-	isp_free_surface(isp, isp->data_surf);
 free_extra:
 	isp_free_surface(isp, isp->extra_surf);
-free_ipc:
-	isp_free_surface(isp, isp->ipc_surf);
 	return err;
 }
 

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

@@ -6,6 +6,9 @@
 
 #include "isp-drv.h"
 
+int apple_isp_alloc_firmware_surface(struct apple_isp *isp);
+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);