From: Ulf Hansson <ulf.hansson@linaro.org> To: Sudeep Holla <sudeep.holla@arm.com> Cc: Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>, Bjorn Andersson <bjorn.andersson@linaro.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Lina Iyer <ilina@codeaurora.org>, Kevin Hilman <khilman@kernel.org>, Linux ARM <linux-arm-kernel@lists.infradead.org>, linux-arm-msm <linux-arm-msm@vger.kernel.org>, Linux PM <linux-pm@vger.kernel.org>, Mark Rutland <mark.rutland@arm.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Rob Herring <robh+dt@kernel.org>, Stephen Boyd <sboyd@kernel.org>, Vincent Guittot <vincent.guittot@linaro.org> Subject: Re: [PATCH] cpuidle: psci: Align psci_power_state count with idle state count Date: Thu, 24 Oct 2019 18:10:09 +0200 [thread overview] Message-ID: <CAPDyKFqOTpwZ_o0Z6hAFDXf9wJM82a_P8fcKkZY-ZfW-d9LFVQ@mail.gmail.com> (raw) In-Reply-To: <20191024151834.17036-1-sudeep.holla@arm.com> On Thu, 24 Oct 2019 at 17:18, Sudeep Holla <sudeep.holla@arm.com> wrote: > > 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 <sudeep.holla@arm.com> Reported-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > 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. As discussed with Lorenzo, I said I was going to adopt his review comments, which means I already have a patch for this locally. Nevermind this time, but I would appreciate if this kind of bikeshedding can been avoided future wise. Kind regards Uffe > > Regards, > Sudeep > > 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); > > -- > 2.17.1 >
WARNING: multiple messages have this Message-ID (diff)
From: Ulf Hansson <ulf.hansson@linaro.org> To: Sudeep Holla <sudeep.holla@arm.com> Cc: Mark Rutland <mark.rutland@arm.com>, Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>, Kevin Hilman <khilman@kernel.org>, Stephen Boyd <sboyd@kernel.org>, linux-arm-msm <linux-arm-msm@vger.kernel.org>, Linux PM <linux-pm@vger.kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Lina Iyer <ilina@codeaurora.org>, Bjorn Andersson <bjorn.andersson@linaro.org>, Rob Herring <robh+dt@kernel.org>, Linux ARM <linux-arm-kernel@lists.infradead.org> Subject: Re: [PATCH] cpuidle: psci: Align psci_power_state count with idle state count Date: Thu, 24 Oct 2019 18:10:09 +0200 [thread overview] Message-ID: <CAPDyKFqOTpwZ_o0Z6hAFDXf9wJM82a_P8fcKkZY-ZfW-d9LFVQ@mail.gmail.com> (raw) In-Reply-To: <20191024151834.17036-1-sudeep.holla@arm.com> On Thu, 24 Oct 2019 at 17:18, Sudeep Holla <sudeep.holla@arm.com> wrote: > > 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 <sudeep.holla@arm.com> Reported-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > 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. As discussed with Lorenzo, I said I was going to adopt his review comments, which means I already have a patch for this locally. Nevermind this time, but I would appreciate if this kind of bikeshedding can been avoided future wise. Kind regards Uffe > > Regards, > Sudeep > > 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); > > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-24 16:10 UTC|newest] Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-10 11:39 [PATCH 00/13] cpuidle: psci: Support hierarchical CPU arrangement Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-10 11:39 ` [PATCH 01/13] cpuidle: psci: Fix potential access to unmapped memory Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-18 9:38 ` Lorenzo Pieralisi 2019-10-18 9:38 ` Lorenzo Pieralisi 2019-10-18 9:51 ` Ulf Hansson 2019-10-18 9:51 ` Ulf Hansson 2019-10-18 10:03 ` Lorenzo Pieralisi 2019-10-18 10:03 ` Lorenzo Pieralisi 2019-10-18 10:29 ` Ulf Hansson 2019-10-18 10:29 ` Ulf Hansson 2019-10-18 16:47 ` Lorenzo Pieralisi 2019-10-18 16:47 ` Lorenzo Pieralisi 2019-10-24 15:18 ` [PATCH] cpuidle: psci: Align psci_power_state count with idle state count Sudeep Holla 2019-10-24 15:18 ` Sudeep Holla 2019-10-24 16:10 ` Ulf Hansson [this message] 2019-10-24 16:10 ` Ulf Hansson 2019-10-27 2:20 ` Sudeep Holla 2019-10-27 2:20 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 02/13] dt: psci: Update DT bindings to support hierarchical PSCI states Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:26 ` Sudeep Holla 2019-10-24 15:26 ` Sudeep Holla 2019-10-24 16:23 ` Ulf Hansson 2019-10-24 16:23 ` Ulf Hansson 2019-10-10 11:39 ` [PATCH 03/13] firmware: psci: Export functions to manage the OSI mode Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:27 ` Sudeep Holla 2019-10-24 15:27 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 04/13] of: base: Add of_get_cpu_state_node() to get idle states for a CPU node Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:28 ` Sudeep Holla 2019-10-24 15:28 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 05/13] cpuidle: dt: Support hierarchical CPU idle states Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:30 ` Sudeep Holla 2019-10-24 15:30 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 06/13] cpuidle: psci: Simplify OF parsing of CPU idle state nodes Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:36 ` Sudeep Holla 2019-10-24 15:36 ` Sudeep Holla 2019-10-24 16:33 ` Ulf Hansson 2019-10-24 16:33 ` Ulf Hansson 2019-10-27 2:24 ` Sudeep Holla 2019-10-27 2:24 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 07/13] cpuidle: psci: Support hierarchical CPU idle states Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:39 ` Sudeep Holla 2019-10-24 15:39 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 08/13] cpuidle: psci: Prepare to use OS initiated suspend mode via PM domains Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:42 ` Sudeep Holla 2019-10-24 15:42 ` Sudeep Holla 2019-10-24 17:01 ` Ulf Hansson 2019-10-24 17:01 ` Ulf Hansson 2019-10-10 11:39 ` [PATCH 09/13] cpuidle: psci: Add support for PM domains by using genpd Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 15:46 ` Sudeep Holla 2019-10-24 15:46 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 10/13] cpuidle: psci: Add a helper to attach a CPU to its PM domain Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 16:31 ` Sudeep Holla 2019-10-24 16:31 ` Sudeep Holla 2019-10-24 16:47 ` Ulf Hansson 2019-10-24 16:47 ` Ulf Hansson 2019-10-27 2:30 ` Sudeep Holla 2019-10-27 2:30 ` Sudeep Holla 2019-10-28 7:35 ` Ulf Hansson 2019-10-28 7:35 ` Ulf Hansson 2019-10-28 7:49 ` Sudeep Holla 2019-10-28 7:49 ` Sudeep Holla 2019-10-28 9:45 ` Ulf Hansson 2019-10-28 9:45 ` Ulf Hansson 2019-10-29 5:34 ` Sudeep Holla 2019-10-29 5:34 ` Sudeep Holla 2019-10-29 9:44 ` Niklas Cassel 2019-10-29 9:44 ` Niklas Cassel 2019-10-30 0:50 ` Sudeep Holla 2019-10-30 0:50 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 11/13] cpuidle: psci: Attach CPU devices to their PM domains Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 16:35 ` Sudeep Holla 2019-10-24 16:35 ` Sudeep Holla 2019-10-24 16:55 ` Ulf Hansson 2019-10-24 16:55 ` Ulf Hansson 2019-10-27 2:32 ` Sudeep Holla 2019-10-27 2:32 ` Sudeep Holla 2019-10-10 11:39 ` [PATCH 12/13] cpuidle: psci: Manage runtime PM in the idle path Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 16:32 ` Sudeep Holla 2019-10-24 16:32 ` Sudeep Holla 2019-10-24 17:00 ` Ulf Hansson 2019-10-24 17:00 ` Ulf Hansson 2019-10-25 8:28 ` Lorenzo Pieralisi 2019-10-25 8:28 ` Lorenzo Pieralisi 2019-10-25 14:13 ` Ulf Hansson 2019-10-25 14:13 ` Ulf Hansson 2019-10-27 2:34 ` Sudeep Holla 2019-10-27 2:34 ` Sudeep Holla 2019-10-28 22:40 ` Ulf Hansson 2019-10-28 22:40 ` Ulf Hansson 2019-10-10 11:39 ` [PATCH 13/13] arm64: dts: Convert to the hierarchical CPU topology layout for MSM8916 Ulf Hansson 2019-10-10 11:39 ` Ulf Hansson 2019-10-24 16:41 ` Sudeep Holla 2019-10-24 16:41 ` Sudeep Holla 2019-10-24 17:03 ` Ulf Hansson 2019-10-24 17:03 ` Ulf Hansson 2019-10-18 8:10 ` [PATCH 00/13] cpuidle: psci: Support hierarchical CPU arrangement Ulf Hansson 2019-10-18 8:10 ` Ulf Hansson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAPDyKFqOTpwZ_o0Z6hAFDXf9wJM82a_P8fcKkZY-ZfW-d9LFVQ@mail.gmail.com \ --to=ulf.hansson@linaro.org \ --cc=Lorenzo.Pieralisi@arm.com \ --cc=bjorn.andersson@linaro.org \ --cc=daniel.lezcano@linaro.org \ --cc=ilina@codeaurora.org \ --cc=khilman@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=rjw@rjwysocki.net \ --cc=robh+dt@kernel.org \ --cc=sboyd@kernel.org \ --cc=sudeep.holla@arm.com \ --cc=vincent.guittot@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.