remoteproc/pru: configure firmware based on client setup

Client device node property firmware-name is now used to configure
firmware for the PRU instances. The default firmware is also
restored once releasing the PRU resource.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>

diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c
index 76beefdb7e0dd3146310e1017649968d4c2888fd..90a50973763bf83e14678639c09bc22f5e30c8ad 100644 (file)
--- a/drivers/remoteproc/pru_rproc.c
+++ b/drivers/remoteproc/pru_rproc.c
@@ -131,6 +131,21 @@ void pru_control_set_reg(struct pru_rproc *pru, unsigned int reg,
        spin_unlock_irqrestore(&pru->rmw_lock, flags);
 }
 
+/**
+ * pru_rproc_set_firmware() - set firmware for a pru core
+ * @rproc: the rproc instance of the PRU
+ * @fw_name: the new firmware name, or NULL if default is desired
+ */
+static int pru_rproc_set_firmware(struct rproc *rproc, const char *fw_name)
+{
+       struct pru_rproc *pru = rproc->priv;
+
+       if (!fw_name)
+               fw_name = pru->fw_name;
+
+       return rproc_set_firmware(rproc, fw_name);
+}
+
 static struct rproc *__pru_rproc_get(struct device_node *np, int index)
 {
        struct device_node *rproc_np = NULL;
@@ -185,12 +200,16 @@ struct rproc *pru_rproc_get(struct device_node *np, int index)
 {
        struct rproc *rproc;
        struct pru_rproc *pru;
+       const char *fw_name;
+       struct device *dev;
+       int ret;
 
        rproc = __pru_rproc_get(np, index);
        if (IS_ERR(rproc))
                return rproc;
 
        pru = rproc->priv;
+       dev = &rproc->dev;
 
        mutex_lock(&pru->lock);
 
@@ -205,7 +224,21 @@ struct rproc *pru_rproc_get(struct device_node *np, int index)
 
        mutex_unlock(&pru->lock);
 
+       ret = of_property_read_string_index(np, "firmware-name", index,
+                                           &fw_name);
+       if (!ret) {
+               ret = pru_rproc_set_firmware(rproc, fw_name);
+               if (ret) {
+                       dev_err(dev, "failed to set firmware: %d\n", ret);
+                       goto err;
+               }
+       }
+
        return rproc;
+
+err:
+       pru_rproc_put(rproc);
+       return ERR_PTR(ret);
 }
 EXPORT_SYMBOL_GPL(pru_rproc_get);
 
@@ -231,6 +264,8 @@ void pru_rproc_put(struct rproc *rproc)
        if (!pru->client_np)
                return;
 
+       pru_rproc_set_firmware(rproc, NULL);
+
        mutex_lock(&pru->lock);
        pru->client_np = NULL;
        rproc->deny_sysfs_ops = 0;