Skip to content

Commit 7b59e8a

Browse files
diandersandersson
authored andcommitted
arm64: dts: qcom: sc7280: Mark SCM as dma-coherent for chrome devices
Just like for sc7180 devices using the Chrome bootflow (AKA trogdor and IDP), sc7280 devices using the Chrome bootflow also need their firmware marked dma-coherent. On sc7280 this wasn't causing WiFi to fail to startup, since WiFi works differently there. However, on sc7280 devices we were still getting the message at bootup after commit 7bd6680 ("Revert "Revert "arm64: dma: Drop cache invalidation from arch_dma_prep_coherent()"""): qcom_scm firmware:scm: Assign memory protection call failed -22 qcom_rmtfs_mem 9c90000.memory: assign memory failed qcom_rmtfs_mem: probe of 9c90000.memory failed with error -22 We should mark SCM properly just like we did for trogdor. Fixes: 7bd6680 ("Revert "Revert "arm64: dma: Drop cache invalidation from arch_dma_prep_coherent()""") Fixes: 7a1f4e7 ("arm64: dts: qcom: sc7280: Add basic dts/dtsi files for sc7280 soc") Signed-off-by: Douglas Anderson <dianders@chromium.org> Link: https://lore.kernel.org/r/20230616081440.v2.4.I21dc14a63327bf81c6bb58fe8ed91dbdc9849ee2@changeid Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent a54b7fa commit 7b59e8a

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@
7979
firmware-name = "ath11k/WCN6750/hw1.0/wpss.mdt";
8080
};
8181

82+
&scm {
83+
/* TF-A firmware maps memory cached so mark dma-coherent to match. */
84+
dma-coherent;
85+
};
86+
8287
&wifi {
8388
status = "okay";
8489

arch/arm64/boot/dts/qcom/sc7280.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@
656656
};
657657

658658
firmware {
659-
scm {
659+
scm: scm {
660660
compatible = "qcom,scm-sc7280", "qcom,scm";
661661
};
662662
};

0 commit comments

Comments
 (0)