Re: [PATCH 2/2] firmware: arm_scmi: Fix SCMI Power Control driver removal

From: Sudeep Holla

Date: Mon Nov 16 2026 - 13:14:56 EST


On Mon, Nov 16, 2026 at 08:42:11AM +0000, Cristian Marussi wrote:
> Once a reboot is initiated following a graceful shutdown request received
> from the SCMI platform server there are a couple of registered notifiers
> and possibly a scheduled delayed work.
>
> Take care to properly stop, unregister and cleanup all such resources
> when the driver is unbound.
>
> Fixes: 2c4b97fee94a ("firmware: arm_scmi: Add SCMI System Power Control driver")
> Reported-by: Sashiko <sashiko-bot@xxxxxxxxxx>
> Closes: https://sashiko.dev/#/bug/linux-dbe4eba7-1520-40a1-92e8-8892b6e47c4b
> Tested-by: Cristian Marussi <cristian.marussi@xxxxxxx>
> Signed-off-by: Cristian Marussi <cristian.marussi@xxxxxxx>
> ---
> .../firmware/arm_scmi/scmi_power_control.c | 76 +++++++++++++++++--
> 1 file changed, 70 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/firmware/arm_scmi/scmi_power_control.c b/drivers/firmware/arm_scmi/scmi_power_control.c
> index e0680e33180e..b0a10fd92fa6 100644
> --- a/drivers/firmware/arm_scmi/scmi_power_control.c
> +++ b/drivers/firmware/arm_scmi/scmi_power_control.c

[...]

> @@ -296,6 +310,10 @@ static int scmi_userspace_notifier(struct notifier_block *nb,
> struct scmi_system_power_state_notifier_report *er = data;
> struct scmi_syspower_conf *sc = userspace_nb_to_sconf(nb);
>
> + guard(srcu)(&sc->dead_srcu);
> + if (READ_ONCE(sc->dead))
> + return NOTIFY_DONE;
> +
> if (er->system_state >= SCMI_SYSTEM_MAX ||
> er->system_state == SCMI_SYSTEM_POWERUP) {
> dev_err(sc->dev, "Ignoring unsupported system_state: 0x%X\n",
> @@ -357,6 +375,10 @@ static int scmi_syspower_probe(struct scmi_device *sdev)
> if (!sc)
> return -ENOMEM;
>
> + ret = init_srcu_struct(&sc->dead_srcu);
> + if (ret)
> + return ret;
> +
> sc->state = SCMI_SYSPOWER_IDLE;
> mutex_init(&sc->state_mtx);
> sc->required_transition = SCMI_SYSTEM_MAX;
> @@ -364,12 +386,53 @@ static int scmi_syspower_probe(struct scmi_device *sdev)
> sc->dev = &sdev->dev;
> dev_set_drvdata(&sdev->dev, sc);
>
> + INIT_DELAYED_WORK(&sc->forceful_work, scmi_forceful_work_func);
> INIT_WORK(&sc->suspend_work, scmi_suspend_work_func);
>
> - return handle->notify_ops->devm_event_notifier_register(sdev,
> - SCMI_PROTOCOL_SYSTEM,
> - SCMI_EVENT_SYSTEM_POWER_STATE_NOTIFIER,
> - NULL, &sc->userspace_nb);
> + ret = handle->notify_ops->event_notifier_register(handle, SCMI_PROTOCOL_SYSTEM,
> + SCMI_EVENT_SYSTEM_POWER_STATE_NOTIFIER,
> + NULL, &sc->userspace_nb);
> + if (ret) {
> + cleanup_srcu_struct(&sc->dead_srcu);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static void scmi_syspower_remove(struct scmi_device *sdev)
> +{
> + struct scmi_handle *handle = sdev->handle;
> + struct scmi_syspower_conf *sc;
> + int ret;
> +
> + sc = dev_get_drvdata(&sdev->dev);
> + if (!sc)
> + return;
> +
> + /* Wait for any notifier to complete and inhibit further processing */
> + WRITE_ONCE(sc->dead, true);
> + synchronize_srcu(&sc->dead_srcu);
> +
> + /*
> + * Once here any possible in-flight userspace or reboot notifier
> + * will have completed and further notifiers will bailout immediately.
> + * Cancel any work which was possibly already scheduled.
> + */
> + cancel_delayed_work_sync(&sc->forceful_work);
> +

To keep it symmetric with probe, do we need cancelling of suspend_work as
well here ?

> +
> + /* Unregister reboot notifier...if any */
> + unregister_reboot_notifier(&sc->reboot_nb);
> +
> + /* Unregister userspace notifier */
> + ret = handle->notify_ops->event_notifier_unregister(handle,
> + SCMI_PROTOCOL_SYSTEM,
> + SCMI_EVENT_SYSTEM_POWER_STATE_NOTIFIER,
> + NULL, &sc->userspace_nb);

Just wondering if it is better to stop receiving notifications from firmware
first and then cancel any pending work ? Basically reverse order of probe
for remove.

--
Regards,
Sudeep