From patchwork Thu Oct 24 15:18:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 177535 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp2335678ill; Thu, 24 Oct 2019 08:18:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKBZ9JV3+OftH9NTgpy/Rzv7nHYPzHA+yVxcvHBos2Ni1zIhQqZVanzFdXUJZmZ0hfWQWu X-Received: by 2002:a50:e445:: with SMTP id e5mr43529242edm.257.1571930339816; Thu, 24 Oct 2019 08:18:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571930339; cv=none; d=google.com; s=arc-20160816; b=dFhNyKAbgH4iICHtK0pg0DB1H0qp4nwLtqiPQPmnmLmcp3ALJkzCCr6QP44hFHxwtc mvM6cTavWBdCqiRDLRMt3nS1xCz+pTmHNQPyrvm9O+cnHTwmKzWp3F6IDzDuljn94g6E Gw/8VY7fCESn4bvb2bUe60rWO06Vb3fRws0kxWe2UorGlCOoY1Ov5a3JwOapUGRxl7Tx DdDY+06iBFA9duV0KVUmegyCku+ldjEVu6sVxGt+PktcQtLtY6R63zEaeYer8XlPogxE u+Uo/HF2QGW5Shs0Pg+3QcDjjj5oXzwliqHFF2JE19bv4tm2CLQlC3rKaTH6H+REd0b7 AsQw== 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; bh=WsRQ0BU1JIBqgy9SKo4vSBlhps5+Aw3+LyBKpvWcoCY=; b=bte3uHyHkppMUrgmfCArqmPFPAzTVgoNUXSNIfH1kowiRyFtdO755zT00aGAdg0Qlx euTFZByE8z1jQhOiQXzyihwsTfb16F5DG4Ma1XDfFnVFbm7g8da+Xo/MvjUSGjArRHvY +0gtXXW28YHeB/sAqv74UM/lti/TYYHoGkze6AAxaRcT9Tl+RVFE059p2+xBXj8iO7nb 4zzJxfVjNb1cKZfmaD9dMh8pUB+/oOy5Img05mX2HoPxur0u9ya2CioW9pLTewdrqqb9 pfSFQ2oJYoXXGSKa+FWdUK9vVQBcgLs5/m98nDCuTHBNw7TKhnuHRdjKfBQQ6N1/bxpc R/SQ== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a24si7715122eda.446.2019.10.24.08.18.59; Thu, 24 Oct 2019 08:18:59 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403859AbfJXPS6 (ORCPT + 15 others); Thu, 24 Oct 2019 11:18:58 -0400 Received: from foss.arm.com ([217.140.110.172]:54144 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403837AbfJXPS6 (ORCPT ); Thu, 24 Oct 2019 11:18:58 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A444131F; Thu, 24 Oct 2019 08:18:42 -0700 (PDT) Received: from usa.arm.com (e107155-lin.cambridge.arm.com [10.1.196.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BBFE93F71F; Thu, 24 Oct 2019 08:18:40 -0700 (PDT) From: Sudeep Holla To: ulf.hansson@linaro.org Cc: Lorenzo.Pieralisi@arm.com, bjorn.andersson@linaro.org, daniel.lezcano@linaro.org, ilina@codeaurora.org, khilman@kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, mark.rutland@arm.com, rjw@rjwysocki.net, robh+dt@kernel.org, sboyd@kernel.org, sudeep.holla@arm.com, vincent.guittot@linaro.org Subject: [PATCH] cpuidle: psci: Align psci_power_state count with idle state count Date: Thu, 24 Oct 2019 16:18:34 +0100 Message-Id: <20191024151834.17036-1-sudeep.holla@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191010113937.15962-2-ulf.hansson@linaro.org> References: <20191010113937.15962-2-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 Instead of allocating 'n-1' states in psci_power_state to manage 'n' idle states which include "ARM WFI" state, it would be simpler to have 1:1 mapping between psci_power_state and cpuidle driver states. ARM WFI state(i.e. idx == 0) is handled specially in the generic macro CPU_PM_CPU_IDLE_ENTER_PARAM and hence state[-1] is not possible. However for sake of code readability, it is better to have 1:1 mapping and not use [idx - 1] to access psci_power_state corresponding to driver cpuidle state for idx. psci_power_state[0] is default initialised to 0 and is never accessed while entering WFI state. Signed-off-by: Sudeep Holla --- drivers/cpuidle/cpuidle-psci.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) Hi Ulf, Lorenzo, Just to avoid confusion, I thought I will just write this patch as I was about to make reference to this in my review. Regards, Sudeep -- 2.17.1 Reported-by: Ulf Hansson Reviewed-by: Ulf Hansson diff --git a/drivers/cpuidle/cpuidle-psci.c b/drivers/cpuidle/cpuidle-psci.c index f3c1a2396f98..361985f52ddd 100644 --- a/drivers/cpuidle/cpuidle-psci.c +++ b/drivers/cpuidle/cpuidle-psci.c @@ -30,7 +30,7 @@ static int psci_enter_idle_state(struct cpuidle_device *dev, u32 *state = __this_cpu_read(psci_power_state); return CPU_PM_CPU_IDLE_ENTER_PARAM(psci_cpu_suspend_enter, - idx, state[idx - 1]); + idx, state[idx]); } static struct cpuidle_driver psci_idle_driver __initdata = { @@ -89,12 +89,14 @@ static int __init psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu) if (!count) return -ENODEV; + count++; /* Add WFI state too */ psci_states = kcalloc(count, sizeof(*psci_states), GFP_KERNEL); if (!psci_states) return -ENOMEM; - for (i = 0; i < count; i++) { - state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i); + for (i = 1; i < count; i++) { + state_node = of_parse_phandle(cpu_node, "cpu-idle-states", + i - 1); ret = psci_dt_parse_state_node(state_node, &psci_states[i]); of_node_put(state_node);