Message ID | 20201030195713.1366341-5-mathieu.poirier@linaro.org (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | remoteproc: Add support for detaching from rproc | expand |
On 10/30/20 8:57 PM, Mathieu Poirier wrote: > There is a need to know when a remote processor has been attached > to rather than booted by the remoteproc core. In order to avoid > manipulating two variables, i.e rproc::autonomous and > rproc::state, get rid of the former and simply use the newly > introduced RPROC_ATTACHED state. > > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> > Reviewed-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> Thanks, Arnaud > --- > drivers/remoteproc/remoteproc_core.c | 20 +------------------- > drivers/remoteproc/remoteproc_sysfs.c | 5 +---- > include/linux/remoteproc.h | 2 -- > 3 files changed, 2 insertions(+), 25 deletions(-) > > diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c > index f36786b47a4f..63fba1b61840 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -1444,7 +1444,7 @@ static int rproc_attach(struct rproc *rproc) > goto stop_rproc; > } > > - rproc->state = RPROC_RUNNING; > + rproc->state = RPROC_ATTACHED; > > dev_info(dev, "remote processor %s is now attached\n", rproc->name); > > @@ -1659,14 +1659,6 @@ static int rproc_stop(struct rproc *rproc, bool crashed) > > rproc->state = RPROC_OFFLINE; > > - /* > - * The remote processor has been stopped and is now offline, which means > - * that the next time it is brought back online the remoteproc core will > - * be responsible to load its firmware. As such it is no longer > - * autonomous. > - */ > - rproc->autonomous = false; > - > dev_info(dev, "stopped remote processor %s\n", rproc->name); > > return 0; > @@ -2017,16 +2009,6 @@ int rproc_add(struct rproc *rproc) > if (ret < 0) > return ret; > > - /* > - * Remind ourselves the remote processor has been attached to rather > - * than booted by the remoteproc core. This is important because the > - * RPROC_DETACHED state will be lost as soon as the remote processor > - * has been attached to. Used in firmware_show() and reset in > - * rproc_stop(). > - */ > - if (rproc->state == RPROC_DETACHED) > - rproc->autonomous = true; > - > /* if rproc is marked always-on, request it to boot */ > if (rproc->auto_boot) { > ret = rproc_trigger_auto_boot(rproc); > diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c > index 1167adcf8741..99ff51fd9707 100644 > --- a/drivers/remoteproc/remoteproc_sysfs.c > +++ b/drivers/remoteproc/remoteproc_sysfs.c > @@ -138,11 +138,8 @@ static ssize_t firmware_show(struct device *dev, struct device_attribute *attr, > * If the remote processor has been started by an external > * entity we have no idea of what image it is running. As such > * simply display a generic string rather then rproc->firmware. > - * > - * Here we rely on the autonomous flag because a remote processor > - * may have been attached to and currently in a running state. > */ > - if (rproc->autonomous) > + if (rproc->state == RPROC_ATTACHED) > firmware = "unknown"; > > return sprintf(buf, "%s\n", firmware); > diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h > index 4564c4665a2c..3fe2ae0bd1ca 100644 > --- a/include/linux/remoteproc.h > +++ b/include/linux/remoteproc.h > @@ -510,7 +510,6 @@ struct rproc_dump_segment { > * @table_sz: size of @cached_table > * @has_iommu: flag to indicate if remote processor is behind an MMU > * @auto_boot: flag to indicate if remote processor should be auto-started > - * @autonomous: true if an external entity has booted the remote processor > * @dump_segments: list of segments in the firmware > * @nb_vdev: number of vdev currently handled by rproc > * @char_dev: character device of the rproc > @@ -547,7 +546,6 @@ struct rproc { > size_t table_sz; > bool has_iommu; > bool auto_boot; > - bool autonomous; > struct list_head dump_segments; > int nb_vdev; > u8 elf_class; >
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index f36786b47a4f..63fba1b61840 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1444,7 +1444,7 @@ static int rproc_attach(struct rproc *rproc) goto stop_rproc; } - rproc->state = RPROC_RUNNING; + rproc->state = RPROC_ATTACHED; dev_info(dev, "remote processor %s is now attached\n", rproc->name); @@ -1659,14 +1659,6 @@ static int rproc_stop(struct rproc *rproc, bool crashed) rproc->state = RPROC_OFFLINE; - /* - * The remote processor has been stopped and is now offline, which means - * that the next time it is brought back online the remoteproc core will - * be responsible to load its firmware. As such it is no longer - * autonomous. - */ - rproc->autonomous = false; - dev_info(dev, "stopped remote processor %s\n", rproc->name); return 0; @@ -2017,16 +2009,6 @@ int rproc_add(struct rproc *rproc) if (ret < 0) return ret; - /* - * Remind ourselves the remote processor has been attached to rather - * than booted by the remoteproc core. This is important because the - * RPROC_DETACHED state will be lost as soon as the remote processor - * has been attached to. Used in firmware_show() and reset in - * rproc_stop(). - */ - if (rproc->state == RPROC_DETACHED) - rproc->autonomous = true; - /* if rproc is marked always-on, request it to boot */ if (rproc->auto_boot) { ret = rproc_trigger_auto_boot(rproc); diff --git a/drivers/remoteproc/remoteproc_sysfs.c b/drivers/remoteproc/remoteproc_sysfs.c index 1167adcf8741..99ff51fd9707 100644 --- a/drivers/remoteproc/remoteproc_sysfs.c +++ b/drivers/remoteproc/remoteproc_sysfs.c @@ -138,11 +138,8 @@ static ssize_t firmware_show(struct device *dev, struct device_attribute *attr, * If the remote processor has been started by an external * entity we have no idea of what image it is running. As such * simply display a generic string rather then rproc->firmware. - * - * Here we rely on the autonomous flag because a remote processor - * may have been attached to and currently in a running state. */ - if (rproc->autonomous) + if (rproc->state == RPROC_ATTACHED) firmware = "unknown"; return sprintf(buf, "%s\n", firmware); diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 4564c4665a2c..3fe2ae0bd1ca 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -510,7 +510,6 @@ struct rproc_dump_segment { * @table_sz: size of @cached_table * @has_iommu: flag to indicate if remote processor is behind an MMU * @auto_boot: flag to indicate if remote processor should be auto-started - * @autonomous: true if an external entity has booted the remote processor * @dump_segments: list of segments in the firmware * @nb_vdev: number of vdev currently handled by rproc * @char_dev: character device of the rproc @@ -547,7 +546,6 @@ struct rproc { size_t table_sz; bool has_iommu; bool auto_boot; - bool autonomous; struct list_head dump_segments; int nb_vdev; u8 elf_class;