Skip to contentSkip to conversation

arm64: dts: qcom: taoyao: Drop adsp_rpc_remote_heap_mem override

PATCH Applied Stanislav Zaikin 3 participants 3 messages Jul 30 – Jul 31

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

PATCH 1/1 arm64: dts: qcom: taoyao: Drop adsp_rpc_remote_heap_mem override

taoyao originally redefined adsp_rpc_remote_heap_mem at a fixed address to avoid overlapping with cdsp_mem, since kodiak.dtsi's version was a fixed-address at the time.

kodiak.dtsi now defines adsp_rpc_remote_heap_mem as a dynamically allocated "shared-dma-pool" region instead, which removes the fixed address entirely and so cannot overlap with cdsp_mem. This makes the override unnecessary.

Remove the taoyao-local /delete-node/ and static reg-based redefinition, and inherit the definition from kodiak.dtsi instead.

Fixes 28705df5d0df ("arm64: dts: qcom: sm7325: Add Xiaomi 12 Lite 5G (taoyao) DTS")
---
 arch/arm64/boot/dts/qcom/sm7325-xiaomi-taoyao.dts | 6 ------
 1 file changed, 6 deletions(-)
arch/arm64/boot/dts/qcom/sm7325-xiaomi-taoyao.dts +0 -6
index 6f8bc65bb99b..87f267aaeec0 100644
@@ -27,7 +27,6 @@
 
 /* The following reserved memory regions have different addresses or sizes */
 /delete-node/ &adsp_mem;
-/delete-node/ &adsp_rpc_remote_heap_mem;
 /delete-node/ &cdsp_mem;
 /delete-node/ &rmtfs_mem;
 
@@ -203,11 +202,6 @@ neuron_block_1_mem: neuron-block@d7f80000 {
 			no-map;
 		};
 
-		adsp_rpc_remote_heap_mem: adsp-rpc-remote-heap@e0400000 {
-			reg = <0x0 0xe0400000 0x0 0x800000>;
-			no-map;
-		};
-
 		framebuffer_reserved: framebuffer@e1000000 {
 			reg = <0x0 0xe1000000 0x0 (1080 * 2400 * 4)>;
 			no-map;
Signature · 1 line
2.53.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Stanislav Zaikin

taoyao originally redefined adsp_rpc_remote_heap_mem at a fixed address to avoid overlapping with cdsp_mem, since kodiak.dtsi's version was a fixed-address at the time.

kodiak.dtsi now defines adsp_rpc_remote_heap_mem as a dynamically allocated "shared-dma-pool" region instead, which removes the fixed address entirely and so cannot overlap with cdsp_mem. This makes the override unnecessary.

Quoted 7 lines

Remove the taoyao-local /delete-node/ and static reg-based redefinition, and inherit the definition from kodiak.dtsi instead.

Fixes 28705df5d0df ("arm64: dts: qcom: sm7325: Add Xiaomi 12 Lite 5G (taoyao) DTS")

---

Konrad

maintainer Applied
#2 lore raw
In reply to Stanislav Zaikin
Quoted 10 lines · Stanislav Zaikin

taoyao originally redefined adsp_rpc_remote_heap_mem at a fixed address to avoid overlapping with cdsp_mem, since kodiak.dtsi's version was a fixed-address at the time.

kodiak.dtsi now defines adsp_rpc_remote_heap_mem as a dynamically allocated "shared-dma-pool" region instead, which removes the fixed address entirely and so cannot overlap with cdsp_mem. This makes the override unnecessary.

[...]

Applied, thanks!

[1/1] arm64: dts: qcom: taoyao: Drop adsp_rpc_remote_heap_mem override

      commit: c8748463283738aacf323eb3f7853e6533d941dc

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>