Commit 79c55327 authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

wifi: rtw89: mac: add registers of MU-EDCA parameters for WiFi 7 chips 



According to chip generation, set MU-EDCA parameters from mac80211 when
connected.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231012021455.19816-4-pkshih@realtek.com
parent 7f69cd42

drivers/net/wireless/realtek/rtw89/mac80211.c

+10 −6
Original line number Diff line number Diff line
@@ -328,11 +328,14 @@ static void ____rtw89_conf_tx_edca(struct rtw89_dev *rtwdev, 
	rtw89_fw_h2c_set_edca(rtwdev, rtwvif, ac_to_fw_idx[ac], val);

}



static const u32 ac_to_mu_edca_param[IEEE80211_NUM_ACS] = {

	[IEEE80211_AC_VO] = R_AX_MUEDCA_VO_PARAM_0,

	[IEEE80211_AC_VI] = R_AX_MUEDCA_VI_PARAM_0,

	[IEEE80211_AC_BE] = R_AX_MUEDCA_BE_PARAM_0,

	[IEEE80211_AC_BK] = R_AX_MUEDCA_BK_PARAM_0,

#define R_MUEDCA_ACS_PARAM(acs) {R_AX_MUEDCA_ ## acs ## _PARAM_0, \

				 R_BE_MUEDCA_ ## acs ## _PARAM_0}



static const u32 ac_to_mu_edca_param[IEEE80211_NUM_ACS][RTW89_CHIP_GEN_NUM] = {

	[IEEE80211_AC_VO] = R_MUEDCA_ACS_PARAM(VO),

	[IEEE80211_AC_VI] = R_MUEDCA_ACS_PARAM(VI),

	[IEEE80211_AC_BE] = R_MUEDCA_ACS_PARAM(BE),

	[IEEE80211_AC_BK] = R_MUEDCA_ACS_PARAM(BK),

};



static void ____rtw89_conf_tx_mu_edca(struct rtw89_dev *rtwdev,
@@ -340,6 +343,7 @@ static void ____rtw89_conf_tx_mu_edca(struct rtw89_dev *rtwdev, 
{

	struct ieee80211_tx_queue_params *params = &rtwvif->tx_params[ac];

	struct ieee80211_he_mu_edca_param_ac_rec *mu_edca;

	int gen = rtwdev->chip->chip_gen;

	u8 aifs, aifsn;

	u16 timer_32us;

	u32 reg;
@@ -356,7 +360,7 @@ static void ____rtw89_conf_tx_mu_edca(struct rtw89_dev *rtwdev, 
	val = FIELD_PREP(B_AX_MUEDCA_BE_PARAM_0_TIMER_MASK, timer_32us) |

	      FIELD_PREP(B_AX_MUEDCA_BE_PARAM_0_CW_MASK, mu_edca->ecw_min_max) |

	      FIELD_PREP(B_AX_MUEDCA_BE_PARAM_0_AIFS_MASK, aifs);

	reg = rtw89_mac_reg_by_idx(rtwdev, ac_to_mu_edca_param[ac], rtwvif->mac_idx);

	reg = rtw89_mac_reg_by_idx(rtwdev, ac_to_mu_edca_param[ac][gen], rtwvif->mac_idx);

	rtw89_write32(rtwdev, reg, val);



	rtw89_mac_set_hw_muedca_ctrl(rtwdev, rtwvif, true);

drivers/net/wireless/realtek/rtw89/reg.h

+5 −0
Original line number Diff line number Diff line
@@ -3780,6 +3780,11 @@ 
#define B_BE_P0_SYNC_PORT_SRC_SEL_MASK GENMASK(26, 24)

#define B_BE_P0_TSFTR_SYNC_OFFSET_MASK GENMASK(18, 0)



#define R_BE_MUEDCA_BE_PARAM_0 0x10350

#define R_BE_MUEDCA_BK_PARAM_0 0x10354

#define R_BE_MUEDCA_VI_PARAM_0 0x10358

#define R_BE_MUEDCA_VO_PARAM_0 0x1035C



#define R_BE_MUEDCA_EN 0x10370

#define R_BE_MUEDCA_EN_C1 0x14370

#define B_BE_MUEDCA_WMM_SEL BIT(8)