aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudeep Holla <Sudeep.Holla@arm.com>2015-06-18 10:41:34 -0400
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2015-10-02 09:35:17 -0400
commitfaf7ec4a92c0231d1079177095077c162eb9b466 (patch)
tree8254d34ad3ff1871e96494d87b53a26223b87d21
parent029180b1c99046831c33ed43fdbdb620506cb15b (diff)
drivers: firmware: psci: add system suspend support
PSCI v1.0 introduces a new API called PSCI_SYSTEM_SUSPEND. This API provides the mechanism by which the calling OS can request entry into the deepest possible system sleep state. It meets all the necessary preconditions for entering suspend to RAM state in Linux. This patch adds support for PSCI_SYSTEM_SUSPEND in psci firmware and registers a psci system suspend operation to implement the suspend-to-RAM(s2r) in a generic way on all the platforms implementing PSCI. Cc: Mark Rutland <mark.rutland@arm.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-rw-r--r--drivers/firmware/psci.c33
-rw-r--r--include/uapi/linux/psci.h3
2 files changed, 36 insertions, 0 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 1fa7284fb21d..492db42c4e08 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -20,12 +20,14 @@
20#include <linux/printk.h> 20#include <linux/printk.h>
21#include <linux/psci.h> 21#include <linux/psci.h>
22#include <linux/reboot.h> 22#include <linux/reboot.h>
23#include <linux/suspend.h>
23 24
24#include <uapi/linux/psci.h> 25#include <uapi/linux/psci.h>
25 26
26#include <asm/cputype.h> 27#include <asm/cputype.h>
27#include <asm/system_misc.h> 28#include <asm/system_misc.h>
28#include <asm/smp_plat.h> 29#include <asm/smp_plat.h>
30#include <asm/suspend.h>
29 31
30/* 32/*
31 * While a 64-bit OS can make calls with SMC32 calling conventions, for some 33 * While a 64-bit OS can make calls with SMC32 calling conventions, for some
@@ -223,6 +225,35 @@ static int __init psci_features(u32 psci_func_id)
223 psci_func_id, 0, 0); 225 psci_func_id, 0, 0);
224} 226}
225 227
228static int psci_system_suspend(unsigned long unused)
229{
230 return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND),
231 virt_to_phys(cpu_resume), 0, 0);
232}
233
234static int psci_system_suspend_enter(suspend_state_t state)
235{
236 return cpu_suspend(0, psci_system_suspend);
237}
238
239static const struct platform_suspend_ops psci_suspend_ops = {
240 .valid = suspend_valid_only_mem,
241 .enter = psci_system_suspend_enter,
242};
243
244static void __init psci_init_system_suspend(void)
245{
246 int ret;
247
248 if (!IS_ENABLED(CONFIG_SUSPEND))
249 return;
250
251 ret = psci_features(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND));
252
253 if (ret != PSCI_RET_NOT_SUPPORTED)
254 suspend_set_ops(&psci_suspend_ops);
255}
256
226static void __init psci_init_cpu_suspend(void) 257static void __init psci_init_cpu_suspend(void)
227{ 258{
228 int feature = psci_features(psci_function_id[PSCI_FN_CPU_SUSPEND]); 259 int feature = psci_features(psci_function_id[PSCI_FN_CPU_SUSPEND]);
@@ -318,6 +349,8 @@ static int __init psci_probe(void)
318 349
319 psci_init_cpu_suspend(); 350 psci_init_cpu_suspend();
320 351
352 psci_init_system_suspend();
353
321 return 0; 354 return 0;
322} 355}
323 356
diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
index 0a9485f3c6c3..3d7a0fc021a7 100644
--- a/include/uapi/linux/psci.h
+++ b/include/uapi/linux/psci.h
@@ -47,6 +47,9 @@
47#define PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU PSCI_0_2_FN64(7) 47#define PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU PSCI_0_2_FN64(7)
48 48
49#define PSCI_1_0_FN_PSCI_FEATURES PSCI_0_2_FN(10) 49#define PSCI_1_0_FN_PSCI_FEATURES PSCI_0_2_FN(10)
50#define PSCI_1_0_FN_SYSTEM_SUSPEND PSCI_0_2_FN(14)
51
52#define PSCI_1_0_FN64_SYSTEM_SUSPEND PSCI_0_2_FN64(14)
50 53
51/* PSCI v0.2 power state encoding for CPU_SUSPEND function */ 54/* PSCI v0.2 power state encoding for CPU_SUSPEND function */
52#define PSCI_0_2_POWER_STATE_ID_MASK 0xffff 55#define PSCI_0_2_POWER_STATE_ID_MASK 0xffff