[PATCH v2 0/3] clk: qcom: gcc-msm8998: Fixes and clkref clocks

[PATCH v2 0/3] clk: qcom: gcc-msm8998: Fixes and clkref clocks

[Bjorn Andersson]

Drop clocks preventing the platform from booting, don't halt-check UFS clocks
and add clkref branches.

Bjorn Andersson (3):
  clk: qcom: gcc-msm8998: Drop hmss_dvm and lpass_at
  clk: qcom: gcc-msm8998: Disable halt check of UFS clocks
  clk: qcom: gcc-msm8998: Add clkref clocks

 drivers/clk/qcom/gcc-msm8998.c               | 109 +++++++++++++------
 include/dt-bindings/clock/qcom,gcc-msm8998.h |   5 +
 2 files changed, 83 insertions(+), 31 deletions(-)

-- 
2.18.0

[PATCH v2 1/3] clk: qcom: gcc-msm8998: Drop hmss_dvm and lpass_at

[Bjorn Andersson]

Disabling gcc_hmss_dvm_bus_clk and gcc_lpass_at_clk causes the board to
lock up, and by that preventing the kernel to boot without
clk_ignore_unused.

gcc_hmss_dvm_bus_clk is marked always-on downstream, but not referenced,
and gcc_lpass_at_clk isn't mentioned. So let's remove them until they
are needed by some client.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---

Changes since v1:
- Drop the clocks, rather than marking them critical.

 drivers/clk/qcom/gcc-msm8998.c | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c
index 9f0ae403d5f5..aed7f1f92614 100644
--- a/drivers/clk/qcom/gcc-msm8998.c
+++ b/drivers/clk/qcom/gcc-msm8998.c
@@ -1964,19 +1964,6 @@ static struct clk_branch gcc_hmss_at_clk = {
 	},
 };
 
-static struct clk_branch gcc_hmss_dvm_bus_clk = {
-	.halt_reg = 0x4808c,
-	.halt_check = BRANCH_HALT,
-	.clkr = {
-		.enable_reg = 0x4808c,
-		.enable_mask = BIT(0),
-		.hw.init = &(struct clk_init_data){
-			.name = "gcc_hmss_dvm_bus_clk",
-			.ops = &clk_branch2_ops,
-		},
-	},
-};
-
 static struct clk_branch gcc_hmss_rbcpr_clk = {
 	.halt_reg = 0x48008,
 	.halt_check = BRANCH_HALT,
@@ -2007,19 +1994,6 @@ static struct clk_branch gcc_hmss_trig_clk = {
 	},
 };
 
