[PATCH 0/6] clk: qcom: cpu-8996: additional cleanup for the driver

[PATCH 0/6] clk: qcom: cpu-8996: additional cleanup for the driver

[Dmitry Baryshkov]

This patch series depends on patches 1-5 from [1].

Path 1 is slightly fixed version of patch 6 from the mentioned
patch series (fixed to use parent_hws where applicable). The rest is
minor cleanup of the driver.

[1] https://lore.kernel.org/linux-arm-msm/20220621160621.24415-1-y.oudjana@protonmail.com/


Dmitry Baryshkov (5):
  clk: qcom: cpu-8996: switch to devm_clk_notifier_register
  clk: qcom: cpu-8996: declare ACD clocks
  clk: qcom: cpu-8996: move ACD logic to
    clk_cpu_8996_pmux_determine_rate
  clk: qcom: cpu-8996: don't store parents in clk_cpu_8996_pmux
  clk: qcom: cpu-8996: use constant mask for pmux

Yassine Oudjana (1):
  clk: qcom: msm8996-cpu: Use parent_data/_hws for all clocks

 drivers/clk/qcom/clk-cpu-8996.c | 191 +++++++++++++++++---------------
 1 file changed, 100 insertions(+), 91 deletions(-)


base-commit: ca48adcc40b09d7f26a7754d4d54cfc4bd611f38
prerequisite-patch-id: ff67ff7bea1aef8e367a2589c46cf2c9ebb48664
prerequisite-patch-id: 1fdf02d8161689f3e571816d73ec94b115f51c34
prerequisite-patch-id: 837945fbb40427dac2e95a58b7660a3cf26d7d53
prerequisite-patch-id: df10945929f6f558c1363a23e2993d748a40236f
prerequisite-patch-id: a657a27256ef4be0cb932cb0ca7b3e4768e466f9
-- 
2.35.1

[PATCH 1/6] clk: qcom: msm8996-cpu: Use parent_data/_hws for all clocks

[Dmitry Baryshkov]

From: Yassine Oudjana <y.oudjana@protonmail.com>

Replace parent_names in PLLs, secondary muxes and primary muxes with
parent_data. For primary muxes there were never any *cl_pll_acd clocks,
so instead of adding them, put the primary PLLs in both PLL_INDEX and
ACD_INDEX, then make sure ACD_INDEX is always picked over PLL_INDEX when
setting parent since we always want ACD when using the primary PLLs.

Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
[DB: switch to parent_hws for pmux clocks]
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/clk-cpu-8996.c | 79 ++++++++++++++++++++-------------
 1 file changed, 47 insertions(+), 32 deletions(-)

diff --git a/drivers/clk/qcom/clk-cpu-8996.c b/drivers/clk/qcom/clk-cpu-8996.c
index b3ad9245874d..708a8ad0c933 100644
--- a/drivers/clk/qcom/clk-cpu-8996.c
+++ b/drivers/clk/qcom/clk-cpu-8996.c
@@ -112,14 +112,18 @@ static const struct alpha_pll_config hfpll_config = {
 	.early_output_mask = BIT(3),
 };
 
+static const struct clk_parent_data pll_parent[] = {
+	{ .fw_name = "xo" },
+};
+
 static struct clk_alpha_pll pwrcl_pll = {
 	.offset = PWRCL_REG_OFFSET,
 	.regs = prim_pll_regs,
 	.flags = SUPPORTS_DYNAMIC_UPDATE | SUPPORTS_FSM_MODE,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "pwrcl_pll",
-		.parent_names = (const char *[]){ "xo" },
-		.num_parents = 1,
+		.parent_data = pll_parent,
+		.num_parents = ARRAY_SIZE(pll_parent),
 		.ops = &clk_alpha_pll_huayra_ops,
 	},
 };
@@ -130,8 +134,8 @@ static struct clk_alpha_pll perfcl_pll = {
 	.flags = SUPPORTS_DYNAMIC_UPDATE | SUPPORTS_FSM_MODE,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "perfcl_pll",
-		.parent_names = (const char *[]){ "xo" },
-		.num_parents = 1,
+		.parent_data = pll_parent,
+		.num_parents = ARRAY_SIZE(pll_parent),
 		.ops = &clk_alpha_pll_huayra_ops,
 	},
 };
@@ -190,8 +194,8 @@ static struct clk_alpha_pll pwrcl_alt_pll = {
 	.flags = SUPPORTS_OFFLINE_REQ | SUPPORTS_FSM_MODE,
 	.clkr.hw.init = &(struct clk_init_data) {
 		.name = "pwrcl_alt_pll",
-		.parent_names = (const char *[]){ "xo" },
-		.num_parents = 1,
+		.parent_data = pll_parent,
+		.num_parents = ARRAY_SIZE(pll_parent),
 		.ops = &clk_alpha_pll_hwfsm_ops,
 	},
 };
