All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/4] camcc-sm8750/eliza: Declare interconnect dependency for TITAN_TOP_GDSC
@ 2026-11-18  7:45 Wenmeng Liu
  2026-11-18  7:45 ` [PATCH 1/4] clk: qcom: camcc-sm8750: Declare icc path " Wenmeng Liu
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Wenmeng Liu @ 2026-11-18  7:45 UTC (permalink / raw)
  To: Bjorn Andersson, Abel Vesa, Stephen Boyd, Brian Masney,
	Jerome Brunet, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
	Conor Dooley
  Cc: linux-arm-msm, linux-clk, devicetree, Wenmeng Liu

The TITAN_TOP GDSC hosts the camera NoC (camnoc). If MMNOC is left without
any client vote while TITAN_TOP is still on, MMNOC attempts a power
collapse while camnoc may still be active. The collapse then gets stuck,
and so does the MMNOC BCM, so any later bandwidth request through it times
out in RPMh:

  Error sending AMC RPMH requests (-110)

This can happen whenever the last MMNOC vote goes away while TITAN_TOP is
kept on by another user, e.g. when the CAMSS driver runtime suspends while
the GDSC is still held by the device link during probe.

Fix this by declaring the interconnect path on the TITAN_TOP GDSC itself,
so that MMNOC is kept voted for as long as the GDSC is on. This uses the
GDSC interconnect support added for the Milos camera clock controller [1].
On Milos the missing vote prevents the GDSC from being enabled, while on
SM8750 and Eliza it shows up as the MMNOC collapse getting stuck, but the
underlying dependency of TITAN_TOP on MMNOC is the same.

[1] https://lore.kernel.org/all/20260501-milos-camcc-icc-v2-0-bb83c1256cc3@fairphone.com/

---
Wenmeng Liu (4):
      clk: qcom: camcc-sm8750: Declare icc path dependency for TITAN_TOP_GDSC
      clk: qcom: camcc-eliza: Declare icc path dependency for TITAN_TOP_GDSC
      arm64: dts: qcom: sm8750: Add interconnects to camcc
      arm64: dts: qcom: eliza: Add interconnects to camcc

 arch/arm64/boot/dts/qcom/eliza.dtsi  | 3 +++
 arch/arm64/boot/dts/qcom/sm8750.dtsi | 3 +++
 drivers/clk/qcom/camcc-eliza.c       | 6 ++++++
 drivers/clk/qcom/camcc-sm8750.c      | 6 ++++++
 4 files changed, 18 insertions(+)
---
base-commit: 7cfbf79c66c63e807ea452abf0546e6f6d6833a6
change-id: 20261118-camcc-fix-5548d108f801

Best regards,
-- 
Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/4] clk: qcom: camcc-sm8750: Declare icc path dependency for TITAN_TOP_GDSC
  2026-11-18  7:45 [PATCH 0/4] camcc-sm8750/eliza: Declare interconnect dependency for TITAN_TOP_GDSC Wenmeng Liu
@ 2026-11-18  7:45 ` Wenmeng Liu
  2026-11-18  7:45 ` [PATCH 2/4] clk: qcom: camcc-eliza: " Wenmeng Liu
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Wenmeng Liu @ 2026-11-18  7:45 UTC (permalink / raw)
  To: Bjorn Andersson, Abel Vesa, Stephen Boyd, Brian Masney,
	Jerome Brunet, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
	Conor Dooley
  Cc: linux-arm-msm, linux-clk, devicetree, Wenmeng Liu

The TITAN_TOP GDSC hosts the camera NoC (camnoc). If MMNOC is left
without any client vote while TITAN_TOP is still on, MMNOC attempts a
power collapse while camnoc may still be active (QACTIVE high). The
power collapse then gets stuck, and so does the MMNOC BCM, so any later
bandwidth request through it times out in RPMh:

  Error sending AMC RPMH requests (-110)

Declare the interconnect path for TITAN_TOP_GDSC, so that MMNOC is kept
voted for as long as the GDSC is on.

Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>
---
 drivers/clk/qcom/camcc-sm8750.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/clk/qcom/camcc-sm8750.c b/drivers/clk/qcom/camcc-sm8750.c
index 4dac298f06b188e78a61121bc9452f7246e59c56..96a2a50a02bbfcc3730bf6737df7bf09d7c09fec 100644
--- a/drivers/clk/qcom/camcc-sm8750.c
+++ b/drivers/clk/qcom/camcc-sm8750.c
@@ -25,6 +25,10 @@ enum {
 	DT_SLEEP_CLK,
 };
 
+enum {
+	DT_ICC_TOP_GDSC,
+};
+
 enum {
 	P_BI_TCXO,
 	P_BI_TCXO_AO,
@@ -2432,6 +2436,8 @@ static struct gdsc cam_cc_titan_top_gdsc = {
 	},
 	.pwrsts = PWRSTS_OFF_ON,
 	.flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE,
+	.needs_icc = true,
+	.icc_path_index = DT_ICC_TOP_GDSC,
 };
 
 static struct gdsc cam_cc_ipe_0_gdsc = {

-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/4] clk: qcom: camcc-eliza: Declare icc path dependency for TITAN_TOP_GDSC
  2026-11-18  7:45 [PATCH 0/4] camcc-sm8750/eliza: Declare interconnect dependency for TITAN_TOP_GDSC Wenmeng Liu
  2026-11-18  7:45 ` [PATCH 1/4] clk: qcom: camcc-sm8750: Declare icc path " Wenmeng Liu
