drm/msm/gpu: Move zap shader loading to adreno

a5xx and a6xx both share (mostly) the same code to load the zap shader and
bring the GPU out of secure mode. Move the formerly 5xx specific code to
adreno to make it available for a6xx too.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>

3 files changed, 142 insertions, 110 deletions

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index 270da14cba67..e5fcefa49f19 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -15,9 +15,6 @@
 #include <linux/types.h>
 #include <linux/cpumask.h>
 #include <linux/qcom_scm.h>
-#include <linux/dma-mapping.h>
-#include <linux/of_address.h>
-#include <linux/soc/qcom/mdt_loader.h>
 #include <linux/pm_opp.h>
 #include <linux/nvmem-consumer.h>
 #include <linux/slab.h>
@@ -30,96 +27,6 @@ static void a5xx_dump(struct msm_gpu *gpu);
 
 #define GPU_PAS_ID 13
 
-static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname)
-{
-        struct device *dev = &gpu->pdev->dev;
-        const struct firmware *fw;
-        struct device_node *np, *mem_np;
-        struct resource r;
-        phys_addr_t mem_phys;
-        ssize_t mem_size;
-        void *mem_region = NULL;
-        int ret;
-
-        if (!IS_ENABLED(CONFIG_ARCH_QCOM))
-                return -EINVAL;
-
-        np = of_get_child_by_name(dev->of_node, "zap-shader");
-        if (!np)
-                return -ENODEV;
-
-        mem_np = of_parse_phandle(np, "memory-region", 0);
-        of_node_put(np);
-        if (!mem_np)
-                return -EINVAL;
-
-        ret = of_address_to_resource(mem_np, 0, &r);
-        of_node_put(mem_np);
-        if (ret)
-                return ret;
-
-        mem_phys = r.start;
-        mem_size = resource_size(&r);
-
-        /* Request the MDT file for the firmware */
-        fw = adreno_request_fw(to_adreno_gpu(gpu), fwname);
-        if (IS_ERR(fw)) {
-                DRM_DEV_ERROR(dev, "Unable to load %s\n", fwname);
-                return PTR_ERR(fw);
-        }
-
-        /* Figure out how much memory we need */
-        mem_size = qcom_mdt_get_size(fw);
-        if (mem_size < 0) {
-                ret = mem_size;
-                goto out;
-        }
-
-        /* Allocate memory for the firmware image */
-        mem_region = memremap(mem_phys, mem_size,  MEMREMAP_WC);
-        if (!mem_region) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        /*
-         * Load the rest of the MDT
-         *
-         * Note that we could be dealing with two different paths, since
-         * with upstream linux-firmware it would be in a qcom/ subdir..
-         * adreno_request_fw() handles this, but qcom_mdt_load() does
-         * not.  But since we've already gotten thru adreno_request_fw()
-         * we know which of the two cases it is:
-         */
-        if (to_adreno_gpu(gpu)->fwloc == FW_LOCATION_LEGACY) {
-                ret = qcom_mdt_load(dev, fw, fwname, GPU_PAS_ID,
-                                mem_region, mem_phys, mem_size, NULL);
-        } else {
-                char *newname;
-
-                newname = kasprintf(GFP_KERNEL, "qcom/%s", fwname);
-
-                ret = qcom_mdt_load(dev, fw, newname, GPU_PAS_ID,
-                                mem_region, mem_phys, mem_size, NULL);
-                kfree(newname);
-        }
-        if (ret)
-                goto out;
-
-        /* Send the image to the secure world */
-        ret = qcom_scm_pas_auth_and_reset(GPU_PAS_ID);
-        if (ret)
-                DRM_DEV_ERROR(dev, "Unable to authorize the image\n");
-
-out:
-        if (mem_region)
-                memunmap(mem_region);
-
-        release_firmware(fw);
-
-        return ret;
-}
-
 static void a5xx_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring)
 {
         struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
@@ -565,8 +472,6 @@ static int a5xx_zap_shader_resume(struct msm_gpu *gpu)
 static int a5xx_zap_shader_init(struct msm_gpu *gpu)
 {
         static bool loaded;
-        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
-        struct platform_device *pdev = gpu->pdev;
         int ret;
 
         /*
@@ -576,23 +481,9 @@ static int a5xx_zap_shader_init(struct msm_gpu *gpu)
         if (loaded)
                 return a5xx_zap_shader_resume(gpu);
 
-        /* We need SCM to be able to load the firmware */
-        if (!qcom_scm_is_available()) {
-                DRM_DEV_ERROR(&pdev->dev, "SCM is not available\n");
-                return -EPROBE_DEFER;
-        }
-
-        /* Each GPU has a target specific zap shader firmware name to use */
-        if (!adreno_gpu->info->zapfw) {
-                DRM_DEV_ERROR(&pdev->dev,
-                        "Zap shader firmware file not specified for this target\n");
-                return -ENODEV;
-        }
-
-        ret = zap_shader_load_mdt(gpu, adreno_gpu->info->zapfw);
+        ret = adreno_zap_shader_load(gpu, GPU_PAS_ID);
 
         loaded = !ret;
-
         return ret;
 }
 
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 6de08cfc38aa..6f7f4114afcf 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -19,13 +19,148 @@
 
 #include <linux/ascii85.h>
 #include <linux/interconnect.h>
+#include <linux/qcom_scm.h>
 #include <linux/kernel.h>
+#include <linux/of_address.h>
 #include <linux/pm_opp.h>
 #include <linux/slab.h>
+#include <linux/soc/qcom/mdt_loader.h>
 #include "adreno_gpu.h"
 #include "msm_gem.h"
 #include "msm_mmu.h"
 
+static bool zap_available = true;
+
+static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname,
+                u32 pasid)
+{
+        struct device *dev = &gpu->pdev->dev;
+        const struct firmware *fw;
+        struct device_node *np, *mem_np;
+        struct resource r;
+        phys_addr_t mem_phys;
+        ssize_t mem_size;
+        void *mem_region = NULL;
+        int ret;
+
+        if (!IS_ENABLED(CONFIG_ARCH_QCOM)) {
+                zap_available = false;
+                return -EINVAL;
+        }
+
+        np = of_get_child_by_name(dev->of_node, "zap-shader");
+        if (!np) {
+                zap_available = false;
+                return -ENODEV;
+        }
+
+        mem_np = of_parse_phandle(np, "memory-region", 0);
+        of_node_put(np);
+        if (!mem_np) {
+                zap_available = false;
+                return -EINVAL;
+        }
+
+        ret = of_address_to_resource(mem_np, 0, &r);
+        of_node_put(mem_np);
+        if (ret)
+                return ret;
+
+        mem_phys = r.start;
+        mem_size = resource_size(&r);
+
+        /* Request the MDT file for the firmware */
+        fw = adreno_request_fw(to_adreno_gpu(gpu), fwname);
+        if (IS_ERR(fw)) {
+                DRM_DEV_ERROR(dev, "Unable to load %s\n", fwname);
+                return PTR_ERR(fw);
+        }
+
+        /* Figure out how much memory we need */
+        mem_size = qcom_mdt_get_size(fw);
+        if (mem_size < 0) {
+                ret = mem_size;
+                goto out;
+        }
+
+        /* Allocate memory for the firmware image */
+        mem_region = memremap(mem_phys, mem_size,  MEMREMAP_WC);
+        if (!mem_region) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        /*
+         * Load the rest of the MDT
+         *
+         * Note that we could be dealing with two different paths, since
+         * with upstream linux-firmware it would be in a qcom/ subdir..
+         * adreno_request_fw() handles this, but qcom_mdt_load() does
+         * not.  But since we've already gotten through adreno_request_fw()
+         * we know which of the two cases it is:
+         */
+        if (to_adreno_gpu(gpu)->fwloc == FW_LOCATION_LEGACY) {
+                ret = qcom_mdt_load(dev, fw, fwname, pasid,
+                                mem_region, mem_phys, mem_size, NULL);
+        } else {
+                char *newname;
+
+                newname = kasprintf(GFP_KERNEL, "qcom/%s", fwname);
+
+                ret = qcom_mdt_load(dev, fw, newname, pasid,
+                                mem_region, mem_phys, mem_size, NULL);
+                kfree(newname);
+        }
+        if (ret)
+                goto out;
+
+        /* Send the image to the secure world */
+        ret = qcom_scm_pas_auth_and_reset(pasid);
+
+        /*
+         * If the scm call returns -EOPNOTSUPP we assume that this target
+         * doesn't need/support the zap shader so quietly fail
+         */
+        if (ret == -EOPNOTSUPP)
+                zap_available = false;
+        else if (ret)
+                DRM_DEV_ERROR(dev, "Unable to authorize the image\n");
+
+out:
+        if (mem_region)
+                memunmap(mem_region);
+
+        release_firmware(fw);
+
+        return ret;
+}
+
+int adreno_zap_shader_load(struct msm_gpu *gpu, u32 pasid)
+{
+        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
+        struct platform_device *pdev = gpu->pdev;
+
+        /* Short cut if we determine the zap shader isn't available/needed */
+        if (!zap_available)
+                return -ENODEV;
+
+        /* We need SCM to be able to load the firmware */
+        if (!qcom_scm_is_available()) {
+                DRM_DEV_ERROR(&pdev->dev, "SCM is not available\n");
+                return -EPROBE_DEFER;
+        }
+
+        /* Each GPU has a target specific zap shader firmware name to use */
+        if (!adreno_gpu->info->zapfw) {
+                zap_available = false;
+                DRM_DEV_ERROR(&pdev->dev,
+                        "Zap shader firmware file not specified for this target\n");
+                return -ENODEV;
+        }
+
+        return zap_shader_load_mdt(gpu, adreno_gpu->info->zapfw, pasid);
+}
+
 int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value)
 {
         struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
index 5db459bc28a7..0925606ec9b5 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
@@ -252,6 +252,12 @@ void adreno_gpu_state_destroy(struct msm_gpu_state *state);
 int adreno_gpu_state_get(struct msm_gpu *gpu, struct msm_gpu_state *state);
 int adreno_gpu_state_put(struct msm_gpu_state *state);
 
+/*
+ * For a5xx and a6xx targets load the zap shader that is used to pull the GPU
+ * out of secure mode
+ */
+int adreno_zap_shader_load(struct msm_gpu *gpu, u32 pasid);
+
 /* ringbuffer helpers (the parts that are adreno specific) */
 
 static inline void