@@ -204,8 +208,8 @@ static struct clk_alpha_pll perfcl_alt_pll = {
 	.flags = SUPPORTS_OFFLINE_REQ | SUPPORTS_FSM_MODE,
 	.clkr.hw.init = &(struct clk_init_data) {
 		.name = "perfcl_alt_pll",
-		.parent_names = (const char *[]){ "xo" },
-		.num_parents = 1,
+		.parent_data = pll_parent,
+		.num_parents = ARRAY_SIZE(pll_parent),
 		.ops = &clk_alpha_pll_hwfsm_ops,
 	},
 };
@@ -252,6 +256,9 @@ static int clk_cpu_8996_pmux_set_parent(struct clk_hw *hw, u8 index)
 	u32 val;
 
 	val = index;
+	/* We always want ACD when using the primary PLL */
+	if (val == PLL_INDEX)
+		val = ACD_INDEX;
 	val <<= cpuclk->shift;
 
 	return regmap_update_bits(clkr->regmap, cpuclk->reg, mask, val);
@@ -282,17 +289,24 @@ static const struct clk_ops clk_cpu_8996_pmux_ops = {
 	.determine_rate = clk_cpu_8996_pmux_determine_rate,
 };
 
+static const struct clk_parent_data pwrcl_smux_parents[] = {
+	{ .fw_name = "xo" },
+	{ .hw = &pwrcl_pll_postdiv.hw },
+};
+
+static const struct clk_parent_data perfcl_smux_parents[] = {
+	{ .fw_name = "xo" },
+	{ .hw = &perfcl_pll_postdiv.hw },
+};
+
 static struct clk_regmap_mux pwrcl_smux = {
 	.reg = PWRCL_REG_OFFSET + MUX_OFFSET,
 	.shift = 2,
 	.width = 2,
 	.clkr.hw.init = &(struct clk_init_data) {
 		.name = "pwrcl_smux",
-		.parent_names = (const char *[]){
-			"xo",
-			"pwrcl_pll_postdiv",
-		},
-		.num_parents = 2,
+		.parent_data = pwrcl_smux_parents,
+		.num_parents = ARRAY_SIZE(pwrcl_smux_parents),
 		.ops = &clk_regmap_mux_closest_ops,
 		.flags = CLK_SET_RATE_PARENT,
 	},
@@ -304,16 +318,27 @@ static struct clk_regmap_mux perfcl_smux = {
 	.width = 2,
 	.clkr.hw.init = &(struct clk_init_data) {
 		.name = "perfcl_smux",
-		.parent_names = (const char *[]){
-			"xo",
-			"perfcl_pll_postdiv",
-		},
-		.num_parents = 2,
+		.parent_data = perfcl_smux_parents,
+		.num_parents = ARRAY_SIZE(perfcl_smux_parents),
 		.ops = &clk_regmap_mux_closest_ops,
 		.flags = CLK_SET_RATE_PARENT,
 	},
 };
 
+static const struct clk_hw *pwrcl_pmux_parents[] = {
+	[SMUX_INDEX] = &pwrcl_smux.clkr.hw,
+	[PLL_INDEX] = &pwrcl_pll.clkr.hw,
+	[ACD_INDEX] = &pwrcl_pll.clkr.hw,
+	[ALT_INDEX] = &pwrcl_alt_pll.clkr.hw,
+};
+
+static const struct clk_hw *perfcl_pmux_parents[] = {
+	[SMUX_INDEX] = &perfcl_smux.clkr.hw,
+	[PLL_INDEX] = &perfcl_pll.clkr.hw,
+	[ACD_INDEX] = &perfcl_pll.clkr.hw,
+	[ALT_INDEX] = &perfcl_alt_pll.clkr.hw,
+};
+
 static struct clk_cpu_8996_pmux pwrcl_pmux = {
 	.reg = PWRCL_REG_OFFSET + MUX_OFFSET,
 	.shift = 0,
@@ -323,13 +348,8 @@ static struct clk_cpu_8996_pmux pwrcl_pmux = {
 	.nb.notifier_call = cpu_clk_notifier_cb,
 	.clkr.hw.init = &(struct clk_init_data) {
 		.name = "pwrcl_pmux",
-		.parent_names = (const char *[]){
-			"pwrcl_smux",
-			"pwrcl_pll",
-			"pwrcl_pll_acd",
-			"pwrcl_alt_pll",
-		},
-		.num_parents = 4,
+		.parent_hws = pwrcl_pmux_parents,
+		.num_parents = ARRAY_SIZE(pwrcl_pmux_parents),
 		.ops = &clk_cpu_8996_pmux_ops,
 		/* CPU clock is critical and should never be gated */
 		.flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL,
@@ -345,13 +365,8 @@ static struct clk_cpu_8996_pmux perfcl_pmux = {
 	.nb.notifier_call = cpu_clk_notifier_cb,
 	.clkr.hw.init = &(struct clk_init_data) {
 		.name = "perfcl_pmux",
-		.parent_names = (const char *[]){
-			"perfcl_smux",
-			"perfcl_pll",
-			"perfcl_pll_acd",
-			"perfcl_alt_pll",
-		},
-		.num_parents = 4,
+		.parent_hws = perfcl_pmux_parents,
+		.num_parents = ARRAY_SIZE(perfcl_pmux_parents),
 		.ops = &clk_cpu_8996_pmux_ops,
 		/* CPU clock is critical and should never be gated */
 		.flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL,
-- 
2.35.1

[PATCH 2/6] clk: qcom: cpu-8996: switch to devm_clk_notifier_register

[Dmitry Baryshkov]

Switch to using devres-managed version of clk_notifier_register(). This
allows us to drop driver's remove() callback.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/clk-cpu-8996.c | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/drivers/clk/qcom/clk-cpu-8996.c b/drivers/clk/qcom/clk-cpu-8996.c
index 708a8ad0c933..ff90cd5b4fba 100644
--- a/drivers/clk/qcom/clk-cpu-8996.c
+++ b/drivers/clk/qcom/clk-cpu-8996.c
@@ -425,27 +425,12 @@ static int qcom_cpu_clk_msm8996_register_clks(struct device *dev,
 	clk_prepare_enable(pwrcl_alt_pll.clkr.hw.clk);
 	clk_prepare_enable(perfcl_alt_pll.clkr.hw.clk);
 
-	clk_notifier_register(pwrcl_pmux.clkr.hw.clk, &pwrcl_pmux.nb);
-	clk_notifier_register(perfcl_pmux.clkr.hw.clk, &perfcl_pmux.nb);
+	devm_clk_notifier_register(dev, pwrcl_pmux.clkr.hw.clk, &pwrcl_pmux.nb);
+	devm_clk_notifier_register(dev, perfcl_pmux.clkr.hw.clk, &perfcl_pmux.nb);
 
 	return ret;
 }
 
-static int qcom_cpu_clk_msm8996_unregister_clks(void)
-{
-	int ret = 0;
-
-	ret = clk_notifier_unregister(pwrcl_pmux.clkr.hw.clk, &pwrcl_pmux.nb);
-	if (ret)
-		return ret;
-
-	ret = clk_notifier_unregister(perfcl_pmux.clkr.hw.clk, &perfcl_pmux.nb);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
 #define CPU_AFINITY_MASK 0xFFF
 #define PWRCL_CPU_REG_MASK 0x3
 #define PERFCL_CPU_REG_MASK 0x103
@@ -544,11 +529,6 @@ static int qcom_cpu_clk_msm8996_driver_probe(struct platform_device *pdev)
 	return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, data);
 }
 
-static int qcom_cpu_clk_msm8996_driver_remove(struct platform_device *pdev)
-{
-	return qcom_cpu_clk_msm8996_unregister_clks();
-}
-
 static const struct of_device_id qcom_cpu_clk_msm8996_match_table[] = {
 	{ .compatible = "qcom,msm8996-apcc" },
 	{}
@@ -557,7 +537,6 @@ MODULE_DEVICE_TABLE(of, qcom_cpu_clk_msm8996_match_table);
 
 static struct platform_driver qcom_cpu_clk_msm8996_driver = {
 	.probe = qcom_cpu_clk_msm8996_driver_probe,
-	.remove = qcom_cpu_clk_msm8996_driver_remove,
 	.driver = {
 		.name = "qcom-msm8996-apcc",
 		.of_match_table = qcom_cpu_clk_msm8996_match_table,
-- 
2.35.1

[PATCH 3/6] clk: qcom: cpu-8996: declare ACD clocks

[Dmitry Baryshkov]

To simplify the code, define 1:1 fixed factor clocks to represent the
ACD pmux parent.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/clk-cpu-8996.c | 53 +++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/drivers/clk/qcom/clk-cpu-8996.c b/drivers/clk/qcom/clk-cpu-8996.c
index ff90cd5b4fba..3dd6efdef82d 100644
--- a/drivers/clk/qcom/clk-cpu-8996.c
+++ b/drivers/clk/qcom/clk-cpu-8996.c
@@ -168,6 +168,34 @@ static struct clk_fixed_factor perfcl_pll_postdiv = {
 	},
 };
 
+static struct clk_fixed_factor perfcl_pll_acd = {
+	.mult = 1,
+	.div = 1,
+	.hw.init = &(struct clk_init_data){
+		.name = "perfcl_pll_acd",
+		.parent_data = &(const struct clk_parent_data){
+			.hw = &perfcl_pll.clkr.hw
+		},
+		.num_parents = 1,
+		.ops = &clk_fixed_factor_ops,
+		.flags = CLK_SET_RATE_PARENT,
+	},
+};
+
+static struct clk_fixed_factor pwrcl_pll_acd = {
+	.mult = 1,
+	.div = 1,
+	.hw.init = &(struct clk_init_data){
+		.name = "pwrcl_pll_acd",
+		.parent_data = &(const struct clk_parent_data){
+			.hw = &pwrcl_pll.clkr.hw
+		},
+		.num_parents = 1,
+		.ops = &clk_fixed_factor_ops,
+		.flags = CLK_SET_RATE_PARENT,
+	},
+};
+
 static const struct pll_vco alt_pll_vco_modes[] = {
 	VCO(3,  250000000,  500000000),
 	VCO(2,  500000000,  750000000),
@@ -328,14 +356,14 @@ static struct clk_regmap_mux perfcl_smux = {
 static const struct clk_hw *pwrcl_pmux_parents[] = {
 	[SMUX_INDEX] = &pwrcl_smux.clkr.hw,
 	[PLL_INDEX] = &pwrcl_pll.clkr.hw,
-	[ACD_INDEX] = &pwrcl_pll.clkr.hw,
+	[ACD_INDEX] = &pwrcl_pll_acd.hw,
 	[ALT_INDEX] = &pwrcl_alt_pll.clkr.hw,
 };
 
 static const struct clk_hw *perfcl_pmux_parents[] = {
 	[SMUX_INDEX] = &perfcl_smux.clkr.hw,
 	[PLL_INDEX] = &perfcl_pll.clkr.hw,
-	[ACD_INDEX] = &perfcl_pll.clkr.hw,
+	[ACD_INDEX] = &perfcl_pll_acd.hw,
 	[ALT_INDEX] = &perfcl_alt_pll.clkr.hw,
 };
 
@@ -382,6 +410,13 @@ static const struct regmap_config cpu_msm8996_regmap_config = {
 	.val_format_endian	= REGMAP_ENDIAN_LITTLE,
 };
 
+static struct clk_hw *cpu_msm8996_hw_clks[] = {
+	&pwrcl_pll_postdiv.hw,
+	&perfcl_pll_postdiv.hw,
+	&pwrcl_pll_acd.hw,
+	&perfcl_pll_acd.hw,
+};
+
 static struct clk_regmap *cpu_msm8996_clks[] = {
 	&pwrcl_pll.clkr,
 	&perfcl_pll.clkr,
@@ -398,16 +433,10 @@ static int qcom_cpu_clk_msm8996_register_clks(struct device *dev,
 {
 	int i, ret;
 
-	ret = devm_clk_hw_register(dev, &pwrcl_pll_postdiv.hw);
-	if (ret) {
-		dev_err(dev, "Failed to register pwrcl_pll_postdiv: %d", ret);
-		return ret;
-	}
-
-	ret = devm_clk_hw_register(dev, &perfcl_pll_postdiv.hw);
-	if (ret) {
-		dev_err(dev, "Failed to register perfcl_pll_postdiv: %d", ret);
-		return ret;
+	for (i = 0; i < ARRAY_SIZE(cpu_msm8996_hw_clks); i++) {
+		ret = devm_clk_hw_register(dev, cpu_msm8996_hw_clks[i]);
+		if (ret)
+			return ret;
 	}
 
 	for (i = 0; i < ARRAY_SIZE(cpu_msm8996_clks); i++) {
-- 
2.35.1

[PATCH 4/6] clk: qcom: cpu-8996: move ACD logic to clk_cpu_8996_pmux_determine_rate

[Dmitry Baryshkov]

Rather than telling everybody that we are using PLL as a parent (and
using ACD clock instead) properly select ACD as a pmux parent clock.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/clk-cpu-8996.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/clk/qcom/clk-cpu-8996.c b/drivers/clk/qcom/clk-cpu-8996.c
index 3dd6efdef82d..5c5adcb533ce 100644
--- a/drivers/clk/qcom/clk-cpu-8996.c
+++ b/drivers/clk/qcom/clk-cpu-8996.c
@@ -284,9 +284,6 @@ static int clk_cpu_8996_pmux_set_parent(struct clk_hw *hw, u8 index)
 	u32 val;
 
 	val = index;
-	/* We always want ACD when using the primary PLL */
-	if (val == PLL_INDEX)
-		val = ACD_INDEX;
 	val <<= cpuclk->shift;
 
 	return regmap_update_bits(clkr->regmap, cpuclk->reg, mask, val);
@@ -371,7 +368,7 @@ static struct clk_cpu_8996_pmux pwrcl_pmux = {
 	.reg = PWRCL_REG_OFFSET + MUX_OFFSET,
 	.shift = 0,
 	.width = 2,
-	.pll = &pwrcl_pll.clkr.hw,
+	.pll = &pwrcl_pll_acd.clkr.hw,
 	.pll_div_2 = &pwrcl_smux.clkr.hw,
 	.nb.notifier_call = cpu_clk_notifier_cb,
 	.clkr.hw.init = &(struct clk_init_data) {
@@ -388,7 +385,7 @@ static struct clk_cpu_8996_pmux perfcl_pmux = {
 	.reg = PERFCL_REG_OFFSET + MUX_OFFSET,
 	.shift = 0,
 	.width = 2,
-	.pll = &perfcl_pll.clkr.hw,
+	.pll = &perfcl_pll_acd.clkr.hw,
 	.pll_div_2 = &perfcl_smux.clkr.hw,
 	.nb.notifier_call = cpu_clk_notifier_cb,
 	.clkr.hw.init = &(struct clk_init_data) {
-- 
2.35.1

[PATCH 5/6] clk: qcom: cpu-8996: don't store parents in clk_cpu_8996_pmux

[Dmitry Baryshkov]

Don't store pointers to parents in struct clk_cpu_8996_pmux. Instead use
clk_hw_get_parent_by_index to fetch them.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/clk-cpu-8996.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/drivers/clk/qcom/clk-cpu-8996.c b/drivers/clk/qcom/clk-cpu-8996.c
index 5c5adcb533ce..0a336adb02b5 100644
--- a/drivers/clk/qcom/clk-cpu-8996.c
+++ b/drivers/clk/qcom/clk-cpu-8996.c
@@ -247,8 +247,6 @@ struct clk_cpu_8996_pmux {
 	u8	shift;
 	u8	width;
 	struct notifier_block nb;
-	struct clk_hw	*pll;
-	struct clk_hw	*pll_div_2;
 	struct clk_regmap clkr;
 };
 
@@ -292,15 +290,17 @@ static int clk_cpu_8996_pmux_set_parent(struct clk_hw *hw, u8 index)
 static int clk_cpu_8996_pmux_determine_rate(struct clk_hw *hw,
 					   struct clk_rate_request *req)
 {
-	struct clk_cpu_8996_pmux *cpuclk = to_clk_cpu_8996_pmux_hw(hw);
-	struct clk_hw *parent = cpuclk->pll;
+	struct clk_hw *parent;
 
-	if (cpuclk->pll_div_2 && req->rate < DIV_2_THRESHOLD) {
-		if (req->rate < (DIV_2_THRESHOLD / 2))
-			return -EINVAL;
+	if (req->rate < (DIV_2_THRESHOLD / 2))
+		return -EINVAL;
 
-		parent = cpuclk->pll_div_2;
-	}
+	if (req->rate < DIV_2_THRESHOLD)
+		parent = clk_hw_get_parent_by_index(hw, SMUX_INDEX);
+	else
+		parent = clk_hw_get_parent_by_index(hw, ACD_INDEX);
+	if (!parent)
+		return -EINVAL;
 
 	req->best_parent_rate = clk_hw_round_rate(parent, req->rate);
 	req->best_parent_hw = parent;
@@ -368,8 +368,6 @@ static struct clk_cpu_8996_pmux pwrcl_pmux = {
 	.reg = PWRCL_REG_OFFSET + MUX_OFFSET,
 	.shift = 0,
 	.width = 2,
-	.pll = &pwrcl_pll_acd.clkr.hw,
-	.pll_div_2 = &pwrcl_smux.clkr.hw,
 	.nb.notifier_call = cpu_clk_notifier_cb,
 	.clkr.hw.init = &(struct clk_init_data) {
 		.name = "pwrcl_pmux",
@@ -385,8 +383,6 @@ static struct clk_cpu_8996_pmux perfcl_pmux = {
 	.reg = PERFCL_REG_OFFSET + MUX_OFFSET,
 	.shift = 0,
 	.width = 2,
-	.pll = &perfcl_pll_acd.clkr.hw,
-	.pll_div_2 = &perfcl_smux.clkr.hw,
 	.nb.notifier_call = cpu_clk_notifier_cb,
 	.clkr.hw.init = &(struct clk_init_data) {
 		.name = "perfcl_pmux",
-- 
2.35.1

[PATCH 6/6] clk: qcom: cpu-8996: use constant mask for pmux

[Dmitry Baryshkov]

Both pmux instances share the same width and shift. Specify the mask at
compile time to simplify functions.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/clk-cpu-8996.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/drivers/clk/qcom/clk-cpu-8996.c b/drivers/clk/qcom/clk-cpu-8996.c
index 0a336adb02b5..ee76ef958d31 100644
--- a/drivers/clk/qcom/clk-cpu-8996.c
+++ b/drivers/clk/qcom/clk-cpu-8996.c
@@ -49,6 +49,7 @@
  * detect voltage droops.
  */
 
+#include <linux/bitfield.h>
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/io.h>
@@ -76,6 +77,8 @@ enum _pmux_input {
 #define ALT_PLL_OFFSET	0x100
 #define SSSCTL_OFFSET 0x160
 
+#define PMUX_MASK	0x3
+
 static const u8 prim_pll_regs[PLL_OFF_MAX_REGS] = {
 	[PLL_OFF_L_VAL] = 0x04,
 	[PLL_OFF_ALPHA_VAL] = 0x08,
@@ -244,8 +247,6 @@ static struct clk_alpha_pll perfcl_alt_pll = {
 
 struct clk_cpu_8996_pmux {
 	u32	reg;
-	u8	shift;
-	u8	width;
 	struct notifier_block nb;
 	struct clk_regmap clkr;
 };
@@ -265,26 +266,22 @@ static u8 clk_cpu_8996_pmux_get_parent(struct clk_hw *hw)
 {
 	struct clk_regmap *clkr = to_clk_regmap(hw);
 	struct clk_cpu_8996_pmux *cpuclk = to_clk_cpu_8996_pmux_hw(hw);
-	u32 mask = GENMASK(cpuclk->width - 1, 0);
 	u32 val;
 
 	regmap_read(clkr->regmap, cpuclk->reg, &val);
-	val >>= cpuclk->shift;
 
-	return val & mask;
+	return FIELD_GET(PMUX_MASK, val);
 }
 
 static int clk_cpu_8996_pmux_set_parent(struct clk_hw *hw, u8 index)
 {
 	struct clk_regmap *clkr = to_clk_regmap(hw);
 	struct clk_cpu_8996_pmux *cpuclk = to_clk_cpu_8996_pmux_hw(hw);
-	u32 mask = GENMASK(cpuclk->width + cpuclk->shift - 1, cpuclk->shift);
 	u32 val;
 
-	val = index;
-	val <<= cpuclk->shift;
+	val = FIELD_PREP(PMUX_MASK, index);
 
-	return regmap_update_bits(clkr->regmap, cpuclk->reg, mask, val);
+	return regmap_update_bits(clkr->regmap, cpuclk->reg, PMUX_MASK, val);
 }
 
 static int clk_cpu_8996_pmux_determine_rate(struct clk_hw *hw,
@@ -366,8 +363,6 @@ static const struct clk_hw *perfcl_pmux_parents[] = {
 
 static struct clk_cpu_8996_pmux pwrcl_pmux = {
 	.reg = PWRCL_REG_OFFSET + MUX_OFFSET,
-	.shift = 0,
-	.width = 2,
 	.nb.notifier_call = cpu_clk_notifier_cb,
 	.clkr.hw.init = &(struct clk_init_data) {
 		.name = "pwrcl_pmux",
@@ -381,8 +376,6 @@ static struct clk_cpu_8996_pmux pwrcl_pmux = {
 
 static struct clk_cpu_8996_pmux perfcl_pmux = {
 	.reg = PERFCL_REG_OFFSET + MUX_OFFSET,
-	.shift = 0,
-	.width = 2,
 	.nb.notifier_call = cpu_clk_notifier_cb,
 	.clkr.hw.init = &(struct clk_init_data) {
 		.name = "perfcl_pmux",
-- 
2.35.1

Re: [PATCH 0/6] clk: qcom: cpu-8996: additional cleanup for the driver

[Dmitry Baryshkov]

On 14/07/2022 13:03, Dmitry Baryshkov wrote:
> This patch series depends on patches 1-5 from [1].
> 
> Path 1 is slightly fixed version of patch 6 from the mentioned
> patch series (fixed to use parent_hws where applicable). The rest is
> minor cleanup of the driver.
> 
> [1] https://lore.kernel.org/linux-arm-msm/20220621160621.24415-1-y.oudjana@protonmail.com/
> 

Gracious ping. Yassing, Bjorn, Konrad?

> 
> Dmitry Baryshkov (5):
>    clk: qcom: cpu-8996: switch to devm_clk_notifier_register
>    clk: qcom: cpu-8996: declare ACD clocks
>    clk: qcom: cpu-8996: move ACD logic to
>      clk_cpu_8996_pmux_determine_rate
>    clk: qcom: cpu-8996: don't store parents in clk_cpu_8996_pmux
>    clk: qcom: cpu-8996: use constant mask for pmux
> 
> Yassine Oudjana (1):
>    clk: qcom: msm8996-cpu: Use parent_data/_hws for all clocks
> 
>   drivers/clk/qcom/clk-cpu-8996.c | 191 +++++++++++++++++---------------
>   1 file changed, 100 insertions(+), 91 deletions(-)
> 
> 
> base-commit: ca48adcc40b09d7f26a7754d4d54cfc4bd611f38
> prerequisite-patch-id: ff67ff7bea1aef8e367a2589c46cf2c9ebb48664
> prerequisite-patch-id: 1fdf02d8161689f3e571816d73ec94b115f51c34
> prerequisite-patch-id: 837945fbb40427dac2e95a58b7660a3cf26d7d53
> prerequisite-patch-id: df10945929f6f558c1363a23e2993d748a40236f
> prerequisite-patch-id: a657a27256ef4be0cb932cb0ca7b3e4768e466f9

-- 
With best wishes
Dmitry

Re: [PATCH 0/6] clk: qcom: cpu-8996: additional cleanup for the driver

[Bjorn Andersson]

On Fri, Sep 09, 2022 at 01:22:40PM +0300, Dmitry Baryshkov wrote:
> On 14/07/2022 13:03, Dmitry Baryshkov wrote:
> > This patch series depends on patches 1-5 from [1].
> > 
> > Path 1 is slightly fixed version of patch 6 from the mentioned
> > patch series (fixed to use parent_hws where applicable). The rest is
> > minor cleanup of the driver.
> > 
> > [1] https://lore.kernel.org/linux-arm-msm/20220621160621.24415-1-y.oudjana@protonmail.com/
> > 
> 
> Gracious ping. Yassing, Bjorn, Konrad?
> 

As I haven't heard anything from Yassine or Konrad I went ahead and
tried to pick this, unfortunately [1] doesn't apply.

Could you please rebase the patches from [1] that you want applied and
resubmit that?

Thanks,
Bjorn

> > 
> > Dmitry Baryshkov (5):
> >    clk: qcom: cpu-8996: switch to devm_clk_notifier_register
> >    clk: qcom: cpu-8996: declare ACD clocks
> >    clk: qcom: cpu-8996: move ACD logic to
> >      clk_cpu_8996_pmux_determine_rate
> >    clk: qcom: cpu-8996: don't store parents in clk_cpu_8996_pmux
> >    clk: qcom: cpu-8996: use constant mask for pmux
> > 
> > Yassine Oudjana (1):
> >    clk: qcom: msm8996-cpu: Use parent_data/_hws for all clocks
> > 
> >   drivers/clk/qcom/clk-cpu-8996.c | 191 +++++++++++++++++---------------
> >   1 file changed, 100 insertions(+), 91 deletions(-)
> > 
> > 
> > base-commit: ca48adcc40b09d7f26a7754d4d54cfc4bd611f38
> > prerequisite-patch-id: ff67ff7bea1aef8e367a2589c46cf2c9ebb48664
> > prerequisite-patch-id: 1fdf02d8161689f3e571816d73ec94b115f51c34
> > prerequisite-patch-id: 837945fbb40427dac2e95a58b7660a3cf26d7d53
> > prerequisite-patch-id: df10945929f6f558c1363a23e2993d748a40236f
> > prerequisite-patch-id: a657a27256ef4be0cb932cb0ca7b3e4768e466f9
> 
> -- 
> With best wishes
> Dmitry
> 

Re: [PATCH 0/6] clk: qcom: cpu-8996: additional cleanup for the driver

[Yassine Oudjana]

On Tue, Sep 13 2022 at 22:19:28 -05:00:00, Bjorn Andersson 
<andersson@kernel.org> wrote:
> On Fri, Sep 09, 2022 at 01:22:40PM +0300, Dmitry Baryshkov wrote:
>>  On 14/07/2022 13:03, Dmitry Baryshkov wrote:
>>  > This patch series depends on patches 1-5 from [1].
>>  >
>>  > Path 1 is slightly fixed version of patch 6 from the mentioned
>>  > patch series (fixed to use parent_hws where applicable). The rest 
>> is
>>  > minor cleanup of the driver.
>>  >
>>  > [1] 
>> https://lore.kernel.org/linux-arm-msm/20220621160621.24415-1-y.oudjana@protonmail.com/
>>  >
>> 
>>  Gracious ping. Yassing, Bjorn, Konrad?
>> 
> 
> As I haven't heard anything from Yassine or Konrad I went ahead and
> tried to pick this, unfortunately [1] doesn't apply.

Seems to apply on next-20220914. Do I need to base on a different 
branch?

> 
> Could you please rebase the patches from [1] that you want applied and
> resubmit that?
> 
> Thanks,
> Bjorn
> 
>>  >
>>  > Dmitry Baryshkov (5):
>>  >    clk: qcom: cpu-8996: switch to devm_clk_notifier_register
>>  >    clk: qcom: cpu-8996: declare ACD clocks
>>  >    clk: qcom: cpu-8996: move ACD logic to
>>  >      clk_cpu_8996_pmux_determine_rate
>>  >    clk: qcom: cpu-8996: don't store parents in clk_cpu_8996_pmux
>>  >    clk: qcom: cpu-8996: use constant mask for pmux
>>  >
>>  > Yassine Oudjana (1):
>>  >    clk: qcom: msm8996-cpu: Use parent_data/_hws for all clocks
>>  >
>>  >   drivers/clk/qcom/clk-cpu-8996.c | 191 
>> +++++++++++++++++---------------
>>  >   1 file changed, 100 insertions(+), 91 deletions(-)
>>  >
>>  >
>>  > base-commit: ca48adcc40b09d7f26a7754d4d54cfc4bd611f38
>>  > prerequisite-patch-id: ff67ff7bea1aef8e367a2589c46cf2c9ebb48664
>>  > prerequisite-patch-id: 1fdf02d8161689f3e571816d73ec94b115f51c34
>>  > prerequisite-patch-id: 837945fbb40427dac2e95a58b7660a3cf26d7d53
>>  > prerequisite-patch-id: df10945929f6f558c1363a23e2993d748a40236f
>>  > prerequisite-patch-id: a657a27256ef4be0cb932cb0ca7b3e4768e466f9
>> 
>>  --
>>  With best wishes
>>  Dmitry
>> 

Re: [PATCH 0/6] clk: qcom: cpu-8996: additional cleanup for the driver

[Dmitry Baryshkov]

On 14/09/2022 06:19, Bjorn Andersson wrote:
> On Fri, Sep 09, 2022 at 01:22:40PM +0300, Dmitry Baryshkov wrote:
>> On 14/07/2022 13:03, Dmitry Baryshkov wrote:
>>> This patch series depends on patches 1-5 from [1].
>>>
>>> Path 1 is slightly fixed version of patch 6 from the mentioned
>>> patch series (fixed to use parent_hws where applicable). The rest is
>>> minor cleanup of the driver.
>>>
>>> [1] https://lore.kernel.org/linux-arm-msm/20220621160621.24415-1-y.oudjana@protonmail.com/
>>>
>>
>> Gracious ping. Yassing, Bjorn, Konrad?
>>
> 
> As I haven't heard anything from Yassine or Konrad I went ahead and
> tried to pick this, unfortunately [1] doesn't apply.
> 
> Could you please rebase the patches from [1] that you want applied and
> resubmit that?

I just checked, patches from [1] apply cleanly on your for-next tree. 
Could you please doublecheck?



> 
> Thanks,
> Bjorn
> 
>>>
>>> Dmitry Baryshkov (5):
>>>     clk: qcom: cpu-8996: switch to devm_clk_notifier_register
>>>     clk: qcom: cpu-8996: declare ACD clocks
>>>     clk: qcom: cpu-8996: move ACD logic to
>>>       clk_cpu_8996_pmux_determine_rate
>>>     clk: qcom: cpu-8996: don't store parents in clk_cpu_8996_pmux
>>>     clk: qcom: cpu-8996: use constant mask for pmux
>>>
>>> Yassine Oudjana (1):
>>>     clk: qcom: msm8996-cpu: Use parent_data/_hws for all clocks
>>>
>>>    drivers/clk/qcom/clk-cpu-8996.c | 191 +++++++++++++++++---------------
>>>    1 file changed, 100 insertions(+), 91 deletions(-)
>>>
>>>
>>> base-commit: ca48adcc40b09d7f26a7754d4d54cfc4bd611f38
>>> prerequisite-patch-id: ff67ff7bea1aef8e367a2589c46cf2c9ebb48664
>>> prerequisite-patch-id: 1fdf02d8161689f3e571816d73ec94b115f51c34
>>> prerequisite-patch-id: 837945fbb40427dac2e95a58b7660a3cf26d7d53
>>> prerequisite-patch-id: df10945929f6f558c1363a23e2993d748a40236f
>>> prerequisite-patch-id: a657a27256ef4be0cb932cb0ca7b3e4768e466f9
>>
>> -- 
>> With best wishes
>> Dmitry
>>

-- 
With best wishes
Dmitry

Re: [PATCH 0/6] clk: qcom: cpu-8996: additional cleanup for the driver

[Bjorn Andersson]

On Thu, 14 Jul 2022 13:03:45 +0300, Dmitry Baryshkov wrote:
> This patch series depends on patches 1-5 from [1].
> 
> Path 1 is slightly fixed version of patch 6 from the mentioned
> patch series (fixed to use parent_hws where applicable). The rest is
> minor cleanup of the driver.
> 
> [1] https://lore.kernel.org/linux-arm-msm/20220621160621.24415-1-y.oudjana@protonmail.com/
> 
> [...]

Applied, thanks!

[1/6] clk: qcom: msm8996-cpu: Use parent_data/_hws for all clocks
      commit: da5daae8b412c922e08f86979e84ea80b60092a1
[2/6] clk: qcom: cpu-8996: switch to devm_clk_notifier_register
      commit: a808c7848a52523cb758c844f642b3d9e059c0c3
[3/6] clk: qcom: cpu-8996: declare ACD clocks
      commit: f1e3fcc4fc81e2aa78f4af754c460468e3f19782
[4/6] clk: qcom: cpu-8996: move ACD logic to clk_cpu_8996_pmux_determine_rate
      commit: 81165aca05dc003ea41c9bc725238dc249d477fd
[5/6] clk: qcom: cpu-8996: don't store parents in clk_cpu_8996_pmux
      commit: f387d1c46f53457d0d9687295629f3db2f44d29b
[6/6] clk: qcom: cpu-8996: use constant mask for pmux
      commit: f9ea0f59f7eefe44d82bbd4e86d2fac353fcfcbe

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