[PATCH 0/3] ath10k calibration variants for sdm845 phones

[PATCH 0/3] ath10k calibration variants for sdm845 phones

[David Heidelberg via B4 Relay]

Let's leaverage linux-firmware and use calibration from the board-2.bin.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
Dylan Van Assche (3):
      arm64: dts: qcom: sdm845-oneplus: add ath10k calibration variant
      arm64: dts: qcom: sdm845-xiaomi-beryllium: Add ath10k calibration variant
      arm64: dts: qcom: sdm845-shift-axolotl: Add ath10k calibration variant

 arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi          | 1 +
 arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts            | 1 +
 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 3 +++
 3 files changed, 5 insertions(+)
---
base-commit: ab40c92c74c6b0c611c89516794502b3a3173966
change-id: 20251110-sdm845-calibration-variants-66ad31ff88ca

Best regards,
-- 
David Heidelberg <david@ixit.cz>

[PATCH 1/3] arm64: dts: qcom: sdm845-oneplus: add ath10k calibration variant

[David Heidelberg via B4 Relay]

From: Dylan Van Assche <me@dylanvanassche.be>

SDM845-based Oneplus 6 and 6T have their own calibration files
for the WCN3990 WiFi/Bluetooth radio with the ath10k driver.
Add the calibration variant name to the DTS to reflect this to
allow using the calibration files from linux-firmware.

[David] Adjust the compatible as ath10k-calibration-variant is deprecated
Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index db6dd04c51bb5..a0c2f6efec59d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -929,5 +929,6 @@ &wifi {
 	vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
 	vdd-3.3-ch1-supply = <&vreg_l23a_3p3>;
 
+	qcom,calibration-variant = "oneplus_sdm845";
 	qcom,snoc-host-cap-8bit-quirk;
 };

-- 
2.51.0

[PATCH 2/3] arm64: dts: qcom: sdm845-xiaomi-beryllium: Add ath10k calibration variant

[David Heidelberg via B4 Relay]

From: Dylan Van Assche <me@dylanvanassche.be>

SDM845-based Xiaomi POCOPHONE F1 has its own calibration files
for the WCN3990 WiFi/Bluetooth radio with the ath10k driver.
Add the calibration variant name to the DTS to reflect this to
allow using the calibration files from linux-firmware.

[David] Adjust the compatible as ath10k-calibration-variant is deprecated
Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index 785006a15e979..ebcd01477f05d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -636,4 +636,7 @@ &wifi {
 	vdd-1.3-rfa-supply = <&vreg_l17a_1p3>;
 	vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
 	vdd-3.3-ch1-supply = <&vreg_l23a_3p3>;
+
+	qcom,calibration-variant = "xiaomi_beryllium";
 };
+

-- 
2.51.0

[PATCH 3/3] arm64: dts: qcom: sdm845-shift-axolotl: Add ath10k calibration variant

[David Heidelberg via B4 Relay]

From: Dylan Van Assche <me@dylanvanassche.be>

SDM845-based SHIFTPHONES SHIFT6mq has its own calibration files
for the WCN3990 WiFi/Bluetooth radio with the ath10k driver.
Add the calibration variant name to the DTS to reflect this to
allow using the calibration files from linux-firmware.

[David] Adjust the compatible as ath10k-calibration-variant is deprecated
Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index ddc2b3ca3bc57..7aae5edfec26d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -740,5 +740,6 @@ &wifi {
 	vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
 	vdd-3.3-ch1-supply = <&vreg_l23a_3p3>;
 
+	qcom,calibration-variant = "shift_axolotl";
 	qcom,snoc-host-cap-8bit-quirk;
 };

-- 
2.51.0

Re: [PATCH 1/3] arm64: dts: qcom: sdm845-oneplus: add ath10k calibration variant

[Dmitry Baryshkov]

On Mon, Nov 10, 2025 at 04:37:46PM +0100, David Heidelberg via B4 Relay wrote:
> From: Dylan Van Assche <me@dylanvanassche.be>
> 
> SDM845-based Oneplus 6 and 6T have their own calibration files
> for the WCN3990 WiFi/Bluetooth radio with the ath10k driver.
> Add the calibration variant name to the DTS to reflect this to
> allow using the calibration files from linux-firmware.
> 
> [David] Adjust the compatible as ath10k-calibration-variant is deprecated
> Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
> Signed-off-by: David Heidelberg <david@ixit.cz>
> ---
>  arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> index db6dd04c51bb5..a0c2f6efec59d 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> @@ -929,5 +929,6 @@ &wifi {
>  	vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
>  	vdd-3.3-ch1-supply = <&vreg_l23a_3p3>;
>  
> +	qcom,calibration-variant = "oneplus_sdm845";

oneplus_sdm845_6? or oneplus_6_6t? SDM845 is too broad.

BTW: Were those board files sent to the ath10k ML for inclusion?

>  	qcom,snoc-host-cap-8bit-quirk;
>  };
> 
> -- 
> 2.51.0
> 
> 

