mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2025-02-12 16:18:11 +00:00
195 lines
7.3 KiB
Diff
195 lines
7.3 KiB
Diff
From d9018f4373517d4560ce2ebf12684f77f5fbdad6 Mon Sep 17 00:00:00 2001
|
|
From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
|
|
Date: Wed, 23 Oct 2024 17:06:14 +0300
|
|
Subject: [PATCH] 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
|
|
---
|
|
drivers/net/wireless/realtek/rtw88/fw.c | 21 +++++++++++++------
|
|
drivers/net/wireless/realtek/rtw88/fw.h | 17 +++++++++++----
|
|
drivers/net/wireless/realtek/rtw88/main.h | 1 +
|
|
drivers/net/wireless/realtek/rtw88/rtw8703b.c | 1 +
|
|
drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 +
|
|
drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 +
|
|
drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 +
|
|
drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 +
|
|
8 files changed, 34 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
|
|
index 813c12148819..168e19187ba7 100644
|
|
--- 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 @@ static void rtw_fw_ra_report_iter(void *data, struct ieee80211_sta *sta)
|
|
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 e999c24e4634..404de1b0c407 100644
|
|
--- 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 58c7c6a178a8..6161db5fcba6 100644
|
|
--- 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 01ac07ac68c8..23125a62e74f 100644
|
|
--- 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 bf87c92087da..6a9115775faf 100644
|
|
--- 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 44ef2e246724..6cb7e9aaa437 100644
|
|
--- 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 9b7c383f37fe..48aefe3722ec 100644
|
|
--- 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 063c65c269fe..25933a54e863 100644
|
|
--- 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,
|
|
--
|
|
2.43.0
|
|
|