From patchwork Fri Feb 12 20:50:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 61894 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1056299lbl; Fri, 12 Feb 2016 12:52:07 -0800 (PST) X-Received: by 10.98.86.145 with SMTP id h17mr5096591pfj.9.1455310304694; Fri, 12 Feb 2016 12:51:44 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b27si22128384pfd.82.2016.02.12.12.51.44; Fri, 12 Feb 2016 12:51:44 -0800 (PST) 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; 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; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751182AbcBLUvn (ORCPT + 7 others); Fri, 12 Feb 2016 15:51:43 -0500 Received: from mail-pa0-f52.google.com ([209.85.220.52]:34819 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751060AbcBLUvm (ORCPT ); Fri, 12 Feb 2016 15:51:42 -0500 Received: by mail-pa0-f52.google.com with SMTP id ho8so52346067pac.2 for ; Fri, 12 Feb 2016 12:51:42 -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=WcbtN4Q1q4qDNjpCwY6JSopUu/omQe54+KbWfwchjcI=; b=VVEnl/ExrqbKRLvLTSCEgmNqCIoanDvtlQCHvJvEugYtVDHD1qly49OcpWsBnGGleh xH2jtsI8ppBTV0xLVJfj1oV10aixVn0uAdU11mh8MzTAUcTjGI7YhNJSAjmnnnXrNgOO juClW3L5b+Aa2ZyasZDBaOfym/ig0lGUkJEc0= 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=WcbtN4Q1q4qDNjpCwY6JSopUu/omQe54+KbWfwchjcI=; b=mP7wfneo0VP0dqjwJz8+12rv6DMTjfxCpfbQqShGt61JI6AmmskzNkyixGl0D/OCx6 MlVgJhpK7q4aotkiM/OnEpmU0L8QJsk4vioiPtHrbJhjGP0cpayGj7LuK6x2ia7lzM6B itSjK7JJz2aQo7wUOk/Dy9+fLdu1CBLxgGOh5TlwxUYZGLFzN3o2RX8UUBsEUQEWKfhh ytxJhV0ooJRo06RF+T7Dk60q86INUniv3BwT30zfH9gIUJxBVSV/tpq1hFSt8zuOh8k3 IJUbgeenHZ6PLkSQnQOWD6bRUNBOyvpSSw5GWwe5DhcFp8N+s27sI71QT8VV6aOUgsAw Uq5g== X-Gm-Message-State: AG10YOS72kwRcE3/djOUIFsvF+6Xntgf1SLuRO7g0anjfOFIO/Elwg/mlVc8CHI0nK11OYBj X-Received: by 10.66.90.199 with SMTP id by7mr4962339pab.113.1455310302468; Fri, 12 Feb 2016 12:51:42 -0800 (PST) Received: from ubuntu.localdomain ([172.56.8.98]) by smtp.gmail.com with ESMTPSA id x12sm21401070pfi.88.2016.02.12.12.51.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Feb 2016 12:51:41 -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 v2 10/12] ARM64: psci: Support cluster idle states for OS-Initiated Date: Fri, 12 Feb 2016 13:50:36 -0700 Message-Id: <1455310238-8963-11-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1455310238-8963-1-git-send-email-lina.iyer@linaro.org> References: <1455310238-8963-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 --- Changes since RFC v1 - - initializes CPU PM domains based on OSI support in FW - simplified initialization and cluster state id determination arch/arm64/kernel/psci.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) -- 2.1.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/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index f67f35b..75b1707 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -15,6 +15,7 @@ #define pr_fmt(fmt) "psci: " fmt +#include #include #include #include @@ -31,6 +32,24 @@ #include static DEFINE_PER_CPU_READ_MOSTLY(u32 *, psci_power_state); +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); +} + +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 __maybe_unused cpu_psci_cpu_init_idle(unsigned int cpu) { @@ -89,6 +108,19 @@ static int __maybe_unused cpu_psci_cpu_init_idle(unsigned int cpu) } /* Idle states parsed correctly, initialize per-cpu pointer */ per_cpu(psci_power_state, cpu) = psci_states; + + if (psci_has_osi_pd_support()) { + const struct cpu_pd_ops psci_pd_ops = { + .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: @@ -117,6 +149,8 @@ static int cpu_psci_cpu_boot(unsigned int cpu) if (err) pr_err("failed to boot CPU%d (%d)\n", cpu, err); + /* Reset CPU cluster states */ + psci_reset_composite_state_id(); return err; } @@ -181,15 +215,16 @@ static int cpu_psci_cpu_kill(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)); } static int __maybe_unused cpu_psci_cpu_suspend(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 @@ -198,10 +233,15 @@ static int __maybe_unused cpu_psci_cpu_suspend(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; }