diff mbox series

[1/4] wifi: rtw89: 8851b: enable hw_scan support

Message ID 20230531060713.57203-2-pkshih@realtek.com
State New
Headers show
Series wifi: rtw89: 8851b: enable firmware features of hw_scan and crash_trigger | expand

Commit Message

Ping-Ke Shih May 31, 2023, 6:07 a.m. UTC 
From: Po-Hao Huang <phhuang@realtek.com>

This enables hw_scan for 8851b after firmware version 0.29.37.1.
Extend the channel info struct with padding zeros so newer firmware
can work properly, this change is backward compatible with older
firmware.

Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
 drivers/net/wireless/realtek/rtw89/fw.c | 1 +
 drivers/net/wireless/realtek/rtw89/fw.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Kalle Valo June 8, 2023, 3:58 p.m. UTC | #1 
Ping-Ke Shih <pkshih@realtek.com> wrote:

> From: Po-Hao Huang <phhuang@realtek.com>
> 
> This enables hw_scan for 8851b after firmware version 0.29.37.1.
> Extend the channel info struct with padding zeros so newer firmware
> can work properly, this change is backward compatible with older
> firmware.
> 
> Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>

4 patches applied to wireless-next.git, thanks.

9c52e8bf07c7 wifi: rtw89: 8851b: enable hw_scan support
b25e755e5e41 wifi: rtw89: debug: txpwr table access only valid page according to chip
db67b03b04b4 wifi: rtw89: set TX power without precondition during setting channel
57369e2aa2eb wifi: rtw89: 8851b: configure CRASH_TRIGGER feature for 8851B
diff mbox series

Patch

diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index f7f40a261c96a..4bb90d9e00d2c 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -257,6 +257,7 @@  struct __fw_feat_cfg {
 
 static const struct __fw_feat_cfg fw_feat_tbl[] = {
 	__CFG_FW_FEAT(RTL8851B, ge, 0, 29, 37, 1, TX_WAKE),
+	__CFG_FW_FEAT(RTL8851B, ge, 0, 29, 37, 1, SCAN_OFFLOAD),
 	__CFG_FW_FEAT(RTL8852A, le, 0, 13, 29, 0, OLD_HT_RA_FORMAT),
 	__CFG_FW_FEAT(RTL8852A, ge, 0, 13, 35, 0, SCAN_OFFLOAD),
 	__CFG_FW_FEAT(RTL8852A, ge, 0, 13, 35, 0, TX_WAKE),
diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index dd71beb152aeb..78d808f1e8c84 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -243,7 +243,7 @@  struct rtw89_fw_macid_pause_grp {
 #define RTW89_SCANOFLD_MAX_IE_LEN 512
 #define RTW89_SCANOFLD_PKT_NONE 0xFF
 #define RTW89_SCANOFLD_DEBUG_MASK 0x1F
-#define RTW89_MAC_CHINFO_SIZE 24
+#define RTW89_MAC_CHINFO_SIZE 28
 #define RTW89_SCAN_LIST_GUARD 4
 #define RTW89_SCAN_LIST_LIMIT \
 		((RTW89_H2C_MAX_SIZE / RTW89_MAC_CHINFO_SIZE) - RTW89_SCAN_LIST_GUARD)