diff mbox series

[v2] remoteproc: k3-r5: Delay notification of wakeup event

Message ID 20240820105004.2788327-1-b-padhi@ti.com (mailing list archive)
State Queued
Headers show
Series [v2] remoteproc: k3-r5: Delay notification of wakeup event | expand

Commit Message

Beleswar Prasad Padhi Aug. 20, 2024, 10:50 a.m. UTC
From: Udit Kumar <u-kumar1@ti.com>

Few times, core1 was scheduled to boot first before core0, which leads
to error:

'k3_r5_rproc_start: can not start core 1 before core 0'.

This was happening due to some scheduling between prepare and start
callback. The probe function waits for event, which is getting
triggered by prepare callback. To avoid above condition move event
trigger to start instead of prepare callback.

Fixes: 61f6f68447ab ("remoteproc: k3-r5: Wait for core0 power-up before powering up core1")
Signed-off-by: Udit Kumar <u-kumar1@ti.com>
[ Applied wakeup event trigger only for Split-Mode booted rprocs ]
Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
---
v2: Changelog:
* Mathieu
1) Rebased changes on top of -next-20240820 tag.

Link to v1:
https://lore.kernel.org/all/20240809060132.308642-1-b-padhi@ti.com/

 drivers/remoteproc/ti_k3_r5_remoteproc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Beleswar Prasad Padhi Sept. 3, 2024, 10:15 a.m. UTC | #1
Hi Mathieu,

On 20-08-2024 16:20, Beleswar Padhi wrote:
> From: Udit Kumar <u-kumar1@ti.com>
>
> Few times, core1 was scheduled to boot first before core0, which leads
> to error:
>
> 'k3_r5_rproc_start: can not start core 1 before core 0'.
>
> This was happening due to some scheduling between prepare and start
> callback. The probe function waits for event, which is getting
> triggered by prepare callback. To avoid above condition move event
> trigger to start instead of prepare callback.
>
> Fixes: 61f6f68447ab ("remoteproc: k3-r5: Wait for core0 power-up before powering up core1")


Please put this patch on hold. I have some additional changelog that 
should go in v3.

Thanks,
Beleswar

