From b9704413c46edb85227e3cebfb9269ee69a8437b Mon Sep 17 00:00:00 2001 From: George Moussalem Date: Tue, 10 Jun 2025 14:45:55 +0400 Subject: [PATCH] qualcommax: ipq50xx: correct fw memory mode for ipq5018 and qcn6122 wifi The reason fwmode 2 was used for ipq5018 and qcn6122 wifi was that coldboot calibration doesn't work and causes the firmware to crach during wifi bringup. Since coldboot calibration is now disabled in the driver, all boards can now use their respective firmware memory mode, so let's the property in all board DTS files accordingly. Signed-off-by: George Moussalem Link: https://github.com/openwrt/openwrt/pull/19083 Signed-off-by: Robert Marko --- .../files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts | 4 ++-- .../files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts | 2 +- .../files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts | 4 ++-- .../files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts | 2 +- .../files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts index dc38c66e115..b08d9235c7b 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-gl-b3000.dts @@ -417,7 +417,7 @@ qcom,rproc = <&q6_wcss_pd1>; qcom,userpd-subsys-name = "q6v5_wcss_userpd1"; qcom,ath11k-calibration-variant = "GL-iNet-GL-B3000"; - qcom,ath11k-fw-memory-mode = <2>; + qcom,ath11k-fw-memory-mode = <1>; qcom,bdf-addr = <0x4c400000>; }; @@ -428,7 +428,7 @@ qcom,rproc = <&q6_wcss_pd3>; qcom,userpd-subsys-name = "q6v5_wcss_userpd3"; qcom,ath11k-calibration-variant = "GL-iNet-GL-B3000"; - qcom,ath11k-fw-memory-mode = <2>; + qcom,ath11k-fw-memory-mode = <1>; qcom,bdf-addr = <0x4d100000>; qcom,m3-dump-addr = <0x4df00000>; }; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts index 8505178a8f6..508ca081b41 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts @@ -375,7 +375,7 @@ // IPQ5018 qcom,rproc = <&q6_wcss_pd1>; qcom,ath11k-calibration-variant = "Linksys-MR5500"; - qcom,ath11k-fw-memory-mode = <2>; + qcom,ath11k-fw-memory-mode = <1>; qcom,bdf-addr = <0x4c400000>; status = "okay"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts index ce104051649..5eaa84e3e64 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts @@ -238,7 +238,7 @@ // IPQ5018 qcom,rproc = <&q6_wcss_pd1>; qcom,ath11k-calibration-variant = "Linksys-MX2000"; - qcom,ath11k-fw-memory-mode = <2>; + qcom,ath11k-fw-memory-mode = <1>; qcom,bdf-addr = <0x4c400000>; status = "okay"; @@ -249,7 +249,7 @@ qcom,rproc = <&q6_wcss_pd2>; qcom,userpd-subsys-name = "q6v5_wcss_userpd2"; qcom,ath11k-calibration-variant = "Linksys-MX2000"; - qcom,ath11k-fw-memory-mode = <2>; + qcom,ath11k-fw-memory-mode = <1>; qcom,bdf-addr = <0x4d100000>; qcom,m3-dump-addr = <0x4df00000>; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts index 036fc63a9ff..535f0ec10e4 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts @@ -223,7 +223,7 @@ // IPQ5018 qcom,rproc = <&q6_wcss_pd1>; qcom,ath11k-calibration-variant = "Linksys-MX5500"; - qcom,ath11k-fw-memory-mode = <2>; + qcom,ath11k-fw-memory-mode = <1>; qcom,bdf-addr = <0x4c400000>; status = "okay"; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts index 84282daa9c9..7984f3f57a7 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts @@ -233,7 +233,7 @@ // IPQ5018 qcom,rproc = <&q6_wcss_pd1>; qcom,ath11k-calibration-variant = "Linksys-SPNMX56"; - qcom,ath11k-fw-memory-mode = <2>; + qcom,ath11k-fw-memory-mode = <1>; qcom,bdf-addr = <0x4c400000>; status = "okay"; -- 2.47.2