From patchwork Thu Oct 10 11:39:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 175751 Delivered-To: patch@linaro.org Received: by 2002:ac9:3c86:0:0:0:0:0 with SMTP id w6csp2186381ocf; Thu, 10 Oct 2019 04:40:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqywDfTXXZ9QbPzp+0sYpAyZhDYs/tj7rFBilhkKVJ8CSvOZ0pgJwf/IdOWpYkY3sdZPUlL4 X-Received: by 2002:aa7:df86:: with SMTP id b6mr7596186edy.107.1570707622738; Thu, 10 Oct 2019 04:40:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570707622; cv=none; d=google.com; s=arc-20160816; b=f763UpGhqqAk1ZxE9FqfOLqMPvEkigq9uYzy8LUOxI7EBq/dxMrw/GB5vxC8atdkzc 5EpRkdOqE1Y2Y2gvSZ8GqNw7rphyYggnFMBYPPSR9Z0I9T4NShKt4RvowRntuM/pHuyt 4Xzzn7Eklx2nhpL2nt/D50qbHznTjYFnTazRCkeEzJwXpFMOj2lZhbl+nE7zhWbc7usr ajwEsHZnhBo/+edYd7wgvThoh6kGUv0Y76H9zofwn4T8/hlv+DnCLFrJBAPUCw9twSYu 0IkPK5QfvZ77qCH3iWSugCgsyKPvluFRMP+zYEZDX8z1ih0imPaH2NlmDn59e/dnu9JR xtig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=p5qrlgEHHz72OqawbaM4oNKQbRiSCqvlNCrVec5FI84=; b=r6lxdbi6S5LbO/IvJE5XzBinxFj5VJrdjBYmkPGrpqW6NFzCxQ7fREIkYc0Lk9IpIU Mtp8ccVeNzwPTivg37drK3M3B63/aAymFrcOUdIEN0cUuAJLqSLWbYNV3i/JrHaxsJlI yUWm3UpdBBM10eTaLKEYXbhEHNa0z+DOAEJ1gsKLkxEtjS7GkGTfZZfRRSgE4Pkb2+AZ wBDbUuOdJ6XBv6XJdid1huHLhb7bNzsosPgC+0CAXdcKPvKZHc41vc6KBPXr1e02DpNh soBCYl/8Lbw3T7RAmLfP2HNHCCDb4BCPBPElWXXyXGTz8gKk6MxUdq65c7ub0GZ8YLJQ 7Kmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fpTsBvZB; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c60si3016856edd.327.2019.10.10.04.40.22; Thu, 10 Oct 2019 04:40:22 -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=pass header.i=@linaro.org header.s=google header.b=fpTsBvZB; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732848AbfJJLkV (ORCPT + 15 others); Thu, 10 Oct 2019 07:40:21 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:42042 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732792AbfJJLkU (ORCPT ); Thu, 10 Oct 2019 07:40:20 -0400 Received: by mail-lf1-f66.google.com with SMTP id c195so4110678lfg.9 for ; Thu, 10 Oct 2019 04:40:18 -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=p5qrlgEHHz72OqawbaM4oNKQbRiSCqvlNCrVec5FI84=; b=fpTsBvZBXrvTN9zR+IrMwIGukuhZz6A+ldBwdcZi85by9XgVOP/bWsZrqXdciNslhQ hPSQ87yb+x0ew8Zra1SvLTZ/P48Hr3FZUtR+nc3Bf+KjolueaFc8mzWO7hCTf5JTZ53J GY5IkZKAU60fnj9UwZMeKc4KEFiIVOqUHjv08fBOzAHTlLevorIgxgahat41rZdmOHja NUdOFzdcgrXCmknjYH2vORo7/nhAmDa0V6rUyNJERU3OmJlYnNSJONJXOFyK9xkZzVhT BZKrXoMMpkDffL35v7BHgNLabiW8/lWryfjLPNpRXqpI8THMQwTtCoxQ3KIMmGeK8+Ak oyhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=p5qrlgEHHz72OqawbaM4oNKQbRiSCqvlNCrVec5FI84=; b=UglOsSXtPHXc7F/rxP47vPm0GcpgkY6wdx87qy1jU5DWTsN4K3JifzYQn/zCAZ1kfQ vbRr9AnwZNzepF4tpvgV0yg7ZYf1h92KqMR75MIu2xyNKqaAnMtSYuiLIjkGtckX/H4m ZLBWkQ7hKyg8KgKKfCpkrEpPZBeRbdDWyEgosvMZ35djKlWLN1GcmxAOrQ7YEaKzaMSl a2Cn+X+GAellEM56GgdNfYqOPeNSLzDWjIlPHbIQy8ZjJvI15c4ZSvQxBtqjBNhIqiqU a80iDsbeho8Tf7zycg+cAMBQo1oAjMhfT644PpIxxoPc8eg1L72uiVIP4MtkvyU1PRoG Z+Tw== X-Gm-Message-State: APjAAAV0L9xdKysPOboYPI0uc2mXQ8F81r/poGE9hqiXb1yqxEgi4rfx T3rf2GGWAl1t2uXss2pv0EJ90w== X-Received: by 2002:a19:ed14:: with SMTP id y20mr5807432lfy.4.1570707618117; Thu, 10 Oct 2019 04:40:18 -0700 (PDT) Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id p3sm1168937ljn.78.2019.10.10.04.40.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 04:40:17 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Daniel Lezcano , Sudeep Holla , Lorenzo Pieralisi , Mark Rutland , Lina Iyer , linux-pm@vger.kernel.org Cc: Rob Herring , Vincent Guittot , Stephen Boyd , Bjorn Andersson , Kevin Hilman , Ulf Hansson , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Lina Iyer Subject: [PATCH 08/13] cpuidle: psci: Prepare to use OS initiated suspend mode via PM domains Date: Thu, 10 Oct 2019 13:39:32 +0200 Message-Id: <20191010113937.15962-9-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191010113937.15962-1-ulf.hansson@linaro.org> References: <20191010113937.15962-1-ulf.hansson@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The per CPU variable psci_power_state, contains an array of fixed values, which reflects the corresponding arm,psci-suspend-param parsed from DT, for each of the available CPU idle states. This isn't sufficient when using the hierarchical CPU topology in DT, in combination with having PSCI OS initiated (OSI) mode enabled. More precisely, in OSI mode, Linux is responsible of telling the PSCI FW what idle state the cluster (a group of CPUs) should enter, while in PSCI Platform Coordinated (PC) mode, each CPU independently votes for an idle state of the cluster. For this reason, introduce a per CPU variable called domain_state and implement two helper functions to read/write its value. Then let the domain_state take precedence over the regular selected state, when idling the CPU in psci_enter_idle_state(). This allows subsequent patches that implements support for PM domains for cpuidle-psci, to write the selected idle state parameter for the cluster into the domain_state variable. Furthermore, let's share the needed functions in a header file, to enable the support for PM domains to be implemented in a separate c-file. Co-developed-by: Lina Iyer Signed-off-by: Lina Iyer Signed-off-by: Ulf Hansson --- drivers/cpuidle/cpuidle-psci.c | 31 ++++++++++++++++++++++++++++--- drivers/cpuidle/cpuidle-psci.h | 11 +++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 drivers/cpuidle/cpuidle-psci.h -- 2.17.1 diff --git a/drivers/cpuidle/cpuidle-psci.c b/drivers/cpuidle/cpuidle-psci.c index 5c30f23a8a7b..a16467daf99d 100644 --- a/drivers/cpuidle/cpuidle-psci.c +++ b/drivers/cpuidle/cpuidle-psci.c @@ -20,17 +20,42 @@ #include +#include "cpuidle-psci.h" #include "dt_idle_states.h" static DEFINE_PER_CPU_READ_MOSTLY(u32 *, psci_power_state); +static DEFINE_PER_CPU(u32, domain_state); + +void psci_set_domain_state(u32 state) +{ + __this_cpu_write(domain_state, state); +} + +static inline u32 psci_get_domain_state(void) +{ + return __this_cpu_read(domain_state); +} + +static int __psci_enter_idle_state(int idx, u32 state) +{ + return CPU_PM_CPU_IDLE_ENTER_PARAM(psci_cpu_suspend_enter, idx, state); +} static int psci_enter_idle_state(struct cpuidle_device *dev, struct cpuidle_driver *drv, int idx) { + int ret; u32 *states = __this_cpu_read(psci_power_state); - u32 state = idx ? states[idx - 1] : 0; + u32 state = psci_get_domain_state(); - return CPU_PM_CPU_IDLE_ENTER_PARAM(psci_cpu_suspend_enter, idx, state); + if (!state && idx) + state = states[idx - 1]; + + ret = __psci_enter_idle_state(idx, state); + + /* Clear the domain state to start fresh when back from idle. */ + psci_set_domain_state(0); + return ret; } static struct cpuidle_driver psci_idle_driver __initdata = { @@ -56,7 +81,7 @@ static const struct of_device_id psci_idle_state_match[] __initconst = { { }, }; -static int __init psci_dt_parse_state_node(struct device_node *np, u32 *state) +int __init psci_dt_parse_state_node(struct device_node *np, u32 *state) { int err = of_property_read_u32(np, "arm,psci-suspend-param", state); diff --git a/drivers/cpuidle/cpuidle-psci.h b/drivers/cpuidle/cpuidle-psci.h new file mode 100644 index 000000000000..e593de1784c3 --- /dev/null +++ b/drivers/cpuidle/cpuidle-psci.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __CPUIDLE_PSCI_H +#define __CPUIDLE_PSCI_H + +struct device_node; + +void psci_set_domain_state(u32 state); +int __init psci_dt_parse_state_node(struct device_node *np, u32 *state); + +#endif /* __CPUIDLE_PSCI_H */