> Signed-off-by: Udit Kumar <u-kumar1@ti.com>
> [ Applied wakeup event trigger only for Split-Mode booted rprocs ]
> Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
> ---
> v2: Changelog:
> * Mathieu
> 1) Rebased changes on top of -next-20240820 tag.
>
> Link to v1:
> https://lore.kernel.org/all/20240809060132.308642-1-b-padhi@ti.com/
>
>   drivers/remoteproc/ti_k3_r5_remoteproc.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
> index 8a63a9360c0f..e61e53381abc 100644
> --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
> @@ -469,8 +469,6 @@ static int k3_r5_rproc_prepare(struct rproc *rproc)
>   			ret);
>   		return ret;
>   	}
> -	core->released_from_reset = true;
> -	wake_up_interruptible(&cluster->core_transition);
>   
>   	/*
>   	 * Newer IP revisions like on J7200 SoCs support h/w auto-initialization
> @@ -587,6 +585,9 @@ static int k3_r5_rproc_start(struct rproc *rproc)
>   		ret = k3_r5_core_run(core);
>   		if (ret)
>   			return ret;
> +
> +		core->released_from_reset = true;
> +		wake_up_interruptible(&cluster->core_transition);
>   	}
>   
>   	return 0;
Mathieu Poirier Sept. 3, 2024, 2:32 p.m. UTC | #2
On Tue, 3 Sept 2024 at 04:15, Beleswar Prasad Padhi <b-padhi@ti.com> wrote:
>
> Hi Mathieu,
>
> On 20-08-2024 16:20, Beleswar Padhi wrote:
> > From: Udit Kumar <u-kumar1@ti.com>
> >
> > Few times, core1 was scheduled to boot first before core0, which leads
> > to error:
> >
> > 'k3_r5_rproc_start: can not start core 1 before core 0'.
> >
> > This was happening due to some scheduling between prepare and start
> > callback. The probe function waits for event, which is getting
> > triggered by prepare callback. To avoid above condition move event
> > trigger to start instead of prepare callback.
> >
> > Fixes: 61f6f68447ab ("remoteproc: k3-r5: Wait for core0 power-up before powering up core1")
>
>
> Please put this patch on hold. I have some additional changelog that
> should go in v3.
>

I applied this patch a couple of weeks ago - are those changes to the
code?  If so please send another patch on top of rproc-next.

> Thanks,
> Beleswar
>
> > Signed-off-by: Udit Kumar <u-kumar1@ti.com>
> > [ Applied wakeup event trigger only for Split-Mode booted rprocs ]
> > Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
> > ---
> > v2: Changelog:
> > * Mathieu
> > 1) Rebased changes on top of -next-20240820 tag.
> >
> > Link to v1:
> > https://lore.kernel.org/all/20240809060132.308642-1-b-padhi@ti.com/
> >
> >   drivers/remoteproc/ti_k3_r5_remoteproc.c | 5 +++--
> >   1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
> > index 8a63a9360c0f..e61e53381abc 100644
> > --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
> > +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
> > @@ -469,8 +469,6 @@ static int k3_r5_rproc_prepare(struct rproc *rproc)
> >                       ret);
> >               return ret;
> >       }
> > -     core->released_from_reset = true;
> > -     wake_up_interruptible(&cluster->core_transition);
> >
> >       /*
> >        * Newer IP revisions like on J7200 SoCs support h/w auto-initialization
> > @@ -587,6 +585,9 @@ static int k3_r5_rproc_start(struct rproc *rproc)
> >               ret = k3_r5_core_run(core);
> >               if (ret)
> >                       return ret;
> > +
> > +             core->released_from_reset = true;
> > +             wake_up_interruptible(&cluster->core_transition);
> >       }
> >
> >       return 0;
Beleswar Prasad Padhi Sept. 4, 2024, 11:20 a.m. UTC | #3
On 03-09-2024 20:02, Mathieu Poirier wrote:
> On Tue, 3 Sept 2024 at 04:15, Beleswar Prasad Padhi <b-padhi@ti.com> wrote:
>> Hi Mathieu,
>>
>> On 20-08-2024 16:20, Beleswar Padhi wrote:
>>> From: Udit Kumar <u-kumar1@ti.com>
>>>
>>> Few times, core1 was scheduled to boot first before core0, which leads
>>> to error:
>>>
>>> 'k3_r5_rproc_start: can not start core 1 before core 0'.
>>>
>>> This was happening due to some scheduling between prepare and start
>>> callback. The probe function waits for event, which is getting
>>> triggered by prepare callback. To avoid above condition move event
>>> trigger to start instead of prepare callback.
>>>
>>> Fixes: 61f6f68447ab ("remoteproc: k3-r5: Wait for core0 power-up before powering up core1")
>>
>> Please put this patch on hold. I have some additional changelog that
>> should go in v3.
>>
> I applied this patch a couple of weeks ago - are those changes to the
> code?  If so please send another patch on top of rproc-next.


Understood. Those are code changes, I will post another patch series for 
the same.

Thanks,
Beleswar

>
>> Thanks,
>> Beleswar
>>
>>> Signed-off-by: Udit Kumar <u-kumar1@ti.com>
>>> [ Applied wakeup event trigger only for Split-Mode booted rprocs ]
>>> Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
>>> ---
>>> v2: Changelog:
>>> * Mathieu
>>> 1) Rebased changes on top of -next-20240820 tag.
>>>
>>> Link to v1:
>>> https://lore.kernel.org/all/20240809060132.308642-1-b-padhi@ti.com/
>>>
>>>    drivers/remoteproc/ti_k3_r5_remoteproc.c | 5 +++--
>>>    1 file changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
>>> index 8a63a9360c0f..e61e53381abc 100644
>>> --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
>>> +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
>>> @@ -469,8 +469,6 @@ static int k3_r5_rproc_prepare(struct rproc *rproc)
>>>                        ret);
>>>                return ret;
>>>        }
>>> -     core->released_from_reset = true;
>>> -     wake_up_interruptible(&cluster->core_transition);
>>>
>>>        /*
>>>         * Newer IP revisions like on J7200 SoCs support h/w auto-initialization
>>> @@ -587,6 +585,9 @@ static int k3_r5_rproc_start(struct rproc *rproc)
>>>                ret = k3_r5_core_run(core);
>>>                if (ret)
>>>                        return ret;
>>> +
>>> +             core->released_from_reset = true;
>>> +             wake_up_interruptible(&cluster->core_transition);
>>>        }
>>>
>>>        return 0;
diff mbox series

Patch

diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
index 8a63a9360c0f..e61e53381abc 100644
--- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
@@ -469,8 +469,6 @@  static int k3_r5_rproc_prepare(struct rproc *rproc)
 			ret);
 		return ret;
 	}
-	core->released_from_reset = true;
-	wake_up_interruptible(&cluster->core_transition);
 
 	/*
 	 * Newer IP revisions like on J7200 SoCs support h/w auto-initialization
@@ -587,6 +585,9 @@  static int k3_r5_rproc_start(struct rproc *rproc)
 		ret = k3_r5_core_run(core);
 		if (ret)
 			return ret;
+
+		core->released_from_reset = true;
+		wake_up_interruptible(&cluster->core_transition);
 	}
 
 	return 0;