* [PATCH V8 1/2] remoteproc: introduce rproc features
2022-09-28 6:47 [PATCH V8 0/2] remoteproc: support self recovery Peng Fan (OSS)
@ 2022-09-28 6:47 ` Peng Fan (OSS)
2022-09-28 6:47 ` [PATCH V8 2/2] remoteproc: support attach recovery after rproc crash Peng Fan (OSS)
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Peng Fan (OSS) @ 2022-09-28 6:47 UTC (permalink / raw)
To: andersson, mathieu.poirier, arnaud.pouliquen
Cc: linux-remoteproc, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
remote processor may support:
- boot recovery with help from main processor
- self recovery without help from main processor
- iommu
- etc
Introduce rproc features could simplify code to avoid adding more bool
flags
Acked-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/remoteproc_internal.h | 15 +++++++++++++++
include/linux/remoteproc.h | 16 ++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h
index bf1fb7bba1a3..d4dbb8d1d80c 100644
--- a/drivers/remoteproc/remoteproc_internal.h
+++ b/drivers/remoteproc/remoteproc_internal.h
@@ -39,6 +39,21 @@ struct rproc_vdev_data {
struct fw_rsc_vdev *rsc;
};
+static inline bool rproc_has_feature(struct rproc *rproc, unsigned int feature)
+{
+ return test_bit(feature, rproc->features);
+}
+
+static inline int rproc_set_feature(struct rproc *rproc, unsigned int feature)
+{
+ if (feature >= RPROC_MAX_FEATURES)
+ return -EINVAL;
+
+ set_bit(feature, rproc->features);
+
+ return 0;
+}
+
/* from remoteproc_core.c */
void rproc_release(struct kref *kref);
int rproc_of_parse_firmware(struct device *dev, int index,
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 1abf56ad02da..fe8978eb69f1 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -489,6 +489,20 @@ struct rproc_dump_segment {
loff_t offset;
};
+/**
+ * enum rproc_features - features supported
+ *
+ * @RPROC_FEAT_ATTACH_ON_RECOVERY: The remote processor does not need help
+ * from Linux to recover, such as firmware
+ * loading. Linux just needs to attach after
+ * recovery.
+ */
+
+enum rproc_features {
+ RPROC_FEAT_ATTACH_ON_RECOVERY,
+ RPROC_MAX_FEATURES,
+};
+
/**
* struct rproc - represents a physical remote processor device
* @node: list node of this rproc object
@@ -530,6 +544,7 @@ struct rproc_dump_segment {
* @elf_machine: firmware ELF machine
* @cdev: character device of the rproc
* @cdev_put_on_release: flag to indicate if remoteproc should be shutdown on @char_dev release
+ * @features: indicate remoteproc features
*/
struct rproc {
struct list_head node;
@@ -570,6 +585,7 @@ struct rproc {
u16 elf_machine;
struct cdev cdev;
bool cdev_put_on_release;
+ DECLARE_BITMAP(features, RPROC_MAX_FEATURES);
};
/**
--
2.37.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH V8 2/2] remoteproc: support attach recovery after rproc crash
2022-09-28 6:47 [PATCH V8 0/2] remoteproc: support self recovery Peng Fan (OSS)
2022-09-28 6:47 ` [PATCH V8 1/2] remoteproc: introduce rproc features Peng Fan (OSS)
@ 2022-09-28 6:47 ` Peng Fan (OSS)
2022-09-28 15:42 ` [PATCH V8 0/2] remoteproc: support self recovery Tanmay Shah
2022-09-28 16:48 ` Mathieu Poirier
3 siblings, 0 replies; 6+ messages in thread
From: Peng Fan (OSS) @ 2022-09-28 6:47 UTC (permalink / raw)
To: andersson, mathieu.poirier, arnaud.pouliquen
Cc: linux-remoteproc, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
Current logic only support main processor to stop/start the remote
processor after crash. However to SoC, such as i.MX8QM/QXP, the
remote processor could do attach recovery after crash and trigger watchdog
to reboot itself. It does not need main processor to load image, or
stop/start remote processor.
Introduce two functions: rproc_attach_recovery, rproc_boot_recovery
for the two cases. Boot recovery is as before, let main processor to
help recovery, while attach recovery is to recover itself without help.
To attach recovery, we only do detach and attach.
Acked-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/remoteproc_core.c | 62 +++++++++++++++++++---------
1 file changed, 43 insertions(+), 19 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index e7c25477b0af..8768cb64f560 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1770,6 +1770,45 @@ static int __rproc_detach(struct rproc *rproc)
return 0;
}
+static int rproc_attach_recovery(struct rproc *rproc)
+{
+ int ret;
+
+ ret = __rproc_detach(rproc);
+ if (ret)
+ return ret;
+
+ return __rproc_attach(rproc);
+}
+
+static int rproc_boot_recovery(struct rproc *rproc)
+{
+ const struct firmware *firmware_p;
+ struct device *dev = &rproc->dev;
+ int ret;
+
+ ret = rproc_stop(rproc, true);
+ if (ret)
+ return ret;
+
+ /* generate coredump */
+ rproc->ops->coredump(rproc);
+
+ /* load firmware */
+ ret = request_firmware(&firmware_p, rproc->firmware, dev);
+ if (ret < 0) {
+ dev_err(dev, "request_firmware failed: %d\n", ret);
+ return ret;
+ }
+
+ /* boot the remote processor up again */
+ ret = rproc_start(rproc, firmware_p);
+
+ release_firmware(firmware_p);
+
+ return ret;
+}
+
/**
* rproc_trigger_recovery() - recover a remoteproc
* @rproc: the remote processor
@@ -1784,7 +1823,6 @@ static int __rproc_detach(struct rproc *rproc)
*/
int rproc_trigger_recovery(struct rproc *rproc)
{
- const struct firmware *firmware_p;
struct device *dev = &rproc->dev;
int ret;
@@ -1798,24 +1836,10 @@ int rproc_trigger_recovery(struct rproc *rproc)
dev_err(dev, "recovering %s\n", rproc->name);
- ret = rproc_stop(rproc, true);
- if (ret)
- goto unlock_mutex;
-
- /* generate coredump */
- rproc->ops->coredump(rproc);
-
- /* load firmware */
- ret = request_firmware(&firmware_p, rproc->firmware, dev);
- if (ret < 0) {
- dev_err(dev, "request_firmware failed: %d\n", ret);
- goto unlock_mutex;
- }
-
- /* boot the remote processor up again */
- ret = rproc_start(rproc, firmware_p);
-
- release_firmware(firmware_p);
+ if (rproc_has_feature(rproc, RPROC_FEAT_ATTACH_ON_RECOVERY))
+ ret = rproc_attach_recovery(rproc);
+ else
+ ret = rproc_boot_recovery(rproc);
unlock_mutex:
mutex_unlock(&rproc->lock);
--
2.37.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH V8 0/2] remoteproc: support self recovery
2022-09-28 6:47 [PATCH V8 0/2] remoteproc: support self recovery Peng Fan (OSS)
2022-09-28 6:47 ` [PATCH V8 1/2] remoteproc: introduce rproc features Peng Fan (OSS)
2022-09-28 6:47 ` [PATCH V8 2/2] remoteproc: support attach recovery after rproc crash Peng Fan (OSS)
@ 2022-09-28 15:42 ` Tanmay Shah
2022-09-29 8:33 ` Peng Fan
2022-09-28 16:48 ` Mathieu Poirier
3 siblings, 1 reply; 6+ messages in thread
From: Tanmay Shah @ 2022-09-28 15:42 UTC (permalink / raw)
To: Peng Fan (OSS), andersson, mathieu.poirier, arnaud.pouliquen
Cc: linux-remoteproc, linux-kernel, Peng Fan
On 9/27/22 11:47 PM, Peng Fan (OSS) wrote:
> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
>
>
> From: Peng Fan <peng.fan@nxp.com>
>
> V8:
> Rebased on linux-next/master tag: next-20220927
Hi Peng,
Thanks for your patch.
Tags are useful, but more accurate method is to use --base option of git
format-patch.
This can inform others what base-commit was used. It is also useful when
you have prerequisite patches.
Hope this helps.
Thanks,
Tanmay
>
> V7:
> Per comments from Arnaud Pouliquen:
> Typo fixes
> Added A-b tag
>
> V6:
> Rename rproc_firmware_recovery to rproc_boot_recovery
> Drop the unlock/lock when do reproc_attach_recovery
>
> V5:
> Rename RPROC_FEAT_ATTACH_RECOVERY to RPROC_FEAT_ATTACH_ON_RECOVERY
> Add kerneldoc for rproc features
> Change rproc_set_feature to return int type and add a max feature check
> Use __rproc_detach and __rproc_attach when do attach recovery
> https://patchwork.kernel.org/project/linux-remoteproc/cover/20220615032048.465486-1-peng.fan@oss.nxp.com/
>
> V4:
> Based on Bjorn's comments on V2-2
> Move the rproc_has_feature/rproc_set_feature to remoteproc_internal.h and
> Keep rproc_features still in remoteproc.h, because we use
> RPROC_MAX_FEATURES to declare bitmap.
> Update commit log for patch 2/2, and add comments
>
> https://patchwork.kernel.org/project/linux-remoteproc/cover/20220323034405.976643-1-peng.fan@oss.nxp.com/
>
> V3:
> Resend the wrong labeled patchset
> https://patchwork.kernel.org/project/linux-remoteproc/list/?series=621311
>
> Write a cover-letter
> To i.MX8QM/QXP, they have a M4 core self-recovery capability without
> Linux loading firmware. The self recovery is done by
> SCU(System Control Unit). Current remoteproc framework only support Linux
> help recovery remote processor(stop, loading firmware, start). This
> patchset is support remote processor self recovery(attach recovery).
>
> In order to avoid introducing a new variable(bool support_self_recovery),
> patch 1 introduce a new function, rproc_has_feature to make code easy to
> extend, cleaner, such as we could move "bool has_iommu" to
> rproc_has_feature(rproc, RPROC_FEAT_IOMMU).
>
> Patch 2 is introduce a new function rproc_attach_recovery for
> self recovery, the original logic move to rproc_firmware_recovery meaning
> needs linux to help recovery.
>
> V2-version 2:
> https://patchwork.kernel.org/project/linux-remoteproc/list/?series=621311
> Introduce rproc_has_feature
>
> V2-version 1:
> https://patchwork.kernel.org/project/linux-remoteproc/patch/20220126085120.3397450-1-peng.fan@oss.nxp.com/
> Nothing change in V2.
> Only move this patch out from
> https://patchwork.kernel.org/project/linux-remoteproc/list/?series=604364
>
> Peng Fan (2):
> remoteproc: introduce rproc features
> remoteproc: support attach recovery after rproc crash
>
> drivers/remoteproc/remoteproc_core.c | 62 ++++++++++++++++--------
> drivers/remoteproc/remoteproc_internal.h | 15 ++++++
> include/linux/remoteproc.h | 16 ++++++
> 3 files changed, 74 insertions(+), 19 deletions(-)
>
> --
> 2.37.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V8 0/2] remoteproc: support self recovery
2022-09-28 15:42 ` [PATCH V8 0/2] remoteproc: support self recovery Tanmay Shah
@ 2022-09-29 8:33 ` Peng Fan
0 siblings, 0 replies; 6+ messages in thread
From: Peng Fan @ 2022-09-29 8:33 UTC (permalink / raw)
To: Tanmay Shah, andersson, mathieu.poirier, arnaud.pouliquen
Cc: linux-remoteproc, linux-kernel, Peng Fan
On 9/28/2022 11:42 PM, Tanmay Shah wrote:
>
> On 9/27/22 11:47 PM, Peng Fan (OSS) wrote:
>> CAUTION: This message has originated from an External Source. Please
>> use proper judgment and caution when opening attachments, clicking
>> links, or responding to this email.
>>
>>
>> From: Peng Fan <peng.fan@nxp.com>
>>
>> V8:
>> Rebased on linux-next/master tag: next-20220927
>
> Hi Peng,
>
> Thanks for your patch.
>
> Tags are useful, but more accurate method is to use --base option of git
> format-patch.
>
> This can inform others what base-commit was used. It is also useful when
> you have prerequisite patches.
Yes, I see. linux-next/master would force update every day, so I am not
sure base-commit would work for linux-next/master branch.
Thanks,
Peng.
>
> Hope this helps.
>
> Thanks,
>
> Tanmay
>
>>
>> V7:
>> Per comments from Arnaud Pouliquen:
>> Typo fixes
>> Added A-b tag
>>
>> V6:
>> Rename rproc_firmware_recovery to rproc_boot_recovery
>> Drop the unlock/lock when do reproc_attach_recovery
>>
>> V5:
>> Rename RPROC_FEAT_ATTACH_RECOVERY to RPROC_FEAT_ATTACH_ON_RECOVERY
>> Add kerneldoc for rproc features
>> Change rproc_set_feature to return int type and add a max feature check
>> Use __rproc_detach and __rproc_attach when do attach recovery
>>
>> https://patchwork.kernel.org/project/linux-remoteproc/cover/20220615032048.465486-1-peng.fan@oss.nxp.com/
>>
>> V4:
>> Based on Bjorn's comments on V2-2
>> Move the rproc_has_feature/rproc_set_feature to
>> remoteproc_internal.h and
>> Keep rproc_features still in remoteproc.h, because we use
>> RPROC_MAX_FEATURES to declare bitmap.
>> Update commit log for patch 2/2, and add comments
>>
>>
>> https://patchwork.kernel.org/project/linux-remoteproc/cover/20220323034405.976643-1-peng.fan@oss.nxp.com/
>>
>> V3:
>> Resend the wrong labeled patchset
>>
>> https://patchwork.kernel.org/project/linux-remoteproc/list/?series=621311
>>
>> Write a cover-letter
>> To i.MX8QM/QXP, they have a M4 core self-recovery capability without
>> Linux loading firmware. The self recovery is done by
>> SCU(System Control Unit). Current remoteproc framework only support
>> Linux
>> help recovery remote processor(stop, loading firmware, start). This
>> patchset is support remote processor self recovery(attach recovery).
>>
>> In order to avoid introducing a new variable(bool
>> support_self_recovery),
>> patch 1 introduce a new function, rproc_has_feature to make code
>> easy to
>> extend, cleaner, such as we could move "bool has_iommu" to
>> rproc_has_feature(rproc, RPROC_FEAT_IOMMU).
>>
>> Patch 2 is introduce a new function rproc_attach_recovery for
>> self recovery, the original logic move to rproc_firmware_recovery
>> meaning
>> needs linux to help recovery.
>>
>> V2-version 2:
>>
>> https://patchwork.kernel.org/project/linux-remoteproc/list/?series=621311
>> Introduce rproc_has_feature
>>
>> V2-version 1:
>>
>> https://patchwork.kernel.org/project/linux-remoteproc/patch/20220126085120.3397450-1-peng.fan@oss.nxp.com/
>> Nothing change in V2.
>> Only move this patch out from
>>
>> https://patchwork.kernel.org/project/linux-remoteproc/list/?series=604364
>>
>> Peng Fan (2):
>> remoteproc: introduce rproc features
>> remoteproc: support attach recovery after rproc crash
>>
>> drivers/remoteproc/remoteproc_core.c | 62 ++++++++++++++++--------
>> drivers/remoteproc/remoteproc_internal.h | 15 ++++++
>> include/linux/remoteproc.h | 16 ++++++
>> 3 files changed, 74 insertions(+), 19 deletions(-)
>>
>> --
>> 2.37.1
>>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V8 0/2] remoteproc: support self recovery
2022-09-28 6:47 [PATCH V8 0/2] remoteproc: support self recovery Peng Fan (OSS)
` (2 preceding siblings ...)
2022-09-28 15:42 ` [PATCH V8 0/2] remoteproc: support self recovery Tanmay Shah
@ 2022-09-28 16:48 ` Mathieu Poirier
3 siblings, 0 replies; 6+ messages in thread
From: Mathieu Poirier @ 2022-09-28 16:48 UTC (permalink / raw)
To: Peng Fan (OSS)
Cc: andersson, arnaud.pouliquen, linux-remoteproc, linux-kernel,
Peng Fan
On Wed, Sep 28, 2022 at 02:47:54PM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
>
> V8:
> Rebased on linux-next/master tag: next-20220927
>
> V7:
> Per comments from Arnaud Pouliquen:
> Typo fixes
> Added A-b tag
>
> V6:
> Rename rproc_firmware_recovery to rproc_boot_recovery
> Drop the unlock/lock when do reproc_attach_recovery
>
> V5:
> Rename RPROC_FEAT_ATTACH_RECOVERY to RPROC_FEAT_ATTACH_ON_RECOVERY
> Add kerneldoc for rproc features
> Change rproc_set_feature to return int type and add a max feature check
> Use __rproc_detach and __rproc_attach when do attach recovery
> https://patchwork.kernel.org/project/linux-remoteproc/cover/20220615032048.465486-1-peng.fan@oss.nxp.com/
>
> V4:
> Based on Bjorn's comments on V2-2
> Move the rproc_has_feature/rproc_set_feature to remoteproc_internal.h and
> Keep rproc_features still in remoteproc.h, because we use
> RPROC_MAX_FEATURES to declare bitmap.
> Update commit log for patch 2/2, and add comments
>
> https://patchwork.kernel.org/project/linux-remoteproc/cover/20220323034405.976643-1-peng.fan@oss.nxp.com/
>
> V3:
> Resend the wrong labeled patchset
> https://patchwork.kernel.org/project/linux-remoteproc/list/?series=621311
>
> Write a cover-letter
> To i.MX8QM/QXP, they have a M4 core self-recovery capability without
> Linux loading firmware. The self recovery is done by
> SCU(System Control Unit). Current remoteproc framework only support Linux
> help recovery remote processor(stop, loading firmware, start). This
> patchset is support remote processor self recovery(attach recovery).
>
> In order to avoid introducing a new variable(bool support_self_recovery),
> patch 1 introduce a new function, rproc_has_feature to make code easy to
> extend, cleaner, such as we could move "bool has_iommu" to
> rproc_has_feature(rproc, RPROC_FEAT_IOMMU).
>
> Patch 2 is introduce a new function rproc_attach_recovery for
> self recovery, the original logic move to rproc_firmware_recovery meaning
> needs linux to help recovery.
>
> V2-version 2:
> https://patchwork.kernel.org/project/linux-remoteproc/list/?series=621311
> Introduce rproc_has_feature
>
> V2-version 1:
> https://patchwork.kernel.org/project/linux-remoteproc/patch/20220126085120.3397450-1-peng.fan@oss.nxp.com/
> Nothing change in V2.
> Only move this patch out from
> https://patchwork.kernel.org/project/linux-remoteproc/list/?series=604364
>
> Peng Fan (2):
> remoteproc: introduce rproc features
> remoteproc: support attach recovery after rproc crash
>
> drivers/remoteproc/remoteproc_core.c | 62 ++++++++++++++++--------
> drivers/remoteproc/remoteproc_internal.h | 15 ++++++
> include/linux/remoteproc.h | 16 ++++++
> 3 files changed, 74 insertions(+), 19 deletions(-)
Applied.
Thanks,
Mathieu
>
> --
> 2.37.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread