From: Peng Fan <[email protected]>
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/[email protected]/
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/[email protected]/
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/[email protected]/
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
From: Peng Fan <[email protected]>
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 <[email protected]>
Signed-off-by: Peng Fan <[email protected]>
---
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
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 <[email protected]>
>
> 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/[email protected]/
>
> 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/[email protected]/
>
> 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/[email protected]/
> 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
>
On Wed, Sep 28, 2022 at 02:47:54PM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <[email protected]>
>
> 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/[email protected]/
>
> 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/[email protected]/
>
> 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/[email protected]/
> 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
>
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 <[email protected]>
>>
>> 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/[email protected]/
>>
>> 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/[email protected]/
>>
>> 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/[email protected]/
>> 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
>>