queue-4.4/arm-8510-1-rework-arm_cpu_suspend-dependencies.patch

   1 From 3b3ec87f5ebfd85f74c5b66d2d299112701cbf21 Mon Sep 17 00:00:00 2001
   2 From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
   3 Date: Mon, 1 Feb 2016 18:01:29 +0100
   4 Subject: ARM: 8510/1: rework ARM_CPU_SUSPEND dependencies
   5
   6 [ Upstream commit 1b9bdf5c1661873a10e193b8cbb803a87fe5c4a1 ]
   7
   8 The code enabled by the ARM_CPU_SUSPEND config option is used by
   9 kernel subsystems for purposes that go beyond system suspend so its
  10 config entry should be augmented to take more default options into
  11 account and avoid forcing its selection to prevent dependencies
  12 override.
  13
  14 To achieve this goal, this patch reworks the ARM_CPU_SUSPEND config
  15 entry and updates its default config value (by adding the BL_SWITCHER
  16 option to it) and its dependencies (ARCH_SUSPEND_POSSIBLE), so that the
  17 symbol is still selected by default by the subsystems requiring it and
  18 at the same time enforcing the dependencies correctly.
  19
  20 Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  21 Cc: Nicolas Pitre <nico@fluxnic.net>
  22 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  23 Signed-off-by: Sasha Levin <sashal@kernel.org>
  24 ---
  25  arch/arm/Kconfig | 4 ++--
  26  1 file changed, 2 insertions(+), 2 deletions(-)
  27
  28 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
  29 index 4cc908ee107f..737c8b0dda84 100644
  30 --- a/arch/arm/Kconfig
  31 +++ b/arch/arm/Kconfig
  32 @@ -1423,7 +1423,6 @@ config BIG_LITTLE
  33  config BL_SWITCHER
  34         bool "big.LITTLE switcher support"
  35         depends on BIG_LITTLE && MCPM && HOTPLUG_CPU && ARM_GIC
  36 -       select ARM_CPU_SUSPEND
  37         select CPU_PM
  38         help
  39           The big.LITTLE "switcher" provides the core functionality to
  40 @@ -2141,7 +2140,8 @@ config ARCH_SUSPEND_POSSIBLE
  41         def_bool y
  42
  43  config ARM_CPU_SUSPEND
  44 -       def_bool PM_SLEEP
  45 +       def_bool PM_SLEEP || BL_SWITCHER
  46 +       depends on ARCH_SUSPEND_POSSIBLE
  47
  48  config ARCH_HIBERNATION_POSSIBLE
  49         bool
  50 --
  51 2.19.1
  52