@ 2026-11-18  7:45 ` Wenmeng Liu
  2026-11-18  7:53   ` sashiko-bot
  2026-11-18  7:45 ` [PATCH 3/4] arm64: dts: qcom: sm8750: Add interconnects to camcc Wenmeng Liu
  2026-11-18  7:45 ` [PATCH 4/4] arm64: dts: qcom: eliza: " Wenmeng Liu
  3 siblings, 1 reply; 6+ messages in thread
From: Wenmeng Liu @ 2026-11-18  7:45 UTC (permalink / raw)
  To: Bjorn Andersson, Abel Vesa, Stephen Boyd, Brian Masney,
	Jerome Brunet, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
	Conor Dooley
  Cc: linux-arm-msm, linux-clk, devicetree, Wenmeng Liu

The TITAN_TOP GDSC hosts the camera NoC (camnoc). If MMNOC is left
without any client vote while TITAN_TOP is still on, MMNOC attempts a
power collapse while camnoc may still be active (QACTIVE high). The
power collapse then gets stuck, and so does the MMNOC BCM, so any later
bandwidth request through it times out in RPMh:

  Error sending AMC RPMH requests (-110)

Declare the interconnect path for TITAN_TOP_GDSC, so that MMNOC is kept
voted for as long as the GDSC is on.

Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>
---
 drivers/clk/qcom/camcc-eliza.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/clk/qcom/camcc-eliza.c b/drivers/clk/qcom/camcc-eliza.c
index 7348f4dde65aeacc27182a926a8c0e5b88eacd74..389fb580985ea8b667ab8cc41c6675c0d9057a42 100644
--- a/drivers/clk/qcom/camcc-eliza.c
+++ b/drivers/clk/qcom/camcc-eliza.c
@@ -27,6 +27,10 @@ enum {
 	DT_AHB_CLK,
 };
 
+enum {
+	DT_ICC_TOP_GDSC,
+};
+
 enum {
 	P_BI_TCXO,
 	P_CAM_CC_PLL0_OUT_EVEN,
@@ -2526,6 +2530,8 @@ static struct gdsc cam_cc_titan_top_gdsc = {
 	},
 	.pwrsts = PWRSTS_OFF_ON,
 	.flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE,
+	.needs_icc = true,
+	.icc_path_index = DT_ICC_TOP_GDSC,
 };
 
 static struct gdsc cam_cc_ipe_0_gdsc = {

-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/4] arm64: dts: qcom: sm8750: Add interconnects to camcc
  2026-11-18  7:45 [PATCH 0/4] camcc-sm8750/eliza: Declare interconnect dependency for TITAN_TOP_GDSC Wenmeng Liu
  2026-11-18  7:45 ` [PATCH 1/4] clk: qcom: camcc-sm8750: Declare icc path " Wenmeng Liu
  2026-11-18  7:45 ` [PATCH 2/4] clk: qcom: camcc-eliza: " Wenmeng Liu
@ 2026-11-18  7:45 ` Wenmeng Liu
  2026-11-18  7:45 ` [PATCH 4/4] arm64: dts: qcom: eliza: " Wenmeng Liu
  3 siblings, 0 replies; 6+ messages in thread
From: Wenmeng Liu @ 2026-11-18  7:45 UTC (permalink / raw)
  To: Bjorn Andersson, Abel Vesa, Stephen Boyd, Brian Masney,
	Jerome Brunet, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
	Conor Dooley
  Cc: linux-arm-msm, linux-clk, devicetree, Wenmeng Liu

Add the interconnect path for the camera clock controller, which is
needed to keep MMNOC voted for while the TITAN_TOP GDSC is on.

Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sm8750.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8750.dtsi b/arch/arm64/boot/dts/qcom/sm8750.dtsi
index d8a853c31eeb15fb1d0023fb8b5a5a59a9ed763b..9312349d19ac5df67a875194a99e4a818cc61bcb 100644
--- a/arch/arm64/boot/dts/qcom/sm8750.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8750.dtsi
@@ -3796,6 +3796,9 @@ camcc: clock-controller@ade0000 {
 			required-opps = <&rpmhpd_opp_low_svs>,
 					<&rpmhpd_opp_low_svs>;
 
+			interconnects = <&mmss_noc MASTER_CAMNOC_HF QCOM_ICC_TAG_ALWAYS
+					 &mmss_noc SLAVE_MNOC_HF_MEM_NOC QCOM_ICC_TAG_ALWAYS>;
+
 			#clock-cells = <1>;
 			#reset-cells = <1>;
 			#power-domain-cells = <1>;

-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 4/4] arm64: dts: qcom: eliza: Add interconnects to camcc
  2026-11-18  7:45 [PATCH 0/4] camcc-sm8750/eliza: Declare interconnect dependency for TITAN_TOP_GDSC Wenmeng Liu
                   ` (2 preceding siblings ...)
  2026-11-18  7:45 ` [PATCH 3/4] arm64: dts: qcom: sm8750: Add interconnects to camcc Wenmeng Liu
