wifi: rtw89: increase 8922a firmware format to 1 and support HW encryption for unicast management
Ping-Ke Shih
maintainercover wifi: rtw89: increase 8922a firmware format to 1 and support HW encryption for unicast management
First two patches are to support new firmware command formats, so needs to increase supported firmware format to 1, which old driver will not use this kind of new firmware.
Newer chips RTL8852C and RTL8922A can support unicast management encryption, enable them accordingly by patch 4/5.
Other two patches are to fix issues we found during testing.
Chih-Kang Chang (1):
wifi: rtw89: avoid to add interface to list twice when SER
Dian-Syuan Yang (1):
wifi: rtw89: correct VHT TX rate on 20MHz connection
Kuan-Chung Chen (2):
wifi: rtw89: 8922a: new implementation for RFK pre-notify H2C
wifi: rtw89: add support for HW encryption in unicast management
frames
Po-Hao Huang (1):
wifi: rtw89: 8922a: Add new fields for scan offload H2C command
drivers/net/wireless/realtek/rtw89/cam.c | 12 ++- drivers/net/wireless/realtek/rtw89/core.c | 29 ++++--- drivers/net/wireless/realtek/rtw89/core.h | 3 + drivers/net/wireless/realtek/rtw89/fw.c | 84 +++++++++++++------ drivers/net/wireless/realtek/rtw89/fw.h | 19 ++++- drivers/net/wireless/realtek/rtw89/mac.c | 7 ++ drivers/net/wireless/realtek/rtw89/mac80211.c | 4 +- drivers/net/wireless/realtek/rtw89/phy.c | 7 +- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 5 +- drivers/net/wireless/realtek/rtw89/util.h | 18 ++++ 15 files changed, 147 insertions(+), 46 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/5 wifi: rtw89: 8922a: new implementation for RFK pre-notify H2C
From: Kuan-Chung Chen <[email protected]>
For firmware version 0.35.31 and above, update H2C RFK pre-notify to new implementation. Rename existing H2C to v0 for backward compatibility.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 62 +++++++++++++++-------- drivers/net/wireless/realtek/rtw89/fw.h | 12 ++++- 3 files changed, 53 insertions(+), 22 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4358,6 +4358,7 @@ enum rtw89_fw_feature {RTW89_FW_FEATURE_BEACON_FILTER ,RTW89_FW_FEATURE_MACID_PAUSE_SLEEP ,RTW89_FW_FEATURE_WOW_REASON_V1 , + RTW89_FW_FEATURE_RFK_PRE_NOTIFY_V0, }; struct rtw89_fw_suit {
drivers/net/wireless/realtek/rtw89/fw.c +41 -21
102 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +11 -1
@@ -4106,7 +4106,7 @@ struct rtw89_fw_h2c_rf_get_mccch {#define NUM_OF_RTW89_FW_RFK_PATH 2#define NUM_OF_RTW89_FW_RFK_TBL 3 -struct rtw89_fw_h2c_rfk_pre_info { +struct rtw89_fw_h2c_rfk_pre_info_common {struct {__le32 ch[NUM_OF_RTW89_FW_RFK_PATH ][NUM_OF_RTW89_FW_RFK_TBL ];__le32 band[NUM_OF_RTW89_FW_RFK_PATH ][NUM_OF_RTW89_FW_RFK_TBL ];
@@ -4119,6 +4119,11 @@ struct rtw89_fw_h2c_rfk_pre_info { }__packed tbl;__le32 phy_idx; +} __packed; + +struct rtw89_fw_h2c_rfk_pre_info_v0 { +struct rtw89_fw_h2c_rfk_pre_info_common common; +__le32 cur_band;__le32 cur_bw;__le32 cur_center_ch;
@@ -4138,6 +4143,11 @@ struct rtw89_fw_h2c_rfk_pre_info { }__packed mlo; } __packed; +struct rtw89_fw_h2c_rfk_pre_info { +struct rtw89_fw_h2c_rfk_pre_info_common common; +__le32 mlo_1_1; +} __packed; +struct rtw89_h2c_rf_tssi {__le16 len;u8 phy;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH 1/5] wifi: rtw89: 8922a: new implementation for RFK pre-notify H2C
Quoted 8 lines · Ping-Ke Shih
From: Kuan-Chung Chen <[email protected]>
For firmware version 0.35.31 and above, update H2C RFK pre-notify to new implementation. Rename existing H2C to v0 for backward compatibility.
Signed-off-by Kuan-Chung Chen <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
5 patch(es) applied to rtw-next branch of rtw.git, thanks.
ca33c15a9360 wifi: rtw89: 8922a: new implementation for RFK pre-notify H2C 6ca6b918f280 wifi: rtw89: 8922a: Add new fields for scan offload H2C command 7dd5d2514a8e wifi: rtw89: avoid to add interface to list twice when SER 50961f88612c wifi: rtw89: add support for HW encryption in unicast management frames 89a4c16cbdc9 wifi: rtw89: correct VHT TX rate on 20MHz connection
Ping-Ke Shih
maintainerPATCH 2/5 wifi: rtw89: 8922a: Add new fields for scan offload H2C command
In reply to Ping-Ke ShihFrom: Po-Hao Huang <[email protected]>
Update scan offload H2C format to fit firmware version 35.21. The new fields indicate lengths of variable length members, so when driver and firmware are using mismatch version, FW could handle the parsing better.
--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 22 ++++++++++++++++--- drivers/net/wireless/realtek/rtw89/fw.h | 7 +++++- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 4 ++-- 4 files changed, 28 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4357,6 +4357,7 @@ enum rtw89_fw_feature {RTW89_FW_FEATURE_NO_LPS_PG ,RTW89_FW_FEATURE_BEACON_FILTER ,RTW89_FW_FEATURE_MACID_PAUSE_SLEEP , +RTW89_FW_FEATURE_SCAN_OFFLOAD_BE_V0 ,RTW89_FW_FEATURE_WOW_REASON_V1 , RTW89_FW_FEATURE_RFK_PRE_NOTIFY_V0, };
drivers/net/wireless/realtek/rtw89/fw.c +19 -3
@@ -683,6 +683,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8922A , ge,0 ,34 ,30 ,0 ,CRASH_TRIGGER ),__CFG_FW_FEAT (RTL8922A , ge,0 ,34 ,11 ,0 ,MACID_PAUSE_SLEEP ),__CFG_FW_FEAT (RTL8922A , ge,0 ,34 ,35 ,0 ,SCAN_OFFLOAD ), +__CFG_FW_FEAT (RTL8922A , lt,0 ,35 ,21 ,0 ,SCAN_OFFLOAD_BE_V0 ),__CFG_FW_FEAT (RTL8922A , ge,0 ,35 ,12 ,0 ,BEACON_FILTER ),__CFG_FW_FEAT (RTL8922A , ge,0 ,35 ,22 ,0 ,WOW_REASON_V1 ), __CFG_FW_FEAT(RTL8922A, lt, 0, 35, 31, 0, RFK_PRE_NOTIFY_V0),
@@ -4907,6 +4908,7 @@ int rtw89_fw_h2c_scan_offload_be(struct rtw89_dev *rtwdev,u8 macc_role_size =sizeof (*macc_role) * option->num_macc_role;u8 opch_size =sizeof (*opch) * option->num_opch;u8 probe_id[NUM_NL80211_BANDS ]; +u8 cfg_len =sizeof (*h2c);unsigned int cond;void *ptr;int ret;
@@ -4915,7 +4917,7 @@ int rtw89_fw_h2c_scan_offload_be(struct rtw89_dev *rtwdev,rtw89_scan_get_6g_disabled_chan (rtwdev, option); - len =sizeof (*h2c) + macc_role_size + opch_size; + len = cfg_len + macc_role_size + opch_size; skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for h2c scan offload\n" );
@@ -4980,10 +4982,24 @@ int rtw89_fw_h2c_scan_offload_be(struct rtw89_dev *rtwdev,le32_encode_bits (RTW89_HW_RATE_OFDM6 ,RTW89_H2C_SCANOFLD_BE_W8_PROBE_RATE_6GHZ ); } - ptr +=sizeof (*h2c); + +if (RTW89_CHK_FW_FEATURE (SCAN_OFFLOAD_BE_V0 , &rtwdev->fw)) { + cfg_len =offsetofend (typeof (*h2c), w8); + goto flex_member; + } + + h2c->w9 =le32_encode_bits (sizeof (*h2c) /sizeof (h2c->w0), +RTW89_H2C_SCANOFLD_BE_W9_SIZE_CFG ) | +le32_encode_bits (sizeof (*macc_role) /sizeof (macc_role->w0), +RTW89_H2C_SCANOFLD_BE_W9_SIZE_MACC ) | +le32_encode_bits (sizeof (*opch) /sizeof (opch->w0), +RTW89_H2C_SCANOFLD_BE_W9_SIZE_OP ); + +flex_member: + ptr += cfg_len;for (i =0 ; i < option->num_macc_role; i++) { - macc_role = (struct rtw89_h2c_scanofld_be_macc_role *)&h2c->role[i]; + macc_role = ptr; macc_role->w0 =le32_encode_bits (0 ,RTW89_H2C_SCANOFLD_BE_MACC_ROLE_W0_BAND ) | le32_encode_bits(0, RTW89_H2C_SCANOFLD_BE_MACC_ROLE_W0_PORT) |
drivers/net/wireless/realtek/rtw89/fw.h +6 -1
@@ -2711,7 +2711,9 @@ struct rtw89_h2c_scanofld_be {__le32 w6;__le32 w7;__le32 w8; -struct rtw89_h2c_scanofld_be_macc_role role[]; +__le32 w9;/* Added after SCAN_OFFLOAD_BE_V1 */ +/* struct rtw89_h2c_scanofld_be_macc_role (flexible number) */ +/* struct rtw89_h2c_scanofld_be_opch (flexible number) */ } __packed;#define RTW89_H2C_SCANOFLD_BE_W0_OP GENMASK(1, 0)
@@ -2742,6 +2744,9 @@ struct rtw89_h2c_scanofld_be {#define RTW89_H2C_SCANOFLD_BE_W8_PROBE_RATE_2GHZ GENMASK(7, 0)#define RTW89_H2C_SCANOFLD_BE_W8_PROBE_RATE_5GHZ GENMASK(15, 8)#define RTW89_H2C_SCANOFLD_BE_W8_PROBE_RATE_6GHZ GENMASK(23, 16) +#define RTW89_H2C_SCANOFLD_BE_W9_SIZE_CFG GENMASK(7, 0) +#define RTW89_H2C_SCANOFLD_BE_W9_SIZE_MACC GENMASK(15, 8) +#define RTW89_H2C_SCANOFLD_BE_W9_SIZE_OP GENMASK(23, 16)static inline void RTW89_SET_FWCMD_P2P_MACID (void *cmd,u32 val) {
drivers/net/wireless/realtek/rtw89/rtw8922a.c +2 -2
@@ -13,10 +13,10 @@#include "rtw8922a_rfk.h" #include "util.h" -#define RTW8922A_FW_FORMAT_MAX 0 +#define RTW8922A_FW_FORMAT_MAX 1#define RTW8922A_FW_BASENAME "rtw89/rtw8922a_fw"#define RTW8922A_MODULE_FIRMWARE \ - RTW8922A_FW_BASENAME ".bin" + RTW8922A_FW_BASENAME "-" __stringify(RTW8922A_FW_FORMAT_MAX) ".bin"#define HE_N_USER_MAX_8922A 4
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/5 wifi: rtw89: avoid to add interface to list twice when SER
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
If SER L2 occurs during the WoWLAN resume flow, the add interface flow is triggered by ieee80211_reconfig(). However, due to rtw89_wow_resume() return failure, it will cause the add interface flow to be executed again, resulting in a double add list and causing a kernel panic. Therefore, we have added a check to prevent double adding of the list.
list_add double add: new=ffff99d6992e2010, prev=ffff99d6992e2010, next=ffff99d695302628.
------------[ cut here ]------------ kernel BUG at lib/list_debug.c:37! invalid opcode: 0000 [#1] PREEMPT SMP NOPTI CPU: 0 PID: 9 Comm: kworker/0:1 Tainted: G W O 6.6.30-02659-gc18865c4dfbd #1 770df2933251a0e3c888ba69d1053a817a6376a7 Hardware name: HP Grunt/Grunt, BIOS Google_Grunt.11031.169.0 06/24/2021 Workqueue: events_freezable ieee80211_restart_work [mac80211] RIP: 0010:__list_add_valid_or_report+0x5e/0xb0 Code: c7 74 18 48 39 ce 74 13 b0 01 59 5a 5e 5f 41 58 41 59 41 5a 5d e9 e2 d6 03 00 cc 48 c7 c7 8d 4f 17 83 48 89 c2 e8 02 c0 00 00 <0f> 0b 48 c7 c7 aa 8c 1c 83 e8 f4 bf 00 00 0f 0b 48 c7 c7 c8 bc 12 RSP: 0018:ffffa91b8007bc50 EFLAGS: 00010246 RAX: 0000000000000058 RBX: ffff99d6992e0900 RCX: a014d76c70ef3900 RDX: ffffa91b8007bae8 RSI: 00000000ffffdfff RDI: 0000000000000001 RBP: ffffa91b8007bc88 R08: 0000000000000000 R09: ffffa91b8007bae0 R10: 00000000ffffdfff R11: ffffffff83a79800 R12: ffff99d695302060 R13: ffff99d695300900 R14: ffff99d6992e1be0 R15: ffff99d6992e2010 FS: 0000000000000000(0000) GS:ffff99d6aac00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000078fbdba43480 CR3: 000000010e464000 CR4: 00000000001506f0 Call Trace: <TASK> ? __die_body+0x1f/0x70 ? die+0x3d/0x60 ? do_trap+0xa4/0x110 ? __list_add_valid_or_report+0x5e/0xb0 ? do_error_trap+0x6d/0x90 ? __list_add_valid_or_report+0x5e/0xb0 ? handle_invalid_op+0x30/0x40 ? __list_add_valid_or_report+0x5e/0xb0 ? exc_invalid_op+0x3c/0x50 ? asm_exc_invalid_op+0x16/0x20 ? __list_add_valid_or_report+0x5e/0xb0 rtw89_ops_add_interface+0x309/0x310 [rtw89_core 7c32b1ee6854761c0321027c8a58c5160e41f48f] drv_add_interface+0x5c/0x130 [mac80211 83e989e6e616bd5b4b8a2b0a9f9352a2c385a3bc] ieee80211_reconfig+0x241/0x13d0 [mac80211 83e989e6e616bd5b4b8a2b0a9f9352a2c385a3bc] ? finish_wait+0x3e/0x90 ? synchronize_rcu_expedited+0x174/0x260 ? sync_rcu_exp_done_unlocked+0x50/0x50 ? wake_bit_function+0x40/0x40 ieee80211_restart_work+0xf0/0x140 [mac80211 83e989e6e616bd5b4b8a2b0a9f9352a2c385a3bc] process_scheduled_works+0x1e5/0x480 worker_thread+0xea/0x1e0 kthread+0xdb/0x110 ? move_linked_works+0x90/0x90 ? kthread_associate_blkcg+0xa0/0xa0 ret_from_fork+0x3b/0x50 ? kthread_associate_blkcg+0xa0/0xa0 ret_from_fork_asm+0x11/0x20 </TASK> Modules linked in: dm_integrity async_xor xor async_tx lz4 lz4_compress zstd zstd_compress zram zsmalloc rfcomm cmac uinput algif_hash algif_skcipher af_alg btusb btrtl iio_trig_hrtimer industrialio_sw_trigger btmtk industrialio_configfs btbcm btintel uvcvideo videobuf2_vmalloc iio_trig_sysfs videobuf2_memops videobuf2_v4l2 videobuf2_common uvc snd_hda_codec_hdmi veth snd_hda_intel snd_intel_dspcfg acpi_als snd_hda_codec industrialio_triggered_buffer kfifo_buf snd_hwdep industrialio i2c_piix4 snd_hda_core designware_i2s ip6table_nat snd_soc_max98357a xt_MASQUERADE xt_cgroup snd_soc_acp_rt5682_mach fuse rtw89_8922ae(O) rtw89_8922a(O) rtw89_pci(O) rtw89_core(O) 8021q mac80211(O) bluetooth ecdh_generic ecc cfg80211 r8152 mii joydev gsmi: Log Shutdown Reason 0x03 ---[ end trace 0000000000000000 ]---
--- drivers/net/wireless/realtek/rtw89/mac80211.c | 4 +++- drivers/net/wireless/realtek/rtw89/util.h | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac80211.c +3 -1
@@ -126,7 +126,9 @@ static int rtw89_ops_add_interface(struct ieee80211_hw *hw, rtwvif->rtwdev = rtwdev; rtwvif->roc.state =RTW89_ROC_IDLE ; rtwvif->offchan = false; -list_add_tail (&rtwvif->list, &rtwdev->rtwvifs_list); +if (!rtw89_rtwvif_in_list (rtwdev, rtwvif)) +list_add_tail (&rtwvif->list, &rtwdev->rtwvifs_list); +INIT_WORK (&rtwvif->update_beacon_work, rtw89_core_update_beacon_work);INIT_DELAYED_WORK (&rtwvif->roc.roc_work, rtw89_roc_work);rtw89_leave_ps_mode (rtwdev);
drivers/net/wireless/realtek/rtw89/util.h +18 -0
@@ -16,6 +16,24 @@#define rtw89_for_each_rtwvif (rtwdev, rtwvif) \ list_for_each_entry(rtwvif, &(rtwdev)->rtwvifs_list, list) +/* Before adding rtwvif to list, we need to check if it already exist, beacase +* in some case such as SER L2 happen during WoWLAN flow, calling reconfig +* twice cause the list to be added twice. +*/ +static inline bool rtw89_rtwvif_in_list (struct rtw89_dev *rtwdev, +struct rtw89_vif *new) +{ +struct rtw89_vif *rtwvif; + +lockdep_assert_held (&rtwdev->mutex); + +rtw89_for_each_rtwvif (rtwdev, rtwvif) +if (rtwvif == new) +return true; + +return false; +} +/* The result of negative dividend and positive divisor is undefined, but it * should be one case of round-down or round-up. So, make it round-down if the * result is round-up.
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/5 wifi: rtw89: add support for HW encryption in unicast management frames
In reply to Ping-Ke ShihFrom: Kuan-Chung Chen <[email protected]>
Add hardware encryption support for unicast management frames for 8922AE and 8852CE. Other chips will continue to use software encryption for unicast management frames.
--- drivers/net/wireless/realtek/rtw89/cam.c | 12 +++++--- drivers/net/wireless/realtek/rtw89/core.c | 29 ++++++++++++------- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/mac.c | 7 +++++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + 10 files changed, 40 insertions(+), 15 deletions(-)
drivers/net/wireless/realtek/rtw89/cam.c +8 -4
@@ -384,20 +384,24 @@ int rtw89_cam_sec_key_add(struct rtw89_dev *rtwdev,break ;case WLAN_CIPHER_SUITE_CCMP : hw_key_type =RTW89_SEC_KEY_TYPE_CCMP128 ; - key->flags |=IEEE80211_KEY_FLAG_SW_MGMT_TX ; +if (!chip->hw_mgmt_tx_encrypt) + key->flags |=IEEE80211_KEY_FLAG_SW_MGMT_TX ;break ;case WLAN_CIPHER_SUITE_CCMP_256 : hw_key_type =RTW89_SEC_KEY_TYPE_CCMP256 ; - key->flags |=IEEE80211_KEY_FLAG_SW_MGMT_TX ; +if (!chip->hw_mgmt_tx_encrypt) + key->flags |=IEEE80211_KEY_FLAG_SW_MGMT_TX ; ext_key = true;break ;case WLAN_CIPHER_SUITE_GCMP : hw_key_type =RTW89_SEC_KEY_TYPE_GCMP128 ; - key->flags |=IEEE80211_KEY_FLAG_SW_MGMT_TX ; +if (!chip->hw_mgmt_tx_encrypt) + key->flags |=IEEE80211_KEY_FLAG_SW_MGMT_TX ;break ;case WLAN_CIPHER_SUITE_GCMP_256 : hw_key_type =RTW89_SEC_KEY_TYPE_GCMP256 ; - key->flags |=IEEE80211_KEY_FLAG_SW_MGMT_TX ; +if (!chip->hw_mgmt_tx_encrypt) + key->flags |=IEEE80211_KEY_FLAG_SW_MGMT_TX ; ext_key = true;break ;case WLAN_CIPHER_SUITE_AES_CMAC :
drivers/net/wireless/realtek/rtw89/core.c +18 -11
@@ -602,15 +602,28 @@ static u8 rtw89_core_tx_get_mac_id(struct rtw89_dev *rtwdev,return rtwsta->mac_id; } +static void rtw89_core_tx_update_llc_hdr (struct rtw89_dev *rtwdev, +struct rtw89_tx_desc_info *desc_info, +struct sk_buff *skb) +{ +struct ieee80211_hdr *hdr = (void *)skb->data; +__le16 fc = hdr->frame_control; + + desc_info->hdr_llc_len =ieee80211_hdrlen (fc); + desc_info->hdr_llc_len >>=1 ;/* in unit of 2 bytes */ +} +static void rtw89_core_tx_update_mgmt_info (struct rtw89_dev *rtwdev,struct rtw89_core_tx_request *tx_req) { +const struct rtw89_chip_info *chip = rtwdev->chip;struct ieee80211_vif *vif = tx_req->vif;struct rtw89_vif *rtwvif = (struct rtw89_vif *)vif->drv_priv;struct rtw89_tx_desc_info *desc_info = &tx_req->desc_info;const struct rtw89_chan *chan =rtw89_chan_get (rtwdev, rtwvif->chanctx_idx); +struct sk_buff *skb = tx_req->skb;u8 qsel, ch_dma; qsel = desc_info->hiq ?RTW89_TX_QSEL_B0_HI :RTW89_TX_QSEL_B0_MGMT ;
@@ -629,6 +642,11 @@ rtw89_core_tx_update_mgmt_info(struct rtw89_dev *rtwdev, desc_info->dis_data_fb = true; desc_info->data_rate =rtw89_core_get_mgmt_rate (rtwdev, tx_req, chan); +if (chip->hw_mgmt_tx_encrypt &&IEEE80211_SKB_CB (skb)->control.hw_key) { +rtw89_core_tx_update_sec_key (rtwdev, tx_req); +rtw89_core_tx_update_llc_hdr (rtwdev, desc_info, skb); + } + rtw89_debug(rtwdev, RTW89_DBG_TXRX, "tx mgmt frame with rate 0x%x on channel %d (band %d, bw %d)\n", desc_info->data_rate, chan->channel, chan->band_type,
@@ -862,17 +880,6 @@ rtw89_core_tx_btc_spec_pkt_notify(struct rtw89_dev *rtwdev,return PACKET_MAX ; } -static void rtw89_core_tx_update_llc_hdr (struct rtw89_dev *rtwdev, -struct rtw89_tx_desc_info *desc_info, -struct sk_buff *skb) -{ -struct ieee80211_hdr *hdr = (void *)skb->data; -__le16 fc = hdr->frame_control; - - desc_info->hdr_llc_len =ieee80211_hdrlen (fc); - desc_info->hdr_llc_len >>=1 ;/* in unit of 2 bytes */ -} -static void rtw89_core_tx_wake (struct rtw89_dev *rtwdev,struct rtw89_core_tx_request *tx_req)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4175,6 +4175,7 @@ struct rtw89_chip_info {bool ul_tb_waveform_ctrl;bool ul_tb_pwr_diff;bool hw_sec_hdr; +bool hw_mgmt_tx_encrypt;u8 rf_path_num;u8 tx_nss;u8 rx_nss;
drivers/net/wireless/realtek/rtw89/mac.c +7 -0
@@ -2032,11 +2032,16 @@ int rtw89_mac_resize_ple_rx_quota(struct rtw89_dev *rtwdev, bool wow)void rtw89_mac_hw_mgnt_sec (struct rtw89_dev *rtwdev,bool enable) { +const struct rtw89_chip_info *chip = rtwdev->chip;u32 msk32 =B_AX_UC_MGNT_DEC |B_AX_BMC_MGNT_DEC ;if (rtwdev->chip->chip_gen !=RTW89_CHIP_AX )return ; +/* 8852C enable B_AX_UC_MGNT_DEC by default */ +if (chip->chip_id ==RTL8852C ) + msk32 =B_AX_BMC_MGNT_DEC ; +if (enable)rtw89_write32_set (rtwdev,R_AX_SEC_ENG_CTRL , msk32);else
@@ -2261,6 +2266,8 @@ static int sec_eng_init_ax(struct rtw89_dev *rtwdev)/* init TX encryption */ val |= (B_AX_SEC_TX_ENC |B_AX_SEC_RX_DEC ); val |= (B_AX_MC_DEC |B_AX_BC_DEC ); +if (chip->chip_id ==RTL8852C ) + val |=B_AX_UC_MGNT_DEC ;if (chip->chip_id ==RTL8852A || chip->chip_id ==RTL8852B || chip->chip_id ==RTL8851B ) val &= ~B_AX_TX_PARTIAL_MODE ;
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2464,6 +2464,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false, .hw_sec_hdr = false, + .hw_mgmt_tx_encrypt = false, .rf_path_num = 1, .tx_nss = 1, .rx_nss = 1,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2179,6 +2179,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = false, .hw_sec_hdr = false, + .hw_mgmt_tx_encrypt = false, .rf_path_num = 2, .tx_nss = 2, .rx_nss = 2,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -819,6 +819,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false, .hw_sec_hdr = false, + .hw_mgmt_tx_encrypt = false, .rf_path_num = 2, .tx_nss = 2, .rx_nss = 2,
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +1 -0
@@ -752,6 +752,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = { .ul_tb_waveform_ctrl = true, .ul_tb_pwr_diff = false, .hw_sec_hdr = false, + .hw_mgmt_tx_encrypt = false, .rf_path_num = 2, .tx_nss = 2, .rx_nss = 2,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2960,6 +2960,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = true, .hw_sec_hdr = true, + .hw_mgmt_tx_encrypt = true, .rf_path_num = 2, .tx_nss = 2, .rx_nss = 2,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -0
@@ -2563,6 +2563,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .ul_tb_waveform_ctrl = false, .ul_tb_pwr_diff = false, .hw_sec_hdr = true, + .hw_mgmt_tx_encrypt = true, .rf_path_num = 2, .tx_nss = 2, .rx_nss = 2,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/5 wifi: rtw89: correct VHT TX rate on 20MHz connection
In reply to Ping-Ke ShihFrom: Dian-Syuan Yang <[email protected]>
It may get wrong bitrate when connecting to AP set VHT 20MHz, and thus we fix it to follow Wi-Fi spec.
--- drivers/net/wireless/realtek/rtw89/phy.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/phy.c +5 -2
@@ -341,8 +341,11 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev, mode |=RTW89_RA_MODE_VHT ; csi_mode =RTW89_RA_RPT_MODE_VHT ; -/* MCS9, MCS8, MCS7 */ - ra_mask |=get_mcs_ra_mask (mcs_map,9 ,1 ); +/* MCS9 (non-20MHz), MCS8, MCS7 */ +if (sta->deflink.bandwidth ==IEEE80211_STA_RX_BW_20 ) + ra_mask |=get_mcs_ra_mask (mcs_map,8 ,1 ); +else + ra_mask |=get_mcs_ra_mask (mcs_map,9 ,1 ); high_rate_masks = rtw89_ra_mask_vht_rates;if (sta->deflink.vht_cap.cap &IEEE80211_VHT_CAP_RXSTBC_MASK ) stbc_en =1 ;
Signature · 1 line
2.25.1