[PATCH 0/2] Introduce new generic bindings for RPMHPD

[PATCH 0/2] Introduce new generic bindings for RPMHPD

[Rohit Agarwal]

Hi,

This series introduces a new generic bindings for Qualcomm SoCs
to be used instead of creating new SoC specific bindings each time.
The order of the bindings is kept according to the order in Qualcomm
SoC like SM8[2345]50 so that it can be reused in these SoC without
breaking the ABI.
This was suggested as per the discussions in [1].
I will create a followup series of DT updates according to the new bindings.

Separating this series from the original [1] since this involves refactoring
and no new support addition.

[1] https://lore.kernel.org/all/1689054169-10800-1-git-send-email-quic_rohiagar@quicinc.com/

Thanks,
Rohit.

Rohit Agarwal (2):
  dt-bindings: power: qcom,rpmhpd: Add Generic RPMh PD indexes
  soc: qcom: rpmhpd: Use the newly created generic RPMHPD bindings

 drivers/soc/qcom/rpmhpd.c               | 101 ++++++++++++++++----------------
 include/dt-bindings/power/qcom,rpmhpd.h |  30 ++++++++++
 2 files changed, 81 insertions(+), 50 deletions(-)
 create mode 100644 include/dt-bindings/power/qcom,rpmhpd.h

-- 
2.7.4

[PATCH 1/2] dt-bindings: power: qcom,rpmhpd: Add Generic RPMh PD indexes

[Rohit Agarwal]

Add Generic RPMh Power Domain indexes that can be used
for all the Qualcomm SoC henceforth.
The power domain indexes of these bindings are based on compatibility
with current targets like SM8[2345]50 targets.

Signed-off-by: Rohit Agarwal <quic_rohiagar@quicinc.com>
Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 include/dt-bindings/power/qcom,rpmhpd.h | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 include/dt-bindings/power/qcom,rpmhpd.h

diff --git a/include/dt-bindings/power/qcom,rpmhpd.h b/include/dt-bindings/power/qcom,rpmhpd.h
new file mode 100644
index 0000000..7c201a6
--- /dev/null
+++ b/include/dt-bindings/power/qcom,rpmhpd.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
+/*
+ * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#ifndef _DT_BINDINGS_POWER_QCOM_RPMHPD_H
+#define _DT_BINDINGS_POWER_QCOM_RPMHPD_H
+
+/* Generic RPMH Power Domain Indexes */
+#define RPMHPD_CX               0
+#define RPMHPD_CX_AO		1
+#define RPMHPD_EBI		2
+#define RPMHPD_GFX		3
+#define RPMHPD_LCX		4
+#define RPMHPD_LMX		5
+#define RPMHPD_MMCX		6
+#define RPMHPD_MMCX_AO		7
+#define RPMHPD_MX		8
+#define RPMHPD_MX_AO		9
+#define RPMHPD_MXC		10
+#define RPMHPD_MXC_AO		11
+#define RPMHPD_MSS              12
+#define RPMHPD_NSP		13
+#define RPMHPD_NSP0             14
+#define RPMHPD_NSP1             15
+#define RPMHPD_QPHY             16
+#define RPMHPD_DDR              17
+#define RPMHPD_XO               18
+
+#endif
-- 
2.7.4

[PATCH 2/2] soc: qcom: rpmhpd: Use the newly created generic RPMHPD bindings

[Rohit Agarwal]

Update the SoC SM8[2345]50 entries to use the new
generic RPMHPD bindings.

Signed-off-by: Rohit Agarwal <quic_rohiagar@quicinc.com>
---
 drivers/soc/qcom/rpmhpd.c | 101 +++++++++++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/drivers/soc/qcom/rpmhpd.c b/drivers/soc/qcom/rpmhpd.c
index 63c35a3..18d8544 100644
--- a/drivers/soc/qcom/rpmhpd.c
+++ b/drivers/soc/qcom/rpmhpd.c
@@ -15,6 +15,7 @@
 #include <soc/qcom/cmd-db.h>
 #include <soc/qcom/rpmh.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
+#include <dt-bindings/power/qcom,rpmhpd.h>
 
 #define domain_to_rpmhpd(domain) container_of(domain, struct rpmhpd, pd)
 
@@ -359,16 +360,16 @@ static const struct rpmhpd_desc sa8155p_desc = {
 
 /* SM8250 RPMH powerdomains */
 static struct rpmhpd *sm8250_rpmhpds[] = {
-	[SM8250_CX] = &cx_w_mx_parent,
-	[SM8250_CX_AO] = &cx_ao_w_mx_parent,
-	[SM8250_EBI] = &ebi,
-	[SM8250_GFX] = &gfx,
-	[SM8250_LCX] = &lcx,
-	[SM8250_LMX] = &lmx,
-	[SM8250_MMCX] = &mmcx,
-	[SM8250_MMCX_AO] = &mmcx_ao,
-	[SM8250_MX] = &mx,
-	[SM8250_MX_AO] = &mx_ao,
+	[RPMHPD_CX] = &cx_w_mx_parent,
+	[RPMHPD_CX_AO] = &cx_ao_w_mx_parent,
+	[RPMHPD_EBI] = &ebi,
+	[RPMHPD_GFX] = &gfx,
+	[RPMHPD_LCX] = &lcx,
+	[RPMHPD_LMX] = &lmx,
+	[RPMHPD_MMCX] = &mmcx,
+	[RPMHPD_MMCX_AO] = &mmcx_ao,
+	[RPMHPD_MX] = &mx,
+	[RPMHPD_MX_AO] = &mx_ao,
 };
 
 static const struct rpmhpd_desc sm8250_desc = {
@@ -378,19 +379,19 @@ static const struct rpmhpd_desc sm8250_desc = {
 
 /* SM8350 Power domains */
 static struct rpmhpd *sm8350_rpmhpds[] = {
-	[SM8350_CX] = &cx_w_mx_parent,
-	[SM8350_CX_AO] = &cx_ao_w_mx_parent,
-	[SM8350_EBI] = &ebi,
-	[SM8350_GFX] = &gfx,
-	[SM8350_LCX] = &lcx,
-	[SM8350_LMX] = &lmx,
-	[SM8350_MMCX] = &mmcx,
-	[SM8350_MMCX_AO] = &mmcx_ao,
-	[SM8350_MSS] = &mss,
-	[SM8350_MX] = &mx,
-	[SM8350_MX_AO] = &mx_ao,
-	[SM8350_MXC] = &mxc,
-	[SM8350_MXC_AO] = &mxc_ao,
+	[RPMHPD_CX] = &cx_w_mx_parent,
+	[RPMHPD_CX_AO] = &cx_ao_w_mx_parent,
+	[RPMHPD_EBI] = &ebi,
+	[RPMHPD_GFX] = &gfx,
+	[RPMHPD_LCX] = &lcx,
+	[RPMHPD_LMX] = &lmx,
+	[RPMHPD_MMCX] = &mmcx,
+	[RPMHPD_MMCX_AO] = &mmcx_ao,
+	[RPMHPD_MSS] = &mss,
+	[RPMHPD_MX] = &mx,
+	[RPMHPD_MX_AO] = &mx_ao,
+	[RPMHPD_MXC] = &mxc,
+	[RPMHPD_MXC_AO] = &mxc_ao,
 };
 
 static const struct rpmhpd_desc sm8350_desc = {
@@ -400,19 +401,19 @@ static const struct rpmhpd_desc sm8350_desc = {
 
 /* SM8450 RPMH powerdomains */
 static struct rpmhpd *sm8450_rpmhpds[] = {
-	[SM8450_CX] = &cx,
-	[SM8450_CX_AO] = &cx_ao,
-	[SM8450_EBI] = &ebi,
-	[SM8450_GFX] = &gfx,
-	[SM8450_LCX] = &lcx,
-	[SM8450_LMX] = &lmx,
-	[SM8450_MMCX] = &mmcx_w_cx_parent,
-	[SM8450_MMCX_AO] = &mmcx_ao_w_cx_parent,
-	[SM8450_MSS] = &mss,
-	[SM8450_MX] = &mx,
-	[SM8450_MX_AO] = &mx_ao,
-	[SM8450_MXC] = &mxc,
-	[SM8450_MXC_AO] = &mxc_ao,
+	[RPMHPD_CX] = &cx,
+	[RPMHPD_CX_AO] = &cx_ao,
+	[RPMHPD_EBI] = &ebi,
+	[RPMHPD_GFX] = &gfx,
+	[RPMHPD_LCX] = &lcx,
+	[RPMHPD_LMX] = &lmx,
+	[RPMHPD_MMCX] = &mmcx_w_cx_parent,
+	[RPMHPD_MMCX_AO] = &mmcx_ao_w_cx_parent,
+	[RPMHPD_MSS] = &mss,
+	[RPMHPD_MX] = &mx,
+	[RPMHPD_MX_AO] = &mx_ao,
+	[RPMHPD_MXC] = &mxc,
+	[RPMHPD_MXC_AO] = &mxc_ao,
 };
 
 static const struct rpmhpd_desc sm8450_desc = {
@@ -422,20 +423,20 @@ static const struct rpmhpd_desc sm8450_desc = {
 
 /* SM8550 RPMH powerdomains */
 static struct rpmhpd *sm8550_rpmhpds[] = {
-	[SM8550_CX] = &cx,
-	[SM8550_CX_AO] = &cx_ao,
-	[SM8550_EBI] = &ebi,
-	[SM8550_GFX] = &gfx,
-	[SM8550_LCX] = &lcx,
-	[SM8550_LMX] = &lmx,
-	[SM8550_MMCX] = &mmcx_w_cx_parent,
-	[SM8550_MMCX_AO] = &mmcx_ao_w_cx_parent,
-	[SM8550_MSS] = &mss,
-	[SM8550_MX] = &mx,
-	[SM8550_MX_AO] = &mx_ao,
-	[SM8550_MXC] = &mxc,
-	[SM8550_MXC_AO] = &mxc_ao,
-	[SM8550_NSP] = &nsp,
+	[RPMHPD_CX] = &cx,
+	[RPMHPD_CX_AO] = &cx_ao,
+	[RPMHPD_EBI] = &ebi,
+	[RPMHPD_GFX] = &gfx,
+	[RPMHPD_LCX] = &lcx,
+	[RPMHPD_LMX] = &lmx,
+	[RPMHPD_MMCX] = &mmcx_w_cx_parent,
+	[RPMHPD_MMCX_AO] = &mmcx_ao_w_cx_parent,
+	[RPMHPD_MSS] = &mss,
+	[RPMHPD_MX] = &mx,
+	[RPMHPD_MX_AO] = &mx_ao,
+	[RPMHPD_MXC] = &mxc,
+	[RPMHPD_MXC_AO] = &mxc_ao,
+	[RPMHPD_NSP] = &nsp,
 };
 
 static const struct rpmhpd_desc sm8550_desc = {
-- 
2.7.4

Re: [PATCH 1/2] dt-bindings: power: qcom,rpmhpd: Add Generic RPMh PD indexes

[Krzysztof Kozlowski]

On 19/07/2023 07:22, Rohit Agarwal wrote:
> Add Generic RPMh Power Domain indexes that can be used
> for all the Qualcomm SoC henceforth.
> The power domain indexes of these bindings are based on compatibility
> with current targets like SM8[2345]50 targets.
> 
> Signed-off-by: Rohit Agarwal <quic_rohiagar@quicinc.com>
> Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> ---


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH 1/2] dt-bindings: power: qcom,rpmhpd: Add Generic RPMh PD indexes

[Mukesh Ojha]

On 7/19/2023 10:52 AM, Rohit Agarwal wrote:
> Add Generic RPMh Power Domain indexes that can be used
> for all the Qualcomm SoC henceforth.
> The power domain indexes of these bindings are based on compatibility
> with current targets like SM8[2345]50 targets.
> 
> Signed-off-by: Rohit Agarwal <quic_rohiagar@quicinc.com>
> Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Signed-off-by should be followed by Suggested-by ?

-Mukesh

> ---
>   include/dt-bindings/power/qcom,rpmhpd.h | 30 ++++++++++++++++++++++++++++++
>   1 file changed, 30 insertions(+)
>   create mode 100644 include/dt-bindings/power/qcom,rpmhpd.h
> 
> diff --git a/include/dt-bindings/power/qcom,rpmhpd.h b/include/dt-bindings/power/qcom,rpmhpd.h
> new file mode 100644
> index 0000000..7c201a6
> --- /dev/null
> +++ b/include/dt-bindings/power/qcom,rpmhpd.h
> @@ -0,0 +1,30 @@
> +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
> +/*
> + * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#ifndef _DT_BINDINGS_POWER_QCOM_RPMHPD_H
> +#define _DT_BINDINGS_POWER_QCOM_RPMHPD_H
> +
> +/* Generic RPMH Power Domain Indexes */
> +#define RPMHPD_CX               0
> +#define RPMHPD_CX_AO		1
> +#define RPMHPD_EBI		2
> +#define RPMHPD_GFX		3
> +#define RPMHPD_LCX		4
> +#define RPMHPD_LMX		5
> +#define RPMHPD_MMCX		6
> +#define RPMHPD_MMCX_AO		7
> +#define RPMHPD_MX		8
> +#define RPMHPD_MX_AO		9
> +#define RPMHPD_MXC		10
> +#define RPMHPD_MXC_AO		11
> +#define RPMHPD_MSS              12
> +#define RPMHPD_NSP		13
> +#define RPMHPD_NSP0             14
> +#define RPMHPD_NSP1             15
> +#define RPMHPD_QPHY             16
> +#define RPMHPD_DDR              17
> +#define RPMHPD_XO               18
> +
> +#endif

Re: [PATCH 1/2] dt-bindings: power: qcom,rpmhpd: Add Generic RPMh PD indexes

[Pavan Kondeti]

On Wed, Jul 19, 2023 at 10:52:41AM +0530, Rohit Agarwal wrote:
> Add Generic RPMh Power Domain indexes that can be used
> for all the Qualcomm SoC henceforth.
> The power domain indexes of these bindings are based on compatibility
> with current targets like SM8[2345]50 targets.
> 
> Signed-off-by: Rohit Agarwal <quic_rohiagar@quicinc.com>
> Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> ---
>  include/dt-bindings/power/qcom,rpmhpd.h | 30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
>  create mode 100644 include/dt-bindings/power/qcom,rpmhpd.h
> 
> diff --git a/include/dt-bindings/power/qcom,rpmhpd.h b/include/dt-bindings/power/qcom,rpmhpd.h
> new file mode 100644
> index 0000000..7c201a6
> --- /dev/null
> +++ b/include/dt-bindings/power/qcom,rpmhpd.h
> @@ -0,0 +1,30 @@
> +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
> +/*
> + * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
> + */
> +
> +#ifndef _DT_BINDINGS_POWER_QCOM_RPMHPD_H
> +#define _DT_BINDINGS_POWER_QCOM_RPMHPD_H
> +
> +/* Generic RPMH Power Domain Indexes */
> +#define RPMHPD_CX               0
> +#define RPMHPD_CX_AO		1
> +#define RPMHPD_EBI		2
> +#define RPMHPD_GFX		3
> +#define RPMHPD_LCX		4
> +#define RPMHPD_LMX		5
> +#define RPMHPD_MMCX		6
> +#define RPMHPD_MMCX_AO		7
> +#define RPMHPD_MX		8
> +#define RPMHPD_MX_AO		9
> +#define RPMHPD_MXC		10
> +#define RPMHPD_MXC_AO		11
> +#define RPMHPD_MSS              12
> +#define RPMHPD_NSP		13
> +#define RPMHPD_NSP0             14
> +#define RPMHPD_NSP1             15
> +#define RPMHPD_QPHY             16
> +#define RPMHPD_DDR              17
> +#define RPMHPD_XO               18
> +
> +#endif
> -- 

I see the PD performance levels (RPMH_REGULATOR_LEVEL_xxx) are still
coming from qcom-rpmpd.h. Which means Socs with RPMh also need to
include the older header for these definitions along with this newly
created header. something to improve for the clarity sake?

Thanks,
Pavan

Re: [PATCH 1/2] dt-bindings: power: qcom,rpmhpd: Add Generic RPMh PD indexes

[Rohit Agarwal]

On 7/21/2023 11:14 AM, Pavan Kondeti wrote:
> On Wed, Jul 19, 2023 at 10:52:41AM +0530, Rohit Agarwal wrote:
>> Add Generic RPMh Power Domain indexes that can be used
>> for all the Qualcomm SoC henceforth.
>> The power domain indexes of these bindings are based on compatibility
>> with current targets like SM8[2345]50 targets.
>>
>> Signed-off-by: Rohit Agarwal <quic_rohiagar@quicinc.com>
>> Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
>> ---
>>   include/dt-bindings/power/qcom,rpmhpd.h | 30 ++++++++++++++++++++++++++++++
>>   1 file changed, 30 insertions(+)
>>   create mode 100644 include/dt-bindings/power/qcom,rpmhpd.h
>>
>> diff --git a/include/dt-bindings/power/qcom,rpmhpd.h b/include/dt-bindings/power/qcom,rpmhpd.h
>> new file mode 100644
>> index 0000000..7c201a6
>> --- /dev/null
>> +++ b/include/dt-bindings/power/qcom,rpmhpd.h
>> @@ -0,0 +1,30 @@
>> +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
>> +/*
>> + * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
>> + */
>> +
>> +#ifndef _DT_BINDINGS_POWER_QCOM_RPMHPD_H
>> +#define _DT_BINDINGS_POWER_QCOM_RPMHPD_H
>> +
>> +/* Generic RPMH Power Domain Indexes */
>> +#define RPMHPD_CX               0
>> +#define RPMHPD_CX_AO		1
>> +#define RPMHPD_EBI		2
>> +#define RPMHPD_GFX		3
>> +#define RPMHPD_LCX		4
>> +#define RPMHPD_LMX		5
>> +#define RPMHPD_MMCX		6
>> +#define RPMHPD_MMCX_AO		7
>> +#define RPMHPD_MX		8
>> +#define RPMHPD_MX_AO		9
>> +#define RPMHPD_MXC		10
>> +#define RPMHPD_MXC_AO		11
>> +#define RPMHPD_MSS              12
>> +#define RPMHPD_NSP		13
>> +#define RPMHPD_NSP0             14
>> +#define RPMHPD_NSP1             15
>> +#define RPMHPD_QPHY             16
>> +#define RPMHPD_DDR              17
>> +#define RPMHPD_XO               18
>> +
>> +#endif
>> -- 
> I see the PD performance levels (RPMH_REGULATOR_LEVEL_xxx) are still
> coming from qcom-rpmpd.h. Which means Socs with RPMh also need to
> include the older header for these definitions along with this newly
> created header. something to improve for the clarity sake?
Agreed. I think we can move these to the new header so that the new SoC 
with RPMH can completely
move to rpmhpd.h.
Ok. Will wait for anymore suggestions before updating this version.

Thanks,
Rohit.
>
> Thanks,
> Pavan

Re: [PATCH 2/2] soc: qcom: rpmhpd: Use the newly created generic RPMHPD bindings

[Bjorn Andersson]

On Wed, Jul 19, 2023 at 10:52:42AM +0530, Rohit Agarwal wrote:
> Update the SoC SM8[2345]50 entries to use the new
> generic RPMHPD bindings.
> 
> Signed-off-by: Rohit Agarwal <quic_rohiagar@quicinc.com>

Reviewed-by: Bjorn Andersson <andersson@kernel.org>

Regards,
Bjorn

Re: [PATCH 1/2] dt-bindings: power: qcom,rpmhpd: Add Generic RPMh PD indexes

[Bjorn Andersson]

On Fri, Jul 21, 2023 at 06:47:42PM +0530, Rohit Agarwal wrote:
> On 7/21/2023 11:14 AM, Pavan Kondeti wrote:
> > On Wed, Jul 19, 2023 at 10:52:41AM +0530, Rohit Agarwal wrote:
> > > diff --git a/include/dt-bindings/power/qcom,rpmhpd.h b/include/dt-bindings/power/qcom,rpmhpd.h
[..]
> > > +
> > > +#endif
> > > -- 
> > I see the PD performance levels (RPMH_REGULATOR_LEVEL_xxx) are still
> > coming from qcom-rpmpd.h. Which means Socs with RPMh also need to
> > include the older header for these definitions along with this newly
> > created header. something to improve for the clarity sake?
> Agreed. I think we can move these to the new header so that the new SoC with
> RPMH can completely
> move to rpmhpd.h.

Sounds very reasonable, please do that in a follow up patch.
I'm picking this as is.

Thanks,
Bjorn

Re: (subset) [PATCH 0/2] Introduce new generic bindings for RPMHPD

[Bjorn Andersson]

On Wed, 19 Jul 2023 10:52:40 +0530, Rohit Agarwal wrote:
> This series introduces a new generic bindings for Qualcomm SoCs
> to be used instead of creating new SoC specific bindings each time.
> The order of the bindings is kept according to the order in Qualcomm
> SoC like SM8[2345]50 so that it can be reused in these SoC without
> breaking the ABI.
> This was suggested as per the discussions in [1].
> I will create a followup series of DT updates according to the new bindings.
> 
> [...]

Applied, thanks!

[2/2] soc: qcom: rpmhpd: Use the newly created generic RPMHPD bindings
      commit: de3acb7af908ef4fa9fda19cdfce1cc30cb48388

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

Re: [PATCH 1/2] dt-bindings: power: qcom,rpmhpd: Add Generic RPMh PD indexes

[Rohit Agarwal]

On 7/22/2023 8:35 AM, Bjorn Andersson wrote:
> On Fri, Jul 21, 2023 at 06:47:42PM +0530, Rohit Agarwal wrote:
>> On 7/21/2023 11:14 AM, Pavan Kondeti wrote:
>>> On Wed, Jul 19, 2023 at 10:52:41AM +0530, Rohit Agarwal wrote:
>>>> diff --git a/include/dt-bindings/power/qcom,rpmhpd.h b/include/dt-bindings/power/qcom,rpmhpd.h
> [..]
>>>> +
>>>> +#endif
>>>> -- 
>>> I see the PD performance levels (RPMH_REGULATOR_LEVEL_xxx) are still
>>> coming from qcom-rpmpd.h. Which means Socs with RPMh also need to
>>> include the older header for these definitions along with this newly
>>> created header. something to improve for the clarity sake?
>> Agreed. I think we can move these to the new header so that the new SoC with
>> RPMH can completely
>> move to rpmhpd.h.
> Sounds very reasonable, please do that in a follow up patch.
> I'm picking this as is.
I have a doubt related to this about sending the patches.

Since I will be moving the regulators level into the same rpmhpd.h 
header, we
would need to update all the qcom soc dtsi file changes as well. Also 
there is a
remaining dt-bindings patch that update the older rpmhpd bindings to 
these new
ones basically the cleanup is remaining.
Shall I create a unified series updating all these in one and tagging 
all the the
related maintainers in the CC
OR
should I create separate series where the dt changes are updated first 
then the
followup cleanup dt-bindings series?

Thanks,
Rohit.
> Thanks,
> Bjorn