@ 2026-11-18  7:45 ` Wenmeng Liu
  3 siblings, 0 replies; 6+ messages in thread
From: Wenmeng Liu @ 2026-11-18  7:45 UTC (permalink / raw)
  To: Bjorn Andersson, Abel Vesa, Stephen Boyd, Brian Masney,
	Jerome Brunet, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
	Conor Dooley
  Cc: linux-arm-msm, linux-clk, devicetree, Wenmeng Liu

Add the interconnect path for the camera clock controller, which is
needed to keep MMNOC voted for while the TITAN_TOP GDSC is on.

Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/eliza.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/eliza.dtsi b/arch/arm64/boot/dts/qcom/eliza.dtsi
index 4a125ef386c025fe6ecdbf4d17a785d1532ba09e..9d0eacadee3fe72283219b630db751f27f61897c 100644
--- a/arch/arm64/boot/dts/qcom/eliza.dtsi
+++ b/arch/arm64/boot/dts/qcom/eliza.dtsi
@@ -3456,6 +3456,9 @@ camcc: clock-controller@ade0000 {
 				 <&sleep_clk>,
 				 <&gcc GCC_CAMERA_AHB_CLK>;
 
+			interconnects = <&mmss_noc MASTER_CAMNOC_HF QCOM_ICC_TAG_ALWAYS
+					 &mmss_noc SLAVE_MNOC_HF_MEM_NOC QCOM_ICC_TAG_ALWAYS>;
+
 			power-domains = <&rpmhpd RPMHPD_CX>,
 					<&rpmhpd RPMHPD_MX>;
 			required-opps = <&rpmhpd_opp_low_svs>,

-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/4] clk: qcom: camcc-eliza: Declare icc path dependency for TITAN_TOP_GDSC
  2026-11-18  7:45 ` [PATCH 2/4] clk: qcom: camcc-eliza: " Wenmeng Liu
@ 2026-11-18  7:53   ` sashiko-bot
  0 siblings, 0 replies; 6+ messages in thread
From: sashiko-bot @ 2026-11-18  7:53 UTC (permalink / raw)
  To: Wenmeng Liu; +Cc: linux-clk, devicetree, robh, conor+dt

Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Low] clk: qcom: camcc-eliza: missing Fixes trailer for TITAN_TOP_GDSC
  icc fix
--

commit c65859d436b87a36e0406115c287548cdbaf30c1
Author: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>

> clk: qcom: camcc-eliza: Declare icc path dependency for TITAN_TOP_GDSC
>
> The TITAN_TOP GDSC hosts the camera NoC (camnoc). If MMNOC is left
> without any client vote while TITAN_TOP is still on, MMNOC attempts a
> power collapse while camnoc may still be active (QACTIVE high). The
> power collapse then gets stuck, and so does the MMNOC BCM, so any later
> bandwidth request through it times out in RPMh:
>
>   Error sending AMC RPMH requests (-110)
>
> Declare the interconnect path for TITAN_TOP_GDSC, so that MMNOC is kept
> voted for as long as the GDSC is on.
>
> Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>

[Severity: Low]
This fixes an MMNOC power-collapse hang and RPMh timeout when
cam_cc_titan_top_gdsc is enabled. Should it include:

  Fixes: 115631176f8a ("clk: qcom: camcc: Add support for camera clock controller for Eliza")

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261118-camcc-fix-v1-0-279d269e343b@oss.qualcomm.com?part=2

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2026-11-18  7:53 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-18  7:45 [PATCH 0/4] camcc-sm8750/eliza: Declare interconnect dependency for TITAN_TOP_GDSC Wenmeng Liu
2026-11-18  7:45 ` [PATCH 1/4] clk: qcom: camcc-sm8750: Declare icc path " Wenmeng Liu
2026-11-18  7:45 ` [PATCH 2/4] clk: qcom: camcc-eliza: " Wenmeng Liu
2026-11-18  7:53   ` sashiko-bot
2026-11-18  7:45 ` [PATCH 3/4] arm64: dts: qcom: sm8750: Add interconnects to camcc Wenmeng Liu
2026-11-18  7:45 ` [PATCH 4/4] arm64: dts: qcom: eliza: " Wenmeng Liu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.