memory: brcmstb: dpfe: skip downloading firmware when possible

We want to skip downloading the DPFE firmware from Linux if it was
already downloaded by the boot loader.

The driver now checks if the DCPU is already running and, if so,
whether it can process commands. If the DCPU processes commands
successfully, the driver skips the firmware download step.

Signed-off-by: Markus Mayer <mmayer@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/drivers/memory/brcmstb_dpfe.c b/drivers/memory/brcmstb_dpfe.c
index 3516ee81ae5c214cab1998b2e941d4ec9479a27f..0a7bdbed3a6f0185ce35ec49d2e6ccce80592a9c 100644 (file)
--- a/drivers/memory/brcmstb_dpfe.c
+++ b/drivers/memory/brcmstb_dpfe.c
@@ -431,13 +431,25 @@ static int brcmstb_dpfe_download_firmware(struct platform_device *pdev,
        const void *fw_blob;
        int ret;
 
+       priv = platform_get_drvdata(pdev);
+
+       /*
+        * Skip downloading the firmware if the DCPU is already running and
+        * responding to commands.
+        */
+       if (is_dcpu_enabled(priv->regs)) {
+               u32 response[MSG_FIELD_MAX];
+
+               ret = __send_command(priv, DPFE_CMD_GET_INFO, response);
+               if (!ret)
+                       return 0;
+       }
+
        ret = request_firmware(&fw, FIRMWARE_NAME, dev);
        /* request_firmware() prints its own error messages. */
        if (ret)
                return ret;
 
-       priv = platform_get_drvdata(pdev);
-
        ret = __verify_firmware(init, fw);
        if (ret)
                return -EFAULT;