wifi: rtw89: correct hardware value of nominal packet padding for WiFi 7 chips

The hardware value of 3 for WiFi 7 chips is padding 16 or 20us selected
by hardware automatically. Correct the value to resolve interoperability
problem. Also define enum to be more readable.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://msgid.link/20240517013639.11643-1-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index c0f2afb4888a9c7ed1dcf6cfbc164a224229a768..523ea9f5e6b19374236eeefcc8559758eb1f53d8 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -884,6 +884,13 @@ enum rtw89_ps_mode {
 #define RTW89_BYR_BW_NUM (RTW89_CHANNEL_WIDTH_320 + 1)
 #define RTW89_PPE_BW_NUM (RTW89_CHANNEL_WIDTH_320 + 1)
 
+enum rtw89_pe_duration {
+       RTW89_PE_DURATION_0 = 0,
+       RTW89_PE_DURATION_8 = 1,
+       RTW89_PE_DURATION_16 = 2,
+       RTW89_PE_DURATION_16_20 = 3,
+};
+
 enum rtw89_ru_bandwidth {
        RTW89_RU26 = 0,
        RTW89_RU52 = 1,

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index f5cd06c35982e4616b752a53a6b0de4142441db8..1ea2b662fc89c0d17eb1a51c37687cbdac6db250 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -2752,11 +2752,11 @@ static void __get_sta_he_pkt_padding(struct rtw89_dev *rtwdev,
                ppe8 = (ppe >> sh) & IEEE80211_PPE_THRES_NSS_MASK;
 
                if (ppe16 != 7 && ppe8 == 7)
-                       pads[i] = 2;
+                       pads[i] = RTW89_PE_DURATION_16;
                else if (ppe8 != 7)
-                       pads[i] = 1;
+                       pads[i] = RTW89_PE_DURATION_8;
                else
-                       pads[i] = 0;
+                       pads[i] = RTW89_PE_DURATION_0;
        }
 }
 
@@ -2889,11 +2889,11 @@ static void __get_sta_eht_pkt_padding(struct rtw89_dev *rtwdev,
                ppe8 = (ppe >> sh) & IEEE80211_PPE_THRES_NSS_MASK;
 
                if (ppe16 != 7 && ppe8 == 7)
-                       pads[i] = 2;
+                       pads[i] = RTW89_PE_DURATION_16_20;
                else if (ppe8 != 7)
-                       pads[i] = 1;
+                       pads[i] = RTW89_PE_DURATION_8;
                else
-                       pads[i] = 0;
+                       pads[i] = RTW89_PE_DURATION_0;
        }
 }