From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753101AbbCSLIF (ORCPT ); Thu, 19 Mar 2015 07:08:05 -0400 Received: from foss.arm.com ([217.140.101.70]:36751 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751386AbbCSLID (ORCPT ); Thu, 19 Mar 2015 07:08:03 -0400 Date: Thu, 19 Mar 2015 11:08:06 +0000 From: Lorenzo Pieralisi To: Daniel Lezcano Cc: "rjw@rjwysocki.net" , "linux-pm@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Catalin Marinas , "robherring2@gmail.com" , "arnd@arndb.de" , "devicetree@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "lina.iyer@linaro.org" Subject: Re: [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device Message-ID: <20150319110806.GE24556@red-moon> References: <1426704372-20406-1-git-send-email-daniel.lezcano@linaro.org> <1426704372-20406-8-git-send-email-daniel.lezcano@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1426704372-20406-8-git-send-email-daniel.lezcano@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 18, 2015 at 06:46:11PM +0000, Daniel Lezcano wrote: > Some architectures have some cpus which does not support idle states. > > Let the underlying low level code to return -ENOSYS when it is not > possible to set an idle state. http://www.spinics.net/lists/linux-acpi/msg55550.html -ENXIO ? > > Signed-off-by: Daniel Lezcano > --- > drivers/cpuidle/cpuidle-arm.c | 45 +++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 43 insertions(+), 2 deletions(-) > > diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c > index 1c94b88..0682ed0 100644 > --- a/drivers/cpuidle/cpuidle-arm.c > +++ b/drivers/cpuidle/cpuidle-arm.c > @@ -17,11 +17,14 @@ > #include > #include > #include > +#include > > #include > > #include "dt_idle_states.h" > > +static DEFINE_PER_CPU(struct cpuidle_device, *cpuidle_arm_dev); > + > /* > * arm_enter_idle_state - Programs CPU to enter the specified state > * > @@ -94,6 +97,7 @@ static int __init arm_idle_init(void) > { > int cpu, ret; > struct cpuidle_driver *drv = &arm_idle_driver; > + struct cpuidle_device *dev; > > /* > * Initialize idle states data, starting at index 1. > @@ -105,18 +109,55 @@ static int __init arm_idle_init(void) > if (ret <= 0) > return ret ? : -ENODEV; > > + ret = cpuidle_register_driver(drv); > + if (ret) { > + pr_err("Failed to register cpuidle driver\n"); > + return ret; > + } > + > /* > * Call arch CPU operations in order to initialize > * idle states suspend back-end specific data > */ > for_each_possible_cpu(cpu) { > ret = arm_cpuidle_init(cpu); > + > + /* This cpu does not support any idle states */ > + if (ret == -ENOSYS) > + continue; > + > if (ret) { > pr_err("CPU %d failed to init idle CPU ops\n", cpu); > - return ret; > + goto out_fail; > + } > + > + dev = kzalloc(sizeof(*dev), GFP_KERNEL); > + if (!dev) { > + pr_err("Failed to allocate cpuidle device\n"); > + goto out_fail; > + } > + > + dev->cpu = cpu; > + per_cpu(cpuidle_arm_dev, cpu) = dev; > + > + ret = cpuidle_register_device(dev); > + if (ret) { > + pr_err("Failed to register cpuidle device for CPU %d\n", > + cpu); > + kfree(dev); > + goto out_fail; > } > } > +out: > + return ret; return 0; > > - return cpuidle_register(drv, NULL); > +out_fail: > + for (cpu--; cpu <= 0; cpu--) { This loop is wrong. > + dev = per_cpu(cpuidle_arm_dev, cpu); > + cpuidle_unregister_device(dev); > + kfree(dev); > + } > + cpuidle_unregister_driver(drv); > + goto out; You just: return ret; little point in jumping around to just return. Lorenzo From mboxrd@z Thu Jan 1 00:00:00 1970 From: lorenzo.pieralisi@arm.com (Lorenzo Pieralisi) Date: Thu, 19 Mar 2015 11:08:06 +0000 Subject: [PATCH V2 7/8] ARM: cpuidle: Register per cpuidle device In-Reply-To: <1426704372-20406-8-git-send-email-daniel.lezcano@linaro.org> References: <1426704372-20406-1-git-send-email-daniel.lezcano@linaro.org> <1426704372-20406-8-git-send-email-daniel.lezcano@linaro.org> Message-ID: <20150319110806.GE24556@red-moon> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Mar 18, 2015 at 06:46:11PM +0000, Daniel Lezcano wrote: > Some architectures have some cpus which does not support idle states. > > Let the underlying low level code to return -ENOSYS when it is not > possible to set an idle state. http://www.spinics.net/lists/linux-acpi/msg55550.html -ENXIO ? > > Signed-off-by: Daniel Lezcano > --- > drivers/cpuidle/cpuidle-arm.c | 45 +++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 43 insertions(+), 2 deletions(-) > > diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c > index 1c94b88..0682ed0 100644 > --- a/drivers/cpuidle/cpuidle-arm.c > +++ b/drivers/cpuidle/cpuidle-arm.c > @@ -17,11 +17,14 @@ > #include > #include > #include > +#include > > #include > > #include "dt_idle_states.h" > > +static DEFINE_PER_CPU(struct cpuidle_device, *cpuidle_arm_dev); > + > /* > * arm_enter_idle_state - Programs CPU to enter the specified state > * > @@ -94,6 +97,7 @@ static int __init arm_idle_init(void) > { > int cpu, ret; > struct cpuidle_driver *drv = &arm_idle_driver; > + struct cpuidle_device *dev; > > /* > * Initialize idle states data, starting at index 1. > @@ -105,18 +109,55 @@ static int __init arm_idle_init(void) > if (ret <= 0) > return ret ? : -ENODEV; > > + ret = cpuidle_register_driver(drv); > + if (ret) { > + pr_err("Failed to register cpuidle driver\n"); > + return ret; > + } > + > /* > * Call arch CPU operations in order to initialize > * idle states suspend back-end specific data > */ > for_each_possible_cpu(cpu) { > ret = arm_cpuidle_init(cpu); > + > + /* This cpu does not support any idle states */ > + if (ret == -ENOSYS) > + continue; > + > if (ret) { > pr_err("CPU %d failed to init idle CPU ops\n", cpu); > - return ret; > + goto out_fail; > + } > + > + dev = kzalloc(sizeof(*dev), GFP_KERNEL); > + if (!dev) { > + pr_err("Failed to allocate cpuidle device\n"); > + goto out_fail; > + } > + > + dev->cpu = cpu; > + per_cpu(cpuidle_arm_dev, cpu) = dev; > + > + ret = cpuidle_register_device(dev); > + if (ret) { > + pr_err("Failed to register cpuidle device for CPU %d\n", > + cpu); > + kfree(dev); > + goto out_fail; > } > } > +out: > + return ret; return 0; > > - return cpuidle_register(drv, NULL); > +out_fail: > + for (cpu--; cpu <= 0; cpu--) { This loop is wrong. > + dev = per_cpu(cpuidle_arm_dev, cpu); > + cpuidle_unregister_device(dev); > + kfree(dev); > + } > + cpuidle_unregister_driver(drv); > + goto out; You just: return ret; little point in jumping around to just return. Lorenzo