wifi: rtw89: 8922a: add chip_ops related to TX/RX, RF access and thermal
Ping-Ke Shih
maintainercover wifi: rtw89: 8922a: add chip_ops related to TX/RX, RF access and thermal
Add more chip_ops for 8922A. First is handlers of TX/RX descriptors to fill/read descriptors. During switching channel, it needs to stop hardware TX scheduler introduced by second patch. Patch 3/6 is to configure TX path, which it can TX 1SS rate data via one or two paths, and normally 2-path TX is adopted by default.
Then, add patch 4/6 to access RF registers via an indirect interface. Normally, use thermal value to decide whether we trigger certain RF calibration again, and it also helps to debug CFO because temperature can affect the result too. The last patch is just to fill two ops that are NULL.
Ping-Ke Shih (6):
wifi: rtw89: 8922a: hook handlers of TX/RX descriptors to chip_ops
wifi: rtw89: 8922a: implement {stop,resume}_sch_tx and cfg_ppdu
wifi: rtw89: 8922a: add chip_ops::cfg_txrx_path
wifi: rtw89: 8922a: add RF read/write v2
wifi: rtw89: 8922a: add chip_ops to get thermal value
wifi: rtw89: 8922a: set chip_ops FEM and GPIO to NULL
drivers/net/wireless/realtek/rtw89/mac.c | 5 +- drivers/net/wireless/realtek/rtw89/mac.h | 14 +- drivers/net/wireless/realtek/rtw89/mac_be.c | 96 +++++ drivers/net/wireless/realtek/rtw89/phy.c | 125 +++++++ drivers/net/wireless/realtek/rtw89/phy.h | 4 + drivers/net/wireless/realtek/rtw89/reg.h | 84 +++++ drivers/net/wireless/realtek/rtw89/rtw8922a.c | 344 ++++++++++++++++++ .../net/wireless/realtek/rtw89/rtw8922a_rfk.c | 33 ++ .../net/wireless/realtek/rtw89/rtw8922a_rfk.h | 12 + 9 files changed, 714 insertions(+), 3 deletions(-) create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/6 wifi: rtw89: 8922a: hook handlers of TX/RX descriptors to chip_ops
Hook implemented handlers to chip_ops, and fill packet frequency and signal strength to RX status from RX PPDU status packet.
--- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+)
drivers/net/wireless/realtek/rtw89/rtw8922a.c +37 -0
@@ -1250,6 +1250,39 @@ static void rtw8922a_ctrl_nbtg_bt_tx(struct rtw89_dev *rtwdev, bool en, } } +static void rtw8922a_fill_freq_with_ppdu (struct rtw89_dev *rtwdev, +struct rtw89_rx_phy_ppdu *phy_ppdu, +struct ieee80211_rx_status *status) +{ +u8 chan_idx = phy_ppdu->chan_idx; +enum nl80211_band band; +u8 ch; + +if (chan_idx ==0 ) +return ; + +rtw89_decode_chan_idx (rtwdev, chan_idx, &ch, &band); + status->freq =ieee80211_channel_to_frequency (ch, band); + status->band = band; +} + +static void rtw8922a_query_ppdu (struct rtw89_dev *rtwdev, +struct rtw89_rx_phy_ppdu *phy_ppdu, +struct ieee80211_rx_status *status) +{ +u8 path; +u8 *rx_power = phy_ppdu->rssi; + + status->signal = +RTW89_RSSI_RAW_TO_DBM (max (rx_power[RF_PATH_A ], rx_power[RF_PATH_B ])); +for (path =0 ; path < rtwdev->chip->rf_path_num; path++) { + status->chains |=BIT (path); + status->chain_signal[path] =RTW89_RSSI_RAW_TO_DBM (rx_power[path]); + } +if (phy_ppdu->valid) +rtw8922a_fill_freq_with_ppdu (rtwdev, phy_ppdu, status); +} +static int rtw8922a_mac_enable_bb_rf (struct rtw89_dev *rtwdev) { rtw89_write8_set(rtwdev, R_BE_FEN_RST_ENABLE,
@@ -1291,10 +1324,14 @@ static const struct rtw89_chip_ops rtw8922a_chip_ops = { .set_txpwr_ctrl = rtw8922a_set_txpwr_ctrl, .init_txpwr_unit = NULL, .ctrl_btg_bt_rx = rtw8922a_ctrl_btg_bt_rx, + .query_ppdu = rtw8922a_query_ppdu, .ctrl_nbtg_bt_tx = rtw8922a_ctrl_nbtg_bt_tx, .set_txpwr_ul_tb_offset = NULL, .pwr_on_func = rtw8922a_pwr_on_func, .pwr_off_func = rtw8922a_pwr_off_func, + .query_rxdesc = rtw89_core_query_rxdesc_v2, + .fill_txdesc = rtw89_core_fill_txdesc_v2, + .fill_txdesc_fwcmd = rtw89_core_fill_txdesc_fwcmd_v2, .h2c_dctl_sec_cam = rtw89_fw_h2c_dctl_sec_cam_v2, .h2c_default_cmac_tbl = rtw89_fw_h2c_default_cmac_tbl_g7, .h2c_assoc_cmac_tbl = rtw89_fw_h2c_assoc_cmac_tbl_g7,
Signature · 1 line
2.25.1
Re: [PATCH 1/6] wifi: rtw89: 8922a: hook handlers of TX/RX descriptors to chip_ops
Quoted 4 lines · Ping-Ke Shih
Hook implemented handlers to
chip_ops, and fill packet frequency and signal strength to RX status from RX PPDU status packet.Signed-off-by Ping-Ke Shih <[email protected]>
6 patches applied to wireless-next.git, thanks.
f8a7840e98a4 wifi: rtw89: 8922a: hook handlers of TX/RX descriptors to chip_ops b16daa62125e wifi: rtw89: 8922a: implement {stop,resume}_sch_tx and cfg_ppdu 1ba63a8a752a wifi: rtw89: 8922a: add chip_ops::cfg_txrx_path 88d1f9b22fab wifi: rtw89: 8922a: add RF read/write v21de97cd362c4 wifi: rtw89: 8922a: add chip_ops to get thermal value a6c759c8962b wifi: rtw89: 8922a: set chip_ops FEM and GPIO to NULL
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Ping-Ke Shih
maintainerPATCH 2/6 wifi: rtw89: 8922a: implement {stop,resume}_sch_tx and cfg_ppdu
In reply to Ping-Ke ShihTo set TX/RX path or set channel, we need these helpers to stop TX and restore settings. The sch_tx stands for scheduler TX channel, and the cfg_ppdu is to stop reporting PPDU status, so we should stop them during setting.
--- drivers/net/wireless/realtek/rtw89/mac.c | 5 +- drivers/net/wireless/realtek/rtw89/mac.h | 14 ++- drivers/net/wireless/realtek/rtw89/mac_be.c | 96 +++++++++++++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 44 +++++++++ drivers/net/wireless/realtek/rtw89/rtw8922a.c | 2 + 5 files changed, 158 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +3 -2
@@ -5205,7 +5205,8 @@ bool rtw89_mac_get_txpwr_cr_ax(struct rtw89_dev *rtwdev,return false; } -int rtw89_mac_cfg_ppdu_status (struct rtw89_dev *rtwdev,u8 mac_idx,bool enable) +static +int rtw89_mac_cfg_ppdu_status_ax (struct rtw89_dev *rtwdev,u8 mac_idx,bool enable) {u32 reg =rtw89_mac_reg_by_idx (rtwdev,R_AX_PPDU_STAT , mac_idx);int ret;
@@ -5228,7 +5229,6 @@ int rtw89_mac_cfg_ppdu_status(struct rtw89_dev *rtwdev, u8 mac_idx, bool enable)return 0 ; } -EXPORT_SYMBOL (rtw89_mac_cfg_ppdu_status);void rtw89_mac_update_rts_threshold (struct rtw89_dev *rtwdev,u8 mac_idx) {
@@ -6179,6 +6179,7 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { .bf_assoc = rtw89_mac_bf_assoc_ax, .typ_fltr_opt = rtw89_mac_typ_fltr_opt_ax, + .cfg_ppdu_status = rtw89_mac_cfg_ppdu_status_ax, .dle_mix_cfg = dle_mix_cfg_ax, .chk_dle_rdy = chk_dle_rdy_ax,
drivers/net/wireless/realtek/rtw89/mac.h +13 -1
@@ -913,6 +913,7 @@ struct rtw89_mac_gen_def {enum rtw89_machdr_frame_type type, enum rtw89_mac_fwd_target fwd_target, u8 mac_idx); +int (*cfg_ppdu_status)(struct rtw89_dev *rtwdev,u8 mac_idx,bool enable);int (*dle_mix_cfg)(struct rtw89_dev *rtwdev,const struct rtw89_dle_mem *cfg);int (*chk_dle_rdy)(struct rtw89_dev *rtwdev,bool wde_or_ple);
@@ -1138,9 +1139,20 @@ int rtw89_mac_stop_sch_tx(struct rtw89_dev *rtwdev, u8 mac_idx, u32 *tx_en, enum rtw89_sch_tx_sel sel);int rtw89_mac_stop_sch_tx_v1 (struct rtw89_dev *rtwdev,u8 mac_idx,u32 *tx_en,enum rtw89_sch_tx_sel sel); +int rtw89_mac_stop_sch_tx_v2 (struct rtw89_dev *rtwdev,u8 mac_idx, +u32 *tx_en,enum rtw89_sch_tx_sel sel);int rtw89_mac_resume_sch_tx (struct rtw89_dev *rtwdev,u8 mac_idx,u32 tx_en);int rtw89_mac_resume_sch_tx_v1 (struct rtw89_dev *rtwdev,u8 mac_idx,u32 tx_en); -int rtw89_mac_cfg_ppdu_status (struct rtw89_dev *rtwdev,u8 mac_ids,bool enable); +int rtw89_mac_resume_sch_tx_v2 (struct rtw89_dev *rtwdev,u8 mac_idx,u32 tx_en); + +static inline +int rtw89_mac_cfg_ppdu_status (struct rtw89_dev *rtwdev,u8 mac_idx,bool enable) +{ +const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def; + +return mac->cfg_ppdu_status (rtwdev, mac_idx, enable); +} +void rtw89_mac_update_rts_threshold (struct rtw89_dev *rtwdev,u8 mac_idx);void rtw89_mac_flush_txq (struct rtw89_dev *rtwdev,u32 queues,bool drop);int rtw89_mac_coex_init (struct rtw89_dev *rtwdev,const struct rtw89_mac_ax_coex *coex);
drivers/net/wireless/realtek/rtw89/mac_be.c +96 -0
108 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/reg.h +44 -0
62 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8922a.c +2 -0
@@ -1332,6 +1332,8 @@ static const struct rtw89_chip_ops rtw8922a_chip_ops = { .query_rxdesc = rtw89_core_query_rxdesc_v2, .fill_txdesc = rtw89_core_fill_txdesc_v2, .fill_txdesc_fwcmd = rtw89_core_fill_txdesc_fwcmd_v2, + .stop_sch_tx = rtw89_mac_stop_sch_tx_v2, + .resume_sch_tx = rtw89_mac_resume_sch_tx_v2, .h2c_dctl_sec_cam = rtw89_fw_h2c_dctl_sec_cam_v2, .h2c_default_cmac_tbl = rtw89_fw_h2c_default_cmac_tbl_g7, .h2c_assoc_cmac_tbl = rtw89_fw_h2c_assoc_cmac_tbl_g7,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/6 wifi: rtw89: 8922a: add chip_ops::cfg_txrx_path
In reply to Ping-Ke ShihThis function is to set TX/RX path. Especially for 1SS rate, it can select to TX on one or two antenna. Before this operation, stop hardware to prevent transmitting/receiving unexpected packets. After that, restore settings and reset hardware to prevent it stays on abnormal state.
--- drivers/net/wireless/realtek/rtw89/reg.h | 24 ++ drivers/net/wireless/realtek/rtw89/rtw8922a.c | 279 ++++++++++++++++++ .../net/wireless/realtek/rtw89/rtw8922a_rfk.c | 33 +++ .../net/wireless/realtek/rtw89/rtw8922a_rfk.h | 12 + 4 files changed, 348 insertions(+) create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c create mode 100644 drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h
drivers/net/wireless/realtek/rtw89/reg.h +24 -0
@@ -7683,9 +7683,23 @@#define B_SWSI_READ_ADDR_ADDR_V1 GENMASK(7, 0)#define B_SWSI_READ_ADDR_PATH_V1 GENMASK(10, 8)#define B_SWSI_READ_ADDR_V1 GENMASK(10, 0) +#define R_BRK_R 0x0418 +#define B_VHTMCS_LMT GENMASK(22, 21) +#define B_HTMCS_LMT GENMASK(9, 8) +#define R_BRK_EHT 0x0474 +#define B_RXEHT_NSS_MAX GENMASK(4, 2) +#define R_BRK_RXEHT 0x0478 +#define B_RXEHT_N_USER_MAX GENMASK(31, 24) +#define B_RXEHTTB_NSS_MAX GENMASK(16, 14)#define R_EN_SND_WO_NDP 0x047c#define R_EN_SND_WO_NDP_C1 0x147c#define B_EN_SND_WO_NDP BIT(1) +#define R_BRK_HE 0x0480 +#define B_TB_NSS_MAX GENMASK(25, 23) +#define B_NSS_MAX GENMASK(16, 14) +#define B_N_USR_MAX GENMASK(13, 6) +#define R_RXCCA_BE1 0x0520 +#define B_RXCCA_BE1_DIS BIT(0)#define R_UPD_CLK_ADC 0x0700#define B_UPD_CLK_ADC_VAL GENMASK(26, 25)#define B_UPD_CLK_ADC_ON BIT(24)
@@ -7732,6 +7746,7 @@#define B_PMAC_RXMOD_MSK GENMASK(7, 4)#define R_MAC_SEL 0x09A4#define B_MAC_SEL_OFDM_TRI_FILTER BIT(31) +#define B_MAC_SEL GENMASK(19, 17)#define B_MAC_SEL_PWR_EN BIT(16)#define B_MAC_SEL_DPD_EN BIT(10)#define B_MAC_SEL_MOD GENMASK(4, 2)
@@ -7825,6 +7840,8 @@#define R_CLK_GCK 0x1008#define B_CLK_GCK GENMASK(24, 0)#define R_EDCCA_RPT_SEL_BE 0x10CC +#define R_ADC_FIFO_V1 0x10FC +#define B_ADC_FIFO_EN_V1 GENMASK(31, 24)#define R_S0_HW_SI_DIS 0x1200#define B_S0_HW_SI_DIS_W_R_TRIG GENMASK(30, 28)#define R_P0_RXCK 0x12A0
@@ -8934,6 +8951,11 @@#define R_IQK_DPK_PRST 0xE4AC#define R_IQK_DPK_PRST_C1 0xE5AC#define B_IQK_DPK_PRST BIT(27) +#define R_TXPWR_RSTA 0xE60C +#define B_TXPWR_RSTA BIT(16) +#define R_TSSI_PWR_P0 0xE610 +#define R_TSSI_PWR_P1 0xE710 +#define B_TSSI_CONT_EN BIT(3)#define R_TSSI_MAP_OFST_P0 0xE620#define R_TSSI_MAP_OFST_P1 0xE720#define B_TSSI_MAP_OFST_OFDM GENMASK(17, 9)
@@ -8946,6 +8968,8 @@#define R_TXAGC_REF1_P0 0xE62C#define R_TXAGC_REF1_P1 0xE72C#define B_TXAGC_REF1_CCK_CW GENMASK(8, 0) +#define R_TXPWR_RSTB 0xE70C +#define B_TXPWR_RSTB BIT(16)/* WiFi CPU local domain */ #define R_AX_WDT_CTRL 0x0040
drivers/net/wireless/realtek/rtw89/rtw8922a.c +279 -0
325 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c new file +33 -0
@@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright(c) 2023 Realtek Corporation +*/ + +#include "debug.h" +#include "phy.h" +#include "reg.h" +#include "rtw8922a.h" +#include "rtw8922a_rfk.h" + +static void rtw8922a_tssi_cont_en (struct rtw89_dev *rtwdev,bool en, +enum rtw89_rf_path path) +{ +static const u32 tssi_trk_man[2 ] = {R_TSSI_PWR_P0 ,R_TSSI_PWR_P1 }; + +if (en) +rtw89_phy_write32_mask (rtwdev, tssi_trk_man[path],B_TSSI_CONT_EN ,0 ); +else +rtw89_phy_write32_mask (rtwdev, tssi_trk_man[path],B_TSSI_CONT_EN ,1 ); +} + +void rtw8922a_tssi_cont_en_phyidx (struct rtw89_dev *rtwdev,bool en,u8 phy_idx) +{ +if (rtwdev->mlo_dbcc_mode ==MLO_1_PLUS_1_1RF ) { +if (phy_idx ==RTW89_PHY_0 ) +rtw8922a_tssi_cont_en (rtwdev, en,RF_PATH_A ); +else +rtw8922a_tssi_cont_en (rtwdev, en,RF_PATH_B ); + }else { +rtw8922a_tssi_cont_en (rtwdev, en,RF_PATH_A ); +rtw8922a_tssi_cont_en (rtwdev, en,RF_PATH_B ); + } +}
drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* Copyright(c) 2023 Realtek Corporation +*/ + +#ifndef __RTW89_8922A_RFK_H__ +#define __RTW89_8922A_RFK_H__ + +#include "core.h" + +void rtw8922a_tssi_cont_en_phyidx (struct rtw89_dev *rtwdev,bool en,u8 phy_idx); + +#endif
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/6 wifi: rtw89: 8922a: add RF read/write v2
In reply to Ping-Ke ShihImplement indirect interface v2 to read/write RF registers via PHY registers for 8922A.
--- drivers/net/wireless/realtek/rtw89/phy.c | 125 ++++++++++++++++++ drivers/net/wireless/realtek/rtw89/phy.h | 4 + drivers/net/wireless/realtek/rtw89/reg.h | 15 +++ drivers/net/wireless/realtek/rtw89/rtw8922a.c | 2 + 4 files changed, 146 insertions(+)
drivers/net/wireless/realtek/rtw89/phy.c +125 -0
@@ -796,6 +796,71 @@ u32 rtw89_phy_read_rf_v1(struct rtw89_dev *rtwdev, enum rtw89_rf_path rf_path, }EXPORT_SYMBOL (rtw89_phy_read_rf_v1); +static u32 rtw89_phy_read_full_rf_v2_a (struct rtw89_dev *rtwdev, +enum rtw89_rf_path rf_path,u32 addr) +{ +static const u16 r_addr_ofst[2 ] = {0x2C24 ,0x2D24 }; +static const u16 addr_ofst[2 ] = {0x2ADC ,0x2BDC }; +bool busy, done; +int ret; +u32 val; + +rtw89_phy_write32_mask (rtwdev, addr_ofst[rf_path],B_HWSI_ADD_CTL_MASK ,0x1 ); + ret =read_poll_timeout_atomic (rtw89_phy_read32_mask, busy, !busy, +1 ,3800 , false, + rtwdev, r_addr_ofst[rf_path],B_HWSI_VAL_BUSY ); +if (ret) { +rtw89_warn (rtwdev,"poll HWSI is busy\n" ); +return INV_RF_DATA ; + } + +rtw89_phy_write32_mask (rtwdev, addr_ofst[rf_path],B_HWSI_ADD_MASK , addr); +rtw89_phy_write32_mask (rtwdev, addr_ofst[rf_path],B_HWSI_ADD_RD ,0x1 ); +udelay (2 ); + + ret =read_poll_timeout_atomic (rtw89_phy_read32_mask, done, done, +1 ,3800 , false, + rtwdev, r_addr_ofst[rf_path],B_HWSI_VAL_RDONE ); +if (ret) { +rtw89_warn (rtwdev,"read HWSI is busy\n" ); + val =INV_RF_DATA ; + goto out; + } + + val =rtw89_phy_read32_mask (rtwdev, r_addr_ofst[rf_path],RFREG_MASK ); +out: +rtw89_phy_write32_mask (rtwdev, addr_ofst[rf_path],B_HWSI_ADD_POLL_MASK ,0 ); + +return val; +} + +static u32 rtw89_phy_read_rf_v2_a (struct rtw89_dev *rtwdev, +enum rtw89_rf_path rf_path,u32 addr,u32 mask) +{ +u32 val; + + val =rtw89_phy_read_full_rf_v2_a (rtwdev, rf_path, addr); + +return (val & mask) >>__ffs (mask); +} + +u32 rtw89_phy_read_rf_v2 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 mask) +{ +bool ad_sel =u32_get_bits (addr,RTW89_RF_ADDR_ADSEL_MASK ); + +if (rf_path >= rtwdev->chip->rf_path_num) { +rtw89_err (rtwdev,"unsupported rf path (%d)\n" , rf_path); +return INV_RF_DATA ; + } + +if (ad_sel) +return rtw89_phy_read_rf (rtwdev, rf_path, addr, mask); +else +return rtw89_phy_read_rf_v2_a (rtwdev, rf_path, addr, mask); +} +EXPORT_SYMBOL (rtw89_phy_read_rf_v2); +bool rtw89_phy_write_rf (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path,u32 addr,u32 mask,u32 data) {
@@ -875,6 +940,66 @@ bool rtw89_phy_write_rf_v1(struct rtw89_dev *rtwdev, enum rtw89_rf_path rf_path, }EXPORT_SYMBOL (rtw89_phy_write_rf_v1); +static +bool rtw89_phy_write_full_rf_v2_a (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 data) +{ +static const u32 addr_is_idle[2 ] = {0x2C24 ,0x2D24 }; +static const u32 addr_ofst[2 ] = {0x2AE0 ,0x2BE0 }; +bool busy; +u32 val; +int ret; + + ret =read_poll_timeout_atomic (rtw89_phy_read32_mask, busy, !busy, +1 ,3800 , false, + rtwdev, addr_is_idle[rf_path],BIT (29 )); +if (ret) { +rtw89_warn (rtwdev,"[%s] HWSI is busy\n" , __func__); +return false; + } + + val =u32_encode_bits (addr,B_HWSI_DATA_ADDR ) | +u32_encode_bits (data,B_HWSI_DATA_VAL ); + +rtw89_phy_write32 (rtwdev, addr_ofst[rf_path], val); + +return true; +} + +static +bool rtw89_phy_write_rf_a_v2 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 mask,u32 data) +{ +u32 val; + +if (mask ==RFREG_MASK ) { + val = data; + }else { + val =rtw89_phy_read_full_rf_v2_a (rtwdev, rf_path, addr); + val &= ~mask; + val |= (data <<__ffs (mask)) & mask; + } + +return rtw89_phy_write_full_rf_v2_a (rtwdev, rf_path, addr, val); +} + +bool rtw89_phy_write_rf_v2 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 mask,u32 data) +{ +bool ad_sel =u32_get_bits (addr,RTW89_RF_ADDR_ADSEL_MASK ); + +if (rf_path >= rtwdev->chip->rf_path_num) { +rtw89_err (rtwdev,"unsupported rf path (%d)\n" , rf_path); +return INV_RF_DATA ; + } + +if (ad_sel) +return rtw89_phy_write_rf (rtwdev, rf_path, addr, mask, data); +else +return rtw89_phy_write_rf_a_v2 (rtwdev, rf_path, addr, mask, data); +} +EXPORT_SYMBOL (rtw89_phy_write_rf_v2); +static bool rtw89_chip_rf_v1 (struct rtw89_dev *rtwdev) {return rtwdev->chip->ops->write_rf == rtw89_phy_write_rf_v1;
drivers/net/wireless/realtek/rtw89/phy.h +4 -0
@@ -781,10 +781,14 @@ u32 rtw89_phy_read_rf(struct rtw89_dev *rtwdev, enum rtw89_rf_path rf_path, u32 addr, u32 mask);u32 rtw89_phy_read_rf_v1 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path,u32 addr,u32 mask); +u32 rtw89_phy_read_rf_v2 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 mask);bool rtw89_phy_write_rf (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path,u32 addr,u32 mask,u32 data);bool rtw89_phy_write_rf_v1 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path,u32 addr,u32 mask,u32 data); +bool rtw89_phy_write_rf_v2 (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path, +u32 addr,u32 mask,u32 data);void rtw89_phy_init_bb_reg (struct rtw89_dev *rtwdev);void rtw89_phy_init_rf_reg (struct rtw89_dev *rtwdev,bool noio); void rtw89_phy_config_rf_reg_v1(struct rtw89_dev *rtwdev,
drivers/net/wireless/realtek/rtw89/reg.h +15 -0
@@ -7994,6 +7994,21 @@#define B_AFEDAC1 GENMASK(2, 0)#define R_IQKDPK_HC 0x2AB8#define B_IQKDPK_HC BIT(28) +#define R_HWSI_ADD0 0x2ADC +#define R_HWSI_ADD1 0x2BDC +#define B_HWSI_ADD_MASK GENMASK(11, 4) +#define B_HWSI_ADD_CTL_MASK GENMASK(2, 0) +#define B_HWSI_ADD_RD BIT(2) +#define B_HWSI_ADD_POLL_MASK GENMASK(1, 0) +#define B_HWSI_ADD_RUN BIT(1) +#define B_HWSI_ADD_BUSY BIT(0) +#define R_HWSI_DATA 0x2AE0 +#define B_HWSI_DATA_VAL GENMASK(27, 8) +#define B_HWSI_DATA_ADDR GENMASK(7, 0) +#define R_HWSI_VAL0 0x2C24 +#define R_HWSI_VAL1 0x2D24 +#define B_HWSI_VAL_RDONE BIT(31) +#define B_HWSI_VAL_BUSY BIT(29)#define R_P1_EN_SOUND_WO_NDP 0x2D7C#define B_P1_EN_SOUND_WO_NDP BIT(1)#define R_EDCCA_RPT_A_BE 0x2E38
drivers/net/wireless/realtek/rtw89/rtw8922a.c +2 -0
@@ -1594,6 +1594,8 @@ static const struct rtw89_chip_ops rtw8922a_chip_ops = { .bb_postinit = rtw8922a_bb_postinit, .bb_reset = rtw8922a_bb_reset, .bb_sethw = rtw8922a_bb_sethw, + .read_rf = rtw89_phy_read_rf_v2, + .write_rf = rtw89_phy_write_rf_v2, .set_channel = rtw8922a_set_channel, .read_efuse = rtw8922a_read_efuse, .read_phycap = rtw8922a_read_phycap,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/6 wifi: rtw89: 8922a: add chip_ops to get thermal value
In reply to Ping-Ke ShihGet thermal value as a clue to do RF calibration if the delta is larger than a threshold, but 8922A doesn't need this, so we only read out the value when debugging to reduce IO.
--- drivers/net/wireless/realtek/rtw89/reg.h | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+)
drivers/net/wireless/realtek/rtw89/reg.h +1 -0
@@ -7465,6 +7465,7 @@#define RR_LUTWD0_LB GENMASK(5, 0)#define RR_TM 0x42#define RR_TM_TRI BIT(19) +#define RR_TM_VAL_V1 GENMASK(7, 0)#define RR_TM_VAL GENMASK(6, 1)#define RR_TM2 0x43#define RR_TM2_OFF GENMASK(19, 16)
drivers/net/wireless/realtek/rtw89/rtw8922a.c +22 -0
@@ -1528,6 +1528,27 @@ static void rtw8922a_bb_cfg_txrx_path(struct rtw89_dev *rtwdev) &tx_en0, false); } +static u8 rtw8922a_get_thermal (struct rtw89_dev *rtwdev,enum rtw89_rf_path rf_path) +{ +struct rtw89_power_trim_info *info = &rtwdev->pwr_trim; +int th; + +/* read thermal only if debugging */ +if (!rtw89_debug_is_enabled (rtwdev,RTW89_DBG_CFO |RTW89_DBG_RFK_TRACK )) +return 80 ; + +rtw89_write_rf (rtwdev, rf_path,RR_TM ,RR_TM_TRI ,0x1 ); +rtw89_write_rf (rtwdev, rf_path,RR_TM ,RR_TM_TRI ,0x0 ); +rtw89_write_rf (rtwdev, rf_path,RR_TM ,RR_TM_TRI ,0x1 ); + +fsleep (200 ); + + th =rtw89_read_rf (rtwdev, rf_path,RR_TM ,RR_TM_VAL_V1 ); + th += (s8 )info->thermal_trim[rf_path]; + +return clamp_t (int, th,0 ,U8_MAX ); +} +static void rtw8922a_fill_freq_with_ppdu (struct rtw89_dev *rtwdev,struct rtw89_rx_phy_ppdu *phy_ppdu,struct ieee80211_rx_status *status)
@@ -1603,6 +1624,7 @@ static const struct rtw89_chip_ops rtw8922a_chip_ops = { .set_txpwr = rtw8922a_set_txpwr, .set_txpwr_ctrl = rtw8922a_set_txpwr_ctrl, .init_txpwr_unit = NULL, + .get_thermal = rtw8922a_get_thermal, .ctrl_btg_bt_rx = rtw8922a_ctrl_btg_bt_rx, .query_ppdu = rtw8922a_query_ppdu, .ctrl_nbtg_bt_tx = rtw8922a_ctrl_nbtg_bt_tx,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 6/6 wifi: rtw89: 8922a: set chip_ops FEM and GPIO to NULL
In reply to Ping-Ke ShihThe chip_ops::fem_setup is to get if a hardware module type contains PA and LNA that will affect how RF calibrations do. The chip_ops::rfe_gpio is to set GPIO PIN MUX according to hardware module type too. 8922A doesn't have these special module types yet, so leave them as NULL.
--- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/realtek/rtw89/rtw8922a.c +2 -0
@@ -1620,6 +1620,8 @@ static const struct rtw89_chip_ops rtw8922a_chip_ops = { .set_channel = rtw8922a_set_channel, .read_efuse = rtw8922a_read_efuse, .read_phycap = rtw8922a_read_phycap, + .fem_setup = NULL, + .rfe_gpio = NULL, .power_trim = rtw8922a_power_trim, .set_txpwr = rtw8922a_set_txpwr, .set_txpwr_ctrl = rtw8922a_set_txpwr_ctrl,
Signature · 1 line
2.25.1