Unverified Commit ed8ff046 authored Jun 23, 2023 by Arnd Bergmann

Merge tag 'qcom-arm64-fixes-for-6.4-2' of...

Merge tag 'qcom-arm64-fixes-for-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

One last Qualcomm ARM64 DeviceTree fix for v6.4

Changes related to cache management for DMA memory caused WiFi to stop
work on SC7180 and SC7280 based products, using TF-A. These changes
marks the relevant device dma-coherent to correct the behavior.

* tag 'qcom-arm64-fixes-for-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: sc7280: Mark SCM as dma-coherent for chrome devices
  arm64: dts: qcom: sc7180: Mark SCM as dma-coherent for trogdor
  arm64: dts: qcom: sc7180: Mark SCM as dma-coherent for IDP
  dt-bindings: firmware: qcom,scm: Document that SCM can be dma-coherent

Link: https://lore.kernel.org/r/20230622203248.106422-1-andersson@kernel.org


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 5b017b5e 7b59e8ae

Documentation/devicetree/bindings/firmware/qcom,scm.yaml

+2 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,8 @@ properties:
		minItems: 1
		maxItems: 3

		dma-coherent: true

		interconnects:
		maxItems: 1

arch/arm64/boot/dts/qcom/sc7180-idp.dts

+5 −0

Original line number	Diff line number	Diff line
		@@ -393,6 +393,11 @@
		qcom,spare-regs = <&tcsr_regs_2 0xb3e4>;
		};

		&scm {
		/* TF-A firmware maps memory cached so mark dma-coherent to match. */
		dma-coherent;
		};

		&sdhc_1 {
		status = "okay";

arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi

+5 −0

Original line number	Diff line number	Diff line
		@@ -892,6 +892,11 @@ hp_i2c: &i2c9 {
		qcom,spare-regs = <&tcsr_regs_2 0xb3e4>;
		};

		&scm {
		/* TF-A firmware maps memory cached so mark dma-coherent to match. */
		dma-coherent;
		};

		&sdhc_1 {
		status = "okay";

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -369,7 +369,7 @@
		};

		firmware {
		scm {
		scm: scm {
		compatible = "qcom,scm-sc7180", "qcom,scm";
		};
		};

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,11 @@
		firmware-name = "ath11k/WCN6750/hw1.0/wpss.mdt";
		};

		&scm {
		/* TF-A firmware maps memory cached so mark dma-coherent to match. */
		dma-coherent;
		};

		&wifi {
		status = "okay";