To unregister private events in device freeze, it should call
cpuhp_remove_state with sdei_hp_state not sdei_entry_point.
otherwise, it seems to fail on cpuhp_cb_check.
Signed-off-by: Levi Yun <[email protected]>
---
drivers/firmware/arm_sdei.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index 285fe7ad490d..3e8051fe8296 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -763,7 +763,7 @@ static int sdei_device_freeze(struct device *dev)
int err;
/* unregister private events */
- cpuhp_remove_state(sdei_entry_point);
+ cpuhp_remove_state(sdei_hp_state);
err = sdei_unregister_shared();
if (err)
--
2.41.0
Hello Levi,
On 1/10/24 10:01, Levi Yun wrote:
> To unregister private events in device freeze, it should call
> cpuhp_remove_state with sdei_hp_state not sdei_entry_point.
> otherwise, it seems to fail on cpuhp_cb_check.
>
I think you can also add:
Fixes: d2c48b2387eb ("firmware: arm_sdei: Fix sleep from invalid context BUG")
> Signed-off-by: Levi Yun <[email protected]>
> ---
> drivers/firmware/arm_sdei.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
> index 285fe7ad490d..3e8051fe8296 100644
> --- a/drivers/firmware/arm_sdei.c
> +++ b/drivers/firmware/arm_sdei.c
> @@ -763,7 +763,7 @@ static int sdei_device_freeze(struct device *dev)
> int err;
>
> /* unregister private events */
> - cpuhp_remove_state(sdei_entry_point);
> + cpuhp_remove_state(sdei_hp_state);
Maybe it would also be worth resetting 'sdei_hp_state':
sdei_hp_state = 0;
>
> err = sdei_unregister_shared();
> if (err)
Regards,
Pierre
Hi Levi, Pierre,
On 15/01/2024 13:01, Pierre Gondois wrote:
> On 1/10/24 10:01, Levi Yun wrote:
>> To unregister private events in device freeze, it should call
>> cpuhp_remove_state with sdei_hp_state not sdei_entry_point.
>> otherwise, it seems to fail on cpuhp_cb_check.
Oops. Well caught!
> I think you can also add:
> Fixes: d2c48b2387eb ("firmware: arm_sdei: Fix sleep from invalid context BUG")
>> diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
>> index 285fe7ad490d..3e8051fe8296 100644
>> --- a/drivers/firmware/arm_sdei.c
>> +++ b/drivers/firmware/arm_sdei.c
>> @@ -763,7 +763,7 @@ static int sdei_device_freeze(struct device *dev)
>> int err;
>> /* unregister private events */
>> - cpuhp_remove_state(sdei_entry_point);
>> + cpuhp_remove_state(sdei_hp_state);
>
> Maybe it would also be worth resetting 'sdei_hp_state':
> sdei_hp_state = 0;
The next call should always be 'thaw', which doesn't check this, but it's good to cleanup
stale values.
Regardless:
Reviewed-by: James Morse <[email protected]>
Thanks,
James
Hi James, Pierre.
> > I think you can also add:
> > Fixes: d2c48b2387eb ("firmware: arm_sdei: Fix sleep from invalid context BUG")
Thanks, I'll add this fix tag.
> >> diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
> >> index 285fe7ad490d..3e8051fe8296 100644
> >> --- a/drivers/firmware/arm_sdei.c
> >> +++ b/drivers/firmware/arm_sdei.c
> >> @@ -763,7 +763,7 @@ static int sdei_device_freeze(struct device *dev)
> >> int err;
> >> /* unregister private events */
> >> - cpuhp_remove_state(sdei_entry_point);
> >> + cpuhp_remove_state(sdei_hp_state);
> >
> > Maybe it would also be worth resetting 'sdei_hp_state':
> > sdei_hp_state = 0;
>
> The next call should always be 'thaw', which doesn't check this, but it's good to cleanup
> stale values.
>
But, I think it should be checked on sdei_reboot_notifier.
otherwise, In the situation sdei device was freezed, when
sdei_reboot_notifier is called,
It would fail on cpuhp_cb_check too.
Should I add a sanity check on sdei_reboot_notifier in the next patch?
Many thanks!
> But, I think it should be checked on sdei_reboot_notifier.
> otherwise, In the situation sdei device was freezed, when
> sdei_reboot_notifier is called,
> It would fail on cpuhp_cb_check too.
>
> Should I add a sanity check on sdei_reboot_notifier in the next patch?
>
Sorry to make a noise. Maybe there's no case for this.
To unregister private events in device freeze, it should call
cpuhp_remove_state with sdei_hp_state not sdei_entry_point.
otherwise, it seems to fail on cpuhp_cb_check.
Fixes: d2c48b2387eb ("firmware: arm_sdei: Fix sleep from invalid context BUG")
Signed-off-by: Levi Yun <[email protected]>
Reviewed-by: James Morse <[email protected]>
---
Changes:
v1->v2: add fixes tag and resetting sdei_hp_state
drivers/firmware/arm_sdei.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index 285fe7ad490d..3e8051fe8296 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -763,7 +763,7 @@ static int sdei_device_freeze(struct device *dev)
int err;
/* unregister private events */
- cpuhp_remove_state(sdei_entry_point);
+ cpuhp_remove_state(sdei_hp_state);
err = sdei_unregister_shared();
if (err)
--
2.41.0