mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-14 04:26:45 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAly4jdcTHHRyZWRpbmdA
 bnZpZGlhLmNvbQAKCRDdI6zXfz6zoRfDD/0erbE8+w+L6RjRBAfY9KefW9I7nbdm
 LJFiXEJOzDqjuKBsnyy+1pOs3hgLlhL/wgy1ndGNc+cUh5hdfcwlSJiWG+iyxq4q
 gqAQ/sBcaGkhCc+arbsQq6JPwwf3VkuxwUC4r7e7jnnOlP74NTd23PH5R9ktidgJ
 EiEevf1HQwQxrTcYHmUObBKoCDv5dkBe89RnLItwwE3YLWnsSkFcS+tjDdtRw6y3
 lRzN6oIOMcGan+4UJMCfAHFdzBBY9ceGXZzoWwLMZRq9j6lSerl761EJT9NFlHQs
 4gOXa7k0EijCcyjL6Tz/MIB5N5PqGeZkbEmSga6E4htLe3xipRMU3NcmFpzq3rsk
 /Ekio1HmpvWhHQknqzQvHzOeFag8Z2SRtU3HLZyoHtc5mTkYln9CsVLXcHAt843C
 q9hzzGUG4CDIGiu5wCLE5LFXt+MUGhFB6pVf/J0uGhNAdVfpp5lWdVC2SiW1Xwzc
 wGvPJyI26lisE5rqKnAxpRj3VzCU6gWBAz2Ff9VbAZ5lsGcFAeHNhFW3dL7L5ges
 aQyMnIIqurCI0SO49B3JKGkv7J+LI7EwENhPZrKBvrBVLaVl1B4jHHfI0A4Y+Oi3
 y1Xfh2lU0M6BI5KM/Pm9lxDKhC4nzhKj9aMyZgwbrVPZXxJX4plxLQMzJCKhdTe7
 uahlAQUt1dDjaQ==
 =u6uq
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-04-28 23:35:41 -07:00
commit dd3e3f2338
3 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-tegra/Kconfig
View file

@ -10,6 +10,7 @@ menuconfig ARCH_TEGRA
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
select PINCTRL
select PM
select PM_OPP
select ARCH_HAS_RESET_CONTROLLER
select RESET_CONTROLLER

11
arch/arm/mach-tegra/cpuidle-tegra20.c
View file

@ -61,7 +61,8 @@ static struct cpuidle_driver tegra_idle_driver = {
.exit_latency = 5000,
.target_residency = 10000,
.power_usage = 0,
.flags = CPUIDLE_FLAG_COUPLED,
.flags = CPUIDLE_FLAG_COUPLED |
CPUIDLE_FLAG_TIMER_STOP,
.name = "powered-down",
.desc = "CPU power gated",
},
@ -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())
return false;
tick_broadcast_enter();
tegra_idle_lp2_last();
tick_broadcast_exit();
if (cpu_online(1))
tegra20_wake_cpu1_from_reset();
@ -153,14 +150,10 @@ static bool tegra20_idle_enter_lp2_cpu_1(struct cpuidle_device *dev,
struct cpuidle_driver *drv,
int index)
{
tick_broadcast_enter();
cpu_suspend(0, tegra20_sleep_cpu_secondary_finish);
tegra20_cpu_clear_resettable();
tick_broadcast_exit();
return true;
}
#else

9
arch/arm/mach-tegra/cpuidle-tegra30.c
View file

@ -56,6 +56,7 @@ static struct cpuidle_driver tegra_idle_driver = {
.exit_latency = 2000,
.target_residency = 2200,
.power_usage = 0,
.flags = CPUIDLE_FLAG_TIMER_STOP,
.name = "powered-down",
.desc = "CPU power gated",
},
@ -76,12 +77,8 @@ static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev,
return false;
}
tick_broadcast_enter();
tegra_idle_lp2_last();
tick_broadcast_exit();
return true;
}
@ -90,14 +87,10 @@ static bool tegra30_cpu_core_power_down(struct cpuidle_device *dev,
struct cpuidle_driver *drv,
int index)
{
tick_broadcast_enter();
smp_wmb();
cpu_suspend(0, tegra30_sleep_cpu_secondary_finish);
tick_broadcast_exit();
return true;
}
#else