]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
irqchip/riscv-aplic: Restrict genpd notifier to device tree only
authorJessica Liu <liu.xuemei1@zte.com.cn>
Tue, 31 Mar 2026 01:30:29 +0000 (09:30 +0800)
committerThomas Gleixner <tglx@kernel.org>
Tue, 31 Mar 2026 08:11:29 +0000 (10:11 +0200)
On ACPI systems, the aplic's pm_domain is set to acpi_general_pm_domain,
which provides its own power management callbacks (e.g., runtime_suspend
via acpi_subsys_runtime_suspend).

aplic_pm_add() unconditionally calls dev_pm_genpd_add_notifier() when
dev->pm_domain is non‑NULL, leading to a comparison between runtime_suspend
and genpd_runtime_suspend. This results in the following errors when ACPI
is enabled:

  riscv-aplic RSCV0002:00: failed to create APLIC context
  riscv-aplic RSCV0002:00: error -ENODEV: failed to setup APLIC in MSI mode

Fix this by checking for dev->of_node before adding or removing the genpd
notifier, ensuring it is only used for device tree based systems.

Fixes: 95a8ddde3660 ("irqchip/riscv-aplic: Preserve APLIC states across suspend/resume")
Signed-off-by: Jessica Liu <liu.xuemei1@zte.com.cn>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260331093029749vRpdH-0qoEqjS0Wnn9M4x@zte.com.cn
drivers/irqchip/irq-riscv-aplic-main.c

index 9f53979b69625fba41fd34d3ecef81f9c854360f..d9afb6ae98cf56d6fd9f858c31a3d23546c3b450 100644 (file)
@@ -150,7 +150,7 @@ static void aplic_pm_remove(void *data)
        struct device *dev = priv->dev;
 
        list_del(&priv->head);
-       if (dev->pm_domain)
+       if (dev->pm_domain && dev->of_node)
                dev_pm_genpd_remove_notifier(dev);
 }
 
@@ -165,7 +165,7 @@ static int aplic_pm_add(struct device *dev, struct aplic_priv *priv)
 
        priv->saved_hw_regs.srcs = srcs;
        list_add(&priv->head, &aplics);
-       if (dev->pm_domain) {
+       if (dev->pm_domain && dev->of_node) {
                priv->genpd_nb.notifier_call = aplic_pm_notifier;
                ret = dev_pm_genpd_add_notifier(dev, &priv->genpd_nb);
                if (ret)