wifi: rtw89: add features of 1SS EVM statistics and rfkill, and fix of IDMEM mode
Ping-Ke Shih
maintainercover wifi: rtw89: add features of 1SS EVM statistics and rfkill, and fix of IDMEM mode
Four patches in this patchset. First two are to add features of 1SS EVM statistics and rfkill. Third is to reset I/D MEM mode of WiFi CPU to prevent boot abnormal. The last is just to correct typo.
Kuan-Chung Chen (2):
wifi: rtw89: add EVM statistics for 1SS rate
wifi: rtw89: add support for hardware rfkill
Ping-Ke Shih (1):
wifi: rtw89: 885xb: reset IDMEM mode to prevent download firmware
failure
Zong-Zhe Yang (1):
wifi: rtw89: fix typo of rtw89_phy_ra_updata_XXX
drivers/net/wireless/realtek/rtw89/core.c | 117 ++++++++++++++++-- drivers/net/wireless/realtek/rtw89/core.h | 12 ++ drivers/net/wireless/realtek/rtw89/debug.c | 5 +- drivers/net/wireless/realtek/rtw89/mac.c | 2 +- drivers/net/wireless/realtek/rtw89/mac80211.c | 21 +++- drivers/net/wireless/realtek/rtw89/phy.c | 8 +- drivers/net/wireless/realtek/rtw89/phy.h | 2 +- drivers/net/wireless/realtek/rtw89/reg.h | 24 ++++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 11 ++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 11 ++ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 11 ++ .../net/wireless/realtek/rtw89/rtw8852bt.c | 11 ++ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 11 ++ drivers/net/wireless/realtek/rtw89/rtw8922a.c | 11 ++ drivers/net/wireless/realtek/rtw89/txrx.h | 8 +- 15 files changed, 244 insertions(+), 21 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/4 wifi: rtw89: add EVM statistics for 1SS rate
From: Kuan-Chung Chen <[email protected]>
To more accurately debug performance issues, EVM statistics will differentiate between different space streams, and only beacon and data frames will be included.
--- drivers/net/wireless/realtek/rtw89/core.c | 49 +++++++++++++++++----- drivers/net/wireless/realtek/rtw89/core.h | 3 ++ drivers/net/wireless/realtek/rtw89/debug.c | 5 ++- drivers/net/wireless/realtek/rtw89/txrx.h | 8 +++- 4 files changed, 52 insertions(+), 13 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +39 -10
@@ -1449,16 +1449,20 @@ static int rtw89_core_rx_process_mac_ppdu(struct rtw89_dev *rtwdev,return -EINVAL ; } -/* For WiFi 7 chips, RXWD.mac_id of PPDU status is not set by hardware, -* so update mac_id by rxinfo_user[].mac_id. -*/ -for (i =0 ; i < usr_num && chip_gen ==RTW89_CHIP_BE ; i++) { +for (i =0 ; i < usr_num; i++) { user = &rxinfo->user[i];if (!le32_get_bits (user->w0,RTW89_RXINFO_USER_MAC_ID_VALID ))continue ; - - phy_ppdu->mac_id = -le32_get_bits (user->w0,RTW89_RXINFO_USER_MACID ); +/* 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 ) + phy_ppdu->mac_id = +le32_get_bits (user->w0,RTW89_RXINFO_USER_MACID ); + phy_ppdu->has_data = +le32_get_bits (user->w0,RTW89_RXINFO_USER_DATA ); + phy_ppdu->has_bcn = +le32_get_bits (user->w0,RTW89_RXINFO_USER_BCN );break ; }
@@ -1480,6 +1484,26 @@ static int rtw89_core_rx_process_mac_ppdu(struct rtw89_dev *rtwdev,return 0 ; } +static u8 rtw89_get_data_rate_nss (struct rtw89_dev *rtwdev,u16 data_rate) +{ +u8 data_rate_mode; + + data_rate_mode =rtw89_get_data_rate_mode (rtwdev, data_rate); +switch (data_rate_mode) { +case DATA_RATE_MODE_NON_HT : +return 1 ; +case DATA_RATE_MODE_HT : +return rtw89_get_data_ht_nss (rtwdev, data_rate) +1 ; +case DATA_RATE_MODE_VHT : +case DATA_RATE_MODE_HE : +case DATA_RATE_MODE_EHT : +return rtw89_get_data_nss (rtwdev, data_rate) +1 ; +default : +rtw89_warn (rtwdev,"invalid RX rate mode %d\n" , data_rate_mode); +return 0 ; + } +} +static void rtw89_core_rx_process_phy_ppdu_iter (void *data,struct ieee80211_sta *sta) {
@@ -1509,10 +1533,14 @@ static void rtw89_core_rx_process_phy_ppdu_iter(void *data,ewma_rssi_add (&rtwsta->rssi[i], phy_ppdu->rssi[i]); } -if (phy_ppdu->ofdm.has) { +if (phy_ppdu->ofdm.has && (phy_ppdu->has_data || phy_ppdu->has_bcn)) {ewma_snr_add (&rtwsta->avg_snr, phy_ppdu->ofdm.avg_snr); -ewma_evm_add (&rtwsta->evm_min[evm_pos], phy_ppdu->ofdm.evm_min); -ewma_evm_add (&rtwsta->evm_max[evm_pos], phy_ppdu->ofdm.evm_max); +if (rtw89_get_data_rate_nss (rtwdev, phy_ppdu->rate) ==1 ) { +ewma_evm_add (&rtwsta->evm_1ss, phy_ppdu->ofdm.evm_min); + }else { +ewma_evm_add (&rtwsta->evm_min[evm_pos], phy_ppdu->ofdm.evm_min); +ewma_evm_add (&rtwsta->evm_max[evm_pos], phy_ppdu->ofdm.evm_max); + } } }
@@ -3367,6 +3395,7 @@ int rtw89_core_sta_add(struct rtw89_dev *rtwdev,ewma_rssi_init (&rtwsta->avg_rssi);ewma_snr_init (&rtwsta->avg_snr); +ewma_evm_init (&rtwsta->evm_1ss);for (i =0 ; i < ant_num; i++) {ewma_rssi_init (&rtwsta->rssi[i]);ewma_evm_init (&rtwsta->evm_min[i]);
drivers/net/wireless/realtek/rtw89/core.h +3 -0
@@ -802,6 +802,8 @@ struct rtw89_rx_phy_ppdu {u8 evm_max;u8 evm_min; } ofdm; +bool has_data; +bool has_bcn;bool ldpc;bool stbc;bool to_self;
@@ -3306,6 +3308,7 @@ struct rtw89_sta {struct ewma_rssi avg_rssi;struct ewma_rssi rssi[RF_PATH_MAX ];struct ewma_snr avg_snr; +struct ewma_evm evm_1ss;struct ewma_evm evm_min[RF_PATH_MAX ];struct ewma_evm evm_max[RF_PATH_MAX ];struct rtw89_ampdu_params ampdu_params[IEEE80211_NUM_TIDS ];
drivers/net/wireless/realtek/rtw89/debug.c +3 -2
@@ -3505,7 +3505,7 @@ static void rtw89_sta_info_get_iter(void *data, struct ieee80211_sta *sta)struct rtw89_hal *hal = &rtwdev->hal;u8 ant_num = hal->ant_diversity ?2 : rtwdev->chip->rf_path_num;bool ant_asterisk = hal->tx_path_diversity || hal->ant_diversity; -u8 evm_min, evm_max; +u8 evm_min, evm_max, evm_1ss;u8 rssi;u8 snr;int i;
@@ -3574,7 +3574,8 @@ static void rtw89_sta_info_get_iter(void *data, struct ieee80211_sta *sta) }seq_puts (m,"]\n" ); -seq_puts (m,"EVM: [" ); + evm_1ss =ewma_evm_read (&rtwsta->evm_1ss); +seq_printf (m,"EVM: [%2u.%02u, " , evm_1ss >>2 , (evm_1ss &0x3 ) *25 );for (i =0 ; i < (hal->ant_diversity ?2 :1 ); i++) { evm_min =ewma_evm_read (&rtwsta->evm_min[i]); evm_max =ewma_evm_read (&rtwsta->evm_max[i]);
drivers/net/wireless/realtek/rtw89/txrx.h +7 -1
@@ -14,6 +14,7 @@#define DATA_RATE_HT_IDX_MASK GENMASK(4, 0)#define DATA_RATE_HT_IDX_MASK_V1 GENMASK(4, 0)#define DATA_RATE_MODE_HT 0x1 +#define DATA_RATE_HT_NSS_MASK GENMASK(4, 3)#define DATA_RATE_VHT_HE_NSS_MASK GENMASK(6, 4)#define DATA_RATE_VHT_HE_IDX_MASK GENMASK(3, 0)#define DATA_RATE_NSS_MASK_V1 GENMASK(7, 5)
@@ -51,6 +52,11 @@ static inline u8 rtw89_get_data_mcs(struct rtw89_dev *rtwdev, u16 hw_rate)return u16_get_bits (hw_rate,DATA_RATE_VHT_HE_IDX_MASK ); } +static inline u8 rtw89_get_data_ht_nss (struct rtw89_dev *rtwdev,u16 hw_rate) +{ +return u16_get_bits (hw_rate,DATA_RATE_HT_NSS_MASK ); +} +static inline u8 rtw89_get_data_nss (struct rtw89_dev *rtwdev,u16 hw_rate) {if (rtwdev->chip->chip_gen ==RTW89_CHIP_BE )
@@ -408,7 +414,7 @@ struct rtw89_rxinfo_user {#define RTW89_RXINFO_USER_DATA BIT(1)#define RTW89_RXINFO_USER_CTRL BIT(2)#define RTW89_RXINFO_USER_MGMT BIT(3) -#define RTW89_RXINFO_USER_BCM BIT(4) +#define RTW89_RXINFO_USER_BCN BIT(4)#define RTW89_RXINFO_USER_MACID GENMASK(15, 8)struct rtw89_rxinfo {
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH 1/4] wifi: rtw89: add EVM statistics for 1SS rate
Quoted 8 lines · Ping-Ke Shih
From: Kuan-Chung Chen <[email protected]>
To more accurately debug performance issues, EVM statistics will differentiate between different space streams, and only beacon and data frames will be included.
Signed-off-by Kuan-Chung Chen <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
4 patch(es) applied to rtw-next branch of rtw.git, thanks.
bd4a3b10fa0e wifi: rtw89: add EVM statistics for 1SS rate0b38e6277aed wifi: rtw89: add support for hardware rfkill80fb81bb46a5 wifi: rtw89: 885xb: reset IDMEM mode to prevent download firmware failure 27d90ad37771 wifi: rtw89: fix typo of rtw89_phy_ra_updata_XXX
Ping-Ke Shih
maintainerPATCH 2/4 wifi: rtw89: add support for hardware rfkill
In reply to Ping-Ke ShihFrom: Kuan-Chung Chen <[email protected]>
Add support for ieee80211::rfkill_poll ops. This enables periodic monitoring of the hardware rfkill state, triggering updates when the status changes.
--- drivers/net/wireless/realtek/rtw89/core.c | 68 +++++++++++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 9 +++ drivers/net/wireless/realtek/rtw89/mac80211.c | 17 +++++ drivers/net/wireless/realtek/rtw89/reg.h | 24 +++++++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 11 +++ drivers/net/wireless/realtek/rtw89/rtw8852a.c | 11 +++ drivers/net/wireless/realtek/rtw89/rtw8852b.c | 11 +++ .../net/wireless/realtek/rtw89/rtw8852bt.c | 11 +++ drivers/net/wireless/realtek/rtw89/rtw8852c.c | 11 +++ drivers/net/wireless/realtek/rtw89/rtw8922a.c | 11 +++ 10 files changed, 184 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +68 -0
@@ -3217,6 +3217,7 @@ static void rtw89_track_work(struct work_struct *work)rtw89_phy_edcca_track (rtwdev);rtw89_tas_track (rtwdev);rtw89_chanctx_track (rtwdev); +rtw89_core_rfkill_poll (rtwdev, false);if (rtwdev->lps_enabled && !rtwdev->btc.lps)rtw89_enter_lps_track (rtwdev);
@@ -4499,6 +4500,70 @@ static int rtw89_chip_board_info_setup(struct rtw89_dev *rtwdev)return 0 ; } +static bool rtw89_chip_has_rfkill (struct rtw89_dev *rtwdev) +{ +return !!rtwdev->chip->rfkill_init; +} + +static void rtw89_core_rfkill_init (struct rtw89_dev *rtwdev) +{ +const struct rtw89_rfkill_regs *regs = rtwdev->chip->rfkill_init; + +rtw89_write16_mask (rtwdev, regs->pinmux.addr, + regs->pinmux.mask, regs->pinmux.data); +rtw89_write16_mask (rtwdev, regs->mode.addr, + regs->mode.mask, regs->mode.data); +} + +static bool rtw89_core_rfkill_get (struct rtw89_dev *rtwdev) +{ +const struct rtw89_reg_def *reg = &rtwdev->chip->rfkill_get; + +return !rtw89_read8_mask (rtwdev, reg->addr, reg->mask); +} + +static void rtw89_rfkill_polling_init (struct rtw89_dev *rtwdev) +{ +if (!rtw89_chip_has_rfkill (rtwdev)) +return ; + +rtw89_core_rfkill_init (rtwdev); +rtw89_core_rfkill_poll (rtwdev, true); +wiphy_rfkill_start_polling (rtwdev->hw->wiphy); +} + +static void rtw89_rfkill_polling_deinit (struct rtw89_dev *rtwdev) +{ +if (!rtw89_chip_has_rfkill (rtwdev)) +return ; + +wiphy_rfkill_stop_polling (rtwdev->hw->wiphy); +} + +void rtw89_core_rfkill_poll (struct rtw89_dev *rtwdev,bool force) +{ +bool prev, blocked; + +if (!rtw89_chip_has_rfkill (rtwdev)) +return ; + + prev =test_bit (RTW89_FLAG_HW_RFKILL_STATE , rtwdev->flags); + blocked =rtw89_core_rfkill_get (rtwdev); + +if (!force && prev == blocked) +return ; + +rtw89_info (rtwdev,"rfkill hardware state changed to %s\n" , + blocked ?"disable" :"enable" ); + +if (blocked) +set_bit (RTW89_FLAG_HW_RFKILL_STATE , rtwdev->flags); +else +clear_bit (RTW89_FLAG_HW_RFKILL_STATE , rtwdev->flags); + +wiphy_rfkill_set_hw_state (rtwdev->hw->wiphy, blocked); +} +int rtw89_chip_info_setup (struct rtw89_dev *rtwdev) {int ret;
@@ -4654,6 +4719,8 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev) goto err_unregister_hw; } +rtw89_rfkill_polling_init (rtwdev); +return 0 ; err_unregister_hw:
@@ -4668,6 +4735,7 @@ static void rtw89_core_unregister_hw(struct rtw89_dev *rtwdev) {struct ieee80211_hw *hw = rtwdev->hw; +rtw89_rfkill_polling_deinit (rtwdev);ieee80211_unregister_hw (hw);rtw89_core_clr_supported_band (rtwdev); }
drivers/net/wireless/realtek/rtw89/core.h +9 -0
@@ -4069,6 +4069,11 @@ struct rtw89_rrsr_cfgs {struct rtw89_reg3_def rsc; }; +struct rtw89_rfkill_regs { +struct rtw89_reg3_def pinmux; +struct rtw89_reg3_def mode; +}; +struct rtw89_dig_regs {u32 seg0_pd_reg;u32 pd_lower_bound_mask;
@@ -4260,6 +4265,8 @@ struct rtw89_chip_info {const struct rtw89_rrsr_cfgs *rrsr_cfgs;struct rtw89_reg_def bss_clr_vld;u32 bss_clr_map_reg; +const struct rtw89_rfkill_regs *rfkill_init; +struct rtw89_reg_def rfkill_get;u32 dma_ch_mask;const struct rtw89_edcca_regs *edcca_regs;const struct wiphy_wowlan_support *wowlan_stub;
@@ -4618,6 +4625,7 @@ enum rtw89_flags {RTW89_FLAG_WOWLAN ,RTW89_FLAG_FORBIDDEN_TRACK_WROK ,RTW89_FLAG_CHANGING_INTERFACE , +RTW89_FLAG_HW_RFKILL_STATE , NUM_OF_RTW89_FLAGS, };
@@ -6506,6 +6514,7 @@ int rtw89_core_sta_remove(struct rtw89_dev *rtwdev,void rtw89_core_set_tid_config (struct rtw89_dev *rtwdev,struct ieee80211_sta *sta,struct cfg80211_tid_config *tid_config); +void rtw89_core_rfkill_poll (struct rtw89_dev *rtwdev,bool force);void rtw89_check_quirks (struct rtw89_dev *rtwdev,const struct dmi_system_id *quirks);int rtw89_core_init (struct rtw89_dev *rtwdev);void rtw89_core_deinit (struct rtw89_dev *rtwdev);
drivers/net/wireless/realtek/rtw89/mac80211.c +17 -0
@@ -1147,6 +1147,22 @@ static void rtw89_set_rekey_data(struct ieee80211_hw *hw, }#endif +static void rtw89_ops_rfkill_poll (struct ieee80211_hw *hw) +{ +struct rtw89_dev *rtwdev = hw->priv; + +mutex_lock (&rtwdev->mutex); + +/* wl_disable GPIO get floating when entering LPS */ +if (test_bit (RTW89_FLAG_RUNNING , rtwdev->flags)) + goto out; + +rtw89_core_rfkill_poll (rtwdev, false); + +out: +mutex_unlock (&rtwdev->mutex); +} +const struct ieee80211_ops rtw89_ops = { .tx = rtw89_ops_tx, .wake_tx_queue = rtw89_ops_wake_tx_queue,
@@ -1193,5 +1209,6 @@ const struct ieee80211_ops rtw89_ops = { .set_wakeup = rtw89_ops_set_wakeup, .set_rekey_data = rtw89_set_rekey_data, #endif + .rfkill_poll = rtw89_ops_rfkill_poll, };EXPORT_SYMBOL (rtw89_ops);
drivers/net/wireless/realtek/rtw89/reg.h +24 -0
@@ -107,6 +107,15 @@#define B_AX_DBG_SEL0_16BIT BIT(11)#define B_AX_DBG_SEL0 GENMASK(7, 0) +#define R_AX_GPIO_EXT_CTRL 0x0060 +#define B_AX_GPIO_MOD_15_TO_8_MASK GENMASK(31, 24) +#define B_AX_GPIO_MOD_9 BIT(25) +#define B_AX_GPIO_IO_SEL_15_TO_8_MASK GENMASK(23, 16) +#define B_AX_GPIO_IO_SEL_9 BIT(17) +#define B_AX_GPIO_OUT_15_TO_8_MASK GENMASK(15, 8) +#define B_AX_GPIO_IN_15_TO_8_MASK GENMASK(7, 0) +#define B_AX_GPIO_IN_9 BIT(1) +#define R_AX_SYS_SDIO_CTRL 0x0070#define B_AX_PCIE_DIS_L2_CTRL_LDO_HCI BIT(15)#define B_AX_PCIE_DIS_WLSUS_AFT_PDN BIT(14)
@@ -267,6 +276,9 @@#define R_AX_GPIO0_7_FUNC_SEL 0x02D0 +#define R_AX_GPIO8_15_FUNC_SEL 0x02D4 +#define B_AX_PINMUX_GPIO9_FUNC_SEL_MASK GENMASK(7, 4) +#define R_AX_EECS_EESK_FUNC_SEL 0x02D8#define B_AX_PINMUX_EESK_FUNC_SEL_MASK GENMASK(7, 4)
@@ -3910,6 +3922,15 @@#define R_BE_EFUSE_CTRL_1_V1 0x0034#define B_BE_EF_DATA_MASK GENMASK(31, 0) +#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) +#define B_BE_GPIO_IO_SEL_15_TO_8_MASK GENMASK(23, 16) +#define B_BE_GPIO_IO_SEL_9 BIT(17) +#define B_BE_GPIO_OUT_15_TO_8_MASK GENMASK(15, 8) +#define B_BE_GPIO_IN_15_TO_8_MASK GENMASK(7, 0) +#define B_BE_GPIO_IN_9 BIT(1) +#define R_BE_WL_BT_PWR_CTRL 0x0068#define B_BE_ISO_BD2PP BIT(31)#define B_BE_LDOV12B_EN BIT(30)
@@ -4355,6 +4376,9 @@#define B_BE_REG_CK40M_EN BIT(1)#define B_BE_REG_CK640M_EN BIT(0) +#define R_BE_GPIO8_15_FUNC_SEL 0x02D4 +#define B_BE_PINMUX_GPIO9_FUNC_SEL_MASK GENMASK(7, 4) +#define R_BE_WLAN_XTAL_SI_CTRL 0x0270#define B_BE_WL_XTAL_SI_CMD_POLL BIT(31)#define B_BE_WL_XTAL_SI_CHIPID_MASK GENMASK(30, 28)
drivers/net/wireless/realtek/rtw89/rtw8851b.c +11 -0
@@ -185,6 +185,15 @@ static const struct rtw89_rrsr_cfgs rtw8851b_rrsr_cfgs = { .rsc = {R_AX_TRXPTCL_RRSR_CTL_0, B_AX_WMAC_RESP_RSC_MASK, 2}, }; +static const struct rtw89_rfkill_regs rtw8851b_rfkill_regs = { + .pinmux = {R_AX_GPIO8_15_FUNC_SEL , +B_AX_PINMUX_GPIO9_FUNC_SEL_MASK , +0xf }, + .mode = {R_AX_GPIO_EXT_CTRL +2 , + (B_AX_GPIO_MOD_9 |B_AX_GPIO_IO_SEL_9 ) >>16 , +0x0 }, +}; +static const struct rtw89_dig_regs rtw8851b_dig_regs = { .seg0_pd_reg =R_SEG0R_PD_V1 , .pd_lower_bound_mask = B_SEG0R_PD_LOWER_BOUND_MSK,
@@ -2524,6 +2533,8 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .rrsr_cfgs = &rtw8851b_rrsr_cfgs, .bss_clr_vld = {R_BSS_CLR_MAP_V1, B_BSS_CLR_MAP_VLD0}, .bss_clr_map_reg = R_BSS_CLR_MAP_V1, + .rfkill_init = &rtw8851b_rfkill_regs, + .rfkill_get = {R_AX_GPIO_EXT_CTRL, B_AX_GPIO_IN_9}, .dma_ch_mask = BIT(RTW89_DMA_ACH4) | BIT(RTW89_DMA_ACH5) |BIT (RTW89_DMA_ACH6 ) |BIT (RTW89_DMA_ACH7 ) | BIT(RTW89_DMA_B1MG) | BIT(RTW89_DMA_B1HI),
drivers/net/wireless/realtek/rtw89/rtw8852a.c +11 -0
@@ -478,6 +478,15 @@ static const struct rtw89_rrsr_cfgs rtw8852a_rrsr_cfgs = { .rsc = {R_AX_TRXPTCL_RRSR_CTL_0, B_AX_WMAC_RESP_RSC_MASK, 2}, }; +static const struct rtw89_rfkill_regs rtw8852a_rfkill_regs = { + .pinmux = {R_AX_GPIO8_15_FUNC_SEL , +B_AX_PINMUX_GPIO9_FUNC_SEL_MASK , +0xf }, + .mode = {R_AX_GPIO_EXT_CTRL +2 , + (B_AX_GPIO_MOD_9 |B_AX_GPIO_IO_SEL_9 ) >>16 , +0x0 }, +}; +static const struct rtw89_dig_regs rtw8852a_dig_regs = { .seg0_pd_reg =R_SEG0R_PD , .pd_lower_bound_mask = B_SEG0R_PD_LOWER_BOUND_MSK,
@@ -2240,6 +2249,8 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .rrsr_cfgs = &rtw8852a_rrsr_cfgs, .bss_clr_vld = {R_BSS_CLR_MAP, B_BSS_CLR_MAP_VLD0}, .bss_clr_map_reg = R_BSS_CLR_MAP, + .rfkill_init = &rtw8852a_rfkill_regs, + .rfkill_get = {R_AX_GPIO_EXT_CTRL, B_AX_GPIO_IN_9}, .dma_ch_mask = 0, .edcca_regs = &rtw8852a_edcca_regs, #ifdef CONFIG_PM
drivers/net/wireless/realtek/rtw89/rtw8852b.c +11 -0
@@ -150,6 +150,15 @@ static const struct rtw89_rrsr_cfgs rtw8852b_rrsr_cfgs = { .rsc = {R_AX_TRXPTCL_RRSR_CTL_0, B_AX_WMAC_RESP_RSC_MASK, 2}, }; +static const struct rtw89_rfkill_regs rtw8852b_rfkill_regs = { + .pinmux = {R_AX_GPIO8_15_FUNC_SEL , +B_AX_PINMUX_GPIO9_FUNC_SEL_MASK , +0xf }, + .mode = {R_AX_GPIO_EXT_CTRL +2 , + (B_AX_GPIO_MOD_9 |B_AX_GPIO_IO_SEL_9 ) >>16 , +0x0 }, +}; +static const struct rtw89_dig_regs rtw8852b_dig_regs = { .seg0_pd_reg =R_SEG0R_PD_V1 , .pd_lower_bound_mask = B_SEG0R_PD_LOWER_BOUND_MSK,
@@ -880,6 +889,8 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .rrsr_cfgs = &rtw8852b_rrsr_cfgs, .bss_clr_vld = {R_BSS_CLR_MAP_V1, B_BSS_CLR_MAP_VLD0}, .bss_clr_map_reg = R_BSS_CLR_MAP_V1, + .rfkill_init = &rtw8852b_rfkill_regs, + .rfkill_get = {R_AX_GPIO_EXT_CTRL, B_AX_GPIO_IN_9}, .dma_ch_mask = BIT(RTW89_DMA_ACH4) | BIT(RTW89_DMA_ACH5) |BIT (RTW89_DMA_ACH6 ) |BIT (RTW89_DMA_ACH7 ) | BIT(RTW89_DMA_B1MG) | BIT(RTW89_DMA_B1HI),
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +11 -0
@@ -148,6 +148,15 @@ static const struct rtw89_rrsr_cfgs rtw8852bt_rrsr_cfgs = { .rsc = {R_AX_TRXPTCL_RRSR_CTL_0, B_AX_WMAC_RESP_RSC_MASK, 2}, }; +static const struct rtw89_rfkill_regs rtw8852bt_rfkill_regs = { + .pinmux = {R_AX_GPIO8_15_FUNC_SEL , +B_AX_PINMUX_GPIO9_FUNC_SEL_MASK , +0xf }, + .mode = {R_AX_GPIO_EXT_CTRL +2 , + (B_AX_GPIO_MOD_9 |B_AX_GPIO_IO_SEL_9 ) >>16 , +0x0 }, +}; +static const struct rtw89_dig_regs rtw8852bt_dig_regs = { .seg0_pd_reg =R_SEG0R_PD_V1 , .pd_lower_bound_mask = B_SEG0R_PD_LOWER_BOUND_MSK,
@@ -813,6 +822,8 @@ const struct rtw89_chip_info rtw8852bt_chip_info = { .rrsr_cfgs = &rtw8852bt_rrsr_cfgs, .bss_clr_vld = {R_BSS_CLR_MAP_V1, B_BSS_CLR_MAP_VLD0}, .bss_clr_map_reg = R_BSS_CLR_MAP_V1, + .rfkill_init = &rtw8852bt_rfkill_regs, + .rfkill_get = {R_AX_GPIO_EXT_CTRL, B_AX_GPIO_IN_9}, .dma_ch_mask = BIT(RTW89_DMA_ACH4) | BIT(RTW89_DMA_ACH5) |BIT (RTW89_DMA_ACH6 ) |BIT (RTW89_DMA_ACH7 ) | BIT(RTW89_DMA_B1MG) | BIT(RTW89_DMA_B1HI),
drivers/net/wireless/realtek/rtw89/rtw8852c.c +11 -0
@@ -147,6 +147,15 @@ static const struct rtw89_rrsr_cfgs rtw8852c_rrsr_cfgs = { .rsc = {R_AX_PTCL_RRSR1, B_AX_RSC_MASK, 2}, }; +static const struct rtw89_rfkill_regs rtw8852c_rfkill_regs = { + .pinmux = {R_AX_GPIO8_15_FUNC_SEL , +B_AX_PINMUX_GPIO9_FUNC_SEL_MASK , +0xf }, + .mode = {R_AX_GPIO_EXT_CTRL +2 , + (B_AX_GPIO_MOD_9 |B_AX_GPIO_IO_SEL_9 ) >>16 , +0x0 }, +}; +static const struct rtw89_dig_regs rtw8852c_dig_regs = { .seg0_pd_reg =R_SEG0R_PD , .pd_lower_bound_mask = B_SEG0R_PD_LOWER_BOUND_MSK,
@@ -3022,6 +3031,8 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .rrsr_cfgs = &rtw8852c_rrsr_cfgs, .bss_clr_vld = {R_BSS_CLR_MAP, B_BSS_CLR_MAP_VLD0}, .bss_clr_map_reg = R_BSS_CLR_MAP, + .rfkill_init = &rtw8852c_rfkill_regs, + .rfkill_get = {R_AX_GPIO_EXT_CTRL, B_AX_GPIO_IN_9}, .dma_ch_mask = 0, .edcca_regs = &rtw8852c_edcca_regs, #ifdef CONFIG_PM
drivers/net/wireless/realtek/rtw89/rtw8922a.c +11 -0
@@ -165,6 +165,15 @@ static const struct rtw89_rrsr_cfgs rtw8922a_rrsr_cfgs = { .rsc = {R_BE_PTCL_RRSR1, B_BE_RSC_MASK, 2}, }; +static const struct rtw89_rfkill_regs rtw8922a_rfkill_regs = { + .pinmux = {R_BE_GPIO8_15_FUNC_SEL , +B_BE_PINMUX_GPIO9_FUNC_SEL_MASK , +0xf }, + .mode = {R_BE_GPIO_EXT_CTRL +2 , + (B_BE_GPIO_MOD_9 |B_BE_GPIO_IO_SEL_9 ) >>16 , +0x0 }, +}; +static const struct rtw89_dig_regs rtw8922a_dig_regs = { .seg0_pd_reg =R_SEG0R_PD_V2 , .pd_lower_bound_mask = B_SEG0R_PD_LOWER_BOUND_MSK,
@@ -2624,6 +2633,8 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .rrsr_cfgs = &rtw8922a_rrsr_cfgs, .bss_clr_vld = {R_BSS_CLR_VLD_V2, B_BSS_CLR_VLD0_V2}, .bss_clr_map_reg = R_BSS_CLR_MAP_V2, + .rfkill_init = &rtw8922a_rfkill_regs, + .rfkill_get = {R_BE_GPIO_EXT_CTRL, B_BE_GPIO_IN_9}, .dma_ch_mask = 0, .edcca_regs = &rtw8922a_edcca_regs, #ifdef CONFIG_PM
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/4 wifi: rtw89: 885xb: reset IDMEM mode to prevent download firmware failure
In reply to Ping-Ke ShihFor different firmware type, it could change IDMEM mode, so reset it to default to avoid encountering error for RTL8851B/RTL8852B/RTL8852BT if that kind of firmware was downloaded before.
rtw89_8851be 0000:02:00.0: Firmware version 0.29.41.3, cmd version 0, type 5
rtw89_8851be 0000:02:00.0: Firmware version 0.29.41.3, cmd version 0, type 3
rtw89_8851be 0000:02:00.0: MAC has already powered on
rtw89_8851be 0000:02:00.0: fw security fail
rtw89_8851be 0000:02:00.0: download firmware fail
rtw89_8851be 0000:02:00.0: [ERR]fwdl 0x1E0 = 0x62
rtw89_8851be 0000:02:00.0: [ERR]fwdl 0x83F2 = 0x8
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f51c
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f524
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f51c
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f500
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f51c
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f53c
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f520
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f520
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f508
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f534
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f520
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f534
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f508
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f53c
rtw89_8851be 0000:02:00.0: [ERR]fw PC = 0xb892f524
rtw89_8851be 0000:02:00.0: failed to setup chip information
rtw89_8851be: probe of 0000:02:00.0 failed with error -16--- drivers/net/wireless/realtek/rtw89/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/mac.c +1 -1
@@ -3788,7 +3788,7 @@ static int rtw89_mac_enable_cpu_ax(struct rtw89_dev *rtwdev, u8 boot_reason,rtw89_write32 (rtwdev,R_AX_WCPU_FW_CTRL , val); -if (rtwdev->chip->chip_id ==RTL8852B ) +if (rtw89_is_rtl885xb (rtwdev))rtw89_write32_mask (rtwdev,R_AX_SEC_CTRL ,B_AX_SEC_IDMEM_SIZE_CONFIG_MASK ,0x2 );
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/4 wifi: rtw89: fix typo of rtw89_phy_ra_updata_XXX
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
updata should be update
--- drivers/net/wireless/realtek/rtw89/mac80211.c | 4 ++-- drivers/net/wireless/realtek/rtw89/phy.c | 8 ++++---- drivers/net/wireless/realtek/rtw89/phy.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtw89/mac80211.c +2 -2
@@ -783,7 +783,7 @@ static void rtw89_ra_mask_info_update_iter(void *data, struct ieee80211_sta *sta rtwsta->use_cfg_mask = true; rtwsta->mask = *br_data->mask; -rtw89_phy_ra_updata_sta (br_data->rtwdev, sta,IEEE80211_RC_SUPP_RATES_CHANGED ); +rtw89_phy_ra_update_sta (br_data->rtwdev, sta,IEEE80211_RC_SUPP_RATES_CHANGED ); } static void rtw89_ra_mask_info_update(struct rtw89_dev *rtwdev,
@@ -925,7 +925,7 @@ static void rtw89_ops_sta_rc_update(struct ieee80211_hw *hw, {struct rtw89_dev *rtwdev = hw->priv; -rtw89_phy_ra_updata_sta (rtwdev, sta, changed); +rtw89_phy_ra_update_sta (rtwdev, sta, changed); } static int rtw89_ops_add_chanctx(struct ieee80211_hw *hw,
drivers/net/wireless/realtek/rtw89/phy.c +4 -4
@@ -462,7 +462,7 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev, ra->csi_mode = csi_mode; } -void rtw89_phy_ra_updata_sta (struct rtw89_dev *rtwdev,struct ieee80211_sta *sta, +void rtw89_phy_ra_update_sta (struct rtw89_dev *rtwdev,struct ieee80211_sta *sta,u32 changed) {struct rtw89_sta *rtwsta = (struct rtw89_sta *)sta->drv_priv;
@@ -610,17 +610,17 @@ void rtw89_phy_rate_pattern_vif(struct rtw89_dev *rtwdev,rtw89_debug (rtwdev,RTW89_DBG_RA ,"unset rate pattern\n" ); } -static void rtw89_phy_ra_updata_sta_iter (void *data,struct ieee80211_sta *sta) +static void rtw89_phy_ra_update_sta_iter (void *data,struct ieee80211_sta *sta) {struct rtw89_dev *rtwdev = (struct rtw89_dev *)data; -rtw89_phy_ra_updata_sta (rtwdev, sta,IEEE80211_RC_SUPP_RATES_CHANGED ); +rtw89_phy_ra_update_sta (rtwdev, sta,IEEE80211_RC_SUPP_RATES_CHANGED ); }void rtw89_phy_ra_update (struct rtw89_dev *rtwdev) {ieee80211_iterate_stations_atomic (rtwdev->hw, - rtw89_phy_ra_updata_sta_iter, + rtw89_phy_ra_update_sta_iter, rtwdev); }
drivers/net/wireless/realtek/rtw89/phy.h +1 -1
@@ -894,7 +894,7 @@ void rtw89_phy_set_txpwr_limit_ru(struct rtw89_dev *rtwdev,void rtw89_phy_ra_assoc (struct rtw89_dev *rtwdev,struct ieee80211_sta *sta);void rtw89_phy_ra_update (struct rtw89_dev *rtwdev); -void rtw89_phy_ra_updata_sta (struct rtw89_dev *rtwdev,struct ieee80211_sta *sta, +void rtw89_phy_ra_update_sta (struct rtw89_dev *rtwdev,struct ieee80211_sta *sta,u32 changed); void rtw89_phy_rate_pattern_vif(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif,
Signature · 1 line
2.25.1