bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cpuidle, OMAP3: Push RCU-idle into omap_sram_idle()

Browse source 
OMAP3 uses full SoC suspend modes as idle states, as such it needs the
whole power-domain and clock-domain code from the idle path.

All that code is not suitable to run with RCU disabled, as such push
RCU-idle deeper still.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Tested-by: Tony Lindgren <tony@atomide.com>
Tested-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Tony Lindgren <tony@atomide.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20230112195541.599561742@infradead.org
This commit is contained in:
Peter Zijlstra 2023-01-12 20:43:51 +01:00 • committed by Ingo Molnar
parent 40dbea961a
commit 8c0956aa76
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/mach-omap2/cpuidle34xx.c
View file

@ -133,9 +133,7 @@ static int omap3_enter_idle(struct cpuidle_device *dev,
} }
/* Execute ARM wfi */ /* Execute ARM wfi */
ct_cpuidle_enter(); omap_sram_idle(true);
omap_sram_idle();
ct_cpuidle_exit();
/* /*
* Call idle CPU PM enter notifier chain to restore * Call idle CPU PM enter notifier chain to restore

2
arch/arm/mach-omap2/pm.h
View file

@ -29,7 +29,7 @@ static inline int omap4_idle_init(void)
extern void *omap3_secure_ram_storage; extern void *omap3_secure_ram_storage;
extern void omap3_pm_off_mode_enable(int); extern void omap3_pm_off_mode_enable(int);
extern void omap_sram_idle(void); extern void omap_sram_idle(bool rcuidle);
extern int omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused); extern int omap_pm_clkdms_setup(struct clockdomain *clkdm, void *unused);
#if defined(CONFIG_PM_OPP) #if defined(CONFIG_PM_OPP)

12
arch/arm/mach-omap2/pm34xx.c
View file

@ -26,6 +26,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/cpuidle.h>
#include <trace/events/power.h> #include <trace/events/power.h>
@ -174,7 +175,7 @@ static int omap34xx_do_sram_idle(unsigned long save_state)
return 0; return 0;
} }
void omap_sram_idle(void) void omap_sram_idle(bool rcuidle)
{ {
/* Variable to tell what needs to be saved and restored /* Variable to tell what needs to be saved and restored
* in omap_sram_idle*/ * in omap_sram_idle*/
@ -254,11 +255,18 @@ void omap_sram_idle(void)
*/ */
if (save_state) if (save_state)
omap34xx_save_context(omap3_arm_context); omap34xx_save_context(omap3_arm_context);
if (rcuidle)
ct_cpuidle_enter();
if (save_state == 1 || save_state == 3) if (save_state == 1 || save_state == 3)
cpu_suspend(save_state, omap34xx_do_sram_idle); cpu_suspend(save_state, omap34xx_do_sram_idle);
else else
omap34xx_do_sram_idle(save_state); omap34xx_do_sram_idle(save_state);
if (rcuidle)
ct_cpuidle_exit();
/* Restore normal SDRC POWER settings */ /* Restore normal SDRC POWER settings */
if (cpu_is_omap3430() && omap_rev() >= OMAP3430_REV_ES3_0 && if (cpu_is_omap3430() && omap_rev() >= OMAP3430_REV_ES3_0 &&
(omap_type() == OMAP2_DEVICE_TYPE_EMU || (omap_type() == OMAP2_DEVICE_TYPE_EMU ||
@ -316,7 +324,7 @@ static int omap3_pm_suspend(void)
omap3_intc_suspend(); omap3_intc_suspend();
omap_sram_idle(); omap_sram_idle(false);
restore: restore:
/* Restore next_pwrsts */ /* Restore next_pwrsts */