From patchwork Thu Aug 25 20:03:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 9299883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E966F607D8 for ; Thu, 25 Aug 2016 20:12:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAB29292E9 for ; Thu, 25 Aug 2016 20:12:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE062292EC; Thu, 25 Aug 2016 20:12:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3990F292E9 for ; Thu, 25 Aug 2016 20:12:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bd0z6-0003lK-0G; Thu, 25 Aug 2016 20:10:44 +0000 Received: from mail-pf0-x236.google.com ([2607:f8b0:400e:c00::236]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bd0t9-0005KH-GU for linux-arm-kernel@lists.infradead.org; Thu, 25 Aug 2016 20:04:44 +0000 Received: by mail-pf0-x236.google.com with SMTP id p64so20785591pfb.1 for ; Thu, 25 Aug 2016 13:04:15 -0700 (PDT) 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=HbfQdxrUDgL1ltlv8mzDj3K3rNIP5pjP/7vxumdBRa0=; b=hp+Ldk9v48cJfklZR7ArliI8E2FgFoZONLYl/NoxPW5tcFCbKt6+xPQZLOfIuLmV0h A3uIRxnj1btQwBYX5xBR1v8rAWodH3LvDTBm3ntg9xF7NCveP9z0scYceG8wEqv34hPg YlJDgwT09r4gJYL1J8boT0fMcDlRSKsgOxoDk= 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=HbfQdxrUDgL1ltlv8mzDj3K3rNIP5pjP/7vxumdBRa0=; b=NaGW9Qum2ct0xQFcUG3Ny5mDe9xUORDdqs8mBu1VjlmV6XGkfU8fisE2NeDws2Urkc Ghxny8A7XqMQhHv1JlcuTj6PxM6v4g7i0b0Rb/FM9WNjIXlPiRqz6KtmKYuWmxE2eOQf QuAEyfdG6bduYTSZIlUY4KraB3vlWN1pfxCeTOMj2wecU7g+WV9AcWSf63rugN5Fjdx8 VOLHa1Yelax1cgpoi4rAvjTGpbwK+87u3yhcD8kHEpZt3Dtp+v0Um0azlPMGxF8tcNbZ A6GEiX9CTVUXLAt1XYCLq2dIV9llVJYANvMAazpfubPNLXQPwdpAVo0n0IwteE6i+pwe nuAw== X-Gm-Message-State: AE9vXwOt06fW59beORgLnPptQzFhFa5fmHm8A/ufxgW1U1HjVj/WFprsfUqS5LPS61oSOzPY X-Received: by 10.98.33.147 with SMTP id o19mr19710539pfj.8.1472155453790; Thu, 25 Aug 2016 13:04:13 -0700 (PDT) Received: from ubuntu.localdomain (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id u1sm22841644pfu.12.2016.08.25.13.04.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Aug 2016 13:04:12 -0700 (PDT) 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 Subject: [PATCH v4 13/16] drivers: firmware: psci: Support cluster idle states for OS-Initiated Date: Thu, 25 Aug 2016 14:03:22 -0600 Message-Id: <1472155405-41841-14-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472155405-41841-1-git-send-email-lina.iyer@linaro.org> References: <1472155405-41841-1-git-send-email-lina.iyer@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160825_130435_964146_2C38DE88 X-CRM114-Status: GOOD ( 19.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , lorenzo.pieralisi@arm.com, Juri.Lelli@arm.com, linux-arm-msm@vger.kernel.org, sboyd@codeaurora.org, brendan.jackman@arm.com, sudeep.holla@arm.com, andy.gross@linaro.org, Lina Iyer MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP PSCI OS initiated firmware may allow Linux to determine the state of the CPU cluster and the cluster at coherency level to enter idle states when there are no active CPUs. Since Linux has a better idea of the QoS and the wakeup pattern of the CPUs, the cluster idle states may be better determined by the OS instead of the firmware. The last CPU entering idle in a cluster, is responsible for selecting the state of the cluster. Only one CPU in a cluster may provide the cluster idle state to the firmware. Similarly, the last CPU in the system may provide the state of the coherency domain along with the cluster and the CPU state IDs. Utilize the CPU PM domain framework's helper functions to build up the hierarchy of cluster topology using Generic PM domains. We provide callbacks for domain power_on and power_off. By appending the state IDs at each domain level in the -power_off() callbacks, we build up a composite state ID that can be passed onto the firmware to idle the CPU, the cluster and the coherency interface. Cc: Lorenzo Pieralisi Cc: Mark Rutland Signed-off-by: Lina Iyer --- drivers/firmware/psci.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 759b134..431385a 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include @@ -53,6 +54,18 @@ */ static int resident_cpu = -1; static bool psci_has_osi; +static bool psci_has_osi_pd; +static DEFINE_PER_CPU(u32, cluster_state_id); + +static inline u32 psci_get_composite_state_id(u32 cpu_state) +{ + return cpu_state | this_cpu_read(cluster_state_id); +} + +static inline void psci_reset_composite_state_id(void) +{ + this_cpu_write(cluster_state_id, 0); +} bool psci_tos_resident_on(int cpu) { @@ -179,6 +192,8 @@ static int psci_cpu_on(unsigned long cpuid, unsigned long entry_point) fn = psci_function_id[PSCI_FN_CPU_ON]; err = invoke_psci_fn(fn, cpuid, entry_point, 0); + /* Reset CPU cluster states */ + psci_reset_composite_state_id(); return psci_to_linux_errno(err); } @@ -250,6 +265,27 @@ static int __init psci_features(u32 psci_func_id) #ifdef CONFIG_CPU_IDLE static DEFINE_PER_CPU_READ_MOSTLY(u32 *, psci_power_state); +static bool psci_suspend_mode_is_osi; + +static int psci_set_suspend_mode_osi(bool enable) +{ + int ret; + int mode; + + if (enable && !psci_has_osi) + 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_1_0_FN_SET_SUSPEND_MODE, + mode, 0, 0); + if (!ret) + psci_suspend_mode_is_osi = enable; + + return psci_to_linux_errno(ret); +} static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) { @@ -311,11 +347,48 @@ free_mem: return ret; } +static int psci_pd_populate_state_data(struct device_node *np, u32 *param) +{ + return of_property_read_u32(np, "arm,psci-suspend-param", param); +} + +static int psci_pd_power_off(u32 idx, u32 param, const struct cpumask *mask) +{ + __this_cpu_add(cluster_state_id, param); + return 0; +} + +const struct cpu_pd_ops psci_pd_ops = { + .populate_state_data = psci_pd_populate_state_data, + .power_off = psci_pd_power_off, +}; + +static int psci_cpu_osi_pd_init(int cpu) +{ + int ret; + + if (!psci_has_osi_pd) + return 0; + + ret = of_setup_cpu_pd_single(cpu, &psci_pd_ops); + if (!ret) { + ret = psci_set_suspend_mode_osi(true); + if (ret) + pr_warn("CPU%d: Error setting PSCI OSI mode\n", cpu); + } + + return ret; +} + int psci_cpu_init_idle(unsigned int cpu) { struct device_node *cpu_node; int ret; + ret = psci_cpu_osi_pd_init(cpu); + if (ret) + return ret; + cpu_node = of_get_cpu_node(cpu, NULL); if (!cpu_node) return -ENODEV; @@ -330,15 +403,17 @@ int psci_cpu_init_idle(unsigned int cpu) static int psci_suspend_finisher(unsigned long index) { u32 *state = __this_cpu_read(psci_power_state); + u32 ext_state = psci_get_composite_state_id(state[index - 1]); - return psci_ops.cpu_suspend(state[index - 1], - virt_to_phys(cpu_resume)); + return psci_ops.cpu_suspend(ext_state, virt_to_phys(cpu_resume)); } int psci_cpu_suspend_enter(unsigned long index) { int ret; u32 *state = __this_cpu_read(psci_power_state); + u32 ext_state = psci_get_composite_state_id(state[index - 1]); + /* * idle state index 0 corresponds to wfi, should never be called * from the cpu_suspend operations @@ -347,10 +422,16 @@ int psci_cpu_suspend_enter(unsigned long index) return -EINVAL; if (!psci_power_state_loses_context(state[index - 1])) - ret = psci_ops.cpu_suspend(state[index - 1], 0); + ret = psci_ops.cpu_suspend(ext_state, 0); else ret = cpu_suspend(index, psci_suspend_finisher); + /* + * Clear the CPU's cluster states, we start afresh after coming + * out of idle. + */ + psci_reset_composite_state_id(); + return ret; } @@ -558,6 +639,7 @@ static int __init psci_0_1_init(struct device_node *np) static int __init psci_1_0_init(struct device_node *np) { + struct device_node *dn; int ret; ret = psci_0_2_init(np); @@ -569,6 +651,11 @@ static int __init psci_1_0_init(struct device_node *np) if (ret & PSCI_1_0_OS_INITIATED) { if (!psci_features(PSCI_1_0_FN_SET_SUSPEND_MODE)) psci_has_osi = true; + /* Check if we power domains defined in the PSCI node */ + dn = of_find_node_with_property(np, "#power-domain-cells"); + if (dn) + psci_has_osi_pd = true; + of_node_put(dn); } return 0;