From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751297AbdGPCgX (ORCPT ); Sat, 15 Jul 2017 22:36:23 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:33827 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751213AbdGPCgU (ORCPT ); Sat, 15 Jul 2017 22:36:20 -0400 From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , "Rafael J. Wysocki" , Alexandre Belloni , "Rafael J. Wysocki" , Ulf Hansson , Daniel Lezcano , linux-pm , Thibaud Cornic , JB , Mason , Kevin Hilman , Pavel Machek , Linux ARM Subject: [PATCH 2/2] soc: bcm: brcmstb: PM: Implement target_state callback Date: Sat, 15 Jul 2017 19:36:10 -0700 Message-Id: <20170716023610.4658-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170716023610.4658-1-f.fainelli@gmail.com> References: <20170623010837.11199-1-f.fainelli@gmail.com> <20170716023610.4658-1-f.fainelli@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Provide a target_state callback implementation which just returns the suspend_state_t the system is about to enter. Broadcom STB drivers can utilize platform_suspend_target_state() to retrieve that and take appropriate actions (e.g: full vs. partial re-initialization). Two states are implemented: PLATFORM_STATE_WORKING and PLATFORM_STATE_BRCMSTB_S3MEM to that end. Signed-off-by: Florian Fainelli --- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 22 ++++++++++++++++++++++ include/linux/suspend.h | 1 + 2 files changed, 23 insertions(+) diff --git a/drivers/soc/bcm/brcmstb/pm/pm-arm.c b/drivers/soc/bcm/brcmstb/pm/pm-arm.c index dcf8c8065508..750a74b3fc9d 100644 --- a/drivers/soc/bcm/brcmstb/pm/pm-arm.c +++ b/drivers/soc/bcm/brcmstb/pm/pm-arm.c @@ -104,6 +104,7 @@ struct brcmstb_pm_control { u32 phy_b_standby_ctrl_offs; bool needs_ddr_pad; struct platform_device *pdev; + suspend_state_t pm_state; }; enum bsp_initiate_command { @@ -533,9 +534,30 @@ static int brcmstb_pm_valid(suspend_state_t state) } } +static int brcmstb_pm_begin(suspend_state_t state) +{ + ctrl.pm_state = state; + + return 0; +} + +static enum platform_target_state brcmstb_target_state(void) +{ + switch (ctrl.pm_state) { + case PM_SUSPEND_STANDBY: + return PLATFORM_STATE_WORKING; + case PM_SUSPEND_MEM: + return PLATFORM_STATE_BRCMSTB_S3MEM; + default: + return PLATFORM_STATE_UNKNOWN; + } +} + static const struct platform_suspend_ops brcmstb_pm_ops = { + .begin = brcmstb_pm_begin, .enter = brcmstb_pm_enter, .valid = brcmstb_pm_valid, + .target_state = brcmstb_target_state, }; static const struct of_device_id aon_ctrl_dt_ids[] = { diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 6e6cc0778816..15d21d76e0bf 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -58,6 +58,7 @@ enum platform_target_state { PLATFORM_STATE_ACPI_S3, PLATFORM_STATE_ACPI_S4, /* Add platform specific states here */ + PLATFORM_STATE_BRCMSTB_S3MEM, }; struct suspend_stats { -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: f.fainelli@gmail.com (Florian Fainelli) Date: Sat, 15 Jul 2017 19:36:10 -0700 Subject: [PATCH 2/2] soc: bcm: brcmstb: PM: Implement target_state callback In-Reply-To: <20170716023610.4658-1-f.fainelli@gmail.com> References: <20170623010837.11199-1-f.fainelli@gmail.com> <20170716023610.4658-1-f.fainelli@gmail.com> Message-ID: <20170716023610.4658-3-f.fainelli@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Provide a target_state callback implementation which just returns the suspend_state_t the system is about to enter. Broadcom STB drivers can utilize platform_suspend_target_state() to retrieve that and take appropriate actions (e.g: full vs. partial re-initialization). Two states are implemented: PLATFORM_STATE_WORKING and PLATFORM_STATE_BRCMSTB_S3MEM to that end. Signed-off-by: Florian Fainelli --- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 22 ++++++++++++++++++++++ include/linux/suspend.h | 1 + 2 files changed, 23 insertions(+) diff --git a/drivers/soc/bcm/brcmstb/pm/pm-arm.c b/drivers/soc/bcm/brcmstb/pm/pm-arm.c index dcf8c8065508..750a74b3fc9d 100644 --- a/drivers/soc/bcm/brcmstb/pm/pm-arm.c +++ b/drivers/soc/bcm/brcmstb/pm/pm-arm.c @@ -104,6 +104,7 @@ struct brcmstb_pm_control { u32 phy_b_standby_ctrl_offs; bool needs_ddr_pad; struct platform_device *pdev; + suspend_state_t pm_state; }; enum bsp_initiate_command { @@ -533,9 +534,30 @@ static int brcmstb_pm_valid(suspend_state_t state) } } +static int brcmstb_pm_begin(suspend_state_t state) +{ + ctrl.pm_state = state; + + return 0; +} + +static enum platform_target_state brcmstb_target_state(void) +{ + switch (ctrl.pm_state) { + case PM_SUSPEND_STANDBY: + return PLATFORM_STATE_WORKING; + case PM_SUSPEND_MEM: + return PLATFORM_STATE_BRCMSTB_S3MEM; + default: + return PLATFORM_STATE_UNKNOWN; + } +} + static const struct platform_suspend_ops brcmstb_pm_ops = { + .begin = brcmstb_pm_begin, .enter = brcmstb_pm_enter, .valid = brcmstb_pm_valid, + .target_state = brcmstb_target_state, }; static const struct of_device_id aon_ctrl_dt_ids[] = { diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 6e6cc0778816..15d21d76e0bf 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -58,6 +58,7 @@ enum platform_target_state { PLATFORM_STATE_ACPI_S3, PLATFORM_STATE_ACPI_S4, /* Add platform specific states here */ + PLATFORM_STATE_BRCMSTB_S3MEM, }; struct suspend_stats { -- 2.9.3