ath9k: fix QCA9561 PA bias
PATCH 1/1 ath9k: fix QCA9561 PA bias
ath9k is setting the TX PA DC bias level differently on QCA9561 and QCA9565 although they have the same radio IP-core, which results in a very low output power and very low throughput as devices are further away from the AP (compared to other 2.4GHz APs).
In real life testing, without this patch the 2.4GHz throughput on Yuncore XD3200 is around 10Mbps sitting next to the AP, and close to practical maximum with the patch applied.
--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +3 -2
@@ -3606,9 +3606,10 @@ static void ar9003_hw_xpa_bias_level_apply(struct ath_hw *ah, bool is2ghz)int bias =ar9003_modal_header (ah, is2ghz)->xpaBiasLvl;if (AR_SREV_9485 (ah) ||AR_SREV_9330 (ah) ||AR_SREV_9340 (ah) || -AR_SREV_9531 (ah) ||AR_SREV_9561 (ah)) +AR_SREV_9531 (ah))REG_RMW_FIELD (ah,AR_CH0_TOP2 ,AR_CH0_TOP2_XPABIASLVL , bias); -else if (AR_SREV_9462 (ah) ||AR_SREV_9550 (ah) ||AR_SREV_9565 (ah)) +else if (AR_SREV_9462 (ah) ||AR_SREV_9550 (ah) ||AR_SREV_9561 (ah) || +AR_SREV_9565 (ah))REG_RMW_FIELD (ah,AR_CH0_TOP ,AR_CH0_TOP_XPABIASLVL , bias);else {REG_RMW_FIELD (ah,AR_CH0_TOP ,AR_CH0_TOP_XPABIASLVL , bias);
Signature · 1 line
2.30.2
Quoted 21 lines · Thibaut VARÈNE
ath9k is setting the TX PA DC bias level differently on QCA9561 and QCA9565 although they have the same radio IP-core, which results in a very low output power and very low throughput as devices are further away from the AP (compared to other 2.4GHz APs).
In real life testing, without this patch the 2.4GHz throughput on Yuncore XD3200 is around 10Mbps sitting next to the AP, and close to practical maximum with the patch applied.
Tested-by Petr Štetiar <[email protected]>Signed-off-by Clemens Hopfer <[email protected]>Signed-off-by Thibaut VARÈNE <[email protected]>--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +0
-0
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c static void ar9003_hw_xpa_bias_level_apply(struct ath_hw *ah, bool is2ghz) · line 3613
Quoted 10 lines
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +3
-2@@ -3606,9 +3606,10 @@ static void ar9003_hw_xpa_bias_level_apply(struct ath_hw *ah, bool is2ghz)int bias =ar9003_modal_header (ah, is2ghz)->xpaBiasLvl;if (AR_SREV_9485 (ah) ||AR_SREV_9330 (ah) ||AR_SREV_9340 (ah) || -AR_SREV_9531 (ah) ||AR_SREV_9561 (ah)) +AR_SREV_9531 (ah))REG_RMW_FIELD (ah,AR_CH0_TOP2 ,AR_CH0_TOP2_XPABIASLVL , bias); -else if (AR_SREV_9462 (ah) ||AR_SREV_9550 (ah) ||AR_SREV_9565 (ah)) +else if (AR_SREV_9462 (ah) ||AR_SREV_9550 (ah) ||AR_SREV_9561 (ah) || +AR_SREV_9565 (ah))REG_RMW_FIELD (ah,AR_CH0_TOP ,AR_CH0_TOP_XPABIASLVL , bias);
The patch looks wrong to me. I'm pretty sure that AR_CH0_TOP2 is the correct register, the definition has an explicit check for 9561 as well.
I believe this patch works by accident because it avoids writing a wrong value to that register.
The value written to that register is wrong, because while the mask definition AR_CH0_TOP2_XPABIASLVL uses a different value for 9561, the shift definition AR_CH0_TOP2_XPABIASLVL_S is hardcoded to 12, which is wrong for 9561. Please try adjusting it to this:
#define AR_CH0_TOP2_XPABIASLVL_S (AR_SREV_9561(ah) ? 9 : 12)
- Felix
Quoted 7 lines · Felix Fietkau
The patch looks wrong to me. I'm pretty sure that
AR_CH0_TOP2is the correct register, the definition has an explicit check for 9561 as well.
I believe this patch works by accident because it avoids writing a wrong value to that register.
The value written to that register is wrong, because while the mask definitionAR_CH0_TOP2_XPABIASLVLuses a different value for 9561, the shift definitionAR_CH0_TOP2_XPABIASLVL_Sis hardcoded to 12, which is wrong for 9561. Please try adjusting it to this:
#defineAR_CH0_TOP2_XPABIASLVL_S(AR_SREV_9561(ah)? 9 : 12)
This works, thanks. I’ll submit a v2 now.
Thibaut
PATCH v2 1/1 ath9k: fix QCA9561 PA bias level
This patch fixes an invalid TX PA DC bias level on QCA9561, which results in a very low output power and very low throughput as devices are further away from the AP (compared to other 2.4GHz APs).
This patch was suggested by Felix Fietkau, who noted[1]:
"The value written to that register is wrong, because while the mask definition AR_CH0_TOP2_XPABIASLVL uses a different value for 9561, the shift definition AR_CH0_TOP2_XPABIASLVL_S is hardcoded to 12, which is wrong for 9561."
In real life testing, without this patch the 2.4GHz throughput on Yuncore XD3200 is around 10Mbps sitting next to the AP, and closer to practical maximum with the patch applied.
[1] https://lore.kernel.org/all/[email protected]
---
v2: Adjust #define per Felix's suggestion
--- drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/ar9003_phy.h +1 -1
@@ -720,7 +720,7 @@#define AR_CH0_TOP2 (AR_SREV_9300(ah) ? 0x1628c : \ (AR_SREV_9462(ah) ? 0x16290 : 0x16284))#define AR_CH0_TOP2_XPABIASLVL (AR_SREV_9561(ah) ? 0x1e00 : 0xf000) -#define AR_CH0_TOP2_XPABIASLVL_S 12 +#define AR_CH0_TOP2_XPABIASLVL_S (AR_SREV_9561(ah) ? 9 : 12)#define AR_CH0_XTAL (AR_SREV_9300(ah) ? 0x16294 : \ ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x16298 : \
Signature · 1 line
2.30.2
Re: [PATCH v2] ath9k: fix QCA9561 PA bias level
Quoted 10 lines · Thibaut VARÈNE
This patch fixes an invalid TX PA DC bias level on QCA9561, which results in a very low output power and very low throughput as devices are further away from the AP (compared to other 2.4GHz APs).
This patch was suggested by Felix Fietkau, who noted[1]:
"The value written to that register is wrong, because while the mask definitionAR_CH0_TOP2_XPABIASLVLuses a different value for 9561, the shift definitionAR_CH0_TOP2_XPABIASLVL_Sis hardcoded to 12, which is wrong for 9561."
Quoted 7 lines
In real life testing, without this patch the 2.4GHz throughput on Yuncore XD3200 is around 10Mbps sitting next to the AP, and closer to practical maximum with the patch applied.
[1] https://lore.kernel.org/all/[email protected]
Signed-off-by Thibaut VARÈNE <[email protected]>
Re: [PATCH v2] ath9k: fix QCA9561 PA bias level
In reply to Thibaut VARÈNEQuoted 10 lines · Thibaut VARÈNE
This patch fixes an invalid TX PA DC bias level on QCA9561, which results in a very low output power and very low throughput as devices are further away from the AP (compared to other 2.4GHz APs).
This patch was suggested by Felix Fietkau, who noted[1]:
"The value written to that register is wrong, because while the mask definitionAR_CH0_TOP2_XPABIASLVLuses a different value for 9561, the shift definitionAR_CH0_TOP2_XPABIASLVL_Sis hardcoded to 12, which is wrong for 9561."
Quoted 7 lines
In real life testing, without this patch the 2.4GHz throughput on Yuncore XD3200 is around 10Mbps sitting next to the AP, and closer to practical maximum with the patch applied.
[1] https://lore.kernel.org/all/[email protected]
Signed-off-by Thibaut VARÈNE <[email protected]>
Thank you for the fix!
Re: [PATCH v2] ath9k: fix QCA9561 PA bias level
In reply to Thibaut VARÈNEQuoted 14 lines · Thibaut VARÈNE
This patch fixes an invalid TX PA DC bias level on QCA9561, which results in a very low output power and very low throughput as devices are further away from the AP (compared to other 2.4GHz APs).
This patch was suggested by Felix Fietkau, who noted[1]:
"The value written to that register is wrong, because while the mask definitionAR_CH0_TOP2_XPABIASLVLuses a different value for 9561, the shift definitionAR_CH0_TOP2_XPABIASLVL_Sis hardcoded to 12, which is wrong for 9561."In real life testing, without this patch the 2.4GHz throughput on Yuncore XD3200 is around 10Mbps sitting next to the AP, and closer to practical maximum with the patch applied.
Quoted 6 lines
[1] https://lore.kernel.org/all/[email protected]
Signed-off-by Thibaut VARÈNE <[email protected]>Acked-by Felix Fietkau <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
e999a5da28a0 ath9k: fix QCA9561 PA bias level
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches