From nobody Sun Apr 5 20:05:15 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4129DC54EBD for ; Fri, 13 Jan 2023 12:36:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241407AbjAMMg2 (ORCPT ); Fri, 13 Jan 2023 07:36:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233174AbjAMMcS (ORCPT ); Fri, 13 Jan 2023 07:32:18 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2164564EA; Fri, 13 Jan 2023 04:31:15 -0800 (PST) Date: Fri, 13 Jan 2023 12:31:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1673613074; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZSzC2dWr0AP5Ym/dMH83OBLZ+AOZhxLm3b0LmSfsXTc=; b=pHPh2PncUBc6Utw4Vwr28dhOWSJdf/pJUYM8DakK3Ls52vxPTjKxkDJDr3hLOnYErv5Flo PDV3MbTYb2CDgW2RvYBClceCG/QBFlbWS30K3DCA72PdwONgkd2q7KJU74yRIiQkQ6i8iD rrU4aUWayRyPdAdyox1rPz20banZ4KX5n6k+39bjvZFexj1RTX5WS+Wc3WioVFjjznmzSj niV7qcjXZzR42D5JET70SaYifJFuLJvk/pEaQH9Az/PQ4vKGWJxUoOW9/d8okY25/8KZmh rhv7Fb2K9SzGqoVYMHV57UAZ9CMcLWEBou4HJX7NcgWk0Bug68gKfSqpmylQPw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1673613074; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZSzC2dWr0AP5Ym/dMH83OBLZ+AOZhxLm3b0LmSfsXTc=; b=KhgbO/j8UKs8GfGa0JQpztn5GcnlV+gvnmWYTMsC9RE5eihT4x6PX0CYWDehuy2aeOqEtB u9JB1mTpBzcJzQBw== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] cpuidle, OMAP4: Push RCU-idle into driver Cc: "Peter Zijlstra (Intel)" , Ingo Molnar , Tony Lindgren , Ulf Hansson , Frederic Weisbecker , "Rafael J. Wysocki" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230112195540.007918454@infradead.org> References: <20230112195540.007918454@infradead.org> MIME-Version: 1.0 Message-ID: <167361307406.4906.17916090208644946752.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the sched/core branch of tip: Commit-ID: c3d42418dca53d6c498a48c408f7a45289593650 Gitweb: https://git.kernel.org/tip/c3d42418dca53d6c498a48c408f7a4528= 9593650 Author: Peter Zijlstra AuthorDate: Thu, 12 Jan 2023 20:43:25 +01:00 Committer: Ingo Molnar CommitterDate: Fri, 13 Jan 2023 11:47:49 +01:00 cpuidle, OMAP4: Push RCU-idle into driver Doing RCU-idle outside the driver, only to then temporarily enable it again, some *four* times, before going idle is suboptimal. Notably three times explicitly using RCU_NONIDLE() and once implicitly through cpu_pm_*(). Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Tested-by: Tony Lindgren Tested-by: Ulf Hansson Reviewed-by: Frederic Weisbecker Reviewed-by: Tony Lindgren Acked-by: Rafael J. Wysocki Link: https://lore.kernel.org/r/20230112195540.007918454@infradead.org --- arch/arm/mach-omap2/cpuidle44xx.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidl= e44xx.c index de37027..953ad88 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -105,7 +105,9 @@ static int omap_enter_idle_smp(struct cpuidle_device *d= ev, } raw_spin_unlock_irqrestore(&mpu_lock, flag); =20 + ct_idle_enter(); omap4_enter_lowpower(dev->cpu, cx->cpu_state); + ct_idle_exit(); =20 raw_spin_lock_irqsave(&mpu_lock, flag); if (cx->mpu_state_vote =3D=3D num_online_cpus()) @@ -151,10 +153,10 @@ static int omap_enter_idle_coupled(struct cpuidle_dev= ice *dev, (cx->mpu_logic_state =3D=3D PWRDM_POWER_OFF); =20 /* Enter broadcast mode for periodic timers */ - RCU_NONIDLE(tick_broadcast_enable()); + tick_broadcast_enable(); =20 /* Enter broadcast mode for one-shot timers */ - RCU_NONIDLE(tick_broadcast_enter()); + tick_broadcast_enter(); =20 /* * Call idle CPU PM enter notifier chain so that @@ -166,7 +168,7 @@ static int omap_enter_idle_coupled(struct cpuidle_devic= e *dev, =20 if (dev->cpu =3D=3D 0) { pwrdm_set_logic_retst(mpu_pd, cx->mpu_logic_state); - RCU_NONIDLE(omap_set_pwrdm_state(mpu_pd, cx->mpu_state)); + omap_set_pwrdm_state(mpu_pd, cx->mpu_state); =20 /* * Call idle CPU cluster PM enter notifier chain @@ -178,14 +180,16 @@ static int omap_enter_idle_coupled(struct cpuidle_dev= ice *dev, index =3D 0; cx =3D state_ptr + index; pwrdm_set_logic_retst(mpu_pd, cx->mpu_logic_state); - RCU_NONIDLE(omap_set_pwrdm_state(mpu_pd, cx->mpu_state)); + omap_set_pwrdm_state(mpu_pd, cx->mpu_state); mpuss_can_lose_context =3D 0; } } } =20 + ct_idle_enter(); omap4_enter_lowpower(dev->cpu, cx->cpu_state); cpu_done[dev->cpu] =3D true; + ct_idle_exit(); =20 /* Wakeup CPU1 only if it is not offlined */ if (dev->cpu =3D=3D 0 && cpumask_test_cpu(1, cpu_online_mask)) { @@ -194,9 +198,9 @@ static int omap_enter_idle_coupled(struct cpuidle_devic= e *dev, mpuss_can_lose_context) gic_dist_disable(); =20 - RCU_NONIDLE(clkdm_deny_idle(cpu_clkdm[1])); - RCU_NONIDLE(omap_set_pwrdm_state(cpu_pd[1], PWRDM_POWER_ON)); - RCU_NONIDLE(clkdm_allow_idle(cpu_clkdm[1])); + clkdm_deny_idle(cpu_clkdm[1]); + omap_set_pwrdm_state(cpu_pd[1], PWRDM_POWER_ON); + clkdm_allow_idle(cpu_clkdm[1]); =20 if (IS_PM44XX_ERRATUM(PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD) && mpuss_can_lose_context) { @@ -222,7 +226,7 @@ static int omap_enter_idle_coupled(struct cpuidle_devic= e *dev, cpu_pm_exit(); =20 cpu_pm_out: - RCU_NONIDLE(tick_broadcast_exit()); + tick_broadcast_exit(); =20 fail: cpuidle_coupled_parallel_barrier(dev, &abort_barrier); @@ -247,7 +251,8 @@ static struct cpuidle_driver omap4_idle_driver =3D { /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */ .exit_latency =3D 328 + 440, .target_residency =3D 960, - .flags =3D CPUIDLE_FLAG_COUPLED, + .flags =3D CPUIDLE_FLAG_COUPLED | + CPUIDLE_FLAG_RCU_IDLE, .enter =3D omap_enter_idle_coupled, .name =3D "C2", .desc =3D "CPUx OFF, MPUSS CSWR", @@ -256,7 +261,8 @@ static struct cpuidle_driver omap4_idle_driver =3D { /* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */ .exit_latency =3D 460 + 518, .target_residency =3D 1100, - .flags =3D CPUIDLE_FLAG_COUPLED, + .flags =3D CPUIDLE_FLAG_COUPLED | + CPUIDLE_FLAG_RCU_IDLE, .enter =3D omap_enter_idle_coupled, .name =3D "C3", .desc =3D "CPUx OFF, MPUSS OSWR", @@ -282,7 +288,8 @@ static struct cpuidle_driver omap5_idle_driver =3D { /* C2 - CPU0 RET + CPU1 RET + MPU CSWR */ .exit_latency =3D 48 + 60, .target_residency =3D 100, - .flags =3D CPUIDLE_FLAG_TIMER_STOP, + .flags =3D CPUIDLE_FLAG_TIMER_STOP | + CPUIDLE_FLAG_RCU_IDLE, .enter =3D omap_enter_idle_smp, .name =3D "C2", .desc =3D "CPUx CSWR, MPUSS CSWR",