mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 03:18:31 +00:00
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 commit7bd6680b47
("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 9c900000.memory: assign memory failed qcom_rmtfs_mem: probe of 9c900000.memory failed with error -22 We should mark SCM properly just like we did for trogdor. Fixes:7bd6680b47
("Revert "Revert "arm64: dma: Drop cache invalidation from arch_dma_prep_coherent()""") Fixes:7a1f4e7f74
("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>
This commit is contained in:
parent
a54b7fa6b9
commit
7b59e8ae92
2 changed files with 6 additions and 1 deletions
|
@ -79,6 +79,11 @@ &remoteproc_wpss {
|
||||||
firmware-name = "ath11k/WCN6750/hw1.0/wpss.mdt";
|
firmware-name = "ath11k/WCN6750/hw1.0/wpss.mdt";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&scm {
|
||||||
|
/* TF-A firmware maps memory cached so mark dma-coherent to match. */
|
||||||
|
dma-coherent;
|
||||||
|
};
|
||||||
|
|
||||||
&wifi {
|
&wifi {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
|
|
|
@ -656,7 +656,7 @@ memory@80000000 {
|
||||||
};
|
};
|
||||||
|
|
||||||
firmware {
|
firmware {
|
||||||
scm {
|
scm: scm {
|
||||||
compatible = "qcom,scm-sc7280", "qcom,scm";
|
compatible = "qcom,scm-sc7280", "qcom,scm";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue