rtw89: correct CCA control

EDCCA signal can block transmitting in certain situation, so ignore this
signal and use others to decide transmitting time.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220506120216.58567-4-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
index e1a1699a1a9cfb58700e84597c455c206ade718a..3b61ff02fe849ba66d08514c00f84a27a570cb99 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.c
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
@@ -1890,11 +1890,12 @@ static int cca_ctrl_init(struct rtw89_dev *rtwdev, u8 mac_idx)
                B_AX_CTN_CHK_BASIC_NAV | B_AX_CTN_CHK_BTCCA |
                B_AX_CTN_CHK_EDCCA | B_AX_CTN_CHK_CCA_S80 |
                B_AX_CTN_CHK_CCA_S40 | B_AX_CTN_CHK_CCA_S20 |
-               B_AX_CTN_CHK_CCA_P20 | B_AX_SIFS_CHK_EDCCA);
+               B_AX_CTN_CHK_CCA_P20);
        val &= ~(B_AX_TB_CHK_TX_NAV | B_AX_TB_CHK_CCA_S80 |
                 B_AX_TB_CHK_CCA_S40 | B_AX_TB_CHK_CCA_S20 |
                 B_AX_SIFS_CHK_CCA_S80 | B_AX_SIFS_CHK_CCA_S40 |
-                B_AX_SIFS_CHK_CCA_S20 | B_AX_CTN_CHK_TXNAV);
+                B_AX_SIFS_CHK_CCA_S20 | B_AX_CTN_CHK_TXNAV |
+                B_AX_SIFS_CHK_EDCCA);
 
        rtw89_write32(rtwdev, reg, val);