From 92bb5453caa0e6346315ddead8733229cb395ec1 Mon Sep 17 00:00:00 2001 From: Yimin Peng Date: Tue, 14 Nov 2017 21:12:13 +0800 Subject: [PATCH 1/2] defconfig: msm: add PM config for virtual platform enable PM config to support gvm suspend and resume. Change-Id: I5f71add6d2c5ac0fb1fc7ea98d13dc256f6e4d5a Signed-off-by: Yimin Peng --- arch/arm64/configs/msm-auto-gvm-perf_defconfig | 3 +++ arch/arm64/configs/msm-auto-gvm_defconfig | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/arch/arm64/configs/msm-auto-gvm-perf_defconfig b/arch/arm64/configs/msm-auto-gvm-perf_defconfig index 1c4e19d9b859..70673d4959eb 100644 --- a/arch/arm64/configs/msm-auto-gvm-perf_defconfig +++ b/arch/arm64/configs/msm-auto-gvm-perf_defconfig @@ -44,6 +44,9 @@ CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y CONFIG_COMPAT=y +CONFIG_PM_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=0 CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y diff --git a/arch/arm64/configs/msm-auto-gvm_defconfig b/arch/arm64/configs/msm-auto-gvm_defconfig index 05ade778b2ae..455c7581f51f 100644 --- a/arch/arm64/configs/msm-auto-gvm_defconfig +++ b/arch/arm64/configs/msm-auto-gvm_defconfig @@ -42,6 +42,10 @@ CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y CONFIG_COMPAT=y +CONFIG_PM_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=0 +CONFIG_PM_DEBUG=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y From 706dcfc66902cd3beff923867eb0851a3db7478d Mon Sep 17 00:00:00 2001 From: Yimin Peng Date: Tue, 14 Nov 2017 21:10:02 +0800 Subject: [PATCH 2/2] ARM: dts: msm: add psci for msm8996 auto virtual platform Hypervisor supports psci-1.0 not 0.1 and new function IDs have been defined in psci driver. Change-Id: Id257dd264f9ffc812879997c0b227e53f84c86a2 Signed-off-by: Yimin Peng --- arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi index 08aa412f1ff4..7815399f23b1 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi @@ -24,11 +24,8 @@ }; psci { - compatible = "arm,psci"; + compatible = "arm,psci-1.0"; method = "smc"; - cpu_suspend = <0xc4000001>; - cpu_off = <0x84000002>; - cpu_on = <0xc4000003>; }; soc: soc { };