From patchwork Wed Dec 11 15:43:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 181274 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp702017ile; Wed, 11 Dec 2019 07:44:14 -0800 (PST) X-Google-Smtp-Source: APXvYqx8s5TPsX1yCY7gFfr6Sfe8WYPfSs6CtqvhLOZHCiZvxlRJmBtRxZR/pCoETMpoJWPQ5iyo X-Received: by 2002:aca:dd04:: with SMTP id u4mr3218491oig.94.1576079053989; Wed, 11 Dec 2019 07:44:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576079053; cv=none; d=google.com; s=arc-20160816; b=bjY76MYdWubewS999UtqTOz5JDpZriO/5A2hblLUO4GhWex8G6z3DDwi7BXap54anu o0+FQV6117PdGRWD2FyFep8d0TSb6u8UEH2vBF6yrBppfSN+FQ7Q9SKqjc8W9vrY/j9y PkH4CN17S6uK0RJ5NtC+Vjq6r9/4+zXhsv2q5m0YhXaekA5cjkCTENSf4IyjT0h11zJ+ RTC1gvNI6goMOvaGlb0LIZoINPPPzJlfWjJ5lY3fv5ravz7kq2C2coeda7LbmdiJN3Uf 2Xh/WpT9j0+g8P+vjGylKpDlU9eaF3kJ3tEp0L7uHJPdY8lF0o/eugg5skol6dfNcBxV z7wQ== 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=xFV9pwGCTDQIRD0MEW258+4R088s+9zQCaaqV7y2r0w=; b=QMz3L3ZpH89a5tRDYPWjcEfG8juKjQP/ZG/l2M+bfH2HJLwErXdvWOyMGIhTitaPc0 GmAmnITz1EyzoZuvPs5OChdUwJ4Qxq/vitsgbVF2FxXxXMZzitPiREYs/7HvesiS9jdk 8kWn21GvPA+TKlP6TL5SykqH3plS6b7qVyHdR27MhH8Dhb9rX9S+vhnw2iy8ZR8ogLD0 ZsDcTn4lOqiUWxzcmqPjEGayNXQ95IcR6J/xDTDNSDl8SzQ60IhYyTC6mRVjWKafoEtB 5UiqyU+FRVLjHUmUHaQING3efK2XdrXf/MbtNz2iPd424MUm5DmuiwNA0J5fGtbLOyVI ZtAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=syw2oRHy; 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 i124si1334435oif.214.2019.12.11.07.44.13; Wed, 11 Dec 2019 07:44:13 -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; dkim=pass header.i=@linaro.org header.s=google header.b=syw2oRHy; 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 S1731900AbfLKPoL (ORCPT + 15 others); Wed, 11 Dec 2019 10:44:11 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:37096 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388417AbfLKPoL (ORCPT ); Wed, 11 Dec 2019 10:44:11 -0500 Received: by mail-lj1-f194.google.com with SMTP id u17so24599235lja.4 for ; Wed, 11 Dec 2019 07:44:09 -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=xFV9pwGCTDQIRD0MEW258+4R088s+9zQCaaqV7y2r0w=; b=syw2oRHygvzxLXpdFNwn22dQOkl4y20AEx6z1Uls/sCqdCKH9r/o178DiOzM54g7OV IpU/IRF4flzpLrKYOHSTQTgXkwHzSkEXp2rV756hmn2XQCDXaD6+cSKzxqSy4vRFG1yy xq9vWaLOGI67hpk7tWHiiKQJ3ewjM9UHPj4tM0WJtVKebWiYIkynUYM2xXG/P/hvtOYR ywZw0bgnjxKUvrLx0aTaqE5z5F3scckjHAmyMWiCyO17yUPp1j6PAtHhutWHx9tr/LPd lG/RPDAnJMf4qeEVMADGUS/b2jiJQHhs/r3fynwHlNPhQAXvFjnhb+m4tItEuDESwGAR Llmw== 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=xFV9pwGCTDQIRD0MEW258+4R088s+9zQCaaqV7y2r0w=; b=FwC9tL56gbtNJqYFTWNsQFQQK7cT44srtKD/YzcrjPuYuIw5J035yCEP8l6q3f2uSR rgzSlI3YZfhxgftYe4jVz4my/6QFM6zsLH4e1Z8H2qDL0v86qEHJwCxrewBQKc93QuGW ZM0iRGh3gcEp3svocdyLNiDTLvpmOA6ejZie6ULbjL2LpeAH/rItOWd51KV2gHLFxFsA 9oZ1UMoeyRm705GxjNGiNot25QGfZMT6HMy8lYUOP3VC21QifCzeeksIHhQnKvoeM7SU 08EsYz4UL4k1Hnp075ZkVGR2QPRn0IqJYXrda3+rEo4O9ynJaJf1RVw8b3648b5RFeWD FjeQ== X-Gm-Message-State: APjAAAXEsgrJa9g+oVb+1llpoOaCNFZBesruWDxnxpX8BnoluoAEo4SC OS6BqBqVBPMb8r9vJA3a0V1sZSS0ea8= X-Received: by 2002:a05:651c:2046:: with SMTP id t6mr2255960ljo.180.1576079048402; Wed, 11 Dec 2019 07:44:08 -0800 (PST) Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id b14sm1389608lff.68.2019.12.11.07.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 07:44:07 -0800 (PST) From: Ulf Hansson To: Sudeep Holla , Lorenzo Pieralisi , Rob Herring , linux-pm@vger.kernel.org Cc: "Rafael J . Wysocki" , Daniel Lezcano , Mark Rutland , Lina Iyer , Vincent Guittot , Stephen Boyd , Andy Gross , Bjorn Andersson , Kevin Hilman , Ulf Hansson , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Lina Iyer Subject: [PATCH v4 10/14] cpuidle: psci: Prepare to use OS initiated suspend mode via PM domains Date: Wed, 11 Dec 2019 16:43:39 +0100 Message-Id: <20191211154343.29765-11-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191211154343.29765-1-ulf.hansson@linaro.org> References: <20191211154343.29765-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 entering and idle state. To avoid executing the above OSI specific code in the ->enter() callback, while operating in the default PSCI Platform Coordinated mode, let's also add a new enter-function and use it for OSI. Co-developed-by: Lina Iyer Signed-off-by: Lina Iyer Signed-off-by: Ulf Hansson --- Changes in v4: - Rebased on top of earlier changes. - Add comment about using the deepest cpuidle state for the domain state selection. --- drivers/cpuidle/cpuidle-psci.c | 56 ++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/drivers/cpuidle/cpuidle-psci.c b/drivers/cpuidle/cpuidle-psci.c index 6a87848be3c3..9600fe674a89 100644 --- a/drivers/cpuidle/cpuidle-psci.c +++ b/drivers/cpuidle/cpuidle-psci.c @@ -29,14 +29,47 @@ struct psci_cpuidle_data { }; static DEFINE_PER_CPU_READ_MOSTLY(struct psci_cpuidle_data, psci_cpuidle_data); +static DEFINE_PER_CPU(u32, domain_state); + +static inline 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 inline int psci_enter_state(int idx, u32 state) +{ + return CPU_PM_CPU_IDLE_ENTER_PARAM(psci_cpu_suspend_enter, idx, state); +} + +static int psci_enter_domain_idle_state(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int idx) +{ + struct psci_cpuidle_data *data = this_cpu_ptr(&psci_cpuidle_data); + u32 *states = data->psci_states; + u32 state = psci_get_domain_state(); + int ret; + + if (!state) + state = states[idx]; + + ret = psci_enter_state(idx, state); + + /* Clear the domain state to start fresh when back from idle. */ + psci_set_domain_state(0); + return ret; +} static int psci_enter_idle_state(struct cpuidle_device *dev, struct cpuidle_driver *drv, int idx) { u32 *state = __this_cpu_read(psci_cpuidle_data.psci_states); - return CPU_PM_CPU_IDLE_ENTER_PARAM(psci_cpu_suspend_enter, - idx, state[idx]); + return psci_enter_state(idx, state[idx]); } static struct cpuidle_driver psci_idle_driver __initdata = { @@ -79,7 +112,8 @@ static int __init psci_dt_parse_state_node(struct device_node *np, u32 *state) return 0; } -static int __init psci_dt_cpu_init_idle(struct device_node *cpu_node, +static int __init psci_dt_cpu_init_idle(struct cpuidle_driver *drv, + struct device_node *cpu_node, unsigned int state_count, int cpu) { int i, ret = 0; @@ -118,6 +152,15 @@ static int __init psci_dt_cpu_init_idle(struct device_node *cpu_node, ret = PTR_ERR(data->dev); goto free_mem; } + + /* + * Using the deepest state for the CPU to trigger a potential + * selection of a shared state for the domain, assumes the + * domain states are all deeper states. + */ + if (data->dev) + drv->states[state_count - 1].enter = + psci_enter_domain_idle_state; } /* Idle states parsed correctly, store them in the per-cpu struct. */ @@ -129,7 +172,8 @@ static int __init psci_dt_cpu_init_idle(struct device_node *cpu_node, return ret; } -static __init int psci_cpu_init_idle(unsigned int cpu, unsigned int state_count) +static __init int psci_cpu_init_idle(struct cpuidle_driver *drv, + unsigned int cpu, unsigned int state_count) { struct device_node *cpu_node; int ret; @@ -145,7 +189,7 @@ static __init int psci_cpu_init_idle(unsigned int cpu, unsigned int state_count) if (!cpu_node) return -ENODEV; - ret = psci_dt_cpu_init_idle(cpu_node, state_count, cpu); + ret = psci_dt_cpu_init_idle(drv, cpu_node, state_count, cpu); of_node_put(cpu_node); @@ -201,7 +245,7 @@ static int __init psci_idle_init_cpu(int cpu) /* * Initialize PSCI idle states. */ - ret = psci_cpu_init_idle(cpu, ret); + ret = psci_cpu_init_idle(drv, cpu, ret); if (ret) { pr_err("CPU %d failed to PSCI idle\n", cpu); goto out_kfree_drv;