[PATCH RFC idle 2/3] arm: Avoid invoking RCU when CPU is idle
Paul E. McKenney
paulmck at linux.vnet.ibm.com
Wed Feb 1 23:40:20 EST 2012
On Wed, Feb 01, 2012 at 08:48:00PM -0600, Rob Herring wrote:
> Paul,
>
> On 02/01/2012 06:43 PM, Paul E. McKenney wrote:
> > From: "Paul E. McKenney" <paul.mckenney at linaro.org>
> >
> > The idle loop is a quiscent state for RCU, which means that RCU ignores
> > CPUs that have told RCU that they are idle via rcu_idle_enter().
> > There are nevertheless quite a few places where idle CPUs use RCU, most
> > commonly indirectly via tracing. This patch fixes these problems for ARM.
>
> Do you have some specific examples of actual problems? It's not possible
> to restrict tracing at this low level?
>
> This really seems like the wrong direction as we are trying to pull
> common pieces up out of platform specific code.
If you yank the tracing, that works for me! But it is your platform,
so I cannot decide that for you.
Thanx, Paul
> > Many of these bugs have been in the kernel for quite some time, but
> > Frederic's recent change now gives warnings.
> >
> > This patch takes the straightforward approach of pushing the
> > rcu_idle_enter()/rcu_idle_exit() pair further down into the core of the
> > idle loop.
> >
> > Signed-off-by: Paul E. McKenney <paul.mckenney at linaro.org>
> > Signed-off-by: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
> > Cc: Russell King <linux at arm.linux.org.uk>
> > Cc: Andrew Victor <linux at maxim.org.za>
> > Cc: Nicolas Ferre <nicolas.ferre at atmel.com>
> > Cc: Jean-Christophe Plagniol-Villard <plagnioj at jcrosoft.com>
> > Cc: Sekhar Nori <nsekhar at ti.com>
> > Cc: Kevin Hilman <khilman at ti.com>
> > Cc: Kukjin Kim <kgene.kim at samsung.com>
> > Cc: Rob Herring <rob.herring at calxeda.com>
> > Cc: Sascha Hauer <kernel at pengutronix.de>
> > Cc: Shawn Guo <shawn.guo at linaro.org>
> > Cc: Lennert Buytenhek <kernel at wantstofly.org>
> > Cc: Nicolas Pitre <nico at fluxnic.net>
> > Cc: Amit Kucheria <amit.kucheria at canonical.com>
> > Cc: Tony Lindgren <tony at atomide.com>
> > Cc: Barry Song <baohua.song at csr.com>
> > Cc: Paul Mundt <lethal at linux-sh.org>
> > Cc: Magnus Damm <magnus.damm at gmail.com>
> > Cc: Will Deacon <will.deacon at arm.com>
> > Cc: H Hartley Sweeten <hsweeten at visionengravers.com>
> > Cc: Trinabh Gupta <g.trinabh at gmail.com>
> > Cc: Deepthi Dharwar <deepthi at linux.vnet.ibm.com>
> > Cc: Len Brown <len.brown at intel.com>
> > Cc: linux-arm-kernel at lists.infradead.org
> > Cc: linux-samsung-soc at vger.kernel.org
> > Cc: linux-omap at vger.kernel.org
> > ---
> > arch/arm/kernel/process.c | 2 --
> > arch/arm/mach-at91/cpuidle.c | 3 +++
> > arch/arm/mach-davinci/cpuidle.c | 3 +++
> > arch/arm/mach-exynos/common.c | 2 ++
> > arch/arm/mach-highbank/pm.c | 12 ++++++++++++
> > arch/arm/mach-imx/mm-imx3.c | 3 +++
> > arch/arm/mach-imx/pm-imx27.c | 4 ++++
> > arch/arm/mach-imx/pm-imx6q.c | 4 ++++
> > arch/arm/mach-kirkwood/cpuidle.c | 3 +++
> > arch/arm/mach-mx5/mm.c | 3 +++
> > arch/arm/mach-mx5/pm-imx5.c | 3 +++
> > arch/arm/mach-mxs/pm.c | 4 ++++
> > arch/arm/mach-omap1/pm.c | 4 ++++
> > arch/arm/mach-omap2/pm24xx.c | 2 ++
> > arch/arm/mach-omap2/pm34xx.c | 2 ++
> > arch/arm/mach-omap2/pm44xx.c | 3 +++
> > arch/arm/mach-pnx4008/pm.c | 2 ++
> > arch/arm/mach-prima2/pm.c | 4 ++++
> > arch/arm/mach-s5p64x0/common.c | 2 ++
> > arch/arm/mach-s5pc100/common.c | 2 ++
> > arch/arm/mach-s5pv210/common.c | 2 ++
> > arch/arm/mach-shmobile/cpuidle.c | 3 +++
> > arch/arm/mach-shmobile/pm-sh7372.c | 8 ++++++++
> > 23 files changed, 78 insertions(+), 2 deletions(-)
> >
>
> This is clearly not all platforms and you're missing some cpuidle
> drivers like omap. Some platform's idle code don't need this?
>
> I'd guess this conflicts with Nico's idle clean-up which is in Russell's
> for-next branch now.
>
> > diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
> > index 971d65c..8241df7 100644
> > --- a/arch/arm/kernel/process.c
> > +++ b/arch/arm/kernel/process.c
> > @@ -207,7 +207,6 @@ void cpu_idle(void)
> > /* endless idle loop with no priority at all */
> > while (1) {
> > tick_nohz_idle_enter();
> > - rcu_idle_enter();
>
> In some cases with the clean-up, there is no platform specific idle
> code, so rcu_idle_enter would never be called.
>
> Rob
>
> > leds_event(led_idle_start);
> > while (!need_resched()) {
> > #ifdef CONFIG_HOTPLUG_CPU
> > @@ -237,7 +236,6 @@ void cpu_idle(void)
> > }
> > }
> > leds_event(led_idle_end);
> > - rcu_idle_exit();
> > tick_nohz_idle_exit();
> > preempt_enable_no_resched();
> > schedule();
> > diff --git a/arch/arm/mach-at91/cpuidle.c b/arch/arm/mach-at91/cpuidle.c
> > index a851e6c..8feff6b 100644
> > --- a/arch/arm/mach-at91/cpuidle.c
> > +++ b/arch/arm/mach-at91/cpuidle.c
> > @@ -20,6 +20,7 @@
> > #include <asm/proc-fns.h>
> > #include <linux/io.h>
> > #include <linux/export.h>
> > +#include <linux/rcupdate.h>
> >
> > #include "pm.h"
> >
> > @@ -43,6 +44,7 @@ static int at91_enter_idle(struct cpuidle_device *dev,
> >
> > local_irq_disable();
> > do_gettimeofday(&before);
> > + rcu_idle_enter();
> > if (index == 0)
> > /* Wait for interrupt state */
> > cpu_do_idle();
> > @@ -53,6 +55,7 @@ static int at91_enter_idle(struct cpuidle_device *dev,
> > cpu_do_idle();
> > sdram_selfrefresh_disable(saved_lpr);
> > }
> > + rcu_idle_exit();
> > do_gettimeofday(&after);
> > local_irq_enable();
> > idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC +
> > diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c
> > index a30c7c5..6594b7e 100644
> > --- a/arch/arm/mach-davinci/cpuidle.c
> > +++ b/arch/arm/mach-davinci/cpuidle.c
> > @@ -17,6 +17,7 @@
> > #include <linux/cpuidle.h>
> > #include <linux/io.h>
> > #include <linux/export.h>
> > +#include <linux/rcupdate.h>
> > #include <asm/proc-fns.h>
> >
> > #include <mach/cpuidle.h>
> > @@ -90,12 +91,14 @@ static int davinci_enter_idle(struct cpuidle_device *dev,
> > local_irq_disable();
> > do_gettimeofday(&before);
> >
> > + rcu_idle_enter();
> > if (ops && ops->enter)
> > ops->enter(ops->flags);
> > /* Wait for interrupt state */
> > cpu_do_idle();
> > if (ops && ops->exit)
> > ops->exit(ops->flags);
> > + rcu_idle_exit();
> >
> > do_gettimeofday(&after);
> > local_irq_enable();
> > diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
> > index c59e188..1e5844a 100644
> > --- a/arch/arm/mach-exynos/common.c
> > +++ b/arch/arm/mach-exynos/common.c
> > @@ -203,8 +203,10 @@ static struct map_desc exynos4_iodesc1[] __initdata = {
> >
> > static void exynos_idle(void)
> > {
> > + rcu_idle_enter();
> > if (!need_resched())
> > cpu_do_idle();
> > + rcu_idle_exit();
> >
> > local_irq_enable();
> > }
> > diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c
> > index 33b3beb..5ecc4bc 100644
> > --- a/arch/arm/mach-highbank/pm.c
> > +++ b/arch/arm/mach-highbank/pm.c
> > @@ -17,6 +17,7 @@
> > #include <linux/init.h>
> > #include <linux/io.h>
> > #include <linux/suspend.h>
> > +#include <linux/rcupdate.h>
> >
> > #include <asm/proc-fns.h>
> > #include <asm/smp_scu.h>
> > @@ -33,12 +34,23 @@ static int highbank_suspend_finish(unsigned long val)
> >
> > static int highbank_pm_enter(suspend_state_t state)
> > {
> > + /*
> > + * Some of the functions preceding the cpu_suspend() can
> > + * invoke RCU, but only in case of failure to disable preemption
> > + * or preempt_disable() misnesting. Assume that these errors
> > + * are not committed in the following code, because RCU just
> > + * doesn't want to run on a CPU that has its caches disabled.
> > + */
> > + rcu_idle_enter();
> > +
> > hignbank_set_pwr_suspend();
> > highbank_set_cpu_jump(0, cpu_resume);
> >
> > scu_power_mode(scu_base_addr, SCU_PM_POWEROFF);
> > cpu_suspend(0, highbank_suspend_finish);
> >
> > + rcu_idle_exit();
> > +
> > return 0;
> > }
> >
> > diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c
> > index 31807d2..0945b23 100644
> > --- a/arch/arm/mach-imx/mm-imx3.c
> > +++ b/arch/arm/mach-imx/mm-imx3.c
> > @@ -19,6 +19,7 @@
> > #include <linux/mm.h>
> > #include <linux/init.h>
> > #include <linux/err.h>
> > +#include <linux/rcupdate.h>
> >
> > #include <asm/pgtable.h>
> > #include <asm/hardware/cache-l2x0.h>
> > @@ -34,6 +35,7 @@ static void imx3_idle(void)
> > {
> > unsigned long reg = 0;
> >
> > + rcu_idle_enter();
> > if (!need_resched())
> > __asm__ __volatile__(
> > /* disable I and D cache */
> > @@ -58,6 +60,7 @@ static void imx3_idle(void)
> > "orr %0, %0, #0x00000004\n"
> > "mcr p15, 0, %0, c1, c0, 0\n"
> > : "=r" (reg));
> > + rcu_idle_exit();
> > local_irq_enable();
> > }
> >
> > diff --git a/arch/arm/mach-imx/pm-imx27.c b/arch/arm/mach-imx/pm-imx27.c
> > index e455d2f..c4adc05 100644
> > --- a/arch/arm/mach-imx/pm-imx27.c
> > +++ b/arch/arm/mach-imx/pm-imx27.c
> > @@ -10,12 +10,14 @@
> > #include <linux/kernel.h>
> > #include <linux/suspend.h>
> > #include <linux/io.h>
> > +#include <linux/rcupdate.h>
> > #include <mach/system.h>
> > #include <mach/hardware.h>
> >
> > static int mx27_suspend_enter(suspend_state_t state)
> > {
> > u32 cscr;
> > + rcu_idle_enter();
> > switch (state) {
> > case PM_SUSPEND_MEM:
> > /* Clear MPEN and SPEN to disable MPLL/SPLL */
> > @@ -24,9 +26,11 @@ static int mx27_suspend_enter(suspend_state_t state)
> > __raw_writel(cscr, MX27_IO_ADDRESS(MX27_CCM_BASE_ADDR));
> > /* Executes WFI */
> > arch_idle();
> > + rcu_idle_exit();
> > break;
> >
> > default:
> > + rcu_idle_exit();
> > return -EINVAL;
> > }
> > return 0;
> > diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c
> > index f7b0c2b..b9c2589 100644
> > --- a/arch/arm/mach-imx/pm-imx6q.c
> > +++ b/arch/arm/mach-imx/pm-imx6q.c
> > @@ -14,6 +14,7 @@
> > #include <linux/io.h>
> > #include <linux/of.h>
> > #include <linux/suspend.h>
> > +#include <linux/rcupdate.h>
> > #include <asm/cacheflush.h>
> > #include <asm/proc-fns.h>
> > #include <asm/suspend.h>
> > @@ -31,6 +32,7 @@ static int imx6q_suspend_finish(unsigned long val)
> >
> > static int imx6q_pm_enter(suspend_state_t state)
> > {
> > + rcu_idle_enter();
> > switch (state) {
> > case PM_SUSPEND_MEM:
> > imx6q_set_lpm(STOP_POWER_OFF);
> > @@ -40,8 +42,10 @@ static int imx6q_pm_enter(suspend_state_t state)
> > cpu_suspend(0, imx6q_suspend_finish);
> > imx_smp_prepare();
> > imx_gpc_post_resume();
> > + rcu_idle_exit();
> > break;
> > default:
> > + rcu_idle_exit();
> > return -EINVAL;
> > }
> >
> > diff --git a/arch/arm/mach-kirkwood/cpuidle.c b/arch/arm/mach-kirkwood/cpuidle.c
> > index 7088180..de8e317 100644
> > --- a/arch/arm/mach-kirkwood/cpuidle.c
> > +++ b/arch/arm/mach-kirkwood/cpuidle.c
> > @@ -19,6 +19,7 @@
> > #include <linux/cpuidle.h>
> > #include <linux/io.h>
> > #include <linux/export.h>
> > +#include <linux/rcupdate.h>
> > #include <asm/proc-fns.h>
> > #include <mach/kirkwood.h>
> >
> > @@ -41,6 +42,7 @@ static int kirkwood_enter_idle(struct cpuidle_device *dev,
> >
> > local_irq_disable();
> > do_gettimeofday(&before);
> > + rcu_idle_enter();
> > if (index == 0)
> > /* Wait for interrupt state */
> > cpu_do_idle();
> > @@ -55,6 +57,7 @@ static int kirkwood_enter_idle(struct cpuidle_device *dev,
> > writel(0x7, DDR_OPERATION_BASE);
> > cpu_do_idle();
> > }
> > + rcu_idle_exit();
> > do_gettimeofday(&after);
> > local_irq_enable();
> > idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC +
> > diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c
> > index bc17dfe..d919648 100644
> > --- a/arch/arm/mach-mx5/mm.c
> > +++ b/arch/arm/mach-mx5/mm.c
> > @@ -14,6 +14,7 @@
> > #include <linux/mm.h>
> > #include <linux/init.h>
> > #include <linux/clk.h>
> > +#include <linux/rcupdate.h>
> >
> > #include <asm/mach/map.h>
> >
> > @@ -37,7 +38,9 @@ static void imx5_idle(void)
> > mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
> > if (tzic_enable_wake())
> > goto err1;
> > + rcu_idle_enter(); /* No tracing until rcu_idle_exit(). */
> > cpu_do_idle();
> > + rcu_idle_exit();
> > err1:
> > clk_disable(gpc_dvfs_clk);
> > }
> > diff --git a/arch/arm/mach-mx5/pm-imx5.c b/arch/arm/mach-mx5/pm-imx5.c
> > index 98052fc..b4adf42 100644
> > --- a/arch/arm/mach-mx5/pm-imx5.c
> > +++ b/arch/arm/mach-mx5/pm-imx5.c
> > @@ -12,6 +12,7 @@
> > #include <linux/clk.h>
> > #include <linux/io.h>
> > #include <linux/err.h>
> > +#include <linux/rcupdate.h>
> > #include <asm/cacheflush.h>
> > #include <asm/tlbflush.h>
> > #include <mach/common.h>
> > @@ -27,6 +28,7 @@ static int mx5_suspend_prepare(void)
> >
> > static int mx5_suspend_enter(suspend_state_t state)
> > {
> > + rcu_idle_enter();
> > switch (state) {
> > case PM_SUSPEND_MEM:
> > mx5_cpu_lp_set(STOP_POWER_OFF);
> > @@ -47,6 +49,7 @@ static int mx5_suspend_enter(suspend_state_t state)
> > __raw_writel(0, MXC_SRPG_EMPGC1_SRPGCR);
> > }
> > cpu_do_idle();
> > + rcu_idle_exit();
> > return 0;
> > }
> >
> > diff --git a/arch/arm/mach-mxs/pm.c b/arch/arm/mach-mxs/pm.c
> > index fb042da..36a3a57 100644
> > --- a/arch/arm/mach-mxs/pm.c
> > +++ b/arch/arm/mach-mxs/pm.c
> > @@ -15,16 +15,20 @@
> > #include <linux/kernel.h>
> > #include <linux/suspend.h>
> > #include <linux/io.h>
> > +#include <linux/rcupdate.h>
> > #include <mach/system.h>
> >
> > static int mxs_suspend_enter(suspend_state_t state)
> > {
> > + rcu_idle_enter();
> > switch (state) {
> > case PM_SUSPEND_MEM:
> > arch_idle();
> > + rcu_idle_exit();
> > break;
> >
> > default:
> > + rcu_idle_exit();
> > return -EINVAL;
> > }
> > return 0;
> > diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
> > index 89ea20c..c661eba 100644
> > --- a/arch/arm/mach-omap1/pm.c
> > +++ b/arch/arm/mach-omap1/pm.c
> > @@ -108,11 +108,13 @@ void omap1_pm_idle(void)
> > __u32 use_idlect1 = arm_idlect1_mask;
> > int do_sleep = 0;
> >
> > + rcu_idle_enter();
> > local_irq_disable();
> > local_fiq_disable();
> > if (need_resched()) {
> > local_fiq_enable();
> > local_irq_enable();
> > + rcu_idle_exit();
> > return;
> > }
> >
> > @@ -158,6 +160,7 @@ void omap1_pm_idle(void)
> >
> > local_fiq_enable();
> > local_irq_enable();
> > + rcu_idle_exit();
> > return;
> > }
> > omap_sram_suspend(omap_readl(ARM_IDLECT1),
> > @@ -165,6 +168,7 @@ void omap1_pm_idle(void)
> >
> > local_fiq_enable();
> > local_irq_enable();
> > + rcu_idle_exit();
> > }
> >
> > /*
> > diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
> > index b8822f8..2139e9d 100644
> > --- a/arch/arm/mach-omap2/pm24xx.c
> > +++ b/arch/arm/mach-omap2/pm24xx.c
> > @@ -232,6 +232,7 @@ static int omap2_can_sleep(void)
> >
> > static void omap2_pm_idle(void)
> > {
> > + rcu_idle_enter();
> > local_irq_disable();
> > local_fiq_disable();
> >
> > @@ -250,6 +251,7 @@ static void omap2_pm_idle(void)
> > out:
> > local_fiq_enable();
> > local_irq_enable();
> > + rcu_idle_exit();
> > }
> >
> > #ifdef CONFIG_SUSPEND
> > diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
> > index fc69875..58a8689 100644
> > --- a/arch/arm/mach-omap2/pm34xx.c
> > +++ b/arch/arm/mach-omap2/pm34xx.c
> > @@ -427,7 +427,9 @@ static void omap3_pm_idle(void)
> > trace_power_start(POWER_CSTATE, 1, smp_processor_id());
> > trace_cpu_idle(1, smp_processor_id());
> >
> > + rcu_idle_enter();
> > omap_sram_idle();
> > + rcu_idle_exit();
> >
> > trace_power_end(smp_processor_id());
> > trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());
> > diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
> > index c264ef7..038796c 100644
> > --- a/arch/arm/mach-omap2/pm44xx.c
> > +++ b/arch/arm/mach-omap2/pm44xx.c
> > @@ -16,6 +16,7 @@
> > #include <linux/list.h>
> > #include <linux/err.h>
> > #include <linux/slab.h>
> > +#include <linux/rcupdate.h>
> >
> > #include "common.h"
> > #include "clockdomain.h"
> > @@ -178,6 +179,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
> > */
> > static void omap_default_idle(void)
> > {
> > + rcu_idle_enter();
> > local_irq_disable();
> > local_fiq_disable();
> >
> > @@ -185,6 +187,7 @@ static void omap_default_idle(void)
> >
> > local_fiq_enable();
> > local_irq_enable();
> > + rcu_idle_exit();
> > }
> >
> > /**
> > diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c
> > index f3e60a0..0b8703f 100644
> > --- a/arch/arm/mach-pnx4008/pm.c
> > +++ b/arch/arm/mach-pnx4008/pm.c
> > @@ -102,6 +102,7 @@ static inline void pnx4008_suspend(void)
> >
> > static int pnx4008_pm_enter(suspend_state_t state)
> > {
> > + rcu_idle_enter();
> > switch (state) {
> > case PM_SUSPEND_STANDBY:
> > pnx4008_standby();
> > @@ -110,6 +111,7 @@ static int pnx4008_pm_enter(suspend_state_t state)
> > pnx4008_suspend();
> > break;
> > }
> > + rcu_idle_exit();
> > return 0;
> > }
> >
> > diff --git a/arch/arm/mach-prima2/pm.c b/arch/arm/mach-prima2/pm.c
> > index 26ebb57..1e35c8a 100644
> > --- a/arch/arm/mach-prima2/pm.c
> > +++ b/arch/arm/mach-prima2/pm.c
> > @@ -15,6 +15,7 @@
> > #include <linux/of_device.h>
> > #include <linux/of_platform.h>
> > #include <linux/io.h>
> > +#include <linux/rcupdate.h>
> > #include <linux/rtc/sirfsoc_rtciobrg.h>
> > #include <asm/suspend.h>
> > #include <asm/hardware/cache-l2x0.h>
> > @@ -64,6 +65,7 @@ static int sirfsoc_pre_suspend_power_off(void)
> >
> > static int sirfsoc_pm_enter(suspend_state_t state)
> > {
> > + rcu_idle_enter(); /* No good place for this: locking->lockdep->RCU. */
> > switch (state) {
> > case PM_SUSPEND_MEM:
> > sirfsoc_pre_suspend_power_off();
> > @@ -73,8 +75,10 @@ static int sirfsoc_pm_enter(suspend_state_t state)
> > /* go zzz */
> > cpu_suspend(0, sirfsoc_finish_suspend);
> > outer_resume();
> > + rcu_idle_exit();
> > break;
> > default:
> > + rcu_idle_exit();
> > return -EINVAL;
> > }
> > return 0;
> > diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c
> > index 52b89a3..c59a7f2 100644
> > --- a/arch/arm/mach-s5p64x0/common.c
> > +++ b/arch/arm/mach-s5p64x0/common.c
> > @@ -146,6 +146,7 @@ static void s5p64x0_idle(void)
> > {
> > unsigned long val;
> >
> > + rcu_idle_enter();
> > if (!need_resched()) {
> > val = __raw_readl(S5P64X0_PWR_CFG);
> > val &= ~(0x3 << 5);
> > @@ -154,6 +155,7 @@ static void s5p64x0_idle(void)
> >
> > cpu_do_idle();
> > }
> > + rcu_idle_exit();
> > local_irq_enable();
> > }
> >
> > diff --git a/arch/arm/mach-s5pc100/common.c b/arch/arm/mach-s5pc100/common.c
> > index c909573..7bf02ff 100644
> > --- a/arch/arm/mach-s5pc100/common.c
> > +++ b/arch/arm/mach-s5pc100/common.c
> > @@ -131,9 +131,11 @@ static struct map_desc s5pc100_iodesc[] __initdata = {
> >
> > static void s5pc100_idle(void)
> > {
> > + rcu_idle_enter();
> > if (!need_resched())
> > cpu_do_idle();
> >
> > + rcu_idle_exit();
> > local_irq_enable();
> > }
> >
> > diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
> > index 9c1bcdc..ccd6b4d 100644
> > --- a/arch/arm/mach-s5pv210/common.c
> > +++ b/arch/arm/mach-s5pv210/common.c
> > @@ -144,9 +144,11 @@ static struct map_desc s5pv210_iodesc[] __initdata = {
> >
> > static void s5pv210_idle(void)
> > {
> > + rcu_idle_enter();
> > if (!need_resched())
> > cpu_do_idle();
> >
> > + rcu_idle_exit();
> > local_irq_enable();
> > }
> >
> > diff --git a/arch/arm/mach-shmobile/cpuidle.c b/arch/arm/mach-shmobile/cpuidle.c
> > index 1b23342..651e92b 100644
> > --- a/arch/arm/mach-shmobile/cpuidle.c
> > +++ b/arch/arm/mach-shmobile/cpuidle.c
> > @@ -13,6 +13,7 @@
> > #include <linux/suspend.h>
> > #include <linux/module.h>
> > #include <linux/err.h>
> > +#include <linux/rcupdate.h>
> > #include <asm/system.h>
> > #include <asm/io.h>
> >
> > @@ -33,6 +34,7 @@ static int shmobile_cpuidle_enter(struct cpuidle_device *dev,
> >
> > before = ktime_get();
> >
> > + rcu_idle_enter();
> > local_irq_disable();
> > local_fiq_disable();
> >
> > @@ -40,6 +42,7 @@ static int shmobile_cpuidle_enter(struct cpuidle_device *dev,
> >
> > local_irq_enable();
> > local_fiq_enable();
> > + rcu_idle_exit();
> >
> > after = ktime_get();
> > dev->last_residency = ktime_to_ns(ktime_sub(after, before)) >> 10;
> > diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
> > index fcf8b17..e11507e 100644
> > --- a/arch/arm/mach-shmobile/pm-sh7372.c
> > +++ b/arch/arm/mach-shmobile/pm-sh7372.c
> > @@ -21,6 +21,7 @@
> > #include <linux/irq.h>
> > #include <linux/bitrev.h>
> > #include <linux/console.h>
> > +#include <linux/rcupdate.h>
> > #include <asm/system.h>
> > #include <asm/io.h>
> > #include <asm/tlbflush.h>
> > @@ -520,17 +521,24 @@ static int sh7372_enter_suspend(suspend_state_t suspend_state)
> > sh7372_a4s.genpd.status == GPD_STATE_POWER_OFF) {
> > /* enter A4S sleep with PLLC0 off */
> > pr_debug("entering A4S\n");
> > + rcu_idle_enter();
> > sh7372_enter_a4s_common(0);
> > + rcu_idle_exit();
> > } else {
> > /* enter A3SM sleep with PLLC0 off */
> > pr_debug("entering A3SM\n");
> > + rcu_idle_enter();
> > sh7372_enter_a3sm_common(0);
> > + rcu_idle_exit();
> > }
> > } else {
> > /* default to Core Standby that supports all wakeup sources */
> > pr_debug("entering Core Standby\n");
> > + rcu_idle_enter();
> > sh7372_enter_core_standby();
> > + rcu_idle_exit();
> > }
> > +
> > return 0;
> > }
> >
>
More information about the linux-arm-kernel
mailing list