wifi: rtw88: Allow different C2H RA report sizes

The RTL8821AU and RTL8812AU have smaller RA report size, only 4 bytes.
Avoid the "invalid ra report c2h length" error.

Also, use a struct and u8_get_bits() to access the RA report C2H.

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/c3e73c3a-fb2f-4013-9f06-d5274211e282@gmail.com

diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index 813c121488199f9438e6eb8707431bc94cc7cd7c..168e19187ba7e7cf8f6c78183610ff23cbd10cb9 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/fw.c
+++ b/drivers/net/wireless/realtek/rtw88/fw.c
@@ -139,25 +139,30 @@ static u16 get_max_amsdu_len(u32 bit_rate)
 struct rtw_fw_iter_ra_data {
        struct rtw_dev *rtwdev;
        u8 *payload;
+       u8 length;
 };
 
 static void rtw_fw_ra_report_iter(void *data, struct ieee80211_sta *sta)
 {
        struct rtw_fw_iter_ra_data *ra_data = data;
+       struct rtw_c2h_ra_rpt *ra_rpt = (struct rtw_c2h_ra_rpt *)ra_data->payload;
        struct rtw_sta_info *si = (struct rtw_sta_info *)sta->drv_priv;
        u8 mac_id, rate, sgi, bw;
        u8 mcs, nss;
        u32 bit_rate;
 
-       mac_id = GET_RA_REPORT_MACID(ra_data->payload);
+       mac_id = ra_rpt->mac_id;
        if (si->mac_id != mac_id)
                return;
 
        si->ra_report.txrate.flags = 0;
 
-       rate = GET_RA_REPORT_RATE(ra_data->payload);
-       sgi = GET_RA_REPORT_SGI(ra_data->payload);
-       bw = GET_RA_REPORT_BW(ra_data->payload);
+       rate = u8_get_bits(ra_rpt->rate_sgi, RTW_C2H_RA_RPT_RATE);
+       sgi = u8_get_bits(ra_rpt->rate_sgi, RTW_C2H_RA_RPT_SGI);
+       if (ra_data->length >= offsetofend(typeof(*ra_rpt), bw))
+               bw = ra_rpt->bw;
+       else
+               bw = si->bw_mode;
 
        if (rate < DESC_RATEMCS0) {
                si->ra_report.txrate.legacy = rtw_desc_to_bitrate(rate);
@@ -197,14 +202,18 @@ legacy:
 static void rtw_fw_ra_report_handle(struct rtw_dev *rtwdev, u8 *payload,
                                    u8 length)
 {
+       struct rtw_c2h_ra_rpt *ra_rpt = (struct rtw_c2h_ra_rpt *)payload;
        struct rtw_fw_iter_ra_data ra_data;
 
-       if (WARN(length < 7, "invalid ra report c2h length\n"))
+       if (WARN(length < rtwdev->chip->c2h_ra_report_size,
+                "invalid ra report c2h length %d\n", length))
                return;
 
-       rtwdev->dm_info.tx_rate = GET_RA_REPORT_RATE(payload);
+       rtwdev->dm_info.tx_rate = u8_get_bits(ra_rpt->rate_sgi,
+                                             RTW_C2H_RA_RPT_RATE);
        ra_data.rtwdev = rtwdev;
        ra_data.payload = payload;
+       ra_data.length = length;
        rtw_iterate_stas_atomic(rtwdev, rtw_fw_ra_report_iter, &ra_data);
 }
 

diff --git a/drivers/net/wireless/realtek/rtw88/fw.h b/drivers/net/wireless/realtek/rtw88/fw.h
index e999c24e463447eafaa543df1046b0ccfb340bcd..404de1b0c407b4cda51e0d182f99b92c4c445e00 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/fw.h
+++ b/drivers/net/wireless/realtek/rtw88/fw.h
@@ -85,6 +85,19 @@ struct rtw_c2h_adaptivity {
        u8 option;
 } __packed;
 
+struct rtw_c2h_ra_rpt {
+       u8 rate_sgi;
+       u8 mac_id;
+       u8 byte2;
+       u8 status;
+       u8 byte4;
+       u8 ra_ratio;
+       u8 bw;
+} __packed;
+
+#define RTW_C2H_RA_RPT_RATE    GENMASK(6, 0)
+#define RTW_C2H_RA_RPT_SGI     BIT(7)
+
 struct rtw_h2c_register {
        u32 w0;
        u32 w1;
@@ -364,10 +377,6 @@ struct rtw_fw_hdr_legacy {
 #define GET_CHAN_SWITCH_CENTRAL_CH(c2h_payload)        (c2h_payload[2])
 #define GET_CHAN_SWITCH_ID(c2h_payload)                (c2h_payload[3])
 #define GET_CHAN_SWITCH_STATUS(c2h_payload)    (c2h_payload[4])
-#define GET_RA_REPORT_RATE(c2h_payload)                (c2h_payload[0] & 0x7f)
-#define GET_RA_REPORT_SGI(c2h_payload)         ((c2h_payload[0] & 0x80) >> 7)
-#define GET_RA_REPORT_BW(c2h_payload)          (c2h_payload[6])
-#define GET_RA_REPORT_MACID(c2h_payload)       (c2h_payload[1])
 
 #define GET_BCN_FILTER_NOTIFY_TYPE(c2h_payload)        (c2h_payload[1] & 0xf)
 #define GET_BCN_FILTER_NOTIFY_EVENT(c2h_payload)       (c2h_payload[1] & 0x10)

diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 58c7c6a178a88efaa76aae6b1461ead4300ec477..6161db5fcba623424baed2909f4c2e8ca00048c5 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -1201,6 +1201,7 @@ struct rtw_chip_info {
 
        u8 usb_tx_agg_desc_num;
        bool hw_feature_report;
+       u8 c2h_ra_report_size;
 
        u8 default_1ss_tx_path;
 

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8703b.c b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
index 01ac07ac68c86f69f00bbaaf8a6a09f1068d6abe..23125a62e74fb55589a57b20719752b791d320c9 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8703b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
@@ -1961,6 +1961,7 @@ const struct rtw_chip_info rtw8703b_hw_spec = {
        .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
        .usb_tx_agg_desc_num = 1, /* Not sure if this chip has USB interface */
        .hw_feature_report = true,
+       .c2h_ra_report_size = 7,
 
        .path_div_supported = false,
        .ht_supported = true,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.c b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
index bf87c92087dad097115a5cf7120d93d8eef02e9e..6a9115775fafeeeb8992f128429d0eac9246703c 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
@@ -2132,6 +2132,7 @@ const struct rtw_chip_info rtw8723d_hw_spec = {
        .dig_min = 0x20,
        .usb_tx_agg_desc_num = 1,
        .hw_feature_report = true,
+       .c2h_ra_report_size = 7,
        .ht_supported = true,
        .vht_supported = false,
        .lps_deep_mode_supported = 0,

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
index 44ef2e246724884769a62b4c560fc52e2127f75c..6cb7e9aaa437fe06ccb8b0a04e079f8671391765 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
@@ -1969,6 +1969,7 @@ const struct rtw_chip_info rtw8821c_hw_spec = {
        .dig_min = 0x1c,
        .usb_tx_agg_desc_num = 3,
        .hw_feature_report = true,
+       .c2h_ra_report_size = 7,
        .ht_supported = true,
        .vht_supported = true,
        .lps_deep_mode_supported = BIT(LPS_DEEP_MODE_LCLK),

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822b.c b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
index 9b7c383f37fe1d65029de6321dcaf95f3ff64c3c..48aefe3722ece02e7f8e0184978cfa114e2a330e 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
@@ -2510,6 +2510,7 @@ const struct rtw_chip_info rtw8822b_hw_spec = {
        .dig_min = 0x1c,
        .usb_tx_agg_desc_num = 3,
        .hw_feature_report = true,
+       .c2h_ra_report_size = 7,
        .ht_supported = true,
        .vht_supported = true,
        .lps_deep_mode_supported = BIT(LPS_DEEP_MODE_LCLK),

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index 063c65c269fe4739f74b7bac8158e480d7a8ade4..25933a54e8631eb425a934e59624ad1a1b021963 100644 (file)
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -5330,6 +5330,7 @@ const struct rtw_chip_info rtw8822c_hw_spec = {
        .dig_min = 0x20,
        .usb_tx_agg_desc_num = 3,
        .hw_feature_report = true,
+       .c2h_ra_report_size = 7,
        .default_1ss_tx_path = BB_PATH_A,
        .path_div_supported = true,
        .ht_supported = true,