, Arnd Bergmann <a...@arndb.de>, ulli.kr...@googlemail.com, vgu...@kernel.org, 
linux-...@vger.kernel.org, j...@joshtriplett.org, rost...@goodmis.org, 
r...@vger.kernel.org, b...@alien8.de, bc...@quicinc.com, 
tsbog...@alpha.franken.de, linux-par...@vger.kernel.org, sudeep.ho...@arm.com, 
shawn...@kernel.org, da...@davemloft.net, dal...@libc.org, t...@atomide.com, 
amakha...@vmware.com, bjorn.anders...@linaro.org, h...@zytor.com, 
sparcli...@vger.kernel.org, linux-hexa...@vger.kernel.org, 
linux-ri...@lists.infradead.org, anton.iva...@cambridgegreys.com, 
jo...@southpole.se, yury.no...@gmail.com, rich...@nod.at, x...@kernel.org, 
li...@armlinux.org.uk, mi...@redhat.com, a...@eecs.berkeley.edu, 
paul...@kernel.org, h...@linux.ibm.com, stefan.kristians...@saunalahti.fi, 
openr...@lists.librecores.org, paul.walms...@sifive.com, 
linux-te...@vger.kernel.org, namhy...@kernel.org, 
andriy.shevche...@linux.intel.com, jpoim...@kernel.org, jgr...@suse.com, 
mon...@monstr.eu, linux-m...@vger.kernel.org, palmer@dab
 belt.com, a...@brainfault.org, i...@jurassic.park.msu.ru, 
johan...@sipsolutions.net, linuxppc-dev@lists.ozlabs.org
Errors-To: linuxppc-dev-bounces+archive=mail-archive....@lists.ozlabs.org
Sender: "Linuxppc-dev" 
<linuxppc-dev-bounces+archive=mail-archive....@lists.ozlabs.org>

Doing RCU-idle outside the driver, only to then temporarily enable it
again before going idle is daft.

Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org>
---
 drivers/cpuidle/cpuidle-mvebu-v7.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- a/drivers/cpuidle/cpuidle-mvebu-v7.c
+++ b/drivers/cpuidle/cpuidle-mvebu-v7.c
@@ -36,7 +36,10 @@ static int mvebu_v7_enter_idle(struct cp
        if (drv->states[index].flags & MVEBU_V7_FLAG_DEEP_IDLE)
                deepidle = true;
 
+       rcu_idle_enter();
        ret = mvebu_v7_cpu_suspend(deepidle);
+       rcu_idle_exit();
+
        cpu_pm_exit();
 
        if (ret)
@@ -49,6 +52,7 @@ static struct cpuidle_driver armadaxp_id
        .name                   = "armada_xp_idle",
        .states[0]              = ARM_CPUIDLE_WFI_STATE,
        .states[1]              = {
+               .flags                  = CPUIDLE_FLAG_RCU_IDLE,
                .enter                  = mvebu_v7_enter_idle,
                .exit_latency           = 100,
                .power_usage            = 50,
@@ -57,6 +61,7 @@ static struct cpuidle_driver armadaxp_id
                .desc                   = "CPU power down",
        },
        .states[2]              = {
+               .flags                  = CPUIDLE_FLAG_RCU_IDLE,
                .enter                  = mvebu_v7_enter_idle,
                .exit_latency           = 1000,
                .power_usage            = 5,
@@ -72,6 +77,7 @@ static struct cpuidle_driver armada370_i
        .name                   = "armada_370_idle",
        .states[0]              = ARM_CPUIDLE_WFI_STATE,
        .states[1]              = {
+               .flags                  = CPUIDLE_FLAG_RCU_IDLE,
                .enter                  = mvebu_v7_enter_idle,
                .exit_latency           = 100,
                .power_usage            = 5,
@@ -87,6 +93,7 @@ static struct cpuidle_driver armada38x_i
        .name                   = "armada_38x_idle",
        .states[0]              = ARM_CPUIDLE_WFI_STATE,
        .states[1]              = {
+               .flags                  = CPUIDLE_FLAG_RCU_IDLE,
                .enter                  = mvebu_v7_enter_idle,
                .exit_latency           = 10,
                .power_usage            = 5,


Reply via email to