Commit dd3e3f23 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'tegra-for-5.2-arm-soc' of...

Merge tag 'tegra-for-5.2-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers

ARM: tegra: Core changes for v5.2-rc1

One of these patches enables PM by default on 32-bit ARM, following the
same default that we already have on 64-bit ARM. The other patch fixes a
cosmetic issue in the cpuidle driver for Tegra20 and Tegra30.

* tag 'tegra-for-5.2-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: cpuidle: Handle tick broadcasting within cpuidle core on Tegra20/30
  ARM: tegra: enforce PM requirement
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 21954712 36841ba2
...@@ -10,6 +10,7 @@ menuconfig ARCH_TEGRA ...@@ -10,6 +10,7 @@ menuconfig ARCH_TEGRA
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select PINCTRL select PINCTRL
select PM
select PM_OPP select PM_OPP
select ARCH_HAS_RESET_CONTROLLER select ARCH_HAS_RESET_CONTROLLER
select RESET_CONTROLLER select RESET_CONTROLLER
......
...@@ -61,7 +61,8 @@ static struct cpuidle_driver tegra_idle_driver = { ...@@ -61,7 +61,8 @@ static struct cpuidle_driver tegra_idle_driver = {
.exit_latency = 5000, .exit_latency = 5000,
.target_residency = 10000, .target_residency = 10000,
.power_usage = 0, .power_usage = 0,
.flags = CPUIDLE_FLAG_COUPLED, .flags = CPUIDLE_FLAG_COUPLED |
CPUIDLE_FLAG_TIMER_STOP,
.name = "powered-down", .name = "powered-down",
.desc = "CPU power gated", .desc = "CPU power gated",
}, },
...@@ -136,12 +137,8 @@ static bool tegra20_cpu_cluster_power_down(struct cpuidle_device *dev, ...@@ -136,12 +137,8 @@ static bool tegra20_cpu_cluster_power_down(struct cpuidle_device *dev,
if (tegra20_reset_cpu_1() || !tegra_cpu_rail_off_ready()) if (tegra20_reset_cpu_1() || !tegra_cpu_rail_off_ready())
return false; return false;
tick_broadcast_enter();
tegra_idle_lp2_last(); tegra_idle_lp2_last();
tick_broadcast_exit();
if (cpu_online(1)) if (cpu_online(1))
tegra20_wake_cpu1_from_reset(); tegra20_wake_cpu1_from_reset();
...@@ -153,14 +150,10 @@ static bool tegra20_idle_enter_lp2_cpu_1(struct cpuidle_device *dev, ...@@ -153,14 +150,10 @@ static bool tegra20_idle_enter_lp2_cpu_1(struct cpuidle_device *dev,
struct cpuidle_driver *drv, struct cpuidle_driver *drv,
int index) int index)
{ {
tick_broadcast_enter();
cpu_suspend(0, tegra20_sleep_cpu_secondary_finish); cpu_suspend(0, tegra20_sleep_cpu_secondary_finish);
tegra20_cpu_clear_resettable(); tegra20_cpu_clear_resettable();
tick_broadcast_exit();
return true; return true;
} }
#else #else
......
...@@ -56,6 +56,7 @@ static struct cpuidle_driver tegra_idle_driver = { ...@@ -56,6 +56,7 @@ static struct cpuidle_driver tegra_idle_driver = {
.exit_latency = 2000, .exit_latency = 2000,
.target_residency = 2200, .target_residency = 2200,
.power_usage = 0, .power_usage = 0,
.flags = CPUIDLE_FLAG_TIMER_STOP,
.name = "powered-down", .name = "powered-down",
.desc = "CPU power gated", .desc = "CPU power gated",
}, },
...@@ -76,12 +77,8 @@ static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev, ...@@ -76,12 +77,8 @@ static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev,
return false; return false;
} }
tick_broadcast_enter();
tegra_idle_lp2_last(); tegra_idle_lp2_last();
tick_broadcast_exit();
return true; return true;
} }
...@@ -90,14 +87,10 @@ static bool tegra30_cpu_core_power_down(struct cpuidle_device *dev, ...@@ -90,14 +87,10 @@ static bool tegra30_cpu_core_power_down(struct cpuidle_device *dev,
struct cpuidle_driver *drv, struct cpuidle_driver *drv,
int index) int index)
{ {
tick_broadcast_enter();
smp_wmb(); smp_wmb();
cpu_suspend(0, tegra30_sleep_cpu_secondary_finish); cpu_suspend(0, tegra30_sleep_cpu_secondary_finish);
tick_broadcast_exit();
return true; return true;
} }
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment