| Message ID | 20240814054434.3563453-3-nick.hu@sifive.com |
|---|---|
| State | Accepted |
| Commit | 27b4d6aa29abe6c4f0b7695bc831fcc8d32267d9 |
| Headers | show |
| Series | cpuidle: riscv-sbi: Allow cpuidle pd used by other devices | expand |
On Wed, Aug 14, 2024 at 11:14 AM Nick Hu <nick.hu@sifive.com> wrote: > > The consumer devices that inside the cpu/cluster power domain may register > the genpd notifier where their power domains point to the pd nodes under > '/cpus/power-domains'. If the cpuidle.off==1, the genpd notifier will fail > due to sbi_cpuidle_pd_allow_domain_state is not set. We also need the > sbi_cpuidle_cpuhp_up/down to invoke the callbacks. Therefore adding a > cpuidle_disabled() check before cpuidle_register() to address the issue. > > Signed-off-by: Nick Hu <nick.hu@sifive.com> LGTM. Reviewed-by: Anup Patel <anup@brainfault.org> Regards, Anup > --- > drivers/cpuidle/cpuidle-riscv-sbi.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c > index 98e7751dbfe8..3c8a509288f3 100644 > --- a/drivers/cpuidle/cpuidle-riscv-sbi.c > +++ b/drivers/cpuidle/cpuidle-riscv-sbi.c > @@ -25,6 +25,7 @@ > #include <asm/smp.h> > #include <asm/suspend.h> > > +#include "cpuidle.h" > #include "dt_idle_states.h" > #include "dt_idle_genpd.h" > > @@ -336,6 +337,9 @@ static int sbi_cpuidle_init_cpu(struct device *dev, int cpu) > return ret; > } > > + if (cpuidle_disabled()) > + return 0; > + > ret = cpuidle_register(drv, NULL); > if (ret) > goto deinit; > @@ -548,7 +552,10 @@ static int sbi_cpuidle_probe(struct platform_device *pdev) > /* Setup CPU hotplut notifiers */ > sbi_idle_init_cpuhp(); > > - pr_info("idle driver registered for all CPUs\n"); > + if (cpuidle_disabled()) > + pr_info("cpuidle is disabled\n"); > + else > + pr_info("idle driver registered for all CPUs\n"); > > return 0; > > -- > 2.34.1 >
diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c index 98e7751dbfe8..3c8a509288f3 100644 --- a/drivers/cpuidle/cpuidle-riscv-sbi.c +++ b/drivers/cpuidle/cpuidle-riscv-sbi.c @@ -25,6 +25,7 @@ #include <asm/smp.h> #include <asm/suspend.h> +#include "cpuidle.h" #include "dt_idle_states.h" #include "dt_idle_genpd.h" @@ -336,6 +337,9 @@ static int sbi_cpuidle_init_cpu(struct device *dev, int cpu) return ret; } + if (cpuidle_disabled()) + return 0; + ret = cpuidle_register(drv, NULL); if (ret) goto deinit; @@ -548,7 +552,10 @@ static int sbi_cpuidle_probe(struct platform_device *pdev) /* Setup CPU hotplut notifiers */ sbi_idle_init_cpuhp(); - pr_info("idle driver registered for all CPUs\n"); + if (cpuidle_disabled()) + pr_info("cpuidle is disabled\n"); + else + pr_info("idle driver registered for all CPUs\n"); return 0;
The consumer devices that inside the cpu/cluster power domain may register the genpd notifier where their power domains point to the pd nodes under '/cpus/power-domains'. If the cpuidle.off==1, the genpd notifier will fail due to sbi_cpuidle_pd_allow_domain_state is not set. We also need the sbi_cpuidle_cpuhp_up/down to invoke the callbacks. Therefore adding a cpuidle_disabled() check before cpuidle_register() to address the issue. Signed-off-by: Nick Hu <nick.hu@sifive.com> --- drivers/cpuidle/cpuidle-riscv-sbi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)