-- 
With best wishes
Dmitry

Re: [PATCH 2/3] arm64: dts: qcom: sdm845-xiaomi-beryllium: Add ath10k calibration variant

[Dmitry Baryshkov]

On Mon, Nov 10, 2025 at 04:37:47PM +0100, David Heidelberg via B4 Relay wrote:
> From: Dylan Van Assche <me@dylanvanassche.be>
> 
> SDM845-based Xiaomi POCOPHONE F1 has its own calibration files
> for the WCN3990 WiFi/Bluetooth radio with the ath10k driver.
> Add the calibration variant name to the DTS to reflect this to
> allow using the calibration files from linux-firmware.
> 
> [David] Adjust the compatible as ath10k-calibration-variant is deprecated
> Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
> Signed-off-by: David Heidelberg <david@ixit.cz>
> ---
>  arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 3 +++
>  1 file changed, 3 insertions(+)
> 

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>


-- 
With best wishes
Dmitry

Re: [PATCH 3/3] arm64: dts: qcom: sdm845-shift-axolotl: Add ath10k calibration variant

[Dmitry Baryshkov]

On Mon, Nov 10, 2025 at 04:37:48PM +0100, David Heidelberg via B4 Relay wrote:
> From: Dylan Van Assche <me@dylanvanassche.be>
> 
> SDM845-based SHIFTPHONES SHIFT6mq has its own calibration files
> for the WCN3990 WiFi/Bluetooth radio with the ath10k driver.
> Add the calibration variant name to the DTS to reflect this to
> allow using the calibration files from linux-firmware.
> 
> [David] Adjust the compatible as ath10k-calibration-variant is deprecated
> Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
> Signed-off-by: David Heidelberg <david@ixit.cz>
> ---
>  arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 1 +
>  1 file changed, 1 insertion(+)
> 

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>


-- 
With best wishes
Dmitry

Re: [PATCH 1/3] arm64: dts: qcom: sdm845-oneplus: add ath10k calibration variant

[David Heidelberg]

On 10/11/2025 16:58, Dmitry Baryshkov wrote:
> On Mon, Nov 10, 2025 at 04:37:46PM +0100, David Heidelberg via B4 Relay wrote:
>> From: Dylan Van Assche <me@dylanvanassche.be>
>>
>> SDM845-based Oneplus 6 and 6T have their own calibration files
>> for the WCN3990 WiFi/Bluetooth radio with the ath10k driver.
>> Add the calibration variant name to the DTS to reflect this to
>> allow using the calibration files from linux-firmware.
>>
>> [David] Adjust the compatible as ath10k-calibration-variant is deprecated
>> Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
>> Signed-off-by: David Heidelberg <david@ixit.cz>
>> ---
>>   arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
>> index db6dd04c51bb5..a0c2f6efec59d 100644
>> --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
>> @@ -929,5 +929,6 @@ &wifi {
>>   	vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
>>   	vdd-3.3-ch1-supply = <&vreg_l23a_3p3>;
>>   
>> +	qcom,calibration-variant = "oneplus_sdm845";
> 
> oneplus_sdm845_6? or oneplus_6_6t? SDM845 is too broad.

I verified with 
https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/ath10k/WCN3990/hw1.0/board-2.bin

$ strings board-2.bin | rg oneplus
bus=snoc,qmi-board-id=ff,qmi-chip-id=30214,variant=oneplus_sdm845mmm

$ ./ath10k-bdencoder -e ~/Downloads/board-2.bin
...
bus=snoc,qmi-board-id=ff,qmi-chip-id=30214,variant=oneplus_sdm845.bin 
created size: 19152
...

Since OP6/6T should have same WiFi.

David>
> BTW: Were those board files sent to the ath10k ML for inclusion?
> 
>>   	qcom,snoc-host-cap-8bit-quirk;
>>   };
>>
>> -- 
>> 2.51.0
>>
>>
> 
-- 
David Heidelberg

