From: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org> To: ohad@wizery.com, bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, robh+dt@kernel.org, s-anna@ti.com, ssantosh@kernel.org Cc: grzegorz.jaszczyk@linaro.org, linux-remoteproc@vger.kernel.org, lee.jones@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, praneeth@ti.com, rogerq@ti.com, t-kristo@ti.com Subject: [PATCH v2 5/5] remoteproc: pru: Configure firmware based on client setup Date: Wed, 16 Dec 2020 17:52:39 +0100 [thread overview] Message-ID: <20201216165239.2744-6-grzegorz.jaszczyk@linaro.org> (raw) In-Reply-To: <20201216165239.2744-1-grzegorz.jaszczyk@linaro.org> From: Tero Kristo <t-kristo@ti.com> 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. Co-developed-by: Suman Anna <s-anna@ti.com> Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tero Kristo <t-kristo@ti.com> Co-developed-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org> Signed-off-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org> --- drivers/remoteproc/pru_rproc.c | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c index a37c3f5838ea..4a9c7973bf3a 100644 --- a/drivers/remoteproc/pru_rproc.c +++ b/drivers/remoteproc/pru_rproc.c @@ -170,6 +170,23 @@ 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 + * + * Return: 0 on success, or errno in error case. + */ +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; @@ -230,6 +247,8 @@ struct rproc *pru_rproc_get(struct device_node *np, int index, struct rproc *rproc; struct pru_rproc *pru; struct device *dev; + const char *fw_name; + int ret; rproc = __pru_rproc_get(np, index); if (IS_ERR(rproc)) @@ -254,7 +273,21 @@ struct rproc *pru_rproc_get(struct device_node *np, int index, if (pru_id) *pru_id = pru->id; + 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); @@ -276,6 +309,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 = false; -- 2.29.0
WARNING: multiple messages have this Message-ID (diff)
From: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org> To: ohad@wizery.com, bjorn.andersson@linaro.org, mathieu.poirier@linaro.org, robh+dt@kernel.org, s-anna@ti.com, ssantosh@kernel.org Cc: devicetree@vger.kernel.org, grzegorz.jaszczyk@linaro.org, praneeth@ti.com, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, t-kristo@ti.com, linux-omap@vger.kernel.org, lee.jones@linaro.org, linux-arm-kernel@lists.infradead.org, rogerq@ti.com Subject: [PATCH v2 5/5] remoteproc: pru: Configure firmware based on client setup Date: Wed, 16 Dec 2020 17:52:39 +0100 [thread overview] Message-ID: <20201216165239.2744-6-grzegorz.jaszczyk@linaro.org> (raw) In-Reply-To: <20201216165239.2744-1-grzegorz.jaszczyk@linaro.org> From: Tero Kristo <t-kristo@ti.com> 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. Co-developed-by: Suman Anna <s-anna@ti.com> Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tero Kristo <t-kristo@ti.com> Co-developed-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org> Signed-off-by: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org> --- drivers/remoteproc/pru_rproc.c | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c index a37c3f5838ea..4a9c7973bf3a 100644 --- a/drivers/remoteproc/pru_rproc.c +++ b/drivers/remoteproc/pru_rproc.c @@ -170,6 +170,23 @@ 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 + * + * Return: 0 on success, or errno in error case. + */ +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; @@ -230,6 +247,8 @@ struct rproc *pru_rproc_get(struct device_node *np, int index, struct rproc *rproc; struct pru_rproc *pru; struct device *dev; + const char *fw_name; + int ret; rproc = __pru_rproc_get(np, index); if (IS_ERR(rproc)) @@ -254,7 +273,21 @@ struct rproc *pru_rproc_get(struct device_node *np, int index, if (pru_id) *pru_id = pru->id; + 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); @@ -276,6 +309,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 = false; -- 2.29.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-12-16 16:54 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-16 16:52 [PATCH v2 0/5] Introduce PRU remoteproc consumer API Grzegorz Jaszczyk 2020-12-16 16:52 ` Grzegorz Jaszczyk 2020-12-16 16:52 ` [PATCH v2 1/5] dt-bindings: remoteproc: Add PRU consumer bindings Grzegorz Jaszczyk 2020-12-16 16:52 ` Grzegorz Jaszczyk 2020-12-16 16:52 ` [PATCH v2 2/5] remoteproc: pru: Add APIs to get and put the PRU cores Grzegorz Jaszczyk 2020-12-16 16:52 ` Grzegorz Jaszczyk 2021-01-04 20:56 ` David Lechner 2021-01-04 20:56 ` David Lechner 2020-12-16 16:52 ` [PATCH v2 3/5] remoteproc: pru: Deny rproc sysfs ops for PRU client driven boots Grzegorz Jaszczyk 2020-12-16 16:52 ` Grzegorz Jaszczyk 2020-12-17 22:43 ` kernel test robot 2020-12-17 22:43 ` kernel test robot 2020-12-16 16:52 ` [PATCH v2 4/5] remoteproc: pru: Add pru_rproc_set_ctable() function Grzegorz Jaszczyk 2020-12-16 16:52 ` Grzegorz Jaszczyk 2020-12-16 16:52 ` Grzegorz Jaszczyk [this message] 2020-12-16 16:52 ` [PATCH v2 5/5] remoteproc: pru: Configure firmware based on client setup Grzegorz Jaszczyk 2021-01-04 20:11 ` [PATCH v2 0/5] Introduce PRU remoteproc consumer API David Lechner 2021-01-04 20:11 ` David Lechner 2021-01-06 21:05 ` Suman Anna 2021-01-06 21:05 ` Suman Anna 2021-01-06 23:27 ` Mathieu Poirier 2021-01-06 23:27 ` Mathieu Poirier 2021-01-07 0:03 ` Suman Anna 2021-01-07 0:03 ` Suman Anna 2021-01-07 22:44 ` Mathieu Poirier 2021-01-07 22:44 ` Mathieu Poirier 2021-01-07 22:49 ` Suman Anna 2021-01-07 22:49 ` Suman Anna 2021-01-25 4:34 ` santosh.shilimkar 2021-01-25 4:34 ` santosh.shilimkar 2021-01-25 15:43 ` Suman Anna 2021-01-25 15:43 ` Suman Anna 2021-01-25 15:56 ` [External] : " Santosh Shilimkar 2021-01-25 15:56 ` Santosh Shilimkar 2021-12-26 13:00 ` Christian Gmeiner 2021-12-26 13:00 ` Christian Gmeiner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201216165239.2744-6-grzegorz.jaszczyk@linaro.org \ --to=grzegorz.jaszczyk@linaro.org \ --cc=bjorn.andersson@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=lee.jones@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-remoteproc@vger.kernel.org \ --cc=mathieu.poirier@linaro.org \ --cc=ohad@wizery.com \ --cc=praneeth@ti.com \ --cc=robh+dt@kernel.org \ --cc=rogerq@ti.com \ --cc=s-anna@ti.com \ --cc=ssantosh@kernel.org \ --cc=t-kristo@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.