From patchwork Tue Mar 1 21:15:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 8470401 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DC8429F8A8 for ; Tue, 1 Mar 2016 21:16:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3B5120357 for ; Tue, 1 Mar 2016 21:16:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1EFE202EC for ; Tue, 1 Mar 2016 21:16:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753737AbcCAVQZ (ORCPT ); Tue, 1 Mar 2016 16:16:25 -0500 Received: from mail-pf0-f179.google.com ([209.85.192.179]:33152 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753711AbcCAVQY (ORCPT ); Tue, 1 Mar 2016 16:16:24 -0500 Received: by mail-pf0-f179.google.com with SMTP id 124so58014711pfg.0 for ; Tue, 01 Mar 2016 13:16:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uLapP8ck13277NtAt0HaY1XfEGxPdS4HiOCcnwpQJZc=; b=TXmnwyJpd/cuaxnjDTrmfZ+L1bkdI5W78ls+IkHsDGaovGAVNczwI+cDcB3OffIcfd PqCO+ToUqBLmu7bOFNug8/oxvFG2LYqN4DtsnQrN44K30a0alpDNczZyh5ytk1dChOtB Mp38142QnyYNXSvA+HBg9ExzonSiJv1bhSvbY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uLapP8ck13277NtAt0HaY1XfEGxPdS4HiOCcnwpQJZc=; b=iQzl3ev3UuMqmNh97/IldrlH0ZbyRGWFNdcZLam86slOHl7PtXTTsQgd3opGMLs7yp AiJgMETvTknpjzAab1NUKJ9gAHcLdhpGPRzMSrc/zlXcyPkVH2q0Vru489YRXuFxD53E r+aizmfYZMI6Svx/sGBsscQGfK01Z8LKCAMkBzICOcrnBQeooDUydq/coSDj9P0xX8zr m59HSV6dAsmrvc8e/fJEoeueUR4vx2KWFNpjOEjI8ce/eQYpFTKoZ/5y2mZoumQxP8rH u7F8XFvpYHlXiAN3ahcXbmTBlPyqeC3lDGvFxAbN+KrUXk086fptA/x7uQlr9O3meK5M otuQ== X-Gm-Message-State: AD7BkJLPSq2aUvLWK8FWdWo5z2jIYHPSSbMOgRzWYcmXq2WgkuADret0ZNM/WlXf7NcJOUJM X-Received: by 10.98.0.11 with SMTP id 11mr33818821pfa.5.1456866983844; Tue, 01 Mar 2016 13:16:23 -0800 (PST) Received: from ubuntu.localdomain (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id kw10sm47749328pab.0.2016.03.01.13.16.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Mar 2016 13:16:22 -0800 (PST) From: Lina Iyer To: ulf.hansson@linaro.org, khilman@kernel.org, rjw@rjwysocki.net, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: geert@linux-m68k.org, k.kozlowski@samsung.com, msivasub@codeaurora.org, agross@codeaurora.org, sboyd@codeaurora.org, linux-arm-msm@vger.kernel.org, lorenzo.pieralisi@arm.com, ahaslam@baylibre.com, mtitinger@baylibre.com, Lina Iyer , Mark Rutland Subject: [RFC v3 09/12] drivers: firmware: psci: Allow OS Initiated suspend mode Date: Tue, 1 Mar 2016 14:15:28 -0700 Message-Id: <1456866931-37851-11-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1456866931-37851-1-git-send-email-lina.iyer@linaro.org> References: <1456866931-37851-1-git-send-email-lina.iyer@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP PSCI firmware v1.0 onwards may support 2 different modes for CPU_SUSPEND. Platform coordinated mode is the default and every firmware should support it. The firmware shall also be the default mode. With the kernel capable of deciding the state for CPU cluster and coherency domains, the OS Initiated mode may now be used by the kernel, provided the firmware supports it. SET_SUSPEND_MODE is a PSCI function available on v1.0 onwards and can be used to set the mode in the firmware. Cc: Lorenzo Pieralisi Cc: Mark Rutland Signed-off-by: Lina Iyer --- drivers/firmware/psci.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- include/linux/psci.h | 2 ++ include/uapi/linux/psci.h | 5 +++++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index f25cd79..03c084e 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -49,12 +49,19 @@ * require cooperation with a Trusted OS driver. */ static int resident_cpu = -1; +static bool has_osi_pd; +static bool psci_suspend_mode_is_osi; bool psci_tos_resident_on(int cpu) { return cpu == resident_cpu; } +bool psci_has_osi_pd_support(void) +{ + return has_osi_pd; +} + struct psci_operations psci_ops; typedef unsigned long (psci_fn)(unsigned long, unsigned long, @@ -250,6 +257,26 @@ static int psci_system_suspend(unsigned long unused) virt_to_phys(cpu_resume), 0, 0); } +int psci_set_suspend_mode_osi(bool enable) +{ + int ret; + int mode; + + if (enable && !psci_has_osi_pd_support()) + return -ENODEV; + + if (enable == psci_suspend_mode_is_osi) + return 0; + + mode = enable ? PSCI_1_0_SUSPEND_MODE_OSI : PSCI_1_0_SUSPEND_MODE_PC; + ret = invoke_psci_fn(PSCI_FN_NATIVE(1_0, SET_SUSPEND_MODE), + mode, 0, 0); + if (!ret) + psci_suspend_mode_is_osi = enable; + + return psci_to_linux_errno(ret); +} + static int psci_system_suspend_enter(suspend_state_t state) { return cpu_suspend(0, psci_system_suspend); @@ -443,10 +470,26 @@ out_put_node: return err; } +static int __init psci_1_0_init(struct device_node *np) +{ + int ret; + + ret = psci_0_2_init(np); + if (ret) + return ret; + + /* Check if PSCI OSI mode is available */ + ret = psci_features(PSCI_FN_NATIVE(0_2, CPU_SUSPEND)); + if (ret & PSCI_1_0_OS_INITIATED) + has_osi_pd = true; + + return 0; +} + static const struct of_device_id const psci_of_match[] __initconst = { { .compatible = "arm,psci", .data = psci_0_1_init}, { .compatible = "arm,psci-0.2", .data = psci_0_2_init}, - { .compatible = "arm,psci-1.0", .data = psci_0_2_init}, + { .compatible = "arm,psci-1.0", .data = psci_1_0_init}, {}, }; diff --git a/include/linux/psci.h b/include/linux/psci.h index 12c4865..deae633 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -23,6 +23,8 @@ bool psci_tos_resident_on(int cpu); bool psci_power_state_loses_context(u32 state); bool psci_power_state_is_valid(u32 state); +bool psci_has_osi_pd_support(void); +int psci_set_suspend_mode_osi(bool enable); struct psci_operations { int (*cpu_suspend)(u32 state, unsigned long entry_point); diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h index 3d7a0fc..eaab6e3 100644 --- a/include/uapi/linux/psci.h +++ b/include/uapi/linux/psci.h @@ -50,6 +50,7 @@ #define PSCI_1_0_FN_SYSTEM_SUSPEND PSCI_0_2_FN(14) #define PSCI_1_0_FN64_SYSTEM_SUSPEND PSCI_0_2_FN64(14) +#define PSCI_1_0_FN64_SET_SUSPEND_MODE PSCI_0_2_FN64(15) /* PSCI v0.2 power state encoding for CPU_SUSPEND function */ #define PSCI_0_2_POWER_STATE_ID_MASK 0xffff @@ -93,6 +94,10 @@ #define PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK \ (0x1 << PSCI_1_0_FEATURES_CPU_SUSPEND_PF_SHIFT) +#define PSCI_1_0_OS_INITIATED BIT(0) +#define PSCI_1_0_SUSPEND_MODE_PC 0 +#define PSCI_1_0_SUSPEND_MODE_OSI 1 + /* PSCI return values (inclusive of all PSCI versions) */ #define PSCI_RET_SUCCESS 0 #define PSCI_RET_NOT_SUPPORTED -1