-static struct clk_branch gcc_lpass_at_clk = {
-	.halt_reg = 0x47020,
-	.halt_check = BRANCH_HALT,
-	.clkr = {
-		.enable_reg = 0x47020,
-		.enable_mask = BIT(0),
-		.hw.init = &(struct clk_init_data){
-			.name = "gcc_lpass_at_clk",
-			.ops = &clk_branch2_ops,
-		},
-	},
-};
-
 static struct clk_branch gcc_lpass_trig_clk = {
 	.halt_reg = 0x4701c,
 	.halt_check = BRANCH_HALT,
@@ -2653,10 +2627,8 @@ static struct clk_regmap *gcc_msm8998_clocks[] = {
 	[GCC_GPU_SNOC_DVM_GFX_CLK] = &gcc_gpu_snoc_dvm_gfx_clk.clkr,
 	[GCC_HMSS_AHB_CLK] = &gcc_hmss_ahb_clk.clkr,
 	[GCC_HMSS_AT_CLK] = &gcc_hmss_at_clk.clkr,
-	[GCC_HMSS_DVM_BUS_CLK] = &gcc_hmss_dvm_bus_clk.clkr,
 	[GCC_HMSS_RBCPR_CLK] = &gcc_hmss_rbcpr_clk.clkr,
 	[GCC_HMSS_TRIG_CLK] = &gcc_hmss_trig_clk.clkr,
-	[GCC_LPASS_AT_CLK] = &gcc_lpass_at_clk.clkr,
 	[GCC_LPASS_TRIG_CLK] = &gcc_lpass_trig_clk.clkr,
 	[GCC_MMSS_NOC_CFG_AHB_CLK] = &gcc_mmss_noc_cfg_ahb_clk.clkr,
 	[GCC_MMSS_QM_AHB_CLK] = &gcc_mmss_qm_ahb_clk.clkr,
-- 
2.18.0

Re: [PATCH v2 1/3] clk: qcom: gcc-msm8998: Drop hmss_dvm and lpass_at

[Marc Gonzalez]

On 03/12/2018 19:33, Bjorn Andersson wrote:

> Disabling gcc_hmss_dvm_bus_clk and gcc_lpass_at_clk causes the board to
> lock up, and by that preventing the kernel to boot without
> clk_ignore_unused.
> 
> gcc_hmss_dvm_bus_clk is marked always-on downstream, but not referenced,
> and gcc_lpass_at_clk isn't mentioned. So let's remove them until they
> are needed by some client.

Hello Bjorn,

What about gcc_gpu_bimc_gfx_clk?

AFAICT, it doesn't lock the system up, but the kernel warns:

[    2.171148] ------------[ cut here ]------------
[    2.173740] gcc_gpu_bimc_gfx_clk status stuck at 'on'
[    2.173996] WARNING: CPU: 3 PID: 1 at drivers/clk/qcom/clk-branch.c:92 clk_branch_toggle+0x190/0x1b0
[    2.183475] Modules linked in:
[    2.192554] CPU: 3 PID: 1 Comm: swapper/0 Tainted: G S                4.20.0-rc4 #23
[    2.195509] Hardware name: Qualcomm Technologies, Inc. MSM8998 v1 MTP (DT)
[    2.203389] pstate: 60000085 (nZCv daIf -PAN -UAO)
[    2.210016] pc : clk_branch_toggle+0x190/0x1b0
[    2.214781] lr : clk_branch_toggle+0x190/0x1b0
[    2.219213] sp : ffff00000807bcf0
[    2.223609] x29: ffff00000807bcf0 x28: 0000000000000008 
[    2.227041] x27: ffff0000089db070 x26: ffff000008961378 
[    2.232425] x25: ffff0000088da4b8 x24: 0000000000000000 
[    2.237721] x23: ffff000009138a08 x22: ffff000008414990 
[    2.243016] x21: 0000000000000000 x20: 0000000000000000 
[    2.248312] x19: ffff0000090e9000 x18: ffffffffffffffff 
[    2.253608] x17: 0000000000000000 x16: 0000000000000000 
[    2.258902] x15: ffff0000090e9648 x14: ffff000089193187 
[    2.264197] x13: ffff000009193195 x12: ffff0000090fb000 
[    2.269493] x11: ffff00000807bcf0 x10: ffff00000807bcf0 
[    2.274789] x9 : ffff00000807bcf0 x8 : 6e6f27207461206b 
[    2.280084] x7 : 6375747320737574 x6 : ffff000009192c89 
[    2.285380] x5 : 0000000000000000 x4 : 0000000000000000 
[    2.290676] x3 : ffffffffffffffff x2 : 00008000f5251000 
[    2.295971] x1 : e0dbf26541ede800 x0 : 0000000000000000 
[    2.301272] Call trace:
[    2.306491]  clk_branch_toggle+0x190/0x1b0
[    2.308705]  clk_branch2_disable+0x18/0x20
[    2.312890]  clk_disable_unused_subtree+0xc4/0xe0
[    2.316960]  clk_disable_unused+0x3c/0x130
[    2.321736]  do_one_initcall+0x5c/0x180
[    2.325745]  kernel_init_freeable+0x198/0x244
[    2.329469]  kernel_init+0x10/0x110
[    2.333942]  ret_from_fork+0x10/0x20
[    2.337257] ---[ end trace 57f62b628c127ef8 ]---


Regards.

Re: [PATCH v2 1/3] clk: qcom: gcc-msm8998: Drop hmss_dvm and lpass_at

[Bjorn Andersson]

On Tue 04 Dec 06:37 PST 2018, Marc Gonzalez wrote:

> On 03/12/2018 19:33, Bjorn Andersson wrote:
> 
> > Disabling gcc_hmss_dvm_bus_clk and gcc_lpass_at_clk causes the board to
> > lock up, and by that preventing the kernel to boot without
> > clk_ignore_unused.
> > 
> > gcc_hmss_dvm_bus_clk is marked always-on downstream, but not referenced,
> > and gcc_lpass_at_clk isn't mentioned. So let's remove them until they
> > are needed by some client.
> 
> Hello Bjorn,
> 
> What about gcc_gpu_bimc_gfx_clk?
> 

The ufs clocks was updated because the ufs driver would fail to enable
them and by that fail. But I have yet to research what the appropriate
solution for this this particular clock is.

> AFAICT, it doesn't lock the system up, but the kernel warns:
> 

Right, so it seems to only be an annoyance for now. Let's revisit this.

Regards,
Bjorn

> [    2.171148] ------------[ cut here ]------------
> [    2.173740] gcc_gpu_bimc_gfx_clk status stuck at 'on'
> [    2.173996] WARNING: CPU: 3 PID: 1 at drivers/clk/qcom/clk-branch.c:92 clk_branch_toggle+0x190/0x1b0
> [    2.183475] Modules linked in:
> [    2.192554] CPU: 3 PID: 1 Comm: swapper/0 Tainted: G S                4.20.0-rc4 #23
> [    2.195509] Hardware name: Qualcomm Technologies, Inc. MSM8998 v1 MTP (DT)
> [    2.203389] pstate: 60000085 (nZCv daIf -PAN -UAO)
> [    2.210016] pc : clk_branch_toggle+0x190/0x1b0
> [    2.214781] lr : clk_branch_toggle+0x190/0x1b0
> [    2.219213] sp : ffff00000807bcf0
> [    2.223609] x29: ffff00000807bcf0 x28: 0000000000000008 
> [    2.227041] x27: ffff0000089db070 x26: ffff000008961378 
> [    2.232425] x25: ffff0000088da4b8 x24: 0000000000000000 
> [    2.237721] x23: ffff000009138a08 x22: ffff000008414990 
> [    2.243016] x21: 0000000000000000 x20: 0000000000000000 
> [    2.248312] x19: ffff0000090e9000 x18: ffffffffffffffff 
> [    2.253608] x17: 0000000000000000 x16: 0000000000000000 
> [    2.258902] x15: ffff0000090e9648 x14: ffff000089193187 
> [    2.264197] x13: ffff000009193195 x12: ffff0000090fb000 
> [    2.269493] x11: ffff00000807bcf0 x10: ffff00000807bcf0 
> [    2.274789] x9 : ffff00000807bcf0 x8 : 6e6f27207461206b 
> [    2.280084] x7 : 6375747320737574 x6 : ffff000009192c89 
> [    2.285380] x5 : 0000000000000000 x4 : 0000000000000000 
> [    2.290676] x3 : ffffffffffffffff x2 : 00008000f5251000 
> [    2.295971] x1 : e0dbf26541ede800 x0 : 0000000000000000 
> [    2.301272] Call trace:
> [    2.306491]  clk_branch_toggle+0x190/0x1b0
> [    2.308705]  clk_branch2_disable+0x18/0x20
> [    2.312890]  clk_disable_unused_subtree+0xc4/0xe0
> [    2.316960]  clk_disable_unused+0x3c/0x130
> [    2.321736]  do_one_initcall+0x5c/0x180
> [    2.325745]  kernel_init_freeable+0x198/0x244
> [    2.329469]  kernel_init+0x10/0x110
> [    2.333942]  ret_from_fork+0x10/0x20
> [    2.337257] ---[ end trace 57f62b628c127ef8 ]---
> 
> 
> Regards.

Re: [PATCH v2 1/3] clk: qcom: gcc-msm8998: Drop hmss_dvm and lpass_at

[Stephen Boyd]

Quoting Bjorn Andersson (2018-12-03 10:33:28)
> Disabling gcc_hmss_dvm_bus_clk and gcc_lpass_at_clk causes the board to
> lock up, and by that preventing the kernel to boot without
> clk_ignore_unused.
> 
> gcc_hmss_dvm_bus_clk is marked always-on downstream, but not referenced,
> and gcc_lpass_at_clk isn't mentioned. So let's remove them until they
> are needed by some client.
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---

Applied to clk-next

[PATCH v2 2/3] clk: qcom: gcc-msm8998: Disable halt check of UFS clocks

[Bjorn Andersson]

Drop the halt check of the UFS symbol clocks, in accordance with other
platforms. This makes clk_disable_unused() happy and makes it possible
to turn the clocks on again without an error.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---

Changes since v1:
- None

 drivers/clk/qcom/gcc-msm8998.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c
index aed7f1f92614..792b431f9945 100644
--- a/drivers/clk/qcom/gcc-msm8998.c
+++ b/drivers/clk/qcom/gcc-msm8998.c
@@ -2375,7 +2375,7 @@ static struct clk_branch gcc_ufs_phy_aux_clk = {
 
 static struct clk_branch gcc_ufs_rx_symbol_0_clk = {
 	.halt_reg = 0x75014,
-	.halt_check = BRANCH_HALT,
+	.halt_check = BRANCH_HALT_SKIP,
 	.clkr = {
 		.enable_reg = 0x75014,
 		.enable_mask = BIT(0),
@@ -2388,7 +2388,7 @@ static struct clk_branch gcc_ufs_rx_symbol_0_clk = {
 
 static struct clk_branch gcc_ufs_rx_symbol_1_clk = {
 	.halt_reg = 0x7605c,
-	.halt_check = BRANCH_HALT,
+	.halt_check = BRANCH_HALT_SKIP,
 	.clkr = {
 		.enable_reg = 0x7605c,
 		.enable_mask = BIT(0),
@@ -2401,7 +2401,7 @@ static struct clk_branch gcc_ufs_rx_symbol_1_clk = {
 
 static struct clk_branch gcc_ufs_tx_symbol_0_clk = {
 	.halt_reg = 0x75010,
-	.halt_check = BRANCH_HALT,
+	.halt_check = BRANCH_HALT_SKIP,
 	.clkr = {
 		.enable_reg = 0x75010,
 		.enable_mask = BIT(0),
-- 
2.18.0

Re: [PATCH v2 2/3] clk: qcom: gcc-msm8998: Disable halt check of UFS clocks

[Stephen Boyd]

Quoting Bjorn Andersson (2018-12-03 10:33:29)
> Drop the halt check of the UFS symbol clocks, in accordance with other
> platforms. This makes clk_disable_unused() happy and makes it possible
> to turn the clocks on again without an error.
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---

Applied to clk-next

[PATCH v2 3/3] clk: qcom: gcc-msm8998: Add clkref clocks

[Bjorn Andersson]

Add clkref clocks for usb3, hdmi, ufs, pcie, and usb2. They are all
sourced off CXO_IN, so parent them off "xo" until a proper link to the
rpmcc can be described in DT.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---

Changes since v1:
- None

 drivers/clk/qcom/gcc-msm8998.c               | 75 ++++++++++++++++++++
 include/dt-bindings/clock/qcom,gcc-msm8998.h |  5 ++
 2 files changed, 80 insertions(+)

diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c
index 792b431f9945..717210f61d27 100644
--- a/drivers/clk/qcom/gcc-msm8998.c
+++ b/drivers/clk/qcom/gcc-msm8998.c
@@ -2515,6 +2515,76 @@ static struct clk_branch gcc_usb_phy_cfg_ahb2phy_clk = {
 	},
 };
 
+static struct clk_branch gcc_hdmi_clkref_clk = {
+	.halt_reg = 0x88000,
+	.clkr = {
+		.enable_reg = 0x88000,
+		.enable_mask = BIT(0),
+		.hw.init = &(struct clk_init_data){
+			.name = "gcc_hdmi_clkref_clk",
+			.parent_names = (const char *[]){ "xo" },
+			.num_parents = 1,
+			.ops = &clk_branch2_ops,
+		},
+	},
+};
+
+static struct clk_branch gcc_ufs_clkref_clk = {
+	.halt_reg = 0x88004,
+	.clkr = {
+		.enable_reg = 0x88004,
+		.enable_mask = BIT(0),
+		.hw.init = &(struct clk_init_data){
+			.name = "gcc_ufs_clkref_clk",
+			.parent_names = (const char *[]){ "xo" },
+			.num_parents = 1,
+			.ops = &clk_branch2_ops,
+		},
+	},
+};
+
+static struct clk_branch gcc_usb3_clkref_clk = {
+	.halt_reg = 0x88008,
+	.clkr = {
+		.enable_reg = 0x88008,
+		.enable_mask = BIT(0),
+		.hw.init = &(struct clk_init_data){
+			.name = "gcc_usb3_clkref_clk",
+			.parent_names = (const char *[]){ "xo" },
+			.num_parents = 1,
+			.ops = &clk_branch2_ops,
+		},
+	},
+};
+
+static struct clk_branch gcc_pcie_clkref_clk = {
+	.halt_reg = 0x8800c,
+	.clkr = {
+		.enable_reg = 0x8800c,
+		.enable_mask = BIT(0),
+		.hw.init = &(struct clk_init_data){
+			.name = "gcc_pcie_clkref_clk",
+			.parent_names = (const char *[]){ "xo" },
+			.num_parents = 1,
+			.ops = &clk_branch2_ops,
+		},
+	},
+};
+
+static struct clk_branch gcc_rx1_usb2_clkref_clk = {
+	.halt_reg = 0x88014,
+	.clkr = {
+		.enable_reg = 0x88014,
+		.enable_mask = BIT(0),
+		.hw.init = &(struct clk_init_data){
+			.name = "gcc_rx1_usb2_clkref_clk",
+			.parent_names = (const char *[]){ "xo" },
+			.num_parents = 1,
+			.ops = &clk_branch2_ops,
+		},
+	},
+};
+
 static struct gdsc pcie_0_gdsc = {
 	.gdscr = 0x6b004,
 	.gds_hw_ctrl = 0x0,
@@ -2705,6 +2775,11 @@ static struct clk_regmap *gcc_msm8998_clocks[] = {
 	[USB30_MASTER_CLK_SRC] = &usb30_master_clk_src.clkr,
 	[USB30_MOCK_UTMI_CLK_SRC] = &usb30_mock_utmi_clk_src.clkr,
 	[USB3_PHY_AUX_CLK_SRC] = &usb3_phy_aux_clk_src.clkr,
+	[GCC_HDMI_CLKREF_CLK] = &gcc_hdmi_clkref_clk.clkr,
+	[GCC_UFS_CLKREF_CLK] = &gcc_ufs_clkref_clk.clkr,
+	[GCC_USB3_CLKREF_CLK] = &gcc_usb3_clkref_clk.clkr,
+	[GCC_PCIE_CLKREF_CLK] = &gcc_pcie_clkref_clk.clkr,
+	[GCC_RX1_USB2_CLKREF_CLK] = &gcc_rx1_usb2_clkref_clk.clkr,
 };
 
 static struct gdsc *gcc_msm8998_gdscs[] = {
diff --git a/include/dt-bindings/clock/qcom,gcc-msm8998.h b/include/dt-bindings/clock/qcom,gcc-msm8998.h
index 58a242e656b1..b3448800980a 100644
--- a/include/dt-bindings/clock/qcom,gcc-msm8998.h
+++ b/include/dt-bindings/clock/qcom,gcc-msm8998.h
@@ -180,6 +180,11 @@
 #define USB30_MASTER_CLK_SRC					163
 #define USB30_MOCK_UTMI_CLK_SRC					164
 #define USB3_PHY_AUX_CLK_SRC					165
+#define GCC_USB3_CLKREF_CLK					166
+#define GCC_HDMI_CLKREF_CLK					167
+#define GCC_UFS_CLKREF_CLK					168
+#define GCC_PCIE_CLKREF_CLK					169
+#define GCC_RX1_USB2_CLKREF_CLK					170
 
 #define PCIE_0_GDSC						0
 #define UFS_GDSC						1
-- 
2.18.0

Re: [PATCH v2 3/3] clk: qcom: gcc-msm8998: Add clkref clocks

[Stephen Boyd]

Quoting Bjorn Andersson (2018-12-03 10:33:30)
> Add clkref clocks for usb3, hdmi, ufs, pcie, and usb2. They are all
> sourced off CXO_IN, so parent them off "xo" until a proper link to the
> rpmcc can be described in DT.
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---

Applied to clk-next