wifi: rtw89: update common flow related to FW, MAC and PHY for coming RTL8922D
Ping-Ke Shih
maintainerv2 cover wifi: rtw89: update common flow related to FW, MAC and PHY for coming RTL8922D
During development of RTL8922D, the FW, MAC and PHY are changed, so prepare this patchset to make changes accordingly. Keep the same behavior for existing chips.
v2:
- patch 6/14: use rtw89_write32() to write R_BE_SECURE_BOOT_MALLOC_INFO
- patch 9/14: add missing '\n' to debug message
Chih-Kang Chang (3):
wifi: rtw89: flush TX queue before deleting key
wifi: rtw89: update format of addr cam H2C command
wifi: rtw89: correct user macid mask of RX info for RTL8922D
Ping-Ke Shih (11):
wifi: rtw89: fw: part size to download firmware by header info
wifi: rtw89: mac: separate pre-init code before downloading firmware
wifi: rtw89: phy: calling BB pre-init by chips with/without BB MCU
wifi: rtw89: mac: remove undefined bit B_BE_PPDU_MAC_INFO
wifi: rtw89: mac: update wcpu_on to download firmware for RTL8922D
wifi: rtw89: phy: consider type 15 in BB gain table
wifi: rtw89: phy: ignore DCFO if not defined in chip_info
wifi: rtw89: fw: print band and port where beacon update on
wifi: rtw89: align RA H2C format v1 for RTL8922A
wifi: rtw89: fill addr cam H2C command by struct
wifi: rtw89: add addr cam H2C command v1
drivers/net/wireless/realtek/rtw89/cam.c | 173 +++---- drivers/net/wireless/realtek/rtw89/cam.h | 446 +++++------------- drivers/net/wireless/realtek/rtw89/core.c | 30 +- drivers/net/wireless/realtek/rtw89/core.h | 23 +- drivers/net/wireless/realtek/rtw89/fw.c | 101 ++-- drivers/net/wireless/realtek/rtw89/fw.h | 20 +- drivers/net/wireless/realtek/rtw89/mac.c | 41 +- drivers/net/wireless/realtek/rtw89/mac.h | 1 + drivers/net/wireless/realtek/rtw89/mac80211.c | 5 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 9 +- drivers/net/wireless/realtek/rtw89/phy.c | 6 +- drivers/net/wireless/realtek/rtw89/phy_be.c | 4 + drivers/net/wireless/realtek/rtw89/reg.h | 24 +- 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 + drivers/net/wireless/realtek/rtw89/txrx.h | 1 + drivers/net/wireless/realtek/rtw89/wow.c | 6 +- 21 files changed, 417 insertions(+), 479 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 1/14 wifi: rtw89: flush TX queue before deleting key
From: Chih-Kang Chang <[email protected]>
In the wpa_supplicant rekey flow, it sends an EAPOL packet 4/4 through nl80211_tx_control_port() and triggers wake_tx_queue() in the driver. Then, it sends nl80211_new_key() to configure a new key in mac80211. However, in wake_tx_queue(), a workqueue is used to process the TX packet, which might cause the driver to process the EAPOL packet later than nl80211_new_key(). This results in the EAPOL packet 4/4 being transmitted with the new key and IV, causing it to be dropped by the AP. Therefore, needs to flush TX queue before deleting the old key to ensure that the EAPOL 4/4 packet is transmitted using the old key.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/mac80211.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtw89/mac80211.c +1 -0
@@ -969,6 +969,7 @@ static int rtw89_ops_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, }break ;case DISABLE_KEY : +flush_work (&rtwdev->txq_work);rtw89_hci_flush_queues (rtwdev,BIT (rtwdev->hw->queues) -1 , false);rtw89_mac_flush_txq (rtwdev,BIT (rtwdev->hw->queues) -1 , false);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH v2 rtw-next 01/14] wifi: rtw89: flush TX queue before deleting key
Quoted 12 lines · Ping-Ke Shih
From: Chih-Kang Chang <[email protected]>
In the
wpa_supplicantrekey flow, it sends an EAPOL packet 4/4 throughnl80211_tx_control_port()and triggerswake_tx_queue()in the driver. Then, it sendsnl80211_new_key()to configure a new key in mac80211. However, inwake_tx_queue(), a workqueue is used to process the TX packet, which might cause the driver to process the EAPOL packet later thannl80211_new_key(). This results in the EAPOL packet 4/4 being transmitted with the new key and IV, causing it to be dropped by the AP. Therefore, needs to flush TX queue before deleting the old key to ensure that the EAPOL 4/4 packet is transmitted using the old key.
Quoted 2 lines
Signed-off-by Chih-Kang Chang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
14 patch(es) applied to rtw-next branch of rtw.git, thanks.
3a12581fc292 wifi: rtw89: flush TX queue before deleting key 92db331de6de wifi: rtw89: fw: part size to download firmware by header info a2a64fe23463 wifi: rtw89: mac: separate pre-init code before downloading firmware 12e84effcb6d wifi: rtw89: phy: calling BB pre-init by chips with/without BB MCU d375434cbcea wifi: rtw89: mac: remove undefined bit B_BE_PPDU_MAC_INFO 7fefea11001d wifi: rtw89: mac: update wcpu_on to download firmware for RTL8922D 9df55e8d41aa wifi: rtw89: phy: consider type 15 in BB gain table 5607a141bf28 wifi: rtw89: phy: ignore DCFO if not defined in chip_info 1c2ada09628b wifi: rtw89: fw: print band and port where beacon update on aa8d1a8805bb wifi: rtw89: align RA H2C format v1 for RTL8922A 239dd70d776c wifi: rtw89: fill addr cam H2C command by struct fc2e8c873f46 wifi: rtw89: add addr cam H2C command v19dab26b9fa45 wifi: rtw89: update format of addr cam H2C command 09afd209a844 wifi: rtw89: correct user macid mask of RX info for RTL8922D
Ping-Ke Shih
maintainerPATCH v2 2/14 wifi: rtw89: fw: part size to download firmware by header info
In reply to Ping-Ke ShihThe part size is the unit to download firmware piece by piece. Old chips use 2020 bytes as a piece, but in new chips the part size is defined in firmware header. Change to use the value dynamically.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/fw.c | 31 +++++++++++++++---------- drivers/net/wireless/realtek/rtw89/fw.h | 1 + 2 files changed, 20 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +19 -12
@@ -161,6 +161,11 @@ static int rtw89_fw_hdr_parser_v0(struct rtw89_dev *rtwdev, const u8 *fw, u32 le info->dynamic_hdr_en =le32_get_bits (fw_hdr->w7,FW_HDR_W7_DYN_HDR ); info->idmem_share_mode =le32_get_bits (fw_hdr->w7,FW_HDR_W7_IDMEM_SHARE_MODE ); +if (chip->chip_gen ==RTW89_CHIP_AX ) + info->part_size =FWDL_SECTION_PER_PKT_LEN ; +else + info->part_size =le32_get_bits (fw_hdr->w7,FW_HDR_W7_PART_SIZE ); +if (info->dynamic_hdr_en) { info->hdr_len =le32_get_bits (fw_hdr->w3,FW_HDR_W3_LEN ); info->dynamic_hdr_len = info->hdr_len - base_hdr_len;
@@ -439,6 +444,7 @@ static int rtw89_fw_hdr_parser_v1(struct rtw89_dev *rtwdev, const u8 *fw, u32 le struct rtw89_fw_bin_info *info) {const struct rtw89_fw_hdr_v1 *fw_hdr = (const struct rtw89_fw_hdr_v1 *)fw; +const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_fw_hdr_section_info *section_info;const struct rtw89_fw_dynhdr_hdr *fwdynhdr;const struct rtw89_fw_hdr_section_v1 *section;
@@ -455,6 +461,11 @@ static int rtw89_fw_hdr_parser_v1(struct rtw89_dev *rtwdev, const u8 *fw, u32 le info->dynamic_hdr_en =le32_get_bits (fw_hdr->w7,FW_HDR_V1_W7_DYN_HDR ); info->idmem_share_mode =le32_get_bits (fw_hdr->w7,FW_HDR_V1_W7_IDMEM_SHARE_MODE ); +if (chip->chip_gen ==RTW89_CHIP_AX ) + info->part_size =FWDL_SECTION_PER_PKT_LEN ; +else + info->part_size =le32_get_bits (fw_hdr->w7,FW_HDR_V1_W7_PART_SIZE ); +if (info->dynamic_hdr_en) { info->hdr_len =le32_get_bits (fw_hdr->w5,FW_HDR_V1_W5_HDR_SIZE ); info->dynamic_hdr_len = info->hdr_len - base_hdr_len;
@@ -1516,8 +1527,7 @@ static u32 __rtw89_fw_download_tweak_hdr_v0(struct rtw89_dev *rtwdev,struct rtw89_fw_hdr_section *section;int i; -le32p_replace_bits (&fw_hdr->w7,FWDL_SECTION_PER_PKT_LEN , -FW_HDR_W7_PART_SIZE ); +le32p_replace_bits (&fw_hdr->w7, info->part_size,FW_HDR_W7_PART_SIZE );for (i =0 ; i < info->section_num; i++) { section_info = &info->section_info[i];
@@ -1542,8 +1552,7 @@ static u32 __rtw89_fw_download_tweak_hdr_v1(struct rtw89_dev *rtwdev,u8 dst_sec_idx =0 ;u8 sec_idx; -le32p_replace_bits (&fw_hdr->w7,FWDL_SECTION_PER_PKT_LEN , -FW_HDR_V1_W7_PART_SIZE ); +le32p_replace_bits (&fw_hdr->w7, info->part_size,FW_HDR_V1_W7_PART_SIZE );for (sec_idx =0 ; sec_idx < info->section_num; sec_idx++) { section_info = &info->section_info[sec_idx];
@@ -1645,7 +1654,8 @@ static int rtw89_fw_download_hdr(struct rtw89_dev *rtwdev, }static int __rtw89_fw_download_main (struct rtw89_dev *rtwdev, -struct rtw89_fw_hdr_section_info *info) +struct rtw89_fw_hdr_section_info *info, +u32 part_size) {struct sk_buff *skb;const u8 *section = info->addr;
@@ -1666,20 +1676,17 @@ static int __rtw89_fw_download_main(struct rtw89_dev *rtwdev, }if (info->key_addr && info->key_len) { -if (residue_len >FWDL_SECTION_PER_PKT_LEN || info->len < info->key_len) +if (residue_len > part_size || info->len < info->key_len)rtw89_warn (rtwdev,"ignore to copy key data because of len %d, %d, %d, %d\n" , - info->len,FWDL_SECTION_PER_PKT_LEN , + info->len, part_size, info->key_len, residue_len);else copy_key = true; }while (residue_len) { -if (residue_len >=FWDL_SECTION_PER_PKT_LEN ) - pkt_len =FWDL_SECTION_PER_PKT_LEN ; -else - pkt_len = residue_len; + pkt_len =min (residue_len, part_size); skb =rtw89_fw_h2c_alloc_skb_no_hdr (rtwdev, pkt_len);if (!skb) {
@@ -1734,7 +1741,7 @@ static int rtw89_fw_download_main(struct rtw89_dev *rtwdev,int ret;while (section_num--) { - ret =__rtw89_fw_download_main (rtwdev, section_info); + ret =__rtw89_fw_download_main (rtwdev, section_info, info->part_size);if (ret)return ret; section_info++;
drivers/net/wireless/realtek/rtw89/fw.h +1 -0
@@ -297,6 +297,7 @@ struct rtw89_fw_hdr_section_info {struct rtw89_fw_bin_info {u8 section_num; +u32 part_size;u32 hdr_len;bool dynamic_hdr_en;u32 dynamic_hdr_len;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 3/14 wifi: rtw89: mac: separate pre-init code before downloading firmware
In reply to Ping-Ke ShihDriver needs to initialize registers before downloading firmware, so move pre-init part (power on) from original rtw89_mac_init(). The consequence patches will add more pre-init codes before downloading firmware.
Since rtw89_phy_init_bb_afe() is used by coming RTL8922D, don't change logic at all for existing chips.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/core.c | 8 ++++++++ drivers/net/wireless/realtek/rtw89/mac.c | 15 +++++++++++---- drivers/net/wireless/realtek/rtw89/mac.h | 1 + 3 files changed, 20 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +8 -0
@@ -5617,8 +5617,16 @@ int rtw89_core_start(struct rtw89_dev *rtwdev) {int ret; + ret =rtw89_mac_preinit (rtwdev); +if (ret) { +rtw89_err (rtwdev,"mac preinit fail, ret: %d\n" , ret); +return ret; + } +rtw89_phy_init_bb_afe (rtwdev); +/* above do preinit before downloading firmware */ + ret =rtw89_mac_init (rtwdev);if (ret) {rtw89_err (rtwdev,"mac init fail, ret:%d\n" , ret);
drivers/net/wireless/realtek/rtw89/mac.c +11 -4
@@ -4126,17 +4126,24 @@ int rtw89_mac_partial_init(struct rtw89_dev *rtwdev, bool include_bb)return 0 ; } -int rtw89_mac_init (struct rtw89_dev *rtwdev) +int rtw89_mac_preinit (struct rtw89_dev *rtwdev) { -const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; -const struct rtw89_chip_info *chip = rtwdev->chip; -bool include_bb = !!chip->bbmcu_nr;int ret; ret =rtw89_mac_pwr_on (rtwdev);if (ret)return ret; +return 0 ; +} + +int rtw89_mac_init (struct rtw89_dev *rtwdev) +{ +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; +const struct rtw89_chip_info *chip = rtwdev->chip; +bool include_bb = !!chip->bbmcu_nr; +int ret; + ret =rtw89_mac_partial_init (rtwdev, include_bb);if (ret) goto fail;
drivers/net/wireless/realtek/rtw89/mac.h +1 -0
@@ -1201,6 +1201,7 @@ rtw89_write32_port_set(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_lint rtw89_mac_pwr_on (struct rtw89_dev *rtwdev);void rtw89_mac_pwr_off (struct rtw89_dev *rtwdev);int rtw89_mac_partial_init (struct rtw89_dev *rtwdev,bool include_bb); +int rtw89_mac_preinit (struct rtw89_dev *rtwdev);int rtw89_mac_init (struct rtw89_dev *rtwdev);int rtw89_mac_dle_init (struct rtw89_dev *rtwdev,enum rtw89_qta_mode mode,enum rtw89_qta_mode ext_mode);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 4/14 wifi: rtw89: phy: calling BB pre-init by chips with/without BB MCU
In reply to Ping-Ke ShihThe existing flow is doing BB pre-init before downloading BB MCU firmware, because existing chip RTL8922A has BB MCU. However, the coming chips don't have this, and BB pre-init configuring registers can affect downloading WiFi-CPU firmware. Therefore, calling BB pre-init afterward for new coming chips without BB MCU.
For existing WiFi 6 chips, no BB pre-init. For RTL8922A, don't change the logic.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/core.c | 4 ++++ drivers/net/wireless/realtek/rtw89/core.h | 11 ++++++++--- drivers/net/wireless/realtek/rtw89/mac.c | 9 ++++++--- 3 files changed, 18 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +4 -0
@@ -5615,6 +5615,7 @@ EXPORT_SYMBOL(rtw89_check_quirks);int rtw89_core_start (struct rtw89_dev *rtwdev) { +bool no_bbmcu = !rtwdev->chip->bbmcu_nr;int ret; ret =rtw89_mac_preinit (rtwdev);
@@ -5623,6 +5624,9 @@ int rtw89_core_start(struct rtw89_dev *rtwdev)return ret; } +if (no_bbmcu) +rtw89_chip_bb_preinit (rtwdev); +rtw89_phy_init_bb_afe (rtwdev);/* above do preinit before downloading firmware */
drivers/net/wireless/realtek/rtw89/core.h +8 -3
@@ -7039,12 +7039,17 @@ static inline void rtw89_chip_rfk_hw_init(struct rtw89_dev *rtwdev) }static inline -void rtw89_chip_bb_preinit (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx) +void rtw89_chip_bb_preinit (struct rtw89_dev *rtwdev) {const struct rtw89_chip_info *chip = rtwdev->chip; -if (chip->ops->bb_preinit) - chip->ops->bb_preinit (rtwdev, phy_idx); +if (!chip->ops->bb_preinit) +return ; + + chip->ops->bb_preinit (rtwdev,RTW89_PHY_0 ); + +if (rtwdev->dbcc_en) + chip->ops->bb_preinit (rtwdev,RTW89_PHY_1 ); } static inline
drivers/net/wireless/realtek/rtw89/mac.c +6 -3
@@ -4104,9 +4104,12 @@ int rtw89_mac_partial_init(struct rtw89_dev *rtwdev, bool include_bb)rtw89_mac_ctrl_hci_dma_trx (rtwdev, true);if (include_bb) { -rtw89_chip_bb_preinit (rtwdev,RTW89_PHY_0 ); -if (rtwdev->dbcc_en) -rtw89_chip_bb_preinit (rtwdev,RTW89_PHY_1 ); +/* Only call BB preinit including configuration of BB MCU for +* the chips which need to download BB MCU firmware. Otherwise, +* calling preinit later to prevent touching registers affecting +* download firmware. +*/ +rtw89_chip_bb_preinit (rtwdev); } ret =rtw89_mac_dmac_pre_init (rtwdev);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 5/14 wifi: rtw89: mac: remove undefined bit B_BE_PPDU_MAC_INFO
In reply to Ping-Ke ShihThe bit is defined during test chip development, but formal chips don't have this. Remove it.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/mac_be.c | 2 +- drivers/net/wireless/realtek/rtw89/reg.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/mac_be.c +1 -1
@@ -2020,7 +2020,7 @@ int rtw89_mac_cfg_ppdu_status_be(struct rtw89_dev *rtwdev, u8 mac_idx, bool enab }rtw89_write32_mask (rtwdev,R_BE_HW_PPDU_STATUS ,B_BE_FWD_PPDU_STAT_MASK ,3 ); -rtw89_write32 (rtwdev, reg,B_BE_PPDU_STAT_RPT_EN |B_BE_PPDU_MAC_INFO | +rtw89_write32 (rtwdev, reg,B_BE_PPDU_STAT_RPT_EN |B_BE_APP_RX_CNT_RPT |B_BE_APP_PLCP_HDR_RPT |B_BE_PPDU_STAT_RPT_CRC32 |B_BE_PPDU_STAT_RPT_DMA );
drivers/net/wireless/realtek/rtw89/reg.h +0 -1
@@ -7476,7 +7476,6 @@#define B_BE_PPDU_STAT_RPT_ADDR BIT(4)#define B_BE_APP_PLCP_HDR_RPT BIT(3)#define B_BE_APP_RX_CNT_RPT BIT(2) -#define B_BE_PPDU_MAC_INFO BIT(1)#define B_BE_PPDU_STAT_RPT_EN BIT(0)#define R_BE_RX_SR_CTRL 0x1144A
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 6/14 wifi: rtw89: mac: update wcpu_on to download firmware for RTL8922D
In reply to Ping-Ke ShihThe RTL8922D does more settings before downloading firmware, so add them accordingly. Also, update the missed settings for RTL8922A.
---
v2: use rtw89_write32() to write R_BE_SECURE_BOOT_MALLOC_INFO
--- drivers/net/wireless/realtek/rtw89/mac_be.c | 7 +++++++ drivers/net/wireless/realtek/rtw89/reg.h | 23 +++++++++++++++++++++ 2 files changed, 30 insertions(+)
drivers/net/wireless/realtek/rtw89/mac_be.c +7 -0
@@ -458,6 +458,7 @@ static void set_cpu_en(struct rtw89_dev *rtwdev, bool include_bb)static int wcpu_on (struct rtw89_dev *rtwdev,u8 boot_reason,bool dlfw) { +const struct rtw89_chip_info *chip = rtwdev->chip;u32 val32;int ret;
@@ -479,6 +480,7 @@ static int wcpu_on(struct rtw89_dev *rtwdev, u8 boot_reason, bool dlfw)rtw89_write32 (rtwdev,R_BE_UDM1 ,0 );rtw89_write32 (rtwdev,R_BE_UDM2 ,0 ); +rtw89_write32 (rtwdev,R_BE_BOOT_DBG ,0x0 );rtw89_write32 (rtwdev,R_BE_HALT_H2C ,0 );rtw89_write32 (rtwdev,R_BE_HALT_C2H ,0 );rtw89_write32 (rtwdev,R_BE_HALT_H2C_CTRL ,0 );
@@ -493,6 +495,11 @@ static int wcpu_on(struct rtw89_dev *rtwdev, u8 boot_reason, bool dlfw) B_BE_WDT_WAKE_PCIE_EN | B_BE_WDT_WAKE_USB_EN);rtw89_write32_clr (rtwdev,R_BE_WCPU_FW_CTRL ,B_BE_WDT_PLT_RST_EN |B_BE_WCPU_ROM_CUT_GET ); +rtw89_write32 (rtwdev,R_BE_SECURE_BOOT_MALLOC_INFO ,0 ); +rtw89_write32_clr (rtwdev,R_BE_GPIO_MUXCFG ,B_BE_BOOT_MODE ); + +if (chip->chip_id !=RTL8922A ) +rtw89_write32_set (rtwdev,R_BE_WCPU_FW_CTRL ,B_BE_HOST_EXIST );rtw89_write16_mask (rtwdev,R_BE_BOOT_REASON ,B_BE_BOOT_REASON_MASK , boot_reason);rtw89_write32_clr (rtwdev,R_BE_PLATFORM_ENABLE ,B_BE_WCPU_EN );
drivers/net/wireless/realtek/rtw89/reg.h +23 -0
@@ -3963,6 +3963,24 @@#define R_BE_EFUSE_CTRL_1_V1 0x0034#define B_BE_EF_DATA_MASK GENMASK(31, 0) +#define R_BE_GPIO_MUXCFG 0x0040 +#define B_BE_WCPU_AUTO_EN BIT(26) +#define B_BE_WCPU_JTAG_EN BIT(24) +#define B_BE_WCPU_DBG_EN BIT(23) +#define B_BE_JTAG_CHAIN_EN BIT(20) +#define B_BE_BOOT_MODE BIT(19) +#define B_BE_WL_EECS_EXT_32K_SEL BIT(18) +#define B_BE_WL_SEC_BONDING_OPT_STS BIT(17) +#define B_BE_SECSIC_SEL BIT(16) +#define B_BE_ENHTP BIT(14) +#define B_BE_ENSIC BIT(12) +#define B_BE_SIC_SWRST BIT(11) +#define B_BE_PINMUX_PTA_EN BIT(10) +#define B_BE_WL_BT_PTA_SEC BIT(9) +#define B_BE_ENUARTTX BIT(8) +#define B_BE_DBG_GNT_BT_S1_POLARITY BIT(4) +#define B_BE_ENUARTRX BIT(2) +#define R_BE_GPIO_EXT_CTRL 0x0060#define B_BE_GPIO_MOD_15_TO_8_MASK GENMASK(31, 24)#define B_BE_GPIO_MOD_9 BIT(25)
@@ -4323,6 +4341,7 @@#define B_BE_RUN_ENV_MASK GENMASK(31, 30)#define B_BE_WCPU_FWDL_STATUS_MASK GENMASK(29, 26)#define B_BE_WDT_PLT_RST_EN BIT(17) +#define B_BE_HOST_EXIST BIT(16)#define B_BE_FW_SEC_AUTH_DONE BIT(14)#define B_BE_FW_CPU_UTIL_STS_EN BIT(13)#define B_BE_BBMCU1_FWDL_EN BIT(12)
@@ -4599,6 +4618,10 @@#define B_BE_HCI_RXDMA_EN BIT(1)#define B_BE_HCI_TXDMA_EN BIT(0) +#define R_BE_BOOT_DBG 0x78F0 +#define B_BE_BOOT_STATUS_MASK GENMASK(31, 16) +#define B_BE_SECUREBOOT_STATUS_MASK GENMASK(15, 0) +#define R_BE_DBG_WOW_READY 0x815E#define B_BE_DBG_WOW_READY GENMASK(7, 0)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 7/14 wifi: rtw89: phy: consider type 15 in BB gain table
In reply to Ping-Ke ShihBB gain table is a table to configure gain for certain channels. Newly added type 15 is considered to write registers accordingly.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/phy_be.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/realtek/rtw89/phy_be.c +4 -0
@@ -266,6 +266,10 @@ static void rtw89_phy_config_bb_gain_be(struct rtw89_dev *rtwdev,case 3 :rtw89_phy_cfg_bb_gain_op1db_be (rtwdev, arg, reg->data);break ; +case 15 : +rtw89_phy_write32_idx (rtwdev, reg->addr &0xFFFFF ,MASKHWORD , + reg->data,RTW89_PHY_0 ); +break ;case 4 :/* This cfg_type is only used by rfe_type >= 50 with eFEM */ if (efuse->rfe_type <50 )
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 8/14 wifi: rtw89: phy: ignore DCFO if not defined in chip_info
In reply to Ping-Ke ShihFor WiFi 7 chips, DCFO (digital carrier frequency offset) feature isn't supported, so the corresponding registers aren't defined in chip_info. Check and ignore this feature accordingly.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/phy.c +1 -1
@@ -4608,7 +4608,7 @@ static void rtw89_dcfo_comp(struct rtw89_dev *rtwdev, s32 curr_cfo)s32 dcfo_comp_val;int sign; -if (rtwdev->chip->chip_id ==RTL8922A ) +if (!dcfo_comp)return ;if (!is_linked) {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 9/14 wifi: rtw89: fw: print band and port where beacon update on
In reply to Ping-Ke ShihThe C2H event of BCN_UPD_DONE is to notify driver that firmware changes beacon content on certain band/port asked by driver. Print the notification for debug purpose for now.
---
v2: add missing '\n' to debug message
--- drivers/net/wireless/realtek/rtw89/fw.h | 9 +++++++++ drivers/net/wireless/realtek/rtw89/mac.c | 13 ++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/fw.h +9 -0
@@ -3648,6 +3648,15 @@ struct rtw89_fw_c2h_log_fmt {#define RTW89_C2H_FW_LOG_SIGNATURE 0xA5A5#define RTW89_C2H_FW_LOG_STR_BUF_SIZE 512 +struct rtw89_c2h_bcn_upd_done { +struct rtw89_c2h_hdr hdr; +__le32 w2; +} __packed; + +#define RTW89_C2H_BCN_UPD_DONE_W2_PORT GENMASK(2, 0) +#define RTW89_C2H_BCN_UPD_DONE_W2_MBSSID GENMASK(6, 3) +#define RTW89_C2H_BCN_UPD_DONE_W2_BAND_IDX BIT(7) +struct rtw89_c2h_mac_bcnfltr_rpt {__le32 w0;__le32 w1;
drivers/net/wireless/realtek/rtw89/mac.c +12 -1
@@ -5309,8 +5309,19 @@ rtw89_mac_c2h_bcn_cnt(struct rtw89_dev *rtwdev, struct sk_buff *c2h, u32 len) }static void -rtw89_mac_c2h_bcn_upd_done (struct rtw89_dev *rtwdev,struct sk_buff *c2h,u32 len) +rtw89_mac_c2h_bcn_upd_done (struct rtw89_dev *rtwdev,struct sk_buff *skb_c2h,u32 len) { +const struct rtw89_c2h_bcn_upd_done *c2h = + (const struct rtw89_c2h_bcn_upd_done *)skb_c2h->data; +u8 band, port, mbssid; + + port =le32_get_bits (c2h->w2,RTW89_C2H_BCN_UPD_DONE_W2_PORT ); + mbssid =le32_get_bits (c2h->w2,RTW89_C2H_BCN_UPD_DONE_W2_MBSSID ); + band =le32_get_bits (c2h->w2,RTW89_C2H_BCN_UPD_DONE_W2_BAND_IDX ); + +rtw89_debug (rtwdev,RTW89_DBG_FW , +"BCN update done on port:%d mbssid:%d band:%d\n" , + port, mbssid, band); } static void
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 10/14 wifi: rtw89: align RA H2C format v1 for RTL8922A
In reply to Ping-Ke ShihFor RTL8922A, the bits [16:31] of word 3 of v1 format isn't as WiFi 6 chips. Instead, it only needs to fill additional band type and partial bandwidth ER.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/core.h | 9 ++++++- drivers/net/wireless/realtek/rtw89/fw.c | 33 ++++++++++++++--------- drivers/net/wireless/realtek/rtw89/fw.h | 7 +++++ drivers/net/wireless/realtek/rtw89/phy.c | 4 +++ 4 files changed, 39 insertions(+), 14 deletions(-)
drivers/net/wireless/realtek/rtw89/core.h +8 -1
@@ -3384,11 +3384,18 @@ struct rtw89_ra_info { u8 cr_tbl_sel:1; u8 fix_giltf_en:1; u8 fix_giltf:3; - u8 rsvd2:1; + u8 partial_bw_er:1;u8 csi_mcs_ss_idx; u8 csi_mode:2; u8 csi_gi_ltf:3; u8 csi_bw:3; +/* after v1 */ + u8 is_noisy:1; + u8 psra_en:1; + u8 rsvd0:1; + u8 macid_msb:2; + u8 band:2; /* enum rtw89_band */ + u8 is_new_dbgreg:1; };#define RTW89_PPDU_MAC_INFO_USR_SIZE 4
drivers/net/wireless/realtek/rtw89/fw.c +20 -13
@@ -4739,13 +4739,16 @@ int rtw89_fw_h2c_ra(struct rtw89_dev *rtwdev, struct rtw89_ra_info *ra, bool csistruct rtw89_h2c_ra_v1 *h2c_v1;struct rtw89_h2c_ra *h2c;u32 len =sizeof (*h2c); -bool format_v1 = false;struct sk_buff *skb; +u8 ver =U8_MAX ;int ret; -if (chip->chip_gen ==RTW89_CHIP_BE ) { +if (chip->chip_gen ==RTW89_CHIP_AX ) { + len =sizeof (*h2c); + ver =0 ; + }else { len =sizeof (*h2c_v1); - format_v1 = true; + ver =1 ; } skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);
@@ -4777,16 +4780,8 @@ int rtw89_fw_h2c_ra(struct rtw89_dev *rtwdev, struct rtw89_ra_info *ra, bool csi h2c->w3 =le32_encode_bits (ra->fix_giltf_en,RTW89_H2C_RA_W3_FIX_GILTF_EN ) |le32_encode_bits (ra->fix_giltf,RTW89_H2C_RA_W3_FIX_GILTF ); -if (!format_v1) - goto csi; - - h2c_v1 = (struct rtw89_h2c_ra_v1 *)h2c; - h2c_v1->w4 =le32_encode_bits (ra->mode_ctrl,RTW89_H2C_RA_V1_W4_MODE_EHT ) | -le32_encode_bits (ra->bw_cap,RTW89_H2C_RA_V1_W4_BW_EHT ); - -csi: -if (!csi) - goto done; +if (!csi || ver >=1 ) + goto next_v1; h2c->w2 |=le32_encode_bits (1 ,RTW89_H2C_RA_W2_BFEE_CSI_CTL ); h2c->w3 |= le32_encode_bits(ra->band_num, RTW89_H2C_RA_W3_BAND_NUM) |
@@ -4798,6 +4793,18 @@ int rtw89_fw_h2c_ra(struct rtw89_dev *rtwdev, struct rtw89_ra_info *ra, bool csile32_encode_bits (ra->csi_gi_ltf,RTW89_H2C_RA_W3_FIXED_CSI_GI_LTF ) |le32_encode_bits (ra->csi_bw,RTW89_H2C_RA_W3_FIXED_CSI_BW ); +next_v1: +if (ver <1 ) + goto done; + + h2c->w3 |=le32_encode_bits (ra->partial_bw_er, +RTW89_H2C_RA_V1_W3_PARTIAL_BW_SU_ER ) | +le32_encode_bits (ra->band,RTW89_H2C_RA_V1_W3_BAND ); + + h2c_v1 = (struct rtw89_h2c_ra_v1 *)h2c; + h2c_v1->w4 =le32_encode_bits (ra->mode_ctrl,RTW89_H2C_RA_V1_W4_MODE_EHT ) | +le32_encode_bits (ra->bw_cap,RTW89_H2C_RA_V1_W4_BW_EHT ); + done: rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C, H2C_CAT_OUTSRC, H2C_CL_OUTSRC_RA,
drivers/net/wireless/realtek/rtw89/fw.h +7 -0
@@ -447,6 +447,13 @@ struct rtw89_h2c_ra {#define RTW89_H2C_RA_W3_FIXED_CSI_MODE GENMASK(25, 24)#define RTW89_H2C_RA_W3_FIXED_CSI_GI_LTF GENMASK(28, 26)#define RTW89_H2C_RA_W3_FIXED_CSI_BW GENMASK(31, 29) +#define RTW89_H2C_RA_V1_W3_PARTIAL_BW_SU_ER BIT(15) +#define RTW89_H2C_RA_V1_W3_FIXED_CSI_RATE_L GENMASK(23, 16) +#define RTW89_H2C_RA_V1_W3_IS_NOISY BIT(24) +#define RTW89_H2C_RA_V1_W3_PSRA_EN BIT(25) +#define RTW89_H2C_RA_V1_W3_MACID_MSB GENMASK(28, 27) +#define RTW89_H2C_RA_V1_W3_BAND GENMASK(30, 29) +#define RTW89_H2C_RA_V1_W3_NEW_DBGREG BIT(31)struct rtw89_h2c_ra_v1 {struct rtw89_h2c_ra v0;
drivers/net/wireless/realtek/rtw89/phy.c +4 -0
@@ -476,6 +476,10 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev, ra->ra_mask = ra_mask; ra->fix_giltf_en = fix_giltf_en; ra->fix_giltf = fix_giltf; + ra->partial_bw_er = link_sta->he_cap.has_he ? + !!(link_sta->he_cap.he_cap_elem.phy_cap_info[6 ] & +IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE ) :0 ; + ra->band = chan->band_type;if (!csi)return ;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 11/14 wifi: rtw89: fill addr cam H2C command by struct
In reply to Ping-Ke ShihThe addr cam is used to tell firmware the MAC address and BSSID associated to connected stations. Use struct instead of macros with pointer arithmetic to fill the data.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/cam.c | 150 ++++---- drivers/net/wireless/realtek/rtw89/cam.h | 431 +++++------------------ drivers/net/wireless/realtek/rtw89/fw.c | 17 +- 3 files changed, 173 insertions(+), 425 deletions(-)
drivers/net/wireless/realtek/rtw89/cam.c +73 -77
@@ -760,7 +760,8 @@ int rtw89_cam_init(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link)int rtw89_cam_fill_bssid_cam_info (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link, -struct rtw89_sta_link *rtwsta_link,u8 *cmd) +struct rtw89_sta_link *rtwsta_link, +struct rtw89_h2c_addr_cam *h2c) {struct rtw89_bssid_cam_entry *bssid_cam =rtw89_get_bssid_cam_of (rtwvif_link, rtwsta_link);
@@ -780,20 +781,19 @@ int rtw89_cam_fill_bssid_cam_info(struct rtw89_dev *rtwdev,rcu_read_unlock (); -FWCMD_SET_ADDR_BSSID_IDX (cmd, bssid_cam->bssid_cam_idx); -FWCMD_SET_ADDR_BSSID_OFFSET (cmd, bssid_cam->offset); -FWCMD_SET_ADDR_BSSID_LEN (cmd, bssid_cam->len); -FWCMD_SET_ADDR_BSSID_VALID (cmd, bssid_cam->valid); -FWCMD_SET_ADDR_BSSID_MASK (cmd, bss_mask); -FWCMD_SET_ADDR_BSSID_BB_SEL (cmd, bssid_cam->phy_idx); -FWCMD_SET_ADDR_BSSID_BSS_COLOR (cmd, bss_color); - -FWCMD_SET_ADDR_BSSID_BSSID0 (cmd, bssid_cam->bssid[0 ]); -FWCMD_SET_ADDR_BSSID_BSSID1 (cmd, bssid_cam->bssid[1 ]); -FWCMD_SET_ADDR_BSSID_BSSID2 (cmd, bssid_cam->bssid[2 ]); -FWCMD_SET_ADDR_BSSID_BSSID3 (cmd, bssid_cam->bssid[3 ]); -FWCMD_SET_ADDR_BSSID_BSSID4 (cmd, bssid_cam->bssid[4 ]); -FWCMD_SET_ADDR_BSSID_BSSID5 (cmd, bssid_cam->bssid[5 ]); + h2c->w12 =le32_encode_bits (bssid_cam->bssid_cam_idx,ADDR_CAM_W12_BSSID_IDX ) | +le32_encode_bits (bssid_cam->offset,ADDR_CAM_W12_BSSID_OFFSET ) | +le32_encode_bits (bssid_cam->len,ADDR_CAM_W12_BSSID_LEN ); + h2c->w13 =le32_encode_bits (bssid_cam->valid,ADDR_CAM_W13_BSSID_VALID ) | +le32_encode_bits (bss_mask,ADDR_CAM_W13_BSSID_MASK ) | +le32_encode_bits (bssid_cam->phy_idx,ADDR_CAM_W13_BSSID_BB_SEL ) | +le32_encode_bits (bss_color,ADDR_CAM_W13_BSSID_BSS_COLOR ) | +le32_encode_bits (bssid_cam->bssid[0 ],ADDR_CAM_W13_BSSID_BSSID0 ) | +le32_encode_bits (bssid_cam->bssid[1 ],ADDR_CAM_W13_BSSID_BSSID1 ); + h2c->w14 =le32_encode_bits (bssid_cam->bssid[2 ],ADDR_CAM_W14_BSSID_BSSID2 ) | +le32_encode_bits (bssid_cam->bssid[3 ],ADDR_CAM_W14_BSSID_BSSID3 ) | +le32_encode_bits (bssid_cam->bssid[4 ],ADDR_CAM_W14_BSSID_BSSID4 ) | +le32_encode_bits (bssid_cam->bssid[5 ],ADDR_CAM_W14_BSSID_BSSID5 );return 0 ; }
@@ -813,7 +813,7 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link, struct rtw89_sta_link *rtwsta_link, const u8 *scan_mac_addr, - u8 *cmd) + struct rtw89_h2c_addr_cam *h2c) { struct ieee80211_vif *vif = rtwvif_link_to_vif(rtwvif_link); struct rtw89_addr_cam_entry *addr_cam =
@@ -845,69 +845,65 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev, sma_hash =rtw89_cam_addr_hash (sma_start, sma); tma_hash =rtw89_cam_addr_hash (tma_start, tma); -FWCMD_SET_ADDR_IDX (cmd, addr_cam->addr_cam_idx); -FWCMD_SET_ADDR_OFFSET (cmd, addr_cam->offset); -FWCMD_SET_ADDR_LEN (cmd, addr_cam->len); - -FWCMD_SET_ADDR_VALID (cmd, addr_cam->valid); -FWCMD_SET_ADDR_NET_TYPE (cmd, rtwvif_link->net_type); -FWCMD_SET_ADDR_BCN_HIT_COND (cmd, rtwvif_link->bcn_hit_cond); -FWCMD_SET_ADDR_HIT_RULE (cmd, rtwvif_link->hit_rule); -FWCMD_SET_ADDR_BB_SEL (cmd, rtwvif_link->phy_idx); -FWCMD_SET_ADDR_ADDR_MASK (cmd, addr_cam->addr_mask); -FWCMD_SET_ADDR_MASK_SEL (cmd, addr_cam->mask_sel); -FWCMD_SET_ADDR_SMA_HASH (cmd, sma_hash); -FWCMD_SET_ADDR_TMA_HASH (cmd, tma_hash); - -FWCMD_SET_ADDR_BSSID_CAM_IDX (cmd, addr_cam->bssid_cam_idx); - -FWCMD_SET_ADDR_SMA0 (cmd, sma[0 ]); -FWCMD_SET_ADDR_SMA1 (cmd, sma[1 ]); -FWCMD_SET_ADDR_SMA2 (cmd, sma[2 ]); -FWCMD_SET_ADDR_SMA3 (cmd, sma[3 ]); -FWCMD_SET_ADDR_SMA4 (cmd, sma[4 ]); -FWCMD_SET_ADDR_SMA5 (cmd, sma[5 ]); - -FWCMD_SET_ADDR_TMA0 (cmd, tma[0 ]); -FWCMD_SET_ADDR_TMA1 (cmd, tma[1 ]); -FWCMD_SET_ADDR_TMA2 (cmd, tma[2 ]); -FWCMD_SET_ADDR_TMA3 (cmd, tma[3 ]); -FWCMD_SET_ADDR_TMA4 (cmd, tma[4 ]); -FWCMD_SET_ADDR_TMA5 (cmd, tma[5 ]); - -FWCMD_SET_ADDR_PORT_INT (cmd, rtwvif_link->port); -FWCMD_SET_ADDR_TSF_SYNC (cmd, rtwvif_link->port); -FWCMD_SET_ADDR_TF_TRS (cmd, rtwvif_link->trigger); -FWCMD_SET_ADDR_LSIG_TXOP (cmd, rtwvif_link->lsig_txop); -FWCMD_SET_ADDR_TGT_IND (cmd, rtwvif_link->tgt_ind); -FWCMD_SET_ADDR_FRM_TGT_IND (cmd, rtwvif_link->frm_tgt_ind); -FWCMD_SET_ADDR_MACID (cmd, rtwsta_link ? rtwsta_link->mac_id : - rtwvif_link->mac_id); + h2c->w1 =le32_encode_bits (addr_cam->addr_cam_idx,ADDR_CAM_W1_IDX ) | +le32_encode_bits (addr_cam->offset,ADDR_CAM_W1_OFFSET ) | +le32_encode_bits (addr_cam->len,ADDR_CAM_W1_LEN ); + h2c->w2 =le32_encode_bits (addr_cam->valid,ADDR_CAM_W2_VALID ) | +le32_encode_bits (rtwvif_link->net_type,ADDR_CAM_W2_NET_TYPE ) | +le32_encode_bits (rtwvif_link->bcn_hit_cond,ADDR_CAM_W2_BCN_HIT_COND ) | +le32_encode_bits (rtwvif_link->hit_rule,ADDR_CAM_W2_HIT_RULE ) | +le32_encode_bits (rtwvif_link->phy_idx,ADDR_CAM_W2_BB_SEL ) | +le32_encode_bits (addr_cam->addr_mask,ADDR_CAM_W2_ADDR_MASK ) | +le32_encode_bits (addr_cam->mask_sel,ADDR_CAM_W2_MASK_SEL ) | +le32_encode_bits (sma_hash,ADDR_CAM_W2_SMA_HASH ) | +le32_encode_bits (tma_hash,ADDR_CAM_W2_TMA_HASH ); + h2c->w3 =le32_encode_bits (addr_cam->bssid_cam_idx,ADDR_CAM_W3_BSSID_CAM_IDX ); + h2c->w4 =le32_encode_bits (sma[0 ],ADDR_CAM_W4_SMA0 ) | +le32_encode_bits (sma[1 ],ADDR_CAM_W4_SMA1 ) | +le32_encode_bits (sma[2 ],ADDR_CAM_W4_SMA2 ) | +le32_encode_bits (sma[3 ],ADDR_CAM_W4_SMA3 ); + h2c->w5 =le32_encode_bits (sma[4 ],ADDR_CAM_W5_SMA4 ) | +le32_encode_bits (sma[5 ],ADDR_CAM_W5_SMA5 ) | +le32_encode_bits (tma[0 ],ADDR_CAM_W5_TMA0 ) | +le32_encode_bits (tma[1 ],ADDR_CAM_W5_TMA1 ); + h2c->w6 =le32_encode_bits (tma[2 ],ADDR_CAM_W6_TMA2 ) | +le32_encode_bits (tma[3 ],ADDR_CAM_W6_TMA3 ) | +le32_encode_bits (tma[4 ],ADDR_CAM_W6_TMA4 ) | +le32_encode_bits (tma[5 ],ADDR_CAM_W6_TMA5 ); + h2c->w8 =le32_encode_bits (rtwvif_link->port,ADDR_CAM_W8_PORT_INT ) | +le32_encode_bits (rtwvif_link->port,ADDR_CAM_W8_TSF_SYNC ) | +le32_encode_bits (rtwvif_link->trigger,ADDR_CAM_W8_TF_TRS ) | +le32_encode_bits (rtwvif_link->lsig_txop,ADDR_CAM_W8_LSIG_TXOP ) | +le32_encode_bits (rtwvif_link->tgt_ind,ADDR_CAM_W8_TGT_IND ) | +le32_encode_bits (rtwvif_link->frm_tgt_ind,ADDR_CAM_W8_FRM_TGT_IND ) | +le32_encode_bits (rtwsta_link ? rtwsta_link->mac_id : + rtwvif_link->mac_id,ADDR_CAM_W8_MACID ); +if (rtwvif_link->net_type ==RTW89_NET_TYPE_INFRA ) -FWCMD_SET_ADDR_AID12 (cmd, vif->cfg.aid &0xfff ); + h2c->w9 =le32_encode_bits (vif->cfg.aid &0xfff ,ADDR_CAM_W9_AID12 );else if (rtwvif_link->net_type ==RTW89_NET_TYPE_AP_MODE ) -FWCMD_SET_ADDR_AID12 (cmd, sta ? sta->aid &0xfff :0 ); -FWCMD_SET_ADDR_WOL_PATTERN (cmd, rtwvif_link->wowlan_pattern); -FWCMD_SET_ADDR_WOL_UC (cmd, rtwvif_link->wowlan_uc); -FWCMD_SET_ADDR_WOL_MAGIC (cmd, rtwvif_link->wowlan_magic); -FWCMD_SET_ADDR_WAPI (cmd, addr_cam->wapi); -FWCMD_SET_ADDR_SEC_ENT_MODE (cmd, addr_cam->sec_ent_mode); -FWCMD_SET_ADDR_SEC_ENT0_KEYID (cmd, addr_cam->sec_ent_keyid[0 ]); -FWCMD_SET_ADDR_SEC_ENT1_KEYID (cmd, addr_cam->sec_ent_keyid[1 ]); -FWCMD_SET_ADDR_SEC_ENT2_KEYID (cmd, addr_cam->sec_ent_keyid[2 ]); -FWCMD_SET_ADDR_SEC_ENT3_KEYID (cmd, addr_cam->sec_ent_keyid[3 ]); -FWCMD_SET_ADDR_SEC_ENT4_KEYID (cmd, addr_cam->sec_ent_keyid[4 ]); -FWCMD_SET_ADDR_SEC_ENT5_KEYID (cmd, addr_cam->sec_ent_keyid[5 ]); -FWCMD_SET_ADDR_SEC_ENT6_KEYID (cmd, addr_cam->sec_ent_keyid[6 ]); - -FWCMD_SET_ADDR_SEC_ENT_VALID (cmd, addr_cam->sec_cam_map[0 ] &0xff ); -FWCMD_SET_ADDR_SEC_ENT0 (cmd, addr_cam->sec_ent[0 ]); -FWCMD_SET_ADDR_SEC_ENT1 (cmd, addr_cam->sec_ent[1 ]); -FWCMD_SET_ADDR_SEC_ENT2 (cmd, addr_cam->sec_ent[2 ]); -FWCMD_SET_ADDR_SEC_ENT3 (cmd, addr_cam->sec_ent[3 ]); -FWCMD_SET_ADDR_SEC_ENT4 (cmd, addr_cam->sec_ent[4 ]); -FWCMD_SET_ADDR_SEC_ENT5 (cmd, addr_cam->sec_ent[5 ]); -FWCMD_SET_ADDR_SEC_ENT6 (cmd, addr_cam->sec_ent[6 ]); + h2c->w9 =le32_encode_bits (sta ? sta->aid &0xfff :0 ,ADDR_CAM_W9_AID12 ); + + h2c->w9 |=le32_encode_bits (rtwvif_link->wowlan_pattern,ADDR_CAM_W9_WOL_PATTERN ) | +le32_encode_bits (rtwvif_link->wowlan_uc,ADDR_CAM_W9_WOL_UC ) | +le32_encode_bits (rtwvif_link->wowlan_magic,ADDR_CAM_W9_WOL_MAGIC ) | +le32_encode_bits (addr_cam->wapi,ADDR_CAM_W9_WAPI ) | +le32_encode_bits (addr_cam->sec_ent_mode,ADDR_CAM_W9_SEC_ENT_MODE ) | +le32_encode_bits (addr_cam->sec_ent_keyid[0 ],ADDR_CAM_W9_SEC_ENT0_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[1 ],ADDR_CAM_W9_SEC_ENT1_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[2 ],ADDR_CAM_W9_SEC_ENT2_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[3 ],ADDR_CAM_W9_SEC_ENT3_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[4 ],ADDR_CAM_W9_SEC_ENT4_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[5 ],ADDR_CAM_W9_SEC_ENT5_KEYID ) | +le32_encode_bits (addr_cam->sec_ent_keyid[6 ],ADDR_CAM_W9_SEC_ENT6_KEYID ); + h2c->w10 =le32_encode_bits (addr_cam->sec_cam_map[0 ] &0xff ,ADDR_CAM_W10_SEC_ENT_VALID ) | +le32_encode_bits (addr_cam->sec_ent[0 ],ADDR_CAM_W10_SEC_ENT0 ) | +le32_encode_bits (addr_cam->sec_ent[1 ],ADDR_CAM_W10_SEC_ENT1 ) | +le32_encode_bits (addr_cam->sec_ent[2 ],ADDR_CAM_W10_SEC_ENT2 ); + h2c->w11 =le32_encode_bits (addr_cam->sec_ent[3 ],ADDR_CAM_W11_SEC_ENT3 ) | +le32_encode_bits (addr_cam->sec_ent[4 ],ADDR_CAM_W11_SEC_ENT4 ) | +le32_encode_bits (addr_cam->sec_ent[5 ],ADDR_CAM_W11_SEC_ENT5 ) | +le32_encode_bits (addr_cam->sec_ent[6 ],ADDR_CAM_W11_SEC_ENT6 );rcu_read_unlock (); }
drivers/net/wireless/realtek/rtw89/cam.h +90 -341
451 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.c +10 -7
@@ -2132,28 +2132,31 @@ void rtw89_fw_log_dump(struct rtw89_dev *rtwdev, u8 *buf, u32 len) } -#define H2C_CAM_LEN 60int rtw89_fw_h2c_cam (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link,const u8 *scan_mac_addr) { +struct rtw89_h2c_addr_cam *h2c; +u32 len =sizeof (*h2c);struct sk_buff *skb;int ret; - skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev,H2C_CAM_LEN ); + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for fw dl\n" );return -ENOMEM ; } -skb_put (skb,H2C_CAM_LEN ); -rtw89_cam_fill_addr_cam_info (rtwdev, rtwvif_link, rtwsta_link, scan_mac_addr, - skb->data); -rtw89_cam_fill_bssid_cam_info (rtwdev, rtwvif_link, rtwsta_link, skb->data); +skb_put (skb, len); + h2c = (struct rtw89_h2c_addr_cam *)skb->data; + +rtw89_cam_fill_addr_cam_info (rtwdev, rtwvif_link, rtwsta_link, + scan_mac_addr, h2c); +rtw89_cam_fill_bssid_cam_info (rtwdev, rtwvif_link, rtwsta_link, h2c);rtw89_h2c_pkt_set_hdr (rtwdev, skb,FWCMD_TYPE_H2C ,H2C_CAT_MAC ,H2C_CL_MAC_ADDR_CAM_UPDATE ,H2C_FUNC_MAC_ADDR_CAM_UPD ,0 ,1 , -H2C_CAM_LEN ); + len); ret =rtw89_h2c_tx (rtwdev, skb, false);if (ret) {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 12/14 wifi: rtw89: add addr cam H2C command v1
In reply to Ping-Ke ShihThe coming RTL8922D uses different format of address CAM command, so add the new format accordingly.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/cam.c | 39 +++++++++++++------ drivers/net/wireless/realtek/rtw89/cam.h | 11 ++++++ drivers/net/wireless/realtek/rtw89/core.h | 1 + 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 + 9 files changed, 46 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw89/cam.c +28 -11
@@ -819,12 +819,15 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,struct rtw89_addr_cam_entry *addr_cam =rtw89_get_addr_cam_of (rtwvif_link, rtwsta_link);struct ieee80211_sta *sta =rtwsta_link_to_sta_safe (rtwsta_link); +const struct rtw89_chip_info *chip = rtwdev->chip;struct ieee80211_link_sta *link_sta;const u8 *sma = scan_mac_addr ? scan_mac_addr : rtwvif_link->mac_addr;u8 sma_hash, tma_hash, addr_msk_start; +u8 ver = chip->addrcam_ver;u8 sma_start =0 ;u8 tma_start =0 ;const u8 *tma; +u8 mac_id;rcu_read_lock ();
@@ -845,9 +848,17 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev, sma_hash =rtw89_cam_addr_hash (sma_start, sma); tma_hash =rtw89_cam_addr_hash (tma_start, tma); - h2c->w1 =le32_encode_bits (addr_cam->addr_cam_idx,ADDR_CAM_W1_IDX ) | -le32_encode_bits (addr_cam->offset,ADDR_CAM_W1_OFFSET ) | -le32_encode_bits (addr_cam->len,ADDR_CAM_W1_LEN ); + mac_id = rtwsta_link ? rtwsta_link->mac_id : rtwvif_link->mac_id; + +if (ver ==0 ) + h2c->w1 =le32_encode_bits (addr_cam->addr_cam_idx,ADDR_CAM_W1_IDX ) | +le32_encode_bits (addr_cam->offset,ADDR_CAM_W1_OFFSET ) | +le32_encode_bits (addr_cam->len,ADDR_CAM_W1_LEN ); +else + h2c->w1 =le32_encode_bits (addr_cam->addr_cam_idx,ADDR_CAM_W1_V1_IDX ) | +le32_encode_bits (addr_cam->offset,ADDR_CAM_W1_V1_OFFSET ) | +le32_encode_bits (addr_cam->len,ADDR_CAM_W1_V1_LEN ); + h2c->w2 =le32_encode_bits (addr_cam->valid,ADDR_CAM_W2_VALID ) |le32_encode_bits (rtwvif_link->net_type,ADDR_CAM_W2_NET_TYPE ) | le32_encode_bits(rtwvif_link->bcn_hit_cond, ADDR_CAM_W2_BCN_HIT_COND) |
@@ -870,14 +881,20 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,le32_encode_bits (tma[3 ],ADDR_CAM_W6_TMA3 ) |le32_encode_bits (tma[4 ],ADDR_CAM_W6_TMA4 ) |le32_encode_bits (tma[5 ],ADDR_CAM_W6_TMA5 ); - h2c->w8 =le32_encode_bits (rtwvif_link->port,ADDR_CAM_W8_PORT_INT ) | -le32_encode_bits (rtwvif_link->port,ADDR_CAM_W8_TSF_SYNC ) | -le32_encode_bits (rtwvif_link->trigger,ADDR_CAM_W8_TF_TRS ) | -le32_encode_bits (rtwvif_link->lsig_txop,ADDR_CAM_W8_LSIG_TXOP ) | -le32_encode_bits (rtwvif_link->tgt_ind,ADDR_CAM_W8_TGT_IND ) | -le32_encode_bits (rtwvif_link->frm_tgt_ind,ADDR_CAM_W8_FRM_TGT_IND ) | -le32_encode_bits (rtwsta_link ? rtwsta_link->mac_id : - rtwvif_link->mac_id,ADDR_CAM_W8_MACID ); +if (ver ==0 ) + h2c->w8 =le32_encode_bits (rtwvif_link->port,ADDR_CAM_W8_PORT_INT ) | +le32_encode_bits (rtwvif_link->port,ADDR_CAM_W8_TSF_SYNC ) | +le32_encode_bits (rtwvif_link->trigger,ADDR_CAM_W8_TF_TRS ) | +le32_encode_bits (rtwvif_link->lsig_txop,ADDR_CAM_W8_LSIG_TXOP ) | +le32_encode_bits (rtwvif_link->tgt_ind,ADDR_CAM_W8_TGT_IND ) | +le32_encode_bits (rtwvif_link->frm_tgt_ind,ADDR_CAM_W8_FRM_TGT_IND ) | +le32_encode_bits (mac_id,ADDR_CAM_W8_MACID ); +else + h2c->w8 =le32_encode_bits (rtwvif_link->port,ADDR_CAM_W8_V1_PORT_INT ) | +le32_encode_bits (rtwvif_link->port,ADDR_CAM_W8_V1_TSF_SYNC ) | +le32_encode_bits (rtwvif_link->trigger,ADDR_CAM_W8_V1_TF_TRS ) | +le32_encode_bits (rtwvif_link->lsig_txop,ADDR_CAM_W8_V1_LSIG_TXOP ) | +le32_encode_bits (mac_id,ADDR_CAM_W8_V1_MACID );if (rtwvif_link->net_type ==RTW89_NET_TYPE_INFRA ) h2c->w9 =le32_encode_bits (vif->cfg.aid &0xfff ,ADDR_CAM_W9_AID12 );
drivers/net/wireless/realtek/rtw89/cam.h +11 -0
@@ -33,6 +33,9 @@ struct rtw89_h2c_addr_cam {#define ADDR_CAM_W1_IDX GENMASK(7, 0)#define ADDR_CAM_W1_OFFSET GENMASK(15, 8)#define ADDR_CAM_W1_LEN GENMASK(23, 16) +#define ADDR_CAM_W1_V1_IDX GENMASK(9, 0) +#define ADDR_CAM_W1_V1_OFFSET GENMASK(23, 16) +#define ADDR_CAM_W1_V1_LEN GENMASK(31, 24)#define ADDR_CAM_W2_VALID BIT(0)#define ADDR_CAM_W2_NET_TYPE GENMASK(2, 1)#define ADDR_CAM_W2_BCN_HIT_COND GENMASK(4, 3)
@@ -62,6 +65,14 @@ struct rtw89_h2c_addr_cam {#define ADDR_CAM_W8_LSIG_TXOP BIT(15)#define ADDR_CAM_W8_TGT_IND GENMASK(26, 24)#define ADDR_CAM_W8_FRM_TGT_IND GENMASK(29, 27) +#define ADDR_CAM_W8_V1_MACID GENMASK(9, 0) +#define ADDR_CAM_W8_V1_PORT_INT GENMASK(18, 16) +#define ADDR_CAM_W8_V1_TSF_SYNC GENMASK(21, 19) +#define ADDR_CAM_W8_V1_TF_TRS BIT(22) +#define ADDR_CAM_W8_V1_LSIG_TXOP BIT(23) +#define ADDR_CAM_W8_V1_TB_RANGING BIT(24) +#define ADDR_CAM_W8_V1_TB_SENSING BIT(25) +#define ADDR_CAM_W8_V1_SENS_EN BIT(26)#define ADDR_CAM_W9_AID12 GENMASK(11, 0)#define ADDR_CAM_W9_AID12_0 GENMASK(7, 0)#define ADDR_CAM_W9_AID12_1 GENMASK(11, 8)
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4458,6 +4458,7 @@ struct rtw89_chip_info {u8 bacam_num;u8 bacam_dynamic_num;enum rtw89_bacam_ver bacam_ver; +u8 addrcam_ver;u8 ppdu_max_usr;u8 sec_ctrl_efuse_size;
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2648,6 +2648,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .bacam_num = 2, .bacam_dynamic_num = 4, .bacam_ver = RTW89_BACAM_V0, + .addrcam_ver = 0, .ppdu_max_usr = 4, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2334,6 +2334,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .bacam_num = 2, .bacam_dynamic_num = 4, .bacam_ver = RTW89_BACAM_V0, + .addrcam_ver = 0, .ppdu_max_usr = 4, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -959,6 +959,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .bacam_num = 2, .bacam_dynamic_num = 4, .bacam_ver = RTW89_BACAM_V0, + .addrcam_ver = 0, .ppdu_max_usr = 4, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216,
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +1 -0
@@ -818,6 +818,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = { .bacam_num = 2, .bacam_dynamic_num = 4, .bacam_ver = RTW89_BACAM_V0, + .addrcam_ver = 0, .ppdu_max_usr = 4, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -3178,6 +3178,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .bacam_num = 8, .bacam_dynamic_num = 8, .bacam_ver = RTW89_BACAM_V0_EXT, + .addrcam_ver = 0, .ppdu_max_usr = 8, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 1216,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -0
@@ -2931,6 +2931,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .bacam_num = 24, .bacam_dynamic_num = 8, .bacam_ver = RTW89_BACAM_V1, + .addrcam_ver = 0, .ppdu_max_usr = 16, .sec_ctrl_efuse_size = 4, .physical_efuse_size = 0x1300,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 13/14 wifi: rtw89: update format of addr cam H2C command
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
The addr cam H2C command is to tell firmware the addr related info. For RTL8922D and RTL8922A after firmware version 0.35.84.0, the addr cam must be updated with update mode to avoid clearing previously set fields. Update it accordingly.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/cam.c | 10 ++++--- drivers/net/wireless/realtek/rtw89/cam.h | 12 ++++++--- drivers/net/wireless/realtek/rtw89/core.c | 12 ++++++--- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/fw.c | 26 ++++++++++++++++--- drivers/net/wireless/realtek/rtw89/fw.h | 3 ++- drivers/net/wireless/realtek/rtw89/mac.c | 4 +-- drivers/net/wireless/realtek/rtw89/mac80211.c | 4 +-- drivers/net/wireless/realtek/rtw89/wow.c | 6 +++-- 9 files changed, 56 insertions(+), 22 deletions(-)
drivers/net/wireless/realtek/rtw89/cam.c +6 -4
@@ -236,7 +236,8 @@ static int __rtw89_cam_detach_sec_cam(struct rtw89_dev *rtwdev,if (ret)rtw89_err (rtwdev,"failed to update dctl cam del key: %d\n" , ret); - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL , +RTW89_ROLE_INFO_CHANGE );if (ret)rtw89_err (rtwdev,"failed to update cam del key: %d\n" , ret); }
@@ -276,7 +277,8 @@ static int __rtw89_cam_attach_sec_cam(struct rtw89_dev *rtwdev, ret);return ret; } - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL , +RTW89_ROLE_INFO_CHANGE );if (ret) {rtw89_err (rtwdev,"failed to update addr cam sec entry: %d\n" , ret);
@@ -761,7 +763,7 @@ int rtw89_cam_init(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link)int rtw89_cam_fill_bssid_cam_info (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link, -struct rtw89_h2c_addr_cam *h2c) +struct rtw89_h2c_addr_cam_v0 *h2c) {struct rtw89_bssid_cam_entry *bssid_cam =rtw89_get_bssid_cam_of (rtwvif_link, rtwsta_link);
@@ -813,7 +815,7 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link, struct rtw89_sta_link *rtwsta_link, const u8 *scan_mac_addr, - struct rtw89_h2c_addr_cam *h2c) + struct rtw89_h2c_addr_cam_v0 *h2c) { struct ieee80211_vif *vif = rtwvif_link_to_vif(rtwvif_link); struct rtw89_addr_cam_entry *addr_cam =
drivers/net/wireless/realtek/rtw89/cam.h +9 -3
@@ -12,7 +12,7 @@#define RTW89_BSSID_MATCH_ALL GENMASK(5, 0)#define RTW89_BSSID_MATCH_5_BYTES GENMASK(4, 0) -struct rtw89_h2c_addr_cam { +struct rtw89_h2c_addr_cam_v0 {__le32 w0;__le32 w1;__le32 w2;
@@ -30,6 +30,11 @@ struct rtw89_h2c_addr_cam {__le32 w14; } __packed; +struct rtw89_h2c_addr_cam { +struct rtw89_h2c_addr_cam_v0 v0; +__le32 w15; +} __packed; +#define ADDR_CAM_W1_IDX GENMASK(7, 0)#define ADDR_CAM_W1_OFFSET GENMASK(15, 8)#define ADDR_CAM_W1_LEN GENMASK(23, 16)
@@ -109,6 +114,7 @@ struct rtw89_h2c_addr_cam {#define ADDR_CAM_W14_BSSID_BSSID3 GENMASK(15, 8)#define ADDR_CAM_W14_BSSID_BSSID4 GENMASK(23, 16)#define ADDR_CAM_W14_BSSID_BSSID5 GENMASK(31, 24) +#define ADDR_CAM_W15_UPD_MODE GENMASK(2, 0)struct rtw89_h2c_dctlinfo_ud_v1 {__le32 c0;
@@ -313,7 +319,7 @@ void rtw89_cam_fill_addr_cam_info(struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link, struct rtw89_sta_link *rtwsta_link, const u8 *scan_mac_addr, - struct rtw89_h2c_addr_cam *h2c); + struct rtw89_h2c_addr_cam_v0 *h2c); void rtw89_cam_fill_dctl_sec_cam_info_v1(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link, struct rtw89_sta_link *rtwsta_link,
@@ -325,7 +331,7 @@ void rtw89_cam_fill_dctl_sec_cam_info_v2(struct rtw89_dev *rtwdev,int rtw89_cam_fill_bssid_cam_info (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link, -struct rtw89_h2c_addr_cam *h2c); +struct rtw89_h2c_addr_cam_v0 *h2c); int rtw89_cam_sec_key_add(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, struct ieee80211_sta *sta,
drivers/net/wireless/realtek/rtw89/core.c +8 -4
@@ -4823,7 +4823,8 @@ int rtw89_core_sta_link_disconnect(struct rtw89_dev *rtwdev, }/* update cam aid mac_id net_type */ - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL , +RTW89_ROLE_CON_DISCONN );if (ret) {rtw89_warn (rtwdev,"failed to send h2c cam\n" );return ret;
@@ -4897,7 +4898,8 @@ int rtw89_core_sta_link_assoc(struct rtw89_dev *rtwdev, }/* update cam aid mac_id net_type */ - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL , +RTW89_ROLE_CON_DISCONN );if (ret) {rtw89_warn (rtwdev,"failed to send h2c cam\n" );return ret;
@@ -6029,7 +6031,8 @@ void rtw89_core_scan_start(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvrtw89_phy_config_edcca (rtwdev, bb, true);rtw89_tas_scan (rtwdev, true); -rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL , mac_addr); +rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL , mac_addr, +RTW89_ROLE_INFO_CHANGE ); } void rtw89_core_scan_complete(struct rtw89_dev *rtwdev,
@@ -6049,7 +6052,8 @@ void rtw89_core_scan_complete(struct rtw89_dev *rtwdev,rcu_read_unlock (); -rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ); +rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL , +RTW89_ROLE_INFO_CHANGE );rtw89_chip_rfk_scan (rtwdev, rtwvif_link, false);rtw89_btc_ntfy_scan_finish (rtwdev, rtwvif_link->phy_idx);
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -4678,6 +4678,7 @@ enum rtw89_fw_feature {RTW89_FW_FEATURE_RFK_NTFY_MCC_V0 ,RTW89_FW_FEATURE_LPS_DACK_BY_C2H_REG ,RTW89_FW_FEATURE_BEACON_TRACKING , + RTW89_FW_FEATURE_ADDR_CAM_V0, }; struct rtw89_fw_suit {
drivers/net/wireless/realtek/rtw89/fw.c +22 -4
@@ -881,6 +881,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8922A , ge,0 ,35 ,76 ,0 ,LPS_DACK_BY_C2H_REG ),__CFG_FW_FEAT (RTL8922A , ge,0 ,35 ,79 ,0 ,CRASH_TRIGGER_TYPE_1 ),__CFG_FW_FEAT (RTL8922A , ge,0 ,35 ,80 ,0 ,BEACON_TRACKING ), + __CFG_FW_FEAT(RTL8922A, lt, 0, 35, 84, 0, ADDR_CAM_V0), }; static void rtw89_fw_iterate_feature_cfg(struct rtw89_fw_info *fw,
@@ -2133,25 +2134,42 @@ void rtw89_fw_log_dump(struct rtw89_dev *rtwdev, u8 *buf, u32 len) }int rtw89_fw_h2c_cam (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link, -struct rtw89_sta_link *rtwsta_link,const u8 *scan_mac_addr) +struct rtw89_sta_link *rtwsta_link,const u8 *scan_mac_addr, +enum rtw89_upd_mode upd_mode) { +const struct rtw89_chip_info *chip = rtwdev->chip; +struct rtw89_h2c_addr_cam_v0 *h2c_v0;struct rtw89_h2c_addr_cam *h2c;u32 len =sizeof (*h2c);struct sk_buff *skb; +u8 ver =U8_MAX ;int ret; +if (RTW89_CHK_FW_FEATURE (ADDR_CAM_V0 , &rtwdev->fw) || + chip->chip_gen ==RTW89_CHIP_AX ) { + len =sizeof (*h2c_v0); + ver =0 ; + } + skb =rtw89_fw_h2c_alloc_skb_with_hdr (rtwdev, len);if (!skb) {rtw89_err (rtwdev,"failed to alloc skb for fw dl\n" );return -ENOMEM ; }skb_put (skb, len); - h2c = (struct rtw89_h2c_addr_cam *)skb->data; + h2c_v0 = (struct rtw89_h2c_addr_cam_v0 *)skb->data;rtw89_cam_fill_addr_cam_info (rtwdev, rtwvif_link, rtwsta_link, - scan_mac_addr, h2c); -rtw89_cam_fill_bssid_cam_info (rtwdev, rtwvif_link, rtwsta_link, h2c); + scan_mac_addr, h2c_v0); +rtw89_cam_fill_bssid_cam_info (rtwdev, rtwvif_link, rtwsta_link, h2c_v0); +if (ver ==0 ) + goto hdr; + + h2c = (struct rtw89_h2c_addr_cam *)skb->data; + h2c->w15 =le32_encode_bits (upd_mode,ADDR_CAM_W15_UPD_MODE ); + +hdr: rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C, H2C_CAT_MAC, H2C_CL_MAC_ADDR_CAM_UPDATE,
drivers/net/wireless/realtek/rtw89/fw.h +2 -1
@@ -4887,7 +4887,8 @@ int rtw89_fw_h2c_tbtt_tuning(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_link, u32 offset);int rtw89_fw_h2c_pwr_lvl (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link);int rtw89_fw_h2c_cam (struct rtw89_dev *rtwdev,struct rtw89_vif_link *vif, -struct rtw89_sta_link *rtwsta_link,const u8 *scan_mac_addr); +struct rtw89_sta_link *rtwsta_link,const u8 *scan_mac_addr, +enum rtw89_upd_mode upd_mode);int rtw89_fw_h2c_dctl_sec_cam_v1 (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct rtw89_sta_link *rtwsta_link);
drivers/net/wireless/realtek/rtw89/mac.c +2 -2
@@ -4835,7 +4835,7 @@ int rtw89_mac_vif_init(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvif_lif (ret)return ret; - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ,RTW89_ROLE_CREATE );if (ret)return ret;
@@ -4860,7 +4860,7 @@ int rtw89_mac_vif_deinit(struct rtw89_dev *rtwdev, struct rtw89_vif_link *rtwvifrtw89_cam_deinit (rtwdev, rtwvif_link); - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ,RTW89_ROLE_REMOVE );if (ret)return ret;
drivers/net/wireless/realtek/rtw89/mac80211.c +2 -2
@@ -759,7 +759,7 @@ static void rtw89_ops_link_info_changed(struct ieee80211_hw *hw,if (changed &BSS_CHANGED_BSSID ) {ether_addr_copy (rtwvif_link->bssid, conf->bssid);rtw89_cam_bssid_changed (rtwdev, rtwvif_link); -rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ); +rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ,RTW89_ROLE_INFO_CHANGE );WRITE_ONCE (rtwvif_link->sync_bcn_tsf,0 ); }
@@ -818,7 +818,7 @@ static int rtw89_ops_start_ap(struct ieee80211_hw *hw,rtw89_chip_h2c_assoc_cmac_tbl (rtwdev, rtwvif_link,NULL );rtw89_fw_h2c_role_maintain (rtwdev, rtwvif_link,NULL ,RTW89_ROLE_TYPE_CHANGE );rtw89_fw_h2c_join_info (rtwdev, rtwvif_link,NULL , true); -rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ); +rtw89_fw_h2c_cam (rtwdev, rtwvif_link,NULL ,NULL ,RTW89_ROLE_TYPE_CHANGE );rtw89_chip_rfk_channel (rtwdev, rtwvif_link);if (RTW89_CHK_FW_FEATURE (NOTIFY_AP_INFO , &rtwdev->fw)) {
drivers/net/wireless/realtek/rtw89/wow.c +4 -2
@@ -1221,7 +1221,8 @@ static int rtw89_wow_cfg_wake(struct rtw89_dev *rtwdev, bool wow) } } - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL , +RTW89_ROLE_INFO_CHANGE );if (ret) {rtw89_warn (rtwdev,"failed to send h2c cam\n" );return ret;
@@ -1318,7 +1319,8 @@ static int rtw89_wow_swap_fw(struct rtw89_dev *rtwdev, bool wow)return ret; } - ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL ); + ret =rtw89_fw_h2c_cam (rtwdev, rtwvif_link, rtwsta_link,NULL , +RTW89_ROLE_FW_RESTORE );if (ret) {rtw89_warn (rtwdev,"failed to send h2c cam\n" );return ret;
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH v2 14/14 wifi: rtw89: correct user macid mask of RX info for RTL8922D
In reply to Ping-Ke ShihFrom: Chih-Kang Chang <[email protected]>
The user MAC ID mask of RX info in MAC PPDU for RTL8922A and RTL8922D is different, correct it accordingly.
---
v2: no change
--- drivers/net/wireless/realtek/rtw89/core.c | 6 +++++- drivers/net/wireless/realtek/rtw89/core.h | 1 + drivers/net/wireless/realtek/rtw89/txrx.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.c +5 -1
@@ -1834,9 +1834,13 @@ static int rtw89_core_rx_process_mac_ppdu(struct rtw89_dev *rtwdev,/* For WiFi 7 chips, RXWD.mac_id of PPDU status is not set * by hardware, so update mac_id by rxinfo_user[].mac_id. */ -if (chip_gen ==RTW89_CHIP_BE ) +if (chip->chip_id ==RTL8922A ) phy_ppdu->mac_id =le32_get_bits (user->w0,RTW89_RXINFO_USER_MACID ); +else if (chip->chip_id ==RTL8922D ) + phy_ppdu->mac_id = +le32_get_bits (user->w0,RTW89_RXINFO_USER_MACID_V1 ); + phy_ppdu->has_data =le32_get_bits (user->w0,RTW89_RXINFO_USER_DATA ); phy_ppdu->has_bcn =
drivers/net/wireless/realtek/rtw89/core.h +1 -0
@@ -155,6 +155,7 @@ enum rtw89_core_chip_id {RTL8852C ,RTL8851B ,RTL8922A , + RTL8922D, }; enum rtw89_chip_gen {
drivers/net/wireless/realtek/rtw89/txrx.h +1 -0
@@ -421,6 +421,7 @@ struct rtw89_rxinfo_user {#define RTW89_RXINFO_USER_MGMT BIT(3)#define RTW89_RXINFO_USER_BCN BIT(4)#define RTW89_RXINFO_USER_MACID GENMASK(15, 8) +#define RTW89_RXINFO_USER_MACID_V1 GENMASK(31, 20)struct rtw89_rxinfo {__le32 w0;
Signature · 1 line
2.25.1