Skip to contentSkip to conversation

Qualcomm clock fixes and preparation for SDM660

PATCH New [email protected] 1 participant 5 messages Sep 26, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover Qualcomm clock fixes and preparation for SDM660

From: AngeloGioacchino Del Regno <[email protected]>

This patch series includes two fixes for the SDM660 GCC, and a change in the rcg2 gfx3d ops, which are essential for a later series that will add the MMCC and GPUCC for this SoC.

The change in rcg2 gfx3d is only about generalizing the functions in order to reuse them for more than just one MMCC for one SoC and brings no functional changes on MSM8996. For more informations, look at the commit description for patch 3/4.

This patch series has been tested against the following devices:
- Sony Xperia XA2 Ultra (SDM630 Nile Discovery)
- Sony Xperia 10 (SDM630 Ganges Kirin)
- Sony Xperia 10 Plus (SDM636 Ganges Mermaid)

AngeloGioacchino Del Regno (4):
clk: qcom: gcc-sdm660: Mark MMSS NoC CFG AHB clock as critical
clk: qcom: gcc-sdm660: Mark GPU CFG AHB clock as critical
clk: qcom: rcg2: Stop hardcoding gfx3d pingpong parent numbers
clk: qcom: mmcc-msm8996: Migrate gfx3d clock to clk_rcg2_gfx3d

 drivers/clk/qcom/clk-rcg.h      |  9 ++++++
 drivers/clk/qcom/clk-rcg2.c     | 56 +++++++++++++++++++++------------
 drivers/clk/qcom/gcc-sdm660.c   |  7 +++++
 drivers/clk/qcom/mmcc-msm8996.c | 29 ++++++++++-------
 4 files changed, 70 insertions(+), 31 deletions(-)
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/4 clk: qcom: gcc-sdm660: Mark MMSS NoC CFG AHB clock as critical

From: AngeloGioacchino Del Regno <[email protected]>

Similarly to MSM8998, any access to the MMSS depends on this clock. Gating it will crash the system when RPMCC inits mmssnoc_axi_rpm_clk.

---
 drivers/clk/qcom/gcc-sdm660.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/clk/qcom/gcc-sdm660.c +6 -0
index f0b47b7d50ca..93ac77628bec 100644
@@ -1684,6 +1684,12 @@ static struct clk_branch gcc_mmss_noc_cfg_ahb_clk = {
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_mmss_noc_cfg_ahb_clk",
 			.ops = &clk_branch2_ops,
+			/*
+			 * Any access to mmss depends on this clock.
+			 * Gating this clock has been shown to crash the system
+			 * when mmssnoc_axi_rpm_clk is inited in rpmcc.
+			 */
+			.flags = CLK_IS_CRITICAL,
 		},
 	},
 };
Signature · 1 line
2.28.0
#2 lore raw

PATCH 2/4 clk: qcom: gcc-sdm660: Mark GPU CFG AHB clock as critical

In reply to [email protected]

From: AngeloGioacchino Del Regno <[email protected]>

This clock is critical for any access to the GPU: gating it will crash the system when the GPU has been initialized (so, you cannot gate it unless you deinit the Adreno completely).

So, to achieve a working state with GPU on, set the CLK_IS_CRITICAL flag to this clock.

---
 drivers/clk/qcom/gcc-sdm660.c | 1 +
 1 file changed, 1 insertion(+)
drivers/clk/qcom/gcc-sdm660.c +1 -0
index 93ac77628bec..7b1c8d1f6388 100644
@@ -1571,6 +1571,7 @@ static struct clk_branch gcc_gpu_cfg_ahb_clk = {
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_gpu_cfg_ahb_clk",
 			.ops = &clk_branch2_ops,
+			.flags = CLK_IS_CRITICAL,
 		},
 	},
 };
Signature · 1 line
2.28.0
#3 lore raw

PATCH 3/4 clk: qcom: rcg2: Stop hardcoding gfx3d pingpong parent numbers

In reply to [email protected]

From: AngeloGioacchino Del Regno <[email protected]>

The function clk_gfx3d_determine_rate is selecting different PLLs to manage the GFX3D clock source in a special way: this one needs to be ping-pong'ed on different PLLs to ensure stability during frequency switching (set a PLL rate, let it stabilize, switch the RCG to the new PLL) and fast frequency transitions.

This technique is currently being used in the MSM8996 SoC and the function was assuming that the parents were always at a specific index in the parents list, which is TRUE, if we use this only on the MSM8996 MMCC.
Unfortunately, MSM8996 is not the only SoC that needs to ping-pong the graphics RCG, so choices are:
1. Make new special ops just to hardcode *again* other indexes, creating code duplication for (imo) no reason; or
2. Generalize this function, so that it becomes usable for a range of SoCs with slightly different ping-pong configuration.

