Commit 7f69cd42 authored by Zong-Zhe Yang's avatar Zong-Zhe Yang Committed by Kalle Valo
Browse files

wifi: rtw89: mac: generalize register of MU-EDCA switch according to chip gen 



When connected with 802.11ax AP, MU-EDCA parameters are given, so enable
this hardware function by registers according to chip generation.

Signed-off-by: default avatarZong-Zhe Yang <kevin_yang@realtek.com>
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-3-pkshih@realtek.com
parent fbd1829d

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

+8 −2
Original line number Diff line number Diff line
@@ -5593,8 +5593,9 @@ int rtw89_mac_get_tx_retry_limit(struct rtw89_dev *rtwdev, 
int rtw89_mac_set_hw_muedca_ctrl(struct rtw89_dev *rtwdev,

				 struct rtw89_vif *rtwvif, bool en)

{

	const struct rtw89_mac_gen_def *mac = rtwdev->chip->mac_def;

	u8 mac_idx = rtwvif->mac_idx;

	u16 set = B_AX_MUEDCA_EN_0 | B_AX_SET_MUEDCATIMER_TF_0;

	u16 set = mac->muedca_ctrl.mask;

	u32 reg;

	u32 ret;
@@ -5602,7 +5603,7 @@ int rtw89_mac_set_hw_muedca_ctrl(struct rtw89_dev *rtwdev, 
	if (ret)

		return ret;



	reg = rtw89_mac_reg_by_idx(rtwdev, R_AX_MUEDCA_EN, mac_idx);

	reg = rtw89_mac_reg_by_idx(rtwdev, mac->muedca_ctrl.addr, mac_idx);

	if (en)

		rtw89_write16_set(rtwdev, reg, set);

	else
@@ -5754,6 +5755,11 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_ax = { 
	.port_base = &rtw89_port_base_ax,

	.agg_len_ht = R_AX_AGG_LEN_HT_0,



	.muedca_ctrl = {

		.addr = R_AX_MUEDCA_EN,

		.mask = B_AX_MUEDCA_EN_0 | B_AX_SET_MUEDCATIMER_TF_0,

	},



	.disable_cpu = rtw89_mac_disable_cpu_ax,

	.fwdl_enable_wcpu = rtw89_mac_enable_cpu_ax,

	.fwdl_get_status = rtw89_fw_get_rdy_ax,

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

+2 −0
Original line number Diff line number Diff line
@@ -861,6 +861,8 @@ struct rtw89_mac_gen_def { 
	const struct rtw89_port_reg *port_base;

	u32 agg_len_ht;



	struct rtw89_reg_def muedca_ctrl;



	void (*disable_cpu)(struct rtw89_dev *rtwdev);

	int (*fwdl_enable_wcpu)(struct rtw89_dev *rtwdev, u8 boot_reason,

				bool dlfw, bool include_bb);

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

+5 −0
Original line number Diff line number Diff line
@@ -252,6 +252,11 @@ const struct rtw89_mac_gen_def rtw89_mac_gen_be = { 
	.port_base = &rtw89_port_base_be,

	.agg_len_ht = R_BE_AGG_LEN_HT_0,



	.muedca_ctrl = {

		.addr = R_BE_MUEDCA_EN,

		.mask = B_BE_MUEDCA_EN_0 | B_BE_SET_MUEDCATIMER_TF_0,

	},



	.disable_cpu = rtw89_mac_disable_cpu_be,

	.fwdl_enable_wcpu = rtw89_mac_fwdl_enable_wcpu_be,

	.fwdl_get_status = fwdl_get_status_be,

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

+7 −0
Original line number Diff line number Diff line
@@ -3780,6 +3780,13 @@ 
#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_EN 0x10370

#define R_BE_MUEDCA_EN_C1 0x14370

#define B_BE_MUEDCA_WMM_SEL BIT(8)

#define B_BE_SET_MUEDCATIMER_TF_1 BIT(5)

#define B_BE_SET_MUEDCATIMER_TF_0 BIT(4)

#define B_BE_MUEDCA_EN_0 BIT(0)



#define R_BE_PORT_CFG_P0 0x10400

#define R_BE_PORT_CFG_P0_C1 0x14400

#define B_BE_BCN_ERLY_SORT_EN_P0 BIT(18)