From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E224CA9EAF for ; Thu, 24 Oct 2019 17:01:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 688C220650 for ; Thu, 24 Oct 2019 17:01:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="t77I8kGw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2410010AbfJXRB6 (ORCPT ); Thu, 24 Oct 2019 13:01:58 -0400 Received: from mail-vs1-f67.google.com ([209.85.217.67]:43665 "EHLO mail-vs1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405976AbfJXRB5 (ORCPT ); Thu, 24 Oct 2019 13:01:57 -0400 Received: by mail-vs1-f67.google.com with SMTP id b1so16648748vsr.10 for ; Thu, 24 Oct 2019 10:01:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NtQVfUVz2FV0gTSPzMm+cpXFmzct1iFbD6hJDcVtKUA=; b=t77I8kGwdUnaDJulyJxolE1Luw8F7JqtXHn7quj7/fUKnmi2K2rRZgTah11TU7kgPF 7PmziGtitlWlatAceURR8G10nlYdBfzZ8Q5HvVUYWCwu4cH+ANF96V8FO+45ffUkDnxT RmTpNtrF8OAACZev9ZvchjpdwWLA0KBBBTeD8uGFbv1hBaRgmZTrL05hJOKbMrY0ZheS /8k8YMx7PjONZjEteNbEQdtoCmW2oBNTfcvFz1xXmsPJeN5EQG6D74BwzKpyEZX6Cvob SW6/kSweOfZDbkHWcspOdN7/bxo3hHqEqYSVfi+TJ0u7BG7ThMludvlAPJyxwTgR9nHx x6ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NtQVfUVz2FV0gTSPzMm+cpXFmzct1iFbD6hJDcVtKUA=; b=LUwjk+r5mhLdjdNuPw54Df4wCIWE0OLaN2ExpXm+pSm8v0bFt5f5UGErHfDvxU/DqC ECyE/UoVXUsgiX+F0Sl80MeaOMVh1M8VRTg0Wxo7+5ylFVBpitBKuawyGBHvXIQK0Rwn 2d04nH5bXMBasjoNGSOmHTZc+GFEcj2L0TMkoXhpTu60XXEeYGuiGYyVs6d+nL+eMKur f4hgbk4XenhAPS30Zmn93pbKQh/HwLY/tI4SLWlmUMYzZLHDidfO4NVxTNmsJBOJYtG2 i0b5VPCRK/SK00cqBpRy1oeLubc7y68sxrE6cDdggHS0K4cibL8Mfu1pdfk7dQHE4+7G vaPw== X-Gm-Message-State: APjAAAXfXmexdiJL1MpkLEjO+wSsudNboQ0DZYd+klUZ4FL3dLg2iken CiQVuZAtbIKBRoed7QuBWfKhnteAdtqPCwEqHoqeRQ== X-Google-Smtp-Source: APXvYqwEQrfMYEQUWIJNCSq021TdmBydPjq8g8NeoBcj8NbB+JWZn8Qj6wMLt4Lhu5OVOw9XhknTHcJMharuO317lxE= X-Received: by 2002:a67:ead4:: with SMTP id s20mr7390409vso.165.1571936516180; Thu, 24 Oct 2019 10:01:56 -0700 (PDT) MIME-Version: 1.0 References: <20191010113937.15962-1-ulf.hansson@linaro.org> <20191010113937.15962-9-ulf.hansson@linaro.org> <20191024154204.GB21622@bogus> In-Reply-To: <20191024154204.GB21622@bogus> From: Ulf Hansson Date: Thu, 24 Oct 2019 19:01:20 +0200 Message-ID: Subject: Re: [PATCH 08/13] cpuidle: psci: Prepare to use OS initiated suspend mode via PM domains To: Sudeep Holla Cc: "Rafael J . Wysocki" , Daniel Lezcano , Lorenzo Pieralisi , Mark Rutland , Lina Iyer , Linux PM , Rob Herring , Vincent Guittot , Stephen Boyd , Bjorn Andersson , Kevin Hilman , Linux ARM , linux-arm-msm , Lina Iyer Content-Type: text/plain; charset="UTF-8" Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Thu, 24 Oct 2019 at 17:42, Sudeep Holla wrote: > > On Thu, Oct 10, 2019 at 01:39:32PM +0200, Ulf Hansson wrote: > > 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 > > > > 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); > > + > > [nit] for me name 'domain_state' is per domain and for one each in the > hierarchical topology. But here it's per cpu, just wondering if we can > rename it to provide implicit meaning ? Feel free to suggest something. I couldn't find any better. :-) > > > +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]; > > This can go as mentioned earlier once we have entry for WFI also. > > > + > > + 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) > > Can this me made part of patch that uses it instead of here ? Sure, just wanted to keep the all the preparations for the PM domains support together. But you have a point, let me move this part to the patch that needs it. Kind regards Uffe From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45A43CA9EAF for ; Thu, 24 Oct 2019 17:02:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0C73220650 for ; Thu, 24 Oct 2019 17:02:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Rsly0KL3"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="t77I8kGw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C73220650 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ErekDgtaxsfTozNTKo4DlE0LJQdiqSHNnNhs+U7gcRA=; b=Rsly0KL3bcHLtQ WAyHAXD8XrplW+Ah8fXjW2VpDDwx2lhu4Pbh6l9HvQWo3zdrZSOLkVLZ0JTm3/YuyOQL0KFzQOJct W2h/VZsmJbu2RYVUdef/8fhjCWmCdbAptZ25E9/vCosuqf1NgBQJVUOpi5fAW4OX1CNNoO1CkKk1F CMIUXNvTDBwC0gGO+kZM7Ij3kbT7JfNe2ORCWYFnJFMswv6l4d4gl1Yrl/0R3IKgWMhD0BuPgGvj/ owzNzOk0hkb3Xq/WJw+R5Af84Ic1nDkoDbLimtWTRwqHxRajx1lAEgfC1lzhvD4HlR1lFIk8RWwmi QVlpL7EFhBtw9CxiaknQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNgUr-0002fa-Ex; Thu, 24 Oct 2019 17:02:01 +0000 Received: from mail-vs1-xe42.google.com ([2607:f8b0:4864:20::e42]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNgUo-0002ev-Ia for linux-arm-kernel@lists.infradead.org; Thu, 24 Oct 2019 17:02:00 +0000 Received: by mail-vs1-xe42.google.com with SMTP id p13so16714327vso.0 for ; Thu, 24 Oct 2019 10:01:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NtQVfUVz2FV0gTSPzMm+cpXFmzct1iFbD6hJDcVtKUA=; b=t77I8kGwdUnaDJulyJxolE1Luw8F7JqtXHn7quj7/fUKnmi2K2rRZgTah11TU7kgPF 7PmziGtitlWlatAceURR8G10nlYdBfzZ8Q5HvVUYWCwu4cH+ANF96V8FO+45ffUkDnxT RmTpNtrF8OAACZev9ZvchjpdwWLA0KBBBTeD8uGFbv1hBaRgmZTrL05hJOKbMrY0ZheS /8k8YMx7PjONZjEteNbEQdtoCmW2oBNTfcvFz1xXmsPJeN5EQG6D74BwzKpyEZX6Cvob SW6/kSweOfZDbkHWcspOdN7/bxo3hHqEqYSVfi+TJ0u7BG7ThMludvlAPJyxwTgR9nHx x6ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NtQVfUVz2FV0gTSPzMm+cpXFmzct1iFbD6hJDcVtKUA=; b=TlATvEyZ4nKXW94ckg8NM1ztoRzkvf9A4fMQEnVu91QBPPkxIAFWw8iXjASiRLeonS 4begez4l+fxpIMQHEfcLGZ42A0CCT5mNOltnJNw4srMvfrGKc2mJ7KEFN7z2sC1RYNdB UAUguHguEF/G3jpNypyPjZfah0tesC1Z/lIgPnKTeb5Js9XWGi65aJqH0ajYAHo99gLy 6DDmivu+tBZzenWeYuQObWkwA1TfKLhsAJtBMas6hijT3TMmNykpKQyNX/hV87NGvP5/ vRwNAV2Gv8dEEO3eKIHsGu7BQTrUih87rPHYe3ZCy0/50T38XKZz9TKenLnywd7Zoy6E 92hg== X-Gm-Message-State: APjAAAVSmvN5bA4Y9OUqgttjGieOS3S6OPauhlRs7Bx7hAyBOZsy+1bM 3Kkryyvn+s9w2VtAog23k+SGqxfTTNMsBUBiOHutgg== X-Google-Smtp-Source: APXvYqwEQrfMYEQUWIJNCSq021TdmBydPjq8g8NeoBcj8NbB+JWZn8Qj6wMLt4Lhu5OVOw9XhknTHcJMharuO317lxE= X-Received: by 2002:a67:ead4:: with SMTP id s20mr7390409vso.165.1571936516180; Thu, 24 Oct 2019 10:01:56 -0700 (PDT) MIME-Version: 1.0 References: <20191010113937.15962-1-ulf.hansson@linaro.org> <20191010113937.15962-9-ulf.hansson@linaro.org> <20191024154204.GB21622@bogus> In-Reply-To: <20191024154204.GB21622@bogus> From: Ulf Hansson Date: Thu, 24 Oct 2019 19:01:20 +0200 Message-ID: Subject: Re: [PATCH 08/13] cpuidle: psci: Prepare to use OS initiated suspend mode via PM domains To: Sudeep Holla X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191024_100158_613757_804ABB93 X-CRM114-Status: GOOD ( 26.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Lorenzo Pieralisi , Linux PM , Stephen Boyd , linux-arm-msm , Daniel Lezcano , "Rafael J . Wysocki" , Lina Iyer , Bjorn Andersson , Kevin Hilman , Rob Herring , Lina Iyer , Linux ARM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, 24 Oct 2019 at 17:42, Sudeep Holla wrote: > > On Thu, Oct 10, 2019 at 01:39:32PM +0200, Ulf Hansson wrote: > > 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 > > > > 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); > > + > > [nit] for me name 'domain_state' is per domain and for one each in the > hierarchical topology. But here it's per cpu, just wondering if we can > rename it to provide implicit meaning ? Feel free to suggest something. I couldn't find any better. :-) > > > +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]; > > This can go as mentioned earlier once we have entry for WFI also. > > > + > > + 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) > > Can this me made part of patch that uses it instead of here ? Sure, just wanted to keep the all the preparations for the PM domains support together. But you have a point, let me move this part to the patch that needs it. Kind regards Uffe _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel