[PATCH] irqchip/riscv-aplic: adapt to syscore API passing context data

[Anup Patel]

On Wed, Dec 24, 2025 at 4:42 PM Sanjay Chitroda
<sanjayembeddedse at gmail.com> wrote:
>
> From: Sanjay Chitroda <sanjayembeddedse at gmail.com>
>
> linux-next commit a97fbc3ee3e2 ("syscore: Pass context data to callbacks")
> changed the syscore API to register per-instance context alongside the
> syscore operations and to pass that context into callbacks. As a result,
> drivers must no longer rely on global state or implicit data access in
> their syscore suspend/resume handlers.
>
> The RISC-V APLIC driver started preserving state across suspend/resume,
> but its syscore usage still assumed the old API. Building against
> linux-next after a97fbc3ee3e2 fails because the callbacks don’t receive
> the necessary driver context.
>
> Update irq-riscv-aplic to the new syscore API:
>   * register syscore with driver-private context,
>   * pass the context to save/restore helpers,
>   * stop using implicit globals in syscore paths.
>
> This fixes the compilation error and restores correct APLIC state
> handling across suspend/resume with the new syscore interface.
>
> Fixes: a97fbc3ee3e2 ("syscore: Pass context data to callbacks")
> Fixes: 1c546bb433618843 ("irqchip/riscv-aplic: Preserve APLIC states across suspend/resume")
> Signed-off-by: Sanjay Chitroda <sanjayembeddedse at gmail.com>
> ---
>  drivers/irqchip/irq-riscv-aplic-main.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/irqchip/irq-riscv-aplic-main.c b/drivers/irqchip/irq-riscv-aplic-main.c
> index b760942e57f9..1283d6e69f5b 100644
> --- a/drivers/irqchip/irq-riscv-aplic-main.c
> +++ b/drivers/irqchip/irq-riscv-aplic-main.c
> @@ -89,7 +89,7 @@ static void aplic_save_states(struct aplic_priv *priv)
>         }
>  }
>
> -static int aplic_syscore_suspend(void)
> +static int aplic_syscore_suspend(void *data)
>  {
>         struct aplic_priv *priv;
>
> @@ -99,7 +99,7 @@ static int aplic_syscore_suspend(void)
>         return 0;
>  }
>
> -static void aplic_syscore_resume(void)
> +static void aplic_syscore_resume(void *data)
>  {
>         struct aplic_priv *priv;
>
> @@ -107,11 +107,15 @@ static void aplic_syscore_resume(void)
>                 aplic_restore_states(priv);
>  }
>
> -static struct syscore_ops aplic_syscore_ops = {
> +static const struct syscore_ops aplic_syscore_ops = {
>         .suspend = aplic_syscore_suspend,
>         .resume = aplic_syscore_resume,
>  };
>
> +static struct syscore aplic_syscore = {
> +       .ops = &aplic_syscore_ops,
> +};
> +
>  static int aplic_pm_notifier(struct notifier_block *nb, unsigned long action, void *data)
>  {
>         struct aplic_priv *priv = container_of(nb, struct aplic_priv, genpd_nb);
> @@ -372,7 +376,7 @@ static int aplic_probe(struct platform_device *pdev)
>                 dev_err_probe(dev, rc, "failed to setup APLIC in %s mode\n",
>                               msi_mode ? "MSI" : "direct");
>         else
> -               register_syscore_ops(&aplic_syscore_ops);
> +               register_syscore(&aplic_syscore);
>
>  #ifdef CONFIG_ACPI
>         if (!acpi_disabled)
> --
> 2.34.1
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv

LGTM.

Reviewed-by: Anup Patel <anup at brainfault.org>

Regards,
Anup