Re: [PATCH 1/3] arm64: dts: qcom: sdm845-oneplus: add ath10k calibration variant

[Dmitry Baryshkov]

On Mon, Nov 10, 2025 at 05:04:35PM +0100, David Heidelberg wrote:
> On 10/11/2025 16:58, Dmitry Baryshkov wrote:
> > On Mon, Nov 10, 2025 at 04:37:46PM +0100, David Heidelberg via B4 Relay wrote:
> > > From: Dylan Van Assche <me@dylanvanassche.be>
> > > 
> > > SDM845-based Oneplus 6 and 6T have their own calibration files
> > > for the WCN3990 WiFi/Bluetooth radio with the ath10k driver.
> > > Add the calibration variant name to the DTS to reflect this to
> > > allow using the calibration files from linux-firmware.
> > > 
> > > [David] Adjust the compatible as ath10k-calibration-variant is deprecated
> > > Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
> > > Signed-off-by: David Heidelberg <david@ixit.cz>
> > > ---
> > >   arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 +
> > >   1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> > > index db6dd04c51bb5..a0c2f6efec59d 100644
> > > --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> > > +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> > > @@ -929,5 +929,6 @@ &wifi {
> > >   	vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
> > >   	vdd-3.3-ch1-supply = <&vreg_l23a_3p3>;
> > > +	qcom,calibration-variant = "oneplus_sdm845";
> > 
> > oneplus_sdm845_6? or oneplus_6_6t? SDM845 is too broad.
> 
> I verified with https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/ath10k/WCN3990/hw1.0/board-2.bin
> 
> $ strings board-2.bin | rg oneplus
> bus=snoc,qmi-board-id=ff,qmi-chip-id=30214,variant=oneplus_sdm845mmm
> 
> $ ./ath10k-bdencoder -e ~/Downloads/board-2.bin
> ...
> bus=snoc,qmi-board-id=ff,qmi-chip-id=30214,variant=oneplus_sdm845.bin
> created size: 19152
> ...
> 
> Since OP6/6T should have same WiFi.

If it's in, then we dont have other choice.

> 
> David>
> > BTW: Were those board files sent to the ath10k ML for inclusion?
> > 
> > >   	qcom,snoc-host-cap-8bit-quirk;
> > >   };
> > > 
> > > -- 
> > > 2.51.0
> > > 
> > > 
> > 
> -- 
> David Heidelberg
> 

-- 
With best wishes
Dmitry

Re: [PATCH 0/3] ath10k calibration variants for sdm845 phones

[David Heidelberg]

Kind reminder for this series, as all the FW is already long-time in 
linux-firmware.

David

On 10/11/2025 16:37, David Heidelberg via B4 Relay wrote:
> Let's leaverage linux-firmware and use calibration from the board-2.bin.
> 
> Signed-off-by: David Heidelberg <david@ixit.cz>
> ---
> Dylan Van Assche (3):
>        arm64: dts: qcom: sdm845-oneplus: add ath10k calibration variant
>        arm64: dts: qcom: sdm845-xiaomi-beryllium: Add ath10k calibration variant
>        arm64: dts: qcom: sdm845-shift-axolotl: Add ath10k calibration variant
> 
>   arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi          | 1 +
>   arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts            | 1 +
>   arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 3 +++
>   3 files changed, 5 insertions(+)
> ---
> base-commit: ab40c92c74c6b0c611c89516794502b3a3173966
> change-id: 20251110-sdm845-calibration-variants-66ad31ff88ca
> 
> Best regards,

-- 
David Heidelberg

Re: [PATCH 0/3] ath10k calibration variants for sdm845 phones

[Bjorn Andersson]

On Mon, 10 Nov 2025 16:37:45 +0100, David Heidelberg wrote:
> Let's leaverage linux-firmware and use calibration from the board-2.bin.
> 
> 

Applied, thanks!

[1/3] arm64: dts: qcom: sdm845-oneplus: add ath10k calibration variant
      commit: 252f98ecb3c71acd818592443496252ecd5ccd6f
[2/3] arm64: dts: qcom: sdm845-xiaomi-beryllium: Add ath10k calibration variant
      commit: ea6926f61a857531d02a72bb5b040e23573fb393
[3/3] arm64: dts: qcom: sdm845-shift-axolotl: Add ath10k calibration variant
      commit: 31deed7b05079b2eb24589d37778466a2a55f4f2

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>