Skip to content

Commit 68cb013

Browse files
JackyBairafaeljw
authored andcommitted
cpuidle: Init cpuidle only for present CPUs
for_each_possible_cpu() is currently used to initialize cpuidle in below cpuidle drivers: drivers/cpuidle/cpuidle-arm.c drivers/cpuidle/cpuidle-big_little.c drivers/cpuidle/cpuidle-psci.c drivers/cpuidle/cpuidle-qcom-spm.c drivers/cpuidle/cpuidle-riscv-sbi.c However, in cpu_dev_register_generic(), for_each_present_cpu() is used to register CPU devices which means the CPU devices are only registered for present CPUs and not all possible CPUs. With nosmp or maxcpus=0, only the boot CPU is present, lead to the failure: | Failed to register cpuidle device for cpu1 Then rollback to cancel all CPUs' cpuidle registration. Change for_each_possible_cpu() to for_each_present_cpu() in the above cpuidle drivers to ensure it only registers cpuidle devices for CPUs that are actually present. Fixes: b0c69e1 ("drivers: base: Use present CPUs in GENERIC_CPU_DEVICES") Reviewed-by: Dhruva Gole <d-gole@ti.com> Reviewed-by: Sudeep Holla <sudeep.holla@arm.com> Tested-by: Yuanjie Yang <quic_yuanjiey@quicinc.com> Signed-off-by: Jacky Bai <ping.bai@nxp.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Link: https://patch.msgid.link/20250307145547.2784821-1-ping.bai@nxp.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 3332dd1 commit 68cb013

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

drivers/cpuidle/cpuidle-arm.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,17 +137,17 @@ static int __init arm_idle_init_cpu(int cpu)
137137
/*
138138
* arm_idle_init - Initializes arm cpuidle driver
139139
*
140-
* Initializes arm cpuidle driver for all CPUs, if any CPU fails
141-
* to register cpuidle driver then rollback to cancel all CPUs
142-
* registration.
140+
* Initializes arm cpuidle driver for all present CPUs, if any
141+
* CPU fails to register cpuidle driver then rollback to cancel
142+
* all CPUs registration.
143143
*/
144144
static int __init arm_idle_init(void)
145145
{
146146
int cpu, ret;
147147
struct cpuidle_driver *drv;
148148
struct cpuidle_device *dev;
149149

150-
for_each_possible_cpu(cpu) {
150+
for_each_present_cpu(cpu) {
151151
ret = arm_idle_init_cpu(cpu);
152152
if (ret)
153153
goto out_fail;

drivers/cpuidle/cpuidle-big_little.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static int __init bl_idle_driver_init(struct cpuidle_driver *drv, int part_id)
148148
if (!cpumask)
149149
return -ENOMEM;
150150

151-
for_each_possible_cpu(cpu)
151+
for_each_present_cpu(cpu)
152152
if (smp_cpuid_part(cpu) == part_id)
153153
cpumask_set_cpu(cpu, cpumask);
154154

drivers/cpuidle/cpuidle-psci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ static int psci_idle_init_cpu(struct device *dev, int cpu)
400400
/*
401401
* psci_idle_probe - Initializes PSCI cpuidle driver
402402
*
403-
* Initializes PSCI cpuidle driver for all CPUs, if any CPU fails
403+
* Initializes PSCI cpuidle driver for all present CPUs, if any CPU fails
404404
* to register cpuidle driver then rollback to cancel all CPUs
405405
* registration.
406406
*/
@@ -410,7 +410,7 @@ static int psci_cpuidle_probe(struct platform_device *pdev)
410410
struct cpuidle_driver *drv;
411411
struct cpuidle_device *dev;
412412

413-
for_each_possible_cpu(cpu) {
413+
for_each_present_cpu(cpu) {
414414
ret = psci_idle_init_cpu(&pdev->dev, cpu);
415415
if (ret)
416416
goto out_fail;

drivers/cpuidle/cpuidle-qcom-spm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static int spm_cpuidle_drv_probe(struct platform_device *pdev)
135135
if (ret)
136136
return dev_err_probe(&pdev->dev, ret, "set warm boot addr failed");
137137

138-
for_each_possible_cpu(cpu) {
138+
for_each_present_cpu(cpu) {
139139
ret = spm_cpuidle_register(&pdev->dev, cpu);
140140
if (ret && ret != -ENODEV) {
141141
dev_err(&pdev->dev,

drivers/cpuidle/cpuidle-riscv-sbi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,8 +529,8 @@ static int sbi_cpuidle_probe(struct platform_device *pdev)
529529
return ret;
530530
}
531531

532-
/* Initialize CPU idle driver for each CPU */
533-
for_each_possible_cpu(cpu) {
532+
/* Initialize CPU idle driver for each present CPU */
533+
for_each_present_cpu(cpu) {
534534
ret = sbi_cpuidle_init_cpu(&pdev->dev, cpu);
535535
if (ret) {
536536
pr_debug("HART%ld: idle driver init failed\n",

0 commit comments

Comments
 (0)