[PATCH] irqchip/riscv-aplic: Restrict genpd notifier to device tree only
From: liu.xuemei1
Date: Mon Mar 30 2026 - 21:31:54 EST
From: Jessica Liu <liu.xuemei1@xxxxxxxxxx>
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).
The 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:
[1.221416] riscv-aplic RSCV0002:00: failed to create APLIC context
[1.221973] riscv-aplic RSCV0002:00: error -ENODEV: failed to setup APLIC in MSI mode
Fix this by adding a check 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@xxxxxxxxxx>
---
drivers/irqchip/irq-riscv-aplic-main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/irq-riscv-aplic-main.c b/drivers/irqchip/irq-riscv-aplic-main.c":
index 9f53979b6962..d9afb6ae98cf 100644
--- a/drivers/irqchip/irq-riscv-aplic-main.c
+++ b/drivers/irqchip/irq-riscv-aplic-main.c
@@ -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)
--
2.27.0