These couple of patches use the new cpuidle core api to refactor some part of the code. The first one removes the state count initialization as it is done from the cpuidle core and the second one use the new API and removes the ops.
The patchset is based on Lenb's tree on top of Robert Lee cpuidle consolidation work.
I don't have this board, I was not able to test these patches.
Daniel Lezcano (2): ARM: DAVINCI: cpuidle - remove useless state count initialization ARM: DAVINCI: cpuidle - remove ops
arch/arm/mach-davinci/cpuidle.c | 83 +++++++++++++-------------------------- 1 files changed, 27 insertions(+), 56 deletions(-)
The state count is initialized in the driver structure, the cpuidle core uses it to initialize the device state count.
Signed-off-by: Daniel Lezcano daniel.lezcano@linaro.org --- arch/arm/mach-davinci/cpuidle.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c index 9107691..f0f179c 100644 --- a/arch/arm/mach-davinci/cpuidle.c +++ b/arch/arm/mach-davinci/cpuidle.c @@ -128,8 +128,6 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev) davinci_states[1].flags |= DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN; cpuidle_set_statedata(&device->states_usage[1], &davinci_states[1]);
- device->state_count = DAVINCI_CPUIDLE_MAX_STATES; - ret = cpuidle_register_driver(&davinci_idle_driver); if (ret) { dev_err(&pdev->dev, "failed to register driver\n");
Hi Daniel,
On 5/10/2012 2:14 PM, Daniel Lezcano wrote:
The state count is initialized in the driver structure, the cpuidle core uses it to initialize the device state count.
Signed-off-by: Daniel Lezcano daniel.lezcano@linaro.org
Looks good to me. Will queue for v3.6
Nit: In future, please use davinci in small case in subject line to keep it consistent with other DaVinci patches.
Thanks, Sekhar
This patch removes the ops usage because we have the index passed as parameter to the idle function and we can determine if we do WFI or memory retention.
The benefit of this cleanup is the removal of: * the ops * the statedata usage because we want to get rid of it in all the drivers * extra structure definition * extra functions definition * pointless macro definition BIT(0)
It also benefits the readability.
Signed-off-by: Daniel Lezcano daniel.lezcano@linaro.org --- arch/arm/mach-davinci/cpuidle.c | 81 +++++++++++++-------------------------- 1 files changed, 27 insertions(+), 54 deletions(-)
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c index f0f179c..61f4e52 100644 --- a/arch/arm/mach-davinci/cpuidle.c +++ b/arch/arm/mach-davinci/cpuidle.c @@ -25,35 +25,46 @@
#define DAVINCI_CPUIDLE_MAX_STATES 2
-struct davinci_ops { - void (*enter) (u32 flags); - void (*exit) (u32 flags); - u32 flags; -}; +static bool ddr2_pwdn = false; + +static void __iomem *ddr2_reg_base; + +static void davinci_save_ddr_power(int enter, bool pdown) +{ + u32 val; + + val = __raw_readl(ddr2_reg_base + DDR2_SDRCR_OFFSET); + + if (enter) { + if (pdown) + val |= DDR2_SRPD_BIT; + else + val &= ~DDR2_SRPD_BIT; + val |= DDR2_LPMODEN_BIT; + } else { + val &= ~(DDR2_SRPD_BIT | DDR2_LPMODEN_BIT); + } + + __raw_writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET); +}
/* Actual code that puts the SoC in different idle states */ static int davinci_enter_idle(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - struct cpuidle_state_usage *state_usage = &dev->states_usage[index]; - struct davinci_ops *ops = cpuidle_get_statedata(state_usage); - - if (ops && ops->enter) - ops->enter(ops->flags); + if (index) + davinci_save_ddr_power(1, ddr2_pwdn);
index = cpuidle_wrap_enter(dev, drv, index, arm_cpuidle_simple_enter);
- if (ops && ops->exit) - ops->exit(ops->flags); + if (index) + davinci_save_ddr_power(0, ddr2_pwdn);
return index; }
-/* fields in davinci_ops.flags */ -#define DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN BIT(0) - static struct cpuidle_driver davinci_idle_driver = { .name = "cpuidle-davinci", .owner = THIS_MODULE, @@ -71,43 +82,6 @@ static struct cpuidle_driver davinci_idle_driver = { };
static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device); -static void __iomem *ddr2_reg_base; - -static void davinci_save_ddr_power(int enter, bool pdown) -{ - u32 val; - - val = __raw_readl(ddr2_reg_base + DDR2_SDRCR_OFFSET); - - if (enter) { - if (pdown) - val |= DDR2_SRPD_BIT; - else - val &= ~DDR2_SRPD_BIT; - val |= DDR2_LPMODEN_BIT; - } else { - val &= ~(DDR2_SRPD_BIT | DDR2_LPMODEN_BIT); - } - - __raw_writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET); -} - -static void davinci_c2state_enter(u32 flags) -{ - davinci_save_ddr_power(1, !!(flags & DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN)); -} - -static void davinci_c2state_exit(u32 flags) -{ - davinci_save_ddr_power(0, !!(flags & DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN)); -} - -static struct davinci_ops davinci_states[DAVINCI_CPUIDLE_MAX_STATES] = { - [1] = { - .enter = davinci_c2state_enter, - .exit = davinci_c2state_exit, - }, -};
static int __init davinci_cpuidle_probe(struct platform_device *pdev) { @@ -125,8 +99,7 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev) ddr2_reg_base = pdata->ddr2_ctlr_base;
if (pdata->ddr2_pdown) - davinci_states[1].flags |= DAVINCI_CPUIDLE_FLAGS_DDR2_PWDN; - cpuidle_set_statedata(&device->states_usage[1], &davinci_states[1]); + ddr2_pwdn = true;
ret = cpuidle_register_driver(&davinci_idle_driver); if (ret) {
Hi Daniel,
On 5/10/2012 2:14 PM, Daniel Lezcano wrote:
This patch removes the ops usage because we have the index passed as parameter to the idle function and we can determine if we do WFI or memory retention.
The benefit of this cleanup is the removal of:
- the ops
- the statedata usage because we want to get rid of it in all the drivers
- extra structure definition
- extra functions definition
- pointless macro definition BIT(0)
This macro was not pointless in the original code. This comment seems to suggest so.
It also benefits the readability.
Signed-off-by: Daniel Lezcano daniel.lezcano@linaro.org
arch/arm/mach-davinci/cpuidle.c | 81 +++++++++++++-------------------------- 1 files changed, 27 insertions(+), 54 deletions(-)
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c index f0f179c..61f4e52 100644 --- a/arch/arm/mach-davinci/cpuidle.c +++ b/arch/arm/mach-davinci/cpuidle.c @@ -25,35 +25,46 @@ #define DAVINCI_CPUIDLE_MAX_STATES 2 -struct davinci_ops {
- void (*enter) (u32 flags);
- void (*exit) (u32 flags);
- u32 flags;
-}; +static bool ddr2_pwdn = false;
This zero initialization is not required. In fact this throws a checkpatch error.
+static void __iomem *ddr2_reg_base;
+static void davinci_save_ddr_power(int enter, bool pdown) +{
- u32 val;
- val = __raw_readl(ddr2_reg_base + DDR2_SDRCR_OFFSET);
- if (enter) {
if (pdown)val |= DDR2_SRPD_BIT;elseval &= ~DDR2_SRPD_BIT;val |= DDR2_LPMODEN_BIT;- } else {
val &= ~(DDR2_SRPD_BIT | DDR2_LPMODEN_BIT);- }
- __raw_writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET);
Can you please use readl/writel instead of the __raw variants. I know this is carried from original code, but we need to git rid of it with cleanups like this.
Thanks, Sekhar
On 05/20/2012 12:19 PM, Sekhar Nori wrote:
Hi Daniel,
On 5/10/2012 2:14 PM, Daniel Lezcano wrote:
This patch removes the ops usage because we have the index passed as parameter to the idle function and we can determine if we do WFI or memory retention.
The benefit of this cleanup is the removal of:
- the ops
- the statedata usage because we want to get rid of it in all the drivers
- extra structure definition
- extra functions definition
- pointless macro definition BIT(0)
This macro was not pointless in the original code. This comment seems to suggest so.
It also benefits the readability.
Signed-off-by: Daniel Lezcanodaniel.lezcano@linaro.org
arch/arm/mach-davinci/cpuidle.c | 81 +++++++++++++-------------------------- 1 files changed, 27 insertions(+), 54 deletions(-)
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c index f0f179c..61f4e52 100644 --- a/arch/arm/mach-davinci/cpuidle.c +++ b/arch/arm/mach-davinci/cpuidle.c @@ -25,35 +25,46 @@
#define DAVINCI_CPUIDLE_MAX_STATES 2
-struct davinci_ops {
- void (*enter) (u32 flags);
- void (*exit) (u32 flags);
- u32 flags;
-}; +static bool ddr2_pwdn = false;
This zero initialization is not required. In fact this throws a checkpatch error.
+static void __iomem *ddr2_reg_base;
+static void davinci_save_ddr_power(int enter, bool pdown) +{
- u32 val;
- val = __raw_readl(ddr2_reg_base + DDR2_SDRCR_OFFSET);
- if (enter) {
if (pdown)val |= DDR2_SRPD_BIT;elseval&= ~DDR2_SRPD_BIT;val |= DDR2_LPMODEN_BIT;- } else {
val&= ~(DDR2_SRPD_BIT | DDR2_LPMODEN_BIT);- }
- __raw_writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET);
Can you please use readl/writel instead of the __raw variants. I know this is carried from original code, but we need to git rid of it with cleanups like this.
Sure, I will resend a version without the initialization and the _raw_write variant.
Thanks -- Daniel
On 05/10/2012 10:44 AM, Daniel Lezcano wrote:
These couple of patches use the new cpuidle core api to refactor some part of the code. The first one removes the state count initialization as it is done from the cpuidle core and the second one use the new API and removes the ops.
The patchset is based on Lenb's tree on top of Robert Lee cpuidle consolidation work.
I don't have this board, I was not able to test these patches.
Daniel Lezcano (2): ARM: DAVINCI: cpuidle - remove useless state count initialization ARM: DAVINCI: cpuidle - remove ops
arch/arm/mach-davinci/cpuidle.c | 83 +++++++++++++-------------------------- 1 files changed, 27 insertions(+), 56 deletions(-)
Hi,
maybe these patches did not raise attention. Do you think they sound good ?
Thanks -- Daniel
-
Daniel Lezcano -
Sekhar Nori