mbox series

[0/2] Fix CPU and GPU clocks on RK3576

Message ID 20250310-rk3576-scmi-clocks-v1-0-e165deb034e8@collabora.com (mailing list archive)
Headers show
Series Fix CPU and GPU clocks on RK3576 | expand

Message

Nicolas Frattaroli March 10, 2025, 9:59 a.m. UTC
As Jonas Karlman pointed out on the #linux-rockchip IRC channel on
Libera yesterday, mainline has once again chosen a different set of
clock IDs compared to downstream, with hugely detrimental effects to
mainline's ability to use SCMI for clock operations. This is because
TF-A will use the downstream IDs, and when we reclock things through
SCMI, TF-A will get the wrong clock ID from us.

So this series adds the three relevant clock IDs to the bindings in
patch 1, and then uses them in the SoC .dtsi in patch 2. That way, we
actually get functional GPU reclocking, and cpufreq will work as well.
As a bonus, we no longer change random unrelated clocks all over the
place, and it seems somewhat miraculous this didn't blow up in our faces
in a much bigger way before this.

Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
---
Nicolas Frattaroli (2):
      dt-bindings: clock: rk3576: add SCMI clocks
      arm64: dts: rockchip: fix RK3576 SCMI clock IDs

 arch/arm64/boot/dts/rockchip/rk3576.dtsi        | 18 +++++++++---------
 include/dt-bindings/clock/rockchip,rk3576-cru.h |  5 +++++
 2 files changed, 14 insertions(+), 9 deletions(-)
---
base-commit: f064b0a4aa5f2bc61c9611a23a7fc83855751626
change-id: 20250310-rk3576-scmi-clocks-a30655d70a72

Best regards,

Comments

Heiko Stuebner March 12, 2025, 7:46 a.m. UTC | #1
On Mon, 10 Mar 2025 10:59:55 +0100, Nicolas Frattaroli wrote:
> As Jonas Karlman pointed out on the #linux-rockchip IRC channel on
> Libera yesterday, mainline has once again chosen a different set of
> clock IDs compared to downstream, with hugely detrimental effects to
> mainline's ability to use SCMI for clock operations. This is because
> TF-A will use the downstream IDs, and when we reclock things through
> SCMI, TF-A will get the wrong clock ID from us.
> 
> [...]

Applied, thanks!

[1/2] dt-bindings: clock: rk3576: add SCMI clocks
      commit: 33a409dd1fc8be5ef8f33ebed76856c4cbc5bc15
[2/2] arm64: dts: rockchip: fix RK3576 SCMI clock IDs
      commit: 825f48a12e597e7556768088b74f3384840df5e6

Best regards,