From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Lezcano Subject: Re: [PATCH v3 12/14] cpuidle: mvebu: Add initial CPU idle support for Armada 370/XP SoC Date: Thu, 17 Oct 2013 12:15:49 +0200 Message-ID: <525FB8D5.1050106@linaro.org> References: <1381759106-15004-1-git-send-email-gregory.clement@free-electrons.com> <1381759106-15004-13-git-send-email-gregory.clement@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-wg0-f52.google.com ([74.125.82.52]:64452 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754155Ab3JQKPy (ORCPT ); Thu, 17 Oct 2013 06:15:54 -0400 Received: by mail-wg0-f52.google.com with SMTP id f12so2020533wgh.31 for ; Thu, 17 Oct 2013 03:15:53 -0700 (PDT) In-Reply-To: <1381759106-15004-13-git-send-email-gregory.clement@free-electrons.com> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: Gregory CLEMENT , "Rafael J. Wysocki" , linux-pm@vger.kernel.org, lorenzo.pieralisi@arm.com, Jason Cooper , Andrew Lunn Cc: Thomas Petazzoni , Ezequiel Garcia , Sebastian Hesselbarth , linux-arm-kernel@lists.infradead.org, Nicolas Pitre , Lior Amsalem , Maen Suleiman , Tawfik Bayouk , Shadi Ammouri , Eran Ben-Avi , Yehuda Yitschak , Nadav Haklai , Ike Pan , Dan Frazier , Leif Lindholm , Jon Masters , David Marlin On 10/14/2013 03:58 PM, Gregory CLEMENT wrote: > Add the wfi, cpu idle and cpu deep idle power states support for the > Armada XP SoCs. > > All the latencies and the power consumption values used at the > "armada_370_xp_idle_driver" structure are preliminary and will be > modified in the future after running some measurements and analysis. > > Based on the work of Nadav Haklai. > > Signed-off-by: Nadav Haklai > Signed-off-by: Gregory CLEMENT > --- > drivers/cpuidle/Kconfig.arm | 5 ++ > drivers/cpuidle/Makefile | 1 + > drivers/cpuidle/cpuidle-armada-370-xp.c | 117 +++++++++++++++++++++= +++++++++++ > 3 files changed, 123 insertions(+) > create mode 100644 drivers/cpuidle/cpuidle-armada-370-xp.c > > diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.ar= m > index 8e36603..071d960 100644 > --- a/drivers/cpuidle/Kconfig.arm > +++ b/drivers/cpuidle/Kconfig.arm > @@ -1,6 +1,11 @@ > # > # ARM CPU Idle drivers > # > +config ARM_ARMADA_370_XP_CPUIDLE > + bool "CPU Idle Driver for Armada 370/XP family processors" > + depends on ARCH_MVEBU > + help > + Select this to enable cpuidle on Armada 370/XP processors. > > config ARM_HIGHBANK_CPUIDLE > bool "CPU Idle Driver for Calxeda processors" > diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile > index cea5ef5..395dab6 100644 > --- a/drivers/cpuidle/Makefile > +++ b/drivers/cpuidle/Makefile > @@ -7,6 +7,7 @@ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) +=3D couple= d.o > > ###################################################################= ############### > # ARM SoC drivers > +obj-$(CONFIG_ARM_ARMADA_370_XP_CPUIDLE) +=3D cpuidle-armada-370-xp.o > obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE) +=3D cpuidle-calxeda.o > obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE) +=3D cpuidle-kirkwood.o > obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) +=3D cpuidle-zynq.o > diff --git a/drivers/cpuidle/cpuidle-armada-370-xp.c b/drivers/cpuidl= e/cpuidle-armada-370-xp.c > new file mode 100644 > index 0000000..3fa005e > --- /dev/null > +++ b/drivers/cpuidle/cpuidle-armada-370-xp.c > @@ -0,0 +1,117 @@ > +/* > + * Marvell Armada 370 and Armada XP SoC cpuidle driver > + * > + * Copyright (C) 2013 Marvell > + * > + * Nadav Haklai > + * Gregory CLEMENT > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any > + * warranty of any kind, whether express or implied. > + * > + * Maintainer: Gregory CLEMENT > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define ARMADA_370_XP_MAX_STATES 3 > +#define ARMADA_370_XP_FLAG_DEEP_IDLE 0x10000 > + > +extern void v7_flush_dcache_all(void); > + > +/* Functions defined in suspend-armada-370-xp.S */ > +int armada_370_xp_cpu_resume(unsigned long); > +int armada_370_xp_cpu_suspend(unsigned long); > + > +static int armada_370_xp_enter_idle(struct cpuidle_device *dev, > + struct cpuidle_driver *drv, > + int index) > +{ > + bool deepidle =3D false; > + unsigned int hw_cpu =3D cpu_logical_map(smp_processor_id()); > > + armada_370_xp_pmsu_set_start_addr(armada_370_xp_cpu_resume, hw_cpu)= ; What about using cpu_pm_enter() here and move the function above to a=20 notifier callback for CPU_PM_ENTER inside the marvell pm code ? The cod= e=20 will be more encapsulated, no ? > + > + if (drv->states[index].flags & ARMADA_370_XP_FLAG_DEEP_IDLE) > + deepidle =3D true; > + > + cpu_suspend(deepidle, armada_370_xp_cpu_suspend); > + > + armada_370_xp_pmsu_idle_restore(); Same comment by using cpu_pm_exit. > + > + return index; > +} > + > +static struct cpuidle_driver armada_370_xp_idle_driver =3D { > + .name =3D "armada_370_xp_idle", > + .states[0] =3D ARM_CPUIDLE_WFI_STATE, > + .states[1] =3D { > + .enter =3D armada_370_xp_enter_idle, > + .exit_latency =3D 10, > + .power_usage =3D 50, > + .target_residency =3D 100, > + .flags =3D CPUIDLE_FLAG_TIME_VALID, > + .name =3D "MV CPU IDLE", > + .desc =3D "CPU power down", > + }, > + .states[2] =3D { > + .enter =3D armada_370_xp_enter_idle, > + .exit_latency =3D 100, > + .power_usage =3D 5, > + .target_residency =3D 1000, > + .flags =3D CPUIDLE_FLAG_TIME_VALID | > + ARMADA_370_XP_FLAG_DEEP_IDLE, > + .name =3D "MV CPU DEEP IDLE", > + .desc =3D "CPU and L2 Fabric power down", > + }, > + .state_count =3D ARMADA_370_XP_MAX_STATES, > +}; > + > +static int armada_370_xp_cpuidle_probe(struct platform_device *pdev) > +{ > + if (!of_find_compatible_node(NULL, NULL, "marvell,armada-370-xp-pms= u")) > + return -ENODEV; > + > + if (!of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric"= )) > + return -ENODEV; > + > + pr_info("Initializing Armada-XP CPU power management "); > + > + armada_370_xp_pmsu_enable_l2_powerdown_onidle(); Isn't possible to move this function inside pmsu.c ? as well as the=20 of_find_compatible functions ? > + > + return cpuidle_register(&armada_370_xp_idle_driver, NULL); > +} > + > +static int armada_370_xp_cpuidle_remove(struct platform_device *pdev= ) > +{ > + cpuidle_unregister(&armada_370_xp_idle_driver); > + return 0; > +} > + > + > +static struct platform_driver armada_370_xp_cpuidle_plat_driver =3D = { > + .driver =3D { > + .name =3D "cpuidle-armada-370-xp", > + .owner =3D THIS_MODULE, > + }, > + .probe =3D armada_370_xp_cpuidle_probe, > + .remove =3D armada_370_xp_cpuidle_remove, > +}; > + > + > +module_platform_driver(armada_370_xp_cpuidle_plat_driver); > + > +MODULE_AUTHOR("Gregory CLEMENT "= ); > +MODULE_DESCRIPTION("Armada 370/XP cpu idle driver"); > +MODULE_LICENSE("GPL"); The driver is statically compiled in the kernel, removal of the driver=20 is pointless. Thanks -- Daniel --=20 Linaro.org =E2=94=82 Open source software fo= r ARM SoCs =46ollow Linaro: Facebook | Twitter | Blog