In this commit, the second road was taken: define a new "special" struct clk_rcg2_gfx3d, containing the ordered list of parents to ping-pong the graphics clock on, and the "regular" rcg2 clock structure in order to generalize the clk_gfx3d_determine_rate function and make it working for other SoCs.

As for the function itself it is left with the assumption that we need to ping-pong over three parents. The reasons for this are:
1. The initial model was MSM8996, which has 3 parents for the graphics clock pingpong;
2. The other example that was taken into consideration is the SDM630/636/660 SoC gpu clock controller, which is ping-ponging over two dynamic clocked and one fixed clock PLL.

---
 drivers/clk/qcom/clk-rcg.h  |  9 ++++++
 drivers/clk/qcom/clk-rcg2.c | 56 ++++++++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 20 deletions(-)
drivers/clk/qcom/clk-rcg.h +9 -0
index 86d2b8b90173..99efcc7f8d88 100644
@@ -153,6 +153,15 @@ struct clk_rcg2 {
 
 #define to_clk_rcg2(_hw) container_of(to_clk_regmap(_hw), struct clk_rcg2, clkr)
 
+struct clk_rcg2_gfx3d {
+	u8 div;
+	struct clk_rcg2 rcg;
+	struct clk_hw **hws;
+};
+
+#define to_clk_rcg2_gfx3d(_hw) \
+	container_of(to_clk_rcg2(_hw), struct clk_rcg2_gfx3d, rcg)
+
 extern const struct clk_ops clk_rcg2_ops;
 extern const struct clk_ops clk_rcg2_floor_ops;
 extern const struct clk_ops clk_edp_pixel_ops;
drivers/clk/qcom/clk-rcg2.c +36 -20

94 lines not on this page · raw message

Signature · 1 line
2.28.0
#4 lore raw

PATCH 4/4 clk: qcom: mmcc-msm8996: Migrate gfx3d clock to clk_rcg2_gfx3d

In reply to [email protected]

From: AngeloGioacchino Del Regno <[email protected]>

In commit 8c5dc88b064d the gfx3d ping-pong ops (clk_gfx3d_ops) were generalized in order to be able to reuse the same ops for more than just one clock for one SoC: follow the change here in the MSM8996 MMCC.

---
 drivers/clk/qcom/mmcc-msm8996.c | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)
drivers/clk/qcom/mmcc-msm8996.c +18 -11
index 3b3aac07fb2d..24843e4f2599 100644
@@ -528,16 +528,23 @@ static struct clk_rcg2 maxi_clk_src = {
 	},
 };
 
-static struct clk_rcg2 gfx3d_clk_src = {
-	.cmd_rcgr = 0x4000,
-	.hid_width = 5,
-	.parent_map = mmss_xo_mmpll0_mmpll9_mmpll2_mmpll8_gpll0_map,
-	.clkr.hw.init = &(struct clk_init_data){
-		.name = "gfx3d_clk_src",
-		.parent_names = mmss_xo_mmpll0_mmpll9_mmpll2_mmpll8_gpll0,
-		.num_parents = 6,
-		.ops = &clk_gfx3d_ops,
-		.flags = CLK_SET_RATE_PARENT,
+static struct clk_rcg2_gfx3d gfx3d_clk_src = {
+	.rcg = {
+		.cmd_rcgr = 0x4000,
+		.hid_width = 5,
+		.parent_map = mmss_xo_mmpll0_mmpll9_mmpll2_mmpll8_gpll0_map,
+		.clkr.hw.init = &(struct clk_init_data){
+			.name = "gfx3d_clk_src",
+			.parent_names = mmss_xo_mmpll0_mmpll9_mmpll2_mmpll8_gpll0,
+			.num_parents = 6,
+			.ops = &clk_gfx3d_ops,
+			.flags = CLK_SET_RATE_PARENT,
+		},
+	},
+	.hws = (struct clk_hw*[]) {
+		&mmpll9.clkr.hw,
+		&mmpll2.clkr.hw,
+		&mmpll8.clkr.hw
 	},
 };
 
@@ -3089,7 +3096,7 @@ static struct clk_regmap *mmcc_msm8996_clocks[] = {
 	[AHB_CLK_SRC] = &ahb_clk_src.clkr,
 	[AXI_CLK_SRC] = &axi_clk_src.clkr,
 	[MAXI_CLK_SRC] = &maxi_clk_src.clkr,
-	[GFX3D_CLK_SRC] = &gfx3d_clk_src.clkr,
+	[GFX3D_CLK_SRC] = &gfx3d_clk_src.rcg.clkr,
 	[RBBMTIMER_CLK_SRC] = &rbbmtimer_clk_src.clkr,
 	[ISENSE_CLK_SRC] = &isense_clk_src.clkr,
 	[RBCPR_CLK_SRC] = &rbcpr_clk_src.clkr,
Signature · 1 line
2.28.0