Skip to contentSkip to conversation

clk: qcom: clk-rcg2: add rcg2 mux ops

PATCH Superseded Robert Marko 3 participants 20 messages Jul 11, 2022

Subsystems (4)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 clk: qcom: clk-rcg2: add rcg2 mux ops

From: Christian Marangi <[email protected]>

An RCG may act as a mux that switch between 2 parents.
This is the case on IPQ6018 and IPQ8074 where the APCS core clk that feeds the CPU cluster clock just switches between XO and the PLL that feeds it.

Add the required ops to add support for this special configuration and use the generic mux function to determine the rate.

This way we dont have to keep a essentially dummy frequency table to use RCG2 as a mux.

---
 drivers/clk/qcom/clk-rcg.h  | 1 +
 drivers/clk/qcom/clk-rcg2.c | 7 +++++++
 2 files changed, 8 insertions(+)
drivers/clk/qcom/clk-rcg.h +1 -0
index 012e745794fd..01581f4d2c39 100644
@@ -167,6 +167,7 @@ struct clk_rcg2_gfx3d {
 
 extern const struct clk_ops clk_rcg2_ops;
 extern const struct clk_ops clk_rcg2_floor_ops;
+extern const struct clk_ops clk_rcg2_mux_closest_ops;
 extern const struct clk_ops clk_edp_pixel_ops;
 extern const struct clk_ops clk_byte_ops;
 extern const struct clk_ops clk_byte2_ops;
drivers/clk/qcom/clk-rcg2.c +7 -0
index 28019edd2a50..609c10f8d0d9 100644
@@ -509,6 +509,13 @@ const struct clk_ops clk_rcg2_floor_ops = {
 };
 EXPORT_SYMBOL_GPL(clk_rcg2_floor_ops);
 
+const struct clk_ops clk_rcg2_mux_closest_ops = {
+	.determine_rate = __clk_mux_determine_rate_closest,
+	.get_parent = clk_rcg2_get_parent,
+	.set_parent = clk_rcg2_set_parent,
+};
+EXPORT_SYMBOL_GPL(clk_rcg2_mux_closest_ops);
+
 struct frac_entry {
 	int num;
 	int den;
Signature · 1 line
2.36.1
#1 lore raw

PATCH 2/6 clk: qcom: apss-ipq6018: fix apcs_alias0_clk_src

While working on IPQ8074 APSS driver it was discovered that IPQ6018 and IPQ8074 use almost the same PLL and APSS clocks, however APSS driver is currently broken.

More precisely apcs_alias0_clk_src is broken, it was added as regmap_mux clock.
However after debugging why it was always stuck at 800Mhz, it was figured out that its not regmap_mux compatible at all.
It is a simple mux but it uses RCG2 register layout and control bits, so utilize the new clk_rcg2_mux_closest_ops to correctly drive it while not having to provide a dummy frequency table.

While we are here, use ARRAY_SIZE for number of parents.

Tested on IPQ6018-CP01-C1 reference board and multiple IPQ8074 boards.

Fixes 5e77b4ef1b19 ("clk: qcom: Add ipq6018 apss clock controller")
---
 drivers/clk/qcom/apss-ipq6018.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/clk/qcom/apss-ipq6018.c +6 -7
index d78ff2f310bf..be952d417ded 100644
@@ -16,7 +16,7 @@
 #include "clk-regmap.h"
 #include "clk-branch.h"
 #include "clk-alpha-pll.h"
-#include "clk-regmap-mux.h"
+#include "clk-rcg.h"
 
 enum {
 	P_XO,
@@ -33,16 +33,15 @@ static const struct parent_map parents_apcs_alias0_clk_src_map[] = {
 	{ P_APSS_PLL_EARLY, 5 },
 };
 
-static struct clk_regmap_mux apcs_alias0_clk_src = {
-	.reg = 0x0050,
-	.width = 3,
-	.shift = 7,
+static struct clk_rcg2 apcs_alias0_clk_src = {
+	.cmd_rcgr = 0x0050,
+	.hid_width = 5,
 	.parent_map = parents_apcs_alias0_clk_src_map,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "apcs_alias0_clk_src",
 		.parent_data = parents_apcs_alias0_clk_src,
-		.num_parents = 2,
-		.ops = &clk_regmap_mux_closest_ops,
+		.num_parents = ARRAY_SIZE(parents_apcs_alias0_clk_src),
+		.ops = &clk_rcg2_mux_closest_ops,
 		.flags = CLK_SET_RATE_PARENT,
 	},
 };
Signature · 1 line
2.36.1
#2 lore raw

Re: [PATCH 2/6] clk: qcom: apss-ipq6018: fix apcs_alias0_clk_src

Quoted 10 lines · Robert Marko

While working on IPQ8074 APSS driver it was discovered that IPQ6018 and IPQ8074 use almost the same PLL and APSS clocks, however APSS driver is currently broken.

More precisely apcs_alias0_clk_src is broken, it was added as regmap_mux clock.
However after debugging why it was always stuck at 800Mhz, it was figured out that its not regmap_mux compatible at all.
It is a simple mux but it uses RCG2 register layout and control bits, so

To utilize control bits, you probably should also use

Quoted 2 lines

utilize the new clk_rcg2_mux_closest_ops to correctly drive it while not having to provide a dummy frequency table.

Could you please clarify this. Your new rcg2 ops seems to be literally equivalent to the clk_regmap_mux_closest_ops provided the shift and width are set correctly..

Quoted 24 lines

While we are here, use ARRAY_SIZE for number of parents.

Tested on IPQ6018-CP01-C1 reference board and multiple IPQ8074 boards.

Fixes 5e77b4ef1b19 ("clk: qcom: Add ipq6018 apss clock controller")
---
 drivers/clk/qcom/apss-ipq6018.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/clk/qcom/apss-ipq6018.c +1 -1
index d78ff2f310bf..be952d417ded 100644
@@ -16,7 +16,7 @@
 #include "clk-regmap.h"
 #include "clk-branch.h"
 #include "clk-alpha-pll.h"
-#include "clk-regmap-mux.h"
+#include "clk-rcg.h"
 
 enum {
        P_XO,

drivers/clk/qcom/apss-ipq6018.c static const struct parent_map parents_apcs_alias0_clk_src_map[] = { · line 39

Quoted 7 lines
drivers/clk/qcom/apss-ipq6018.c +0 -4
@@ -33,16 +33,15 @@ static const struct parent_map parents_apcs_alias0_clk_src_map[] = {
        { P_APSS_PLL_EARLY, 5 },
 };
 
-static struct clk_regmap_mux apcs_alias0_clk_src = {
-       .reg = 0x0050,
-       .width = 3,
-       .shift = 7,

Judging from rcg2 ops, .shift should be set to 8.

Quoted 15 lines
drivers/clk/qcom/apss-ipq6018.c +5 -3
+static struct clk_rcg2 apcs_alias0_clk_src = {
+       .cmd_rcgr = 0x0050,
+       .hid_width = 5,
        .parent_map = parents_apcs_alias0_clk_src_map,
        .clkr.hw.init = &(struct clk_init_data){
                .name = "apcs_alias0_clk_src",
                .parent_data = parents_apcs_alias0_clk_src,
-               .num_parents = 2,
-               .ops = &clk_regmap_mux_closest_ops,
+               .num_parents = ARRAY_SIZE(parents_apcs_alias0_clk_src),
+               .ops = &clk_rcg2_mux_closest_ops,
                .flags = CLK_SET_RATE_PARENT,
        },
 };
--
Quoted 2 lines

2.36.1

--
With best wishes
Dmitry

#3 lore raw

Re: [PATCH 2/6] clk: qcom: apss-ipq6018: fix apcs_alias0_clk_src

Quoted 7 lines · Dmitry Baryshkov
Quoted 5 lines · Robert Marko

While working on IPQ8074 APSS driver it was discovered that IPQ6018 and IPQ8074 use almost the same PLL and APSS clocks, however APSS driver is currently broken.

Quoted 7 lines
Quoted 5 lines

More precisely apcs_alias0_clk_src is broken, it was added as regmap_mux clock.
However after debugging why it was always stuck at 800Mhz, it was figured out that its not regmap_mux compatible at all.
It is a simple mux but it uses RCG2 register layout and control bits, so

To utilize control bits, you probably should also use

Hi,
I am not really sure what you mean here?

Quoted 7 lines
Quoted 3 lines

utilize the new clk_rcg2_mux_closest_ops to correctly drive it while not having to provide a dummy frequency table.

Could you please clarify this. Your new rcg2 ops seems to be literally equivalent to the clk_regmap_mux_closest_ops provided the shift and width are set correctly..

Well, I have tried playing with the clk_regmap_mux_closest_ops but I just cannot get it
to work.

The width like you pointed out should be 8, register offset is currently pointing at the RCG control
register and not the CFG one, so it obviously does not work.

Setting the register to 0x54 and shift to 8 will just fail silently, leaving the shift at 7 and correcting
the register won't work as RCG control bits are not utilized at all with regmap_mux and DIRTY_CFG
is active when I manually look at the register.

So, I am really not sure how clk_regmap_mux_closest_ops are supposed to work here at all.

Regards,
Robert

Quoted 57 lines
Quoted 25 lines

While we are here, use ARRAY_SIZE for number of parents.

Tested on IPQ6018-CP01-C1 reference board and multiple IPQ8074 boards.

Fixes 5e77b4ef1b19 ("clk: qcom: Add ipq6018 apss clock controller")
---
 drivers/clk/qcom/apss-ipq6018.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/clk/qcom/apss-ipq6018.c +1 -1
index d78ff2f310bf..be952d417ded 100644
@@ -16,7 +16,7 @@
 #include "clk-regmap.h"
 #include "clk-branch.h"
 #include "clk-alpha-pll.h"
-#include "clk-regmap-mux.h"
+#include "clk-rcg.h"
 
 enum {
        P_XO,

drivers/clk/qcom/apss-ipq6018.c static const struct parent_map parents_apcs_alias0_clk_src_map[] = { · line 39

Quoted 7 lines
drivers/clk/qcom/apss-ipq6018.c +0 -4
@@ -33,16 +33,15 @@ static const struct parent_map parents_apcs_alias0_clk_src_map[] = {
        { P_APSS_PLL_EARLY, 5 },
 };
 
-static struct clk_regmap_mux apcs_alias0_clk_src = {
-       .reg = 0x0050,
-       .width = 3,
-       .shift = 7,

Judging from rcg2 ops, .shift should be set to 8.

Quoted 15 lines
drivers/clk/qcom/apss-ipq6018.c +5 -3
+static struct clk_rcg2 apcs_alias0_clk_src = {
+       .cmd_rcgr = 0x0050,
+       .hid_width = 5,
        .parent_map = parents_apcs_alias0_clk_src_map,
        .clkr.hw.init = &(struct clk_init_data){
                .name = "apcs_alias0_clk_src",
                .parent_data = parents_apcs_alias0_clk_src,
-               .num_parents = 2,
-               .ops = &clk_regmap_mux_closest_ops,
+               .num_parents = ARRAY_SIZE(parents_apcs_alias0_clk_src),
+               .ops = &clk_rcg2_mux_closest_ops,
                .flags = CLK_SET_RATE_PARENT,
        },
 };
--
Quoted 2 lines

2.36.1

--
With best wishes
Dmitry

Reviewed-by
#4 lore raw

Re: [PATCH 2/6] clk: qcom: apss-ipq6018: fix apcs_alias0_clk_src

Quoted 16 lines · Robert Marko
Quoted 13 lines · Dmitry Baryshkov
Quoted 10 lines · Robert Marko

While working on IPQ8074 APSS driver it was discovered that IPQ6018 and IPQ8074 use almost the same PLL and APSS clocks, however APSS driver is currently broken.

More precisely apcs_alias0_clk_src is broken, it was added as regmap_mux clock.
However after debugging why it was always stuck at 800Mhz, it was figured out that its not regmap_mux compatible at all.
It is a simple mux but it uses RCG2 register layout and control bits, so

Quoted 4 lines
Quoted 1 line

To utilize control bits, you probably should also use

Hi,
I am not really sure what you mean here?

Ugh, excuse me. Sent the message too early.
I mean that to utilize RCG2 control bits, you probably also need to use clk_rcg2_is_enabled, etc.

Quoted 17 lines
Quoted 8 lines
Quoted 4 lines

utilize the new clk_rcg2_mux_closest_ops to correctly drive it while not having to provide a dummy frequency table.

Could you please clarify this. Your new rcg2 ops seems to be literally equivalent to the clk_regmap_mux_closest_ops provided the shift and width are set correctly..

Well, I have tried playing with the clk_regmap_mux_closest_ops but I just cannot get it
to work.

The width like you pointed out should be 8, register offset is currently pointing at the RCG control
register and not the CFG one, so it obviously does not work.

Quoted 5 lines

Setting the register to 0x54 and shift to 8 will just fail silently, leaving the shift at 7 and correcting
the register won't work as RCG control bits are not utilized at all with regmap_mux and DIRTY_CFG
is active when I manually look at the register.

Ok, I missed the update_cfg part. So, yes, this looks correct.

Quoted 63 lines

So, I am really not sure how clk_regmap_mux_closest_ops are supposed to work here at all.

Regards,
Robert

Quoted 57 lines
Quoted 25 lines

While we are here, use ARRAY_SIZE for number of parents.

Tested on IPQ6018-CP01-C1 reference board and multiple IPQ8074 boards.

Fixes 5e77b4ef1b19 ("clk: qcom: Add ipq6018 apss clock controller")
---
 drivers/clk/qcom/apss-ipq6018.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/clk/qcom/apss-ipq6018.c +1 -1
index d78ff2f310bf..be952d417ded 100644
@@ -16,7 +16,7 @@
 #include "clk-regmap.h"
 #include "clk-branch.h"
 #include "clk-alpha-pll.h"
-#include "clk-regmap-mux.h"
+#include "clk-rcg.h"
 
 enum {
        P_XO,

drivers/clk/qcom/apss-ipq6018.c static const struct parent_map parents_apcs_alias0_clk_src_map[] = { · line 39

Quoted 7 lines
drivers/clk/qcom/apss-ipq6018.c +0 -4
@@ -33,16 +33,15 @@ static const struct parent_map parents_apcs_alias0_clk_src_map[] = {
        { P_APSS_PLL_EARLY, 5 },
 };
 
-static struct clk_regmap_mux apcs_alias0_clk_src = {
-       .reg = 0x0050,
-       .width = 3,
-       .shift = 7,

Judging from rcg2 ops, .shift should be set to 8.

Quoted 15 lines
drivers/clk/qcom/apss-ipq6018.c +5 -3
+static struct clk_rcg2 apcs_alias0_clk_src = {
+       .cmd_rcgr = 0x0050,
+       .hid_width = 5,
        .parent_map = parents_apcs_alias0_clk_src_map,
        .clkr.hw.init = &(struct clk_init_data){
                .name = "apcs_alias0_clk_src",
                .parent_data = parents_apcs_alias0_clk_src,
-               .num_parents = 2,
-               .ops = &clk_regmap_mux_closest_ops,
+               .num_parents = ARRAY_SIZE(parents_apcs_alias0_clk_src),
+               .ops = &clk_rcg2_mux_closest_ops,
                .flags = CLK_SET_RATE_PARENT,
        },
 };
--
Quoted 2 lines

2.36.1

--
With best wishes
Dmitry

Signature · 2 lines
With best wishes
Dmitry
#5 lore raw

PATCH 3/6 clk: qcom: apss-ipq6018: mark apcs_alias0_core_clk as critical

In reply to Robert Marko

While fixing up the driver I noticed that my IPQ8074 board was hanging after CPUFreq switched the frequency during boot, WDT would eventually reset it.

So mark apcs_alias0_core_clk as critical since its the clock feeding the CPU cluster and must never be disabled.

Fixes 5e77b4ef1b19 ("clk: qcom: Add ipq6018 apss clock controller")
---
 drivers/clk/qcom/apss-ipq6018.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/apss-ipq6018.c +1 -1
index be952d417ded..f2f502e2d5a4 100644
@@ -56,7 +56,7 @@ static struct clk_branch apcs_alias0_core_clk = {
 			.parent_hws = (const struct clk_hw *[]){
 				&apcs_alias0_clk_src.clkr.hw },
 			.num_parents = 1,
-			.flags = CLK_SET_RATE_PARENT,
+			.flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL,
 			.ops = &clk_branch2_ops,
 		},
 	},
Signature · 1 line
2.36.1
Reviewed-by on v1 3/6
#6 lore raw

Re: [PATCH 3/6] clk: qcom: apss-ipq6018: mark apcs_alias0_core_clk as critical

Quoted 7 lines · Robert Marko

While fixing up the driver I noticed that my IPQ8074 board was hanging after CPUFreq switched the frequency during boot, WDT would eventually reset it.

So mark apcs_alias0_core_clk as critical since its the clock feeding the CPU cluster and must never be disabled.

Quoted 23 lines
Fixes 5e77b4ef1b19 ("clk: qcom: Add ipq6018 apss clock controller")
---
 drivers/clk/qcom/apss-ipq6018.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/apss-ipq6018.c +1 -2
index be952d417ded..f2f502e2d5a4 100644
@@ -56,7 +56,7 @@ static struct clk_branch apcs_alias0_core_clk = {
                        .parent_hws = (const struct clk_hw *[]){
                                &apcs_alias0_clk_src.clkr.hw },
                        .num_parents = 1,
-                       .flags = CLK_SET_RATE_PARENT,
+                       .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL,
                        .ops = &clk_branch2_ops,
                },
        },
--

2.36.1

Signature · 2 lines
With best wishes
Dmitry
#7 lore raw

PATCH 4/6 clk: qcom: apss-ipq6018: add MODULE_ALIAS

In reply to Robert Marko

Add MODULE_ALIAS so that driver will be autoloaded if built as a module.

---
 drivers/clk/qcom/apss-ipq6018.c | 1 +
 1 file changed, 1 insertion(+)
drivers/clk/qcom/apss-ipq6018.c +1 -0
index f2f502e2d5a4..963c69f2c0c2 100644
@@ -101,5 +101,6 @@ static struct platform_driver apss_ipq6018_driver = {
 
 module_platform_driver(apss_ipq6018_driver);
 
+MODULE_ALIAS("platform:qcom,apss-ipq6018-clk");
 MODULE_DESCRIPTION("QCOM APSS IPQ 6018 CLK Driver");
 MODULE_LICENSE("GPL v2");
Signature · 1 line
2.36.1
#8 lore raw

Re: [PATCH 4/6] clk: qcom: apss-ipq6018: add MODULE_ALIAS

Quoted 12 lines · Robert Marko

Add MODULE_ALIAS so that driver will be autoloaded if built as a module.

---
 drivers/clk/qcom/apss-ipq6018.c | 1 +
 1 file changed, 1 insertion(+)
drivers/clk/qcom/apss-ipq6018.c +0 -0
index f2f502e2d5a4..963c69f2c0c2 100644

drivers/clk/qcom/apss-ipq6018.c static struct platform_driver apss_ipq6018_driver = { · line 104

Quoted 4 lines
drivers/clk/qcom/apss-ipq6018.c +1 -0
@@ -101,5 +101,6 @@ static struct platform_driver apss_ipq6018_driver = {
 
 module_platform_driver(apss_ipq6018_driver);
 
+MODULE_ALIAS("platform:qcom,apss-ipq6018-clk");

That's not correct alias (no commas) and usually alias is not needed at all. If you need one, please explain why it is needed. Module autoloading works fine without aliases...

Best regards,
Krzysztof

#9 lore raw

Re: [PATCH 4/6] clk: qcom: apss-ipq6018: add MODULE_ALIAS

Quoted 15 lines · Krzysztof Kozlowski
Quoted 13 lines · Robert Marko

Add MODULE_ALIAS so that driver will be autoloaded if built as a module.

---
 drivers/clk/qcom/apss-ipq6018.c | 1 +
 1 file changed, 1 insertion(+)
drivers/clk/qcom/apss-ipq6018.c +0 -0
index f2f502e2d5a4..963c69f2c0c2 100644
@@ -101,5 +101,6 @@ static struct platform_driver apss_ipq6018_driver = {
 
Quoted 7 lines

drivers/clk/qcom/apss-ipq6018.c static struct platform_driver apss_ipq6018_driver = { · line 104

Quoted 3 lines
drivers/clk/qcom/apss-ipq6018.c +1 -0
 module_platform_driver(apss_ipq6018_driver);
 
+MODULE_ALIAS("platform:qcom,apss-ipq6018-clk");

That's not correct alias (no commas) and usually alias is not needed at all. If you need one, please explain why it is needed. Module autoloading works fine without aliases...

Hi Krzysztof,
alias is required here as the driver does not use a DT compatible but is registered
by the APCS driver, if built as a module, it won't get autoloaded without an alias.

I can only fix up the driver name here and in APCS first to have an alias without commas.

Regards,
Robert

Quoted 3 lines

Best regards,
Krzysztof

#10 lore raw

Re: [PATCH 4/6] clk: qcom: apss-ipq6018: add MODULE_ALIAS

Quoted 25 lines · Robert Marko
Quoted 15 lines · Krzysztof Kozlowski
Quoted 13 lines · Robert Marko

Add MODULE_ALIAS so that driver will be autoloaded if built as a module.

---
 drivers/clk/qcom/apss-ipq6018.c | 1 +
 1 file changed, 1 insertion(+)
drivers/clk/qcom/apss-ipq6018.c +0 -0
index f2f502e2d5a4..963c69f2c0c2 100644
@@ -101,5 +101,6 @@ static struct platform_driver apss_ipq6018_driver = {
 
Quoted 7 lines

drivers/clk/qcom/apss-ipq6018.c static struct platform_driver apss_ipq6018_driver = { · line 104

Quoted 3 lines
drivers/clk/qcom/apss-ipq6018.c +1 -0
 module_platform_driver(apss_ipq6018_driver);
 
+MODULE_ALIAS("platform:qcom,apss-ipq6018-clk");

That's not correct alias (no commas) and usually alias is not needed at all. If you need one, please explain why it is needed. Module autoloading works fine without aliases...

Quoted 5 lines

Hi Krzysztof,
alias is required here as the driver does not use a DT compatible but is registered
by the APCS driver, if built as a module, it won't get autoloaded without an alias.

Instead you need device ID table. Aliases are not a workaround for missing core driver elements.

Quoted 3 lines

I can only fix up the driver name here and in APCS first to have an alias without commas.

I see that the comma is used in driver name, so this is an independent issue. Maybe change it to '-' in separate commit?

Best regards,
Krzysztof

#11 lore raw

Re: [PATCH 4/6] clk: qcom: apss-ipq6018: add MODULE_ALIAS

Quoted 27 lines · Krzysztof Kozlowski
Quoted 25 lines · Robert Marko
Quoted 22 lines · Krzysztof Kozlowski
Quoted 12 lines · Robert Marko

Add MODULE_ALIAS so that driver will be autoloaded if built as a module.

---
 drivers/clk/qcom/apss-ipq6018.c | 1 +
 1 file changed, 1 insertion(+)
drivers/clk/qcom/apss-ipq6018.c +0 -0
index f2f502e2d5a4..963c69f2c0c2 100644

drivers/clk/qcom/apss-ipq6018.c static struct platform_driver apss_ipq6018_driver = { · line 104

Quoted 4 lines
drivers/clk/qcom/apss-ipq6018.c +1 -0
@@ -101,5 +101,6 @@ static struct platform_driver apss_ipq6018_driver = {
 
 module_platform_driver(apss_ipq6018_driver);
 
+MODULE_ALIAS("platform:qcom,apss-ipq6018-clk");

That's not correct alias (no commas) and usually alias is not needed at all. If you need one, please explain why it is needed. Module autoloading works fine without aliases...

Quoted 8 lines
Quoted 5 lines

Hi Krzysztof,
alias is required here as the driver does not use a DT compatible but is registered
by the APCS driver, if built as a module, it won't get autoloaded without an alias.

Instead you need device ID table. Aliases are not a workaround for missing core driver elements.

Thanks for pointing this out, it looks like a proper solution for this. I will drop this patch and fix up autoloading after this series gets merged as APCS also requires a fixup, especially since the name in the platform table is limited to 20 characters and the current name does not fit.

Quoted 7 lines
Quoted 4 lines

I can only fix up the driver name here and in APCS first to have an alias without commas.

I see that the comma is used in driver name, so this is an independent issue. Maybe change it to '-' in separate commit?

Like with the previous point, I will drop this patch and fix it after this series gets merged.

Regards,
Robert

Quoted 4 lines

Best regards,
Krzysztof

#12 lore raw

PATCH 5/6 dt-bindings: clock: qcom,a53pll: add IPQ8074 compatible

In reply to Robert Marko

Add IPQ8074 compatible to A53 PLL bindings.

---
 Documentation/devicetree/bindings/clock/qcom,a53pll.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml +1 -0
index fbd758470b88..76830816982e 100644
@@ -17,6 +17,7 @@ properties:
   compatible:
     enum:
       - qcom,ipq6018-a53pll
+      - qcom,ipq8074-a53pll
       - qcom,msm8916-a53pll
       - qcom,msm8939-a53pll
 
Signature · 1 line
2.36.1
#14 lore raw

PATCH 6/6 clk: qcom: apss-ipq-pll: add support for IPQ8074

In reply to Robert Marko

Add support for IPQ8074 since it uses the same PLL setup, however it does not require the Alpha PLL to be reconfigured.

---
 drivers/clk/qcom/apss-ipq-pll.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/qcom/apss-ipq-pll.c +4 -1
index bef7899ad0d6..acfb3ec4f142 100644
@@ -55,6 +55,7 @@ static const struct regmap_config ipq_pll_regmap_config = {
 static int apss_ipq_pll_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
+	struct device_node *node = dev->of_node;
 	struct regmap *regmap;
 	void __iomem *base;
 	int ret;
@@ -67,7 +68,8 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
 	if (IS_ERR(regmap))
 		return PTR_ERR(regmap);
 
-	clk_alpha_pll_configure(&ipq_pll, regmap, &ipq_pll_config);
+	if (of_device_is_compatible(node, "qcom,ipq6018-a53pll"))
+		clk_alpha_pll_configure(&ipq_pll, regmap, &ipq_pll_config);
 
 	ret = devm_clk_register_regmap(dev, &ipq_pll.clkr);
 	if (ret)
@@ -79,6 +81,7 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
 
 static const struct of_device_id apss_ipq_pll_match_table[] = {
 	{ .compatible = "qcom,ipq6018-a53pll" },
+	{ .compatible = "qcom,ipq8074-a53pll" },
 	{ }
 };
 MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
Signature · 1 line
2.36.1
#15 lore raw

Re: [PATCH 6/6] clk: qcom: apss-ipq-pll: add support for IPQ8074

Quoted 21 lines · Robert Marko

Add support for IPQ8074 since it uses the same PLL setup, however it does not require the Alpha PLL to be reconfigured.

---
 drivers/clk/qcom/apss-ipq-pll.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/qcom/apss-ipq-pll.c +1 -0
index bef7899ad0d6..acfb3ec4f142 100644
@@ -55,6 +55,7 @@ static const struct regmap_config ipq_pll_regmap_config = {
 static int apss_ipq_pll_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
+	struct device_node *node = dev->of_node;
 	struct regmap *regmap;
 	void __iomem *base;
 	int ret;

drivers/clk/qcom/apss-ipq-pll.c static int apss_ipq_pll_probe(struct platform_device *pdev) · line 71

Quoted 5 lines
drivers/clk/qcom/apss-ipq-pll.c +1 -1
@@ -67,7 +68,8 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
 	if (IS_ERR(regmap))
 		return PTR_ERR(regmap);
 
-	clk_alpha_pll_configure(&ipq_pll, regmap, &ipq_pll_config);
+	if (of_device_is_compatible(node, "qcom,ipq6018-a53pll"))

Use match data instead with quirks. Better not to encode compatibles all through the code.

Best regards,
Krzysztof

#16 lore raw

Re: [PATCH 6/6] clk: qcom: apss-ipq-pll: add support for IPQ8074

In reply to Robert Marko
Quoted 22 lines · Robert Marko

Add support for IPQ8074 since it uses the same PLL setup, however it does not require the Alpha PLL to be reconfigured.

---
 drivers/clk/qcom/apss-ipq-pll.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/qcom/apss-ipq-pll.c +1 -0
index bef7899ad0d6..acfb3ec4f142 100644
@@ -55,6 +55,7 @@ static const struct regmap_config ipq_pll_regmap_config = {
 static int apss_ipq_pll_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
+       struct device_node *node = dev->of_node;
        struct regmap *regmap;
        void __iomem *base;
        int ret;

drivers/clk/qcom/apss-ipq-pll.c static int apss_ipq_pll_probe(struct platform_device *pdev) · line 72

Quoted 6 lines
drivers/clk/qcom/apss-ipq-pll.c +2 -1
@@ -67,7 +68,8 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
        if (IS_ERR(regmap))
                return PTR_ERR(regmap);
 
-       clk_alpha_pll_configure(&ipq_pll, regmap, &ipq_pll_config);
+       if (of_device_is_compatible(node, "qcom,ipq6018-a53pll"))
+               clk_alpha_pll_configure(&ipq_pll, regmap, &ipq_pll_config);

I'd suggest having the 8074 config here too. It seems logical to me to make sure that the pll is configured correctly.

Quoted 14 lines
drivers/clk/qcom/apss-ipq-pll.c +1 -1
        ret = devm_clk_register_regmap(dev, &ipq_pll.clkr);
        if (ret)
@@ -79,6 +81,7 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
 
 static const struct of_device_id apss_ipq_pll_match_table[] = {
        { .compatible = "qcom,ipq6018-a53pll" },
+       { .compatible = "qcom,ipq8074-a53pll" },
        { }
 };
 MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
--

2.36.1

Signature · 2 lines
With best wishes
Dmitry
#17 lore raw

Re: [PATCH 6/6] clk: qcom: apss-ipq-pll: add support for IPQ8074

Quoted 27 lines · Dmitry Baryshkov
Quoted 25 lines · Robert Marko

Add support for IPQ8074 since it uses the same PLL setup, however it does not require the Alpha PLL to be reconfigured.

---
 drivers/clk/qcom/apss-ipq-pll.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/qcom/apss-ipq-pll.c +1 -0
index bef7899ad0d6..acfb3ec4f142 100644
@@ -55,6 +55,7 @@ static const struct regmap_config ipq_pll_regmap_config = {
 static int apss_ipq_pll_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
+       struct device_node *node = dev->of_node;
        struct regmap *regmap;
        void __iomem *base;
        int ret;
@@ -67,7 +68,8 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
        if (IS_ERR(regmap))
                return PTR_ERR(regmap);
 
Quoted 6 lines

drivers/clk/qcom/apss-ipq-pll.c static int apss_ipq_pll_probe(struct platform_device *pdev) · line 72

Quoted 3 lines
drivers/clk/qcom/apss-ipq-pll.c +2 -1
-       clk_alpha_pll_configure(&ipq_pll, regmap, &ipq_pll_config);
+       if (of_device_is_compatible(node, "qcom,ipq6018-a53pll"))
+               clk_alpha_pll_configure(&ipq_pll, regmap, &ipq_pll_config);

I'd suggest having the 8074 config here too. It seems logical to me to make sure that the pll is configured correctly.

Hi,

I have reworked the driver to use match data so it can be easily provided, However, I dont have it as the downstream QCA kernel does not reconfigure the PLL, unlike IPQ6018.
I can probably read the registers from a running board and provide that?

Regards,
Robert

Quoted 20 lines
Quoted 13 lines
drivers/clk/qcom/apss-ipq-pll.c +1 -1
        ret = devm_clk_register_regmap(dev, &ipq_pll.clkr);
        if (ret)
@@ -79,6 +81,7 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
 
 static const struct of_device_id apss_ipq_pll_match_table[] = {
        { .compatible = "qcom,ipq6018-a53pll" },
+       { .compatible = "qcom,ipq8074-a53pll" },
        { }
 };
 MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
--
Quoted 2 lines

2.36.1

--
With best wishes
Dmitry

#18 lore raw

Re: [PATCH 6/6] clk: qcom: apss-ipq-pll: add support for IPQ8074

Quoted 37 lines · Robert Marko
Quoted 27 lines · Dmitry Baryshkov
Quoted 25 lines · Robert Marko

Add support for IPQ8074 since it uses the same PLL setup, however it does not require the Alpha PLL to be reconfigured.

---
 drivers/clk/qcom/apss-ipq-pll.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/qcom/apss-ipq-pll.c +1 -0
index bef7899ad0d6..acfb3ec4f142 100644
@@ -55,6 +55,7 @@ static const struct regmap_config ipq_pll_regmap_config = {
 static int apss_ipq_pll_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
+       struct device_node *node = dev->of_node;
        struct regmap *regmap;
        void __iomem *base;
        int ret;
@@ -67,7 +68,8 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
        if (IS_ERR(regmap))
                return PTR_ERR(regmap);
 
Quoted 6 lines

drivers/clk/qcom/apss-ipq-pll.c static int apss_ipq_pll_probe(struct platform_device *pdev) · line 72

Quoted 3 lines
drivers/clk/qcom/apss-ipq-pll.c +2 -1
-       clk_alpha_pll_configure(&ipq_pll, regmap, &ipq_pll_config);
+       if (of_device_is_compatible(node, "qcom,ipq6018-a53pll"))
+               clk_alpha_pll_configure(&ipq_pll, regmap, &ipq_pll_config);

I'd suggest having the 8074 config here too. It seems logical to me to make sure that the pll is configured correctly.

Quoted 6 lines

Hi,

I have reworked the driver to use match data so it can be easily provided, However, I dont have it as the downstream QCA kernel does not reconfigure the PLL, unlike IPQ6018.
I can probably read the registers from a running board and provide that?

Yes, please try that.

Quoted 23 lines

Regards,
Robert

Quoted 20 lines
Quoted 13 lines
drivers/clk/qcom/apss-ipq-pll.c +1 -1
        ret = devm_clk_register_regmap(dev, &ipq_pll.clkr);
        if (ret)
@@ -79,6 +81,7 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
 
 static const struct of_device_id apss_ipq_pll_match_table[] = {
        { .compatible = "qcom,ipq6018-a53pll" },
+       { .compatible = "qcom,ipq8074-a53pll" },
        { }
 };
 MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
--
Quoted 2 lines

2.36.1

--
With best wishes
Dmitry

Signature · 2 lines
With best wishes
Dmitry
Reviewed-by on v1 1/6
#19 lore raw
In reply to Robert Marko
Quoted 7 lines · Robert Marko

From: Christian Marangi <[email protected]>

An RCG may act as a mux that switch between 2 parents.
This is the case on IPQ6018 and IPQ8074 where the APCS core clk that feeds the CPU cluster clock just switches between XO and the PLL that feeds it.

Quoted 8 lines

Add the required ops to add support for this special configuration and use the generic mux function to determine the rate.

This way we dont have to keep a essentially dummy frequency table to use RCG2 as a mux.

Quoted 38 lines
---
 drivers/clk/qcom/clk-rcg.h  | 1 +
 drivers/clk/qcom/clk-rcg2.c | 7 +++++++
 2 files changed, 8 insertions(+)
drivers/clk/qcom/clk-rcg.h +1 -0
index 012e745794fd..01581f4d2c39 100644
@@ -167,6 +167,7 @@ struct clk_rcg2_gfx3d {
 
 extern const struct clk_ops clk_rcg2_ops;
 extern const struct clk_ops clk_rcg2_floor_ops;
+extern const struct clk_ops clk_rcg2_mux_closest_ops;
 extern const struct clk_ops clk_edp_pixel_ops;
 extern const struct clk_ops clk_byte_ops;
 extern const struct clk_ops clk_byte2_ops;
drivers/clk/qcom/clk-rcg2.c +7 -1
index 28019edd2a50..609c10f8d0d9 100644
@@ -509,6 +509,13 @@ const struct clk_ops clk_rcg2_floor_ops = {
 };
 EXPORT_SYMBOL_GPL(clk_rcg2_floor_ops);
 
+const struct clk_ops clk_rcg2_mux_closest_ops = {
+       .determine_rate = __clk_mux_determine_rate_closest,
+       .get_parent = clk_rcg2_get_parent,
+       .set_parent = clk_rcg2_set_parent,
+};
+EXPORT_SYMBOL_GPL(clk_rcg2_mux_closest_ops);
+
 struct frac_entry {
        int num;
        int den;
--

2.36.1

Signature · 2 lines
With best wishes
Dmitry