From patchwork Fri Jul 29 21:56:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 73059 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1601360qga; Fri, 29 Jul 2016 14:57:28 -0700 (PDT) X-Received: by 10.66.54.35 with SMTP id g3mr72212345pap.30.1469829423429; Fri, 29 Jul 2016 14:57:03 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 195si20379500pfz.17.2016.07.29.14.57.03; Fri, 29 Jul 2016 14:57:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753882AbcG2V5A (ORCPT + 8 others); Fri, 29 Jul 2016 17:57:00 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:36483 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754058AbcG2V47 (ORCPT ); Fri, 29 Jul 2016 17:56:59 -0400 Received: by mail-pa0-f46.google.com with SMTP id pp5so34538603pac.3 for ; Fri, 29 Jul 2016 14:56:59 -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=beyufypxcOrXX1U0dyPmRhVOYAMR1yrpv2iNET31WHw=; b=PDT8vd9j6pvA/ga6KiGkNjDD99sFd9axuRR/ILq6atLyN4xADKJTOsvgrahzJ26ZmF w8RcPrgeONinQiTYTna0dRMWVu9GF5vbTXo8I9k/VVmMWRUhFCTNcJXwX1Ac3x6S7bTh lLHPBIh4Cw5bW6D5azGqxid5kPw4wr/VKUJ2M= 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=beyufypxcOrXX1U0dyPmRhVOYAMR1yrpv2iNET31WHw=; b=EMO9VO9GlBoio+QGOXS60xa/a3Fq4kw7ZAa7C0ykArJLnd8Wunj9cpq5hX15DptDoD rQdgloeEOkz0WsdigwdFT2bF2A9ZLb0Op5u2hz7duy21wPIQc82SdCgbXEpRfSMEMNIQ xmB651s9jp0nZGu5yMUhedoPfPhkUDyfPczP3JKM8lG87c+bLoXJZ7kH5j9kTH5HL2vs TblvLfDYEq93haCKUTrVWNZs+NxVY0dx+orW3uvmXesyPl80592T4wW+LbDrfImZ9sGg 8e7ip/uS1MeRdoq+bDiY3GgH50atDt3Eu2w4jfu01XwXxu7juH3efmUuFc4E5divm8HR 33lA== X-Gm-Message-State: AEkoouvCKOCHb1I6HJAPAX/ypmFpSHge+fE8yV+7kEaogVIoiRRloRzhirlXfdZPtDosPjyW X-Received: by 10.67.7.165 with SMTP id dd5mr72582295pad.124.1469829418938; Fri, 29 Jul 2016 14:56:58 -0700 (PDT) Received: from ubuntu.localdomain (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id 81sm27196601pfm.90.2016.07.29.14.56.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Jul 2016 14:56:58 -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 Cc: andy.gross@linaro.org, sboyd@codeaurora.org, linux-arm-msm@vger.kernel.org, Lina Iyer , Lorenzo Pieralisi , Mark Rutland Subject: [PATCH v2 12/14] drivers: firmware: psci: Support cluster idle states for OS-Initiated Date: Fri, 29 Jul 2016 15:56:23 -0600 Message-Id: <1469829385-11511-13-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469829385-11511-1-git-send-email-lina.iyer@linaro.org> References: <1469829385-11511-1-git-send-email-lina.iyer@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 | 76 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 3 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 3920aba..d73af98 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include @@ -53,6 +54,17 @@ */ static int resident_cpu = -1; 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 +191,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 +264,39 @@ 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_pd) + 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_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 state_idx, u32 param, + const struct cpumask *mask) +{ + __this_cpu_add(cluster_state_id, param); + return 0; +} static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) { @@ -304,6 +351,21 @@ static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) } /* Idle states parsed correctly, initialize per-cpu pointer */ per_cpu(psci_power_state, cpu) = psci_states; + + if (psci_has_osi_pd) { + int ret; + const struct cpu_pd_ops psci_pd_ops = { + .populate_state_data = psci_pd_populate_state_data, + .power_off = psci_pd_power_off, + }; + + 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 0; free_mem: @@ -330,15 +392,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 +411,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; }