From: Suman Anna <s-anna@ti.com>
To: Loic PALLARDY <loic.pallardy@st.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
"bjorn.andersson@linaro.org" <bjorn.andersson@linaro.org>
Cc: "ohad@wizery.com" <ohad@wizery.com>,
"peng.fan@nxp.com" <peng.fan@nxp.com>,
Arnaud POULIQUEN <arnaud.pouliquen@st.com>,
Fabien DESSENNE <fabien.dessenne@st.com>,
"linux-remoteproc@vger.kernel.org"
<linux-remoteproc@vger.kernel.org>
Subject: Re: [PATCH v2 03/17] remoteproc: Split firmware name allocation from rproc_alloc()
Date: Mon, 30 Mar 2020 14:47:54 -0500 [thread overview]
Message-ID: <3cdc557f-61bf-fd0f-07b0-4ab5454f39f1@ti.com> (raw)
In-Reply-To: <d0a399feb0f647ec98841ea8b8339449@SFHDAG7NODE2.st.com>
Hi Mathieu,
On 3/27/20 6:05 AM, Loic PALLARDY wrote:
> Hi Mathieu,
>
>> -----Original Message-----
>> From: Mathieu Poirier <mathieu.poirier@linaro.org>
>> Sent: mardi 24 mars 2020 22:46
>> To: bjorn.andersson@linaro.org
>> Cc: ohad@wizery.com; Loic PALLARDY <loic.pallardy@st.com>; s-
>> anna@ti.com; peng.fan@nxp.com; Arnaud POULIQUEN
>> <arnaud.pouliquen@st.com>; Fabien DESSENNE
>> <fabien.dessenne@st.com>; linux-remoteproc@vger.kernel.org
>> Subject: [PATCH v2 03/17] remoteproc: Split firmware name allocation from
>> rproc_alloc()
>>
>> Make the firmware name allocation a function on its own in order to
>> introduce more flexibility to function rproc_alloc().
I see patches 3 through 5 are generic cleanups, can you post them
separately from this series? Bjorn has commented about using the
put_device() to free the code on one of the remoteproc core patches [1]
in my R5 patch series, and I can do my patch on top of yours. I plan to
split out those 2 core patches for my next version, and can do them on
top of these.
[1] https://patchwork.kernel.org/patch/11456385/#23248321
>>
>> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
>> ---
>> drivers/remoteproc/remoteproc_core.c | 62 +++++++++++++++++-----------
>> 1 file changed, 39 insertions(+), 23 deletions(-)
>>
>> diff --git a/drivers/remoteproc/remoteproc_core.c
>> b/drivers/remoteproc/remoteproc_core.c
>> index 097f33e4f1f3..c0871f69929b 100644
>> --- a/drivers/remoteproc/remoteproc_core.c
>> +++ b/drivers/remoteproc/remoteproc_core.c
>> @@ -1962,6 +1962,36 @@ static const struct device_type rproc_type = {
>> .release = rproc_type_release,
>> };
>>
>> +static int rproc_alloc_firmware(struct rproc *rproc,
>> + const char *name, const char *firmware)
>> +{
>> + char *p, *template = "rproc-%s-fw";
>> + int name_len;
>> +
>> + if (!rproc || !name)
>> + return -EINVAL;
This is an internal function, and these are already checked in
rproc_alloc(), so you can drop this.
>> +
>> + if (!firmware) {
>> + /*
>> + * If the caller didn't pass in a firmware name then
>> + * construct a default name.
>> + */
>> + name_len = strlen(name) + strlen(template) - 2 + 1;
>> + p = kmalloc(name_len, GFP_KERNEL);
>> + if (!p)
>> + return -ENOMEM;
>> + snprintf(p, name_len, template, name);
>> + } else {
>> + p = kstrdup(firmware, GFP_KERNEL);
>> + if (!p)
>> + return -ENOMEM;
>> + }
>> +
>> + rproc->firmware = p;
>> +
>> + return 0;
>> +}
>> +
>> /**
>> * rproc_alloc() - allocate a remote processor handle
>> * @dev: the underlying device
>> @@ -1990,42 +2020,24 @@ struct rproc *rproc_alloc(struct device *dev,
>> const char *name,
>> const char *firmware, int len)
>> {
>> struct rproc *rproc;
>> - char *p, *template = "rproc-%s-fw";
>> - int name_len;
>>
>> if (!dev || !name || !ops)
>> return NULL;
>>
>> - if (!firmware) {
>> - /*
>> - * If the caller didn't pass in a firmware name then
>> - * construct a default name.
>> - */
>> - name_len = strlen(name) + strlen(template) - 2 + 1;
>> - p = kmalloc(name_len, GFP_KERNEL);
>> - if (!p)
>> - return NULL;
>> - snprintf(p, name_len, template, name);
>> - } else {
>> - p = kstrdup(firmware, GFP_KERNEL);
>> - if (!p)
>> - return NULL;
>> - }
>> -
>> rproc = kzalloc(sizeof(struct rproc) + len, GFP_KERNEL);
>> - if (!rproc) {
>> - kfree(p);
>> + if (!rproc)
>> return NULL;
>> - }
>> +
>> + if (rproc_alloc_firmware(rproc, name, firmware))
>> + goto free_rproc;
Since you are already moving this after rproc_alloc() here in this
patch, you might as well fold the relevant patch 5 contents here?
Otherwise, retain the existing code as is, and do all the movement in
patch 5.
regards
Suman
>>
>> rproc->ops = kmemdup(ops, sizeof(*ops), GFP_KERNEL);
>> if (!rproc->ops) {
>> - kfree(p);
>> + kfree(rproc->firmware);
>> kfree(rproc);
> Small remark only for patch coherency, as it is modified in next patches.
> Use free_rproc label which is introduced just below here for error management.
>
> Regards,
> Loic
>> return NULL;
>> }
>>
>> - rproc->firmware = p;
>> rproc->name = name;
>> rproc->priv = &rproc[1];
>> rproc->auto_boot = true;
>> @@ -2073,6 +2085,10 @@ struct rproc *rproc_alloc(struct device *dev, const
>> char *name,
>> rproc->state = RPROC_OFFLINE;
>>
>> return rproc;
>> +
>> +free_rproc:
>> + kfree(rproc);
>> + return NULL;
>> }
>> EXPORT_SYMBOL(rproc_alloc);
>>
>> --
>> 2.20.1
>
next prev parent reply other threads:[~2020-03-30 19:47 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 21:45 [PATCH v2 00/17] remoteproc: Add support for synchronisation with MCU Mathieu Poirier
2020-03-24 21:45 ` [PATCH v2 01/17] remoteproc: Add new operation and state machine for MCU synchronisation Mathieu Poirier
2020-03-30 22:46 ` Suman Anna
2020-03-30 22:49 ` Suman Anna
2020-04-01 21:53 ` Mathieu Poirier
2020-04-09 21:38 ` Suman Anna
2020-04-09 21:38 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 02/17] remoteproc: Introduce function rproc_set_mcu_sync_state() Mathieu Poirier
2020-03-30 22:55 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 03/17] remoteproc: Split firmware name allocation from rproc_alloc() Mathieu Poirier
2020-03-27 11:05 ` Loic PALLARDY
2020-03-30 19:47 ` Suman Anna [this message]
2020-04-01 21:58 ` Mathieu Poirier
2020-03-24 21:45 ` [PATCH v2 04/17] remoteproc: Split rproc_ops " Mathieu Poirier
2020-03-30 19:54 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 05/17] remoteproc: Get rid of tedious error path Mathieu Poirier
2020-03-30 20:31 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 06/17] remoteproc: Introduce function rproc_alloc_internals() Mathieu Poirier
2020-03-27 11:10 ` Loic PALLARDY
2020-03-30 20:38 ` Suman Anna
2020-04-01 20:29 ` Mathieu Poirier
2020-04-09 21:53 ` Suman Anna
2020-04-09 21:53 ` Suman Anna
2020-03-30 23:07 ` Mathieu Poirier
2020-03-24 21:45 ` [PATCH v2 07/17] remoteproc: Introduce function rproc_alloc_state_machine() Mathieu Poirier
2020-03-27 13:12 ` Loic PALLARDY
2020-03-30 23:10 ` Suman Anna
2020-04-01 20:41 ` Mathieu Poirier
2020-04-09 18:35 ` Suman Anna
2020-04-09 18:35 ` Suman Anna
2020-03-30 23:13 ` Mathieu Poirier
2020-03-24 21:45 ` [PATCH v2 08/17] remoteproc: Allocate synchronisation state machine Mathieu Poirier
2020-03-27 13:47 ` Loic PALLARDY
2020-03-30 23:16 ` Mathieu Poirier
2020-03-30 23:20 ` Suman Anna
2020-04-01 20:46 ` Mathieu Poirier
2020-03-24 21:45 ` [PATCH v2 09/17] remoteproc: Call the right core function based on synchronisation state Mathieu Poirier
2020-03-31 15:10 ` Suman Anna
2020-04-02 20:16 ` Mathieu Poirier
2020-04-09 18:48 ` Suman Anna
2020-04-09 18:48 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 10/17] remoteproc: Decouple firmware load and remoteproc booting Mathieu Poirier
2020-03-31 21:27 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 11/17] remoteproc: Repurpose function rproc_trigger_auto_boot() Mathieu Poirier
2020-03-31 21:32 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 12/17] remoteproc: Rename function rproc_fw_boot() Mathieu Poirier
2020-03-31 21:42 ` Suman Anna
2020-03-24 21:45 ` [PATCH v2 13/17] remoteproc: Introducting new functions to start and stop an MCU Mathieu Poirier
2020-03-31 18:08 ` Suman Anna
2020-03-31 21:46 ` Suman Anna
2020-04-01 21:55 ` Mathieu Poirier
2020-03-24 21:46 ` [PATCH v2 14/17] remoteproc: Refactor function rproc_trigger_recovery() Mathieu Poirier
2020-03-31 21:52 ` Suman Anna
2020-04-02 20:35 ` Mathieu Poirier
2020-04-09 19:02 ` Suman Anna
2020-04-09 19:02 ` Suman Anna
2020-03-24 21:46 ` [PATCH v2 15/17] remoteproc: Correctly deal with MCU synchronisation when changing FW image Mathieu Poirier
2020-03-27 13:50 ` Loic PALLARDY
2020-03-30 23:21 ` Mathieu Poirier
2020-03-31 22:14 ` Suman Anna
2020-04-01 20:55 ` Mathieu Poirier
2020-04-22 21:29 ` Mathieu Poirier
2020-04-22 21:29 ` Mathieu Poirier
2020-04-22 22:56 ` Suman Anna
2020-04-22 22:56 ` Suman Anna
2020-03-24 21:46 ` [PATCH v2 16/17] remoteproc: Correctly deal with MCU synchronisation when changing state Mathieu Poirier
2020-03-27 14:04 ` Loic PALLARDY
2020-03-30 23:49 ` Mathieu Poirier
2020-03-31 22:35 ` Suman Anna
2020-04-01 21:29 ` Mathieu Poirier
2020-04-09 20:55 ` Suman Anna
2020-04-09 20:55 ` Suman Anna
2020-04-02 20:42 ` Mathieu Poirier
2020-04-09 20:40 ` Suman Anna
2020-04-09 20:40 ` Suman Anna
2020-03-24 21:46 ` [PATCH v2 17/17] remoteproc: Make MCU synchronisation state changes on stop and crashed Mathieu Poirier
2020-03-27 17:20 ` [PATCH v2 00/17] remoteproc: Add support for synchronisation with MCU Loic PALLARDY
2020-03-31 22:51 ` Suman Anna
2020-04-01 21:39 ` Mathieu Poirier
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=3cdc557f-61bf-fd0f-07b0-4ab5454f39f1@ti.com \
--to=s-anna@ti.com \
--cc=arnaud.pouliquen@st.com \
--cc=bjorn.andersson@linaro.org \
--cc=fabien.dessenne@st.com \
--cc=linux-remoteproc@vger.kernel.org \
--cc=loic.pallardy@st.com \
--cc=mathieu.poirier@linaro.org \
--cc=ohad@wizery.com \
--cc=peng.fan@nxp.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).