Commit e390cf2e authored by Ching-Te Ku's avatar Ching-Te Ku Committed by Kalle Valo
Browse files

rtw89: coex: update WL role info v1 for RTL8852C branch using 



The H2C format and support feature are different. The newer Wi-Fi firmware
and driver branch need to handshake more information like DBCC or P2P
connection info.

Signed-off-by: default avatarChing-Te Ku <ku920601@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/20220725023509.43114-7-pkshih@realtek.com
parent ce986f3d

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

+259 −35
Original line number Diff line number Diff line
@@ -1493,12 +1493,17 @@ static void _fw_set_policy(struct rtw89_dev *rtwdev, u16 policy_type, 


static void _fw_set_drv_info(struct rtw89_dev *rtwdev, u8 type)

{

	const struct rtw89_chip_info *chip = rtwdev->chip;



	switch (type) {

	case CXDRVINFO_INIT:

		rtw89_fw_h2c_cxdrv_init(rtwdev);

		break;

	case CXDRVINFO_ROLE:

		if (chip->chip_id == RTL8852A)

			rtw89_fw_h2c_cxdrv_role(rtwdev);

		else

			rtw89_fw_h2c_cxdrv_role_v1(rtwdev);

		break;

	case CXDRVINFO_CTRL:

		rtw89_fw_h2c_cxdrv_ctrl(rtwdev);
@@ -1768,28 +1773,45 @@ static void _set_bt_afh_info(struct rtw89_dev *rtwdev) 
	struct rtw89_btc_bt_info *bt = &btc->cx.bt;

	struct rtw89_btc_bt_link_info *b = &bt->link_info;

	struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;

	struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1;

	struct rtw89_btc_wl_active_role *r;

	struct rtw89_btc_wl_active_role_v1 *r1;

	u8 en = 0, i, ch = 0, bw = 0;

	u8 mode, connect_cnt;



	if (btc->ctrl.manual || wl->status.map.scan)

		return;



	/* TODO if include module->ant.type == BTC_ANT_SHARED */

	if (chip->chip_id == RTL8852A) {

		mode = wl_rinfo->link_mode;

		connect_cnt = wl_rinfo->connect_cnt;

	} else {

		mode = wl_rinfo_v1->link_mode;

		connect_cnt = wl_rinfo_v1->connect_cnt;

	}



	if (wl->status.map.rf_off || bt->whql_test ||

	    wl_rinfo->link_mode == BTC_WLINK_NOLINK ||

	    wl_rinfo->link_mode == BTC_WLINK_5G ||

	    wl_rinfo->connect_cnt > BTC_TDMA_WLROLE_MAX) {

	    mode == BTC_WLINK_NOLINK || mode == BTC_WLINK_5G ||

	    connect_cnt > BTC_TDMA_WLROLE_MAX) {

		en = false;

	} else if (wl_rinfo->link_mode == BTC_WLINK_2G_MCC ||

		   wl_rinfo->link_mode == BTC_WLINK_2G_SCC) {

	} else if (mode == BTC_WLINK_2G_MCC || mode == BTC_WLINK_2G_SCC) {

		en = true;

		/* get p2p channel */

		for (i = 0; i < RTW89_PORT_NUM; i++) {

			if (wl_rinfo->active_role[i].role ==

			    RTW89_WIFI_ROLE_P2P_GO ||

			    wl_rinfo->active_role[i].role ==

			    RTW89_WIFI_ROLE_P2P_CLIENT) {

				ch = wl_rinfo->active_role[i].ch;

				bw = wl_rinfo->active_role[i].bw;

			r = &wl_rinfo->active_role[i];

			r1 = &wl_rinfo_v1->active_role_v1[i];



			if (chip->chip_id == RTL8852A &&

			    (r->role == RTW89_WIFI_ROLE_P2P_GO ||

			     r->role == RTW89_WIFI_ROLE_P2P_CLIENT)) {

				ch = r->ch;

				bw = r->bw;

				break;

			} else if (chip->chip_id != RTL8852A &&

				   (r1->role == RTW89_WIFI_ROLE_P2P_GO ||

				    r1->role == RTW89_WIFI_ROLE_P2P_CLIENT)) {

				ch = r1->ch;

				bw = r1->bw;

				break;

			}

		}
@@ -1797,10 +1819,18 @@ static void _set_bt_afh_info(struct rtw89_dev *rtwdev) 
		en = true;

		/* get 2g channel  */

		for (i = 0; i < RTW89_PORT_NUM; i++) {

			if (wl_rinfo->active_role[i].connected &&

			    wl_rinfo->active_role[i].band == RTW89_BAND_2G) {

				ch = wl_rinfo->active_role[i].ch;

				bw = wl_rinfo->active_role[i].bw;

			r = &wl_rinfo->active_role[i];

			r1 = &wl_rinfo_v1->active_role_v1[i];



			if (chip->chip_id == RTL8852A &&

			    r->connected && r->band == RTW89_BAND_2G) {

				ch = r->ch;

				bw = r->bw;

				break;

			} else if (chip->chip_id != RTL8852A &&

				   r1->connected && r1->band == RTW89_BAND_2G) {

				ch = r1->ch;

				bw = r1->bw;

				break;

			}

		}
@@ -1853,6 +1883,7 @@ static bool _check_freerun(struct rtw89_dev *rtwdev) 
	struct rtw89_btc_wl_info *wl = &btc->cx.wl;

	struct rtw89_btc_bt_info *bt = &btc->cx.bt;

	struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;

	struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1;

	struct rtw89_btc_bt_link_info *bt_linfo = &bt->link_info;

	struct rtw89_btc_bt_hid_desc *hid = &bt_linfo->hid_desc;
@@ -1862,7 +1893,8 @@ static bool _check_freerun(struct rtw89_dev *rtwdev) 
	}



	/* The below is dedicated antenna case */

	if (wl_rinfo->connect_cnt > BTC_TDMA_WLROLE_MAX) {

	if (wl_rinfo->connect_cnt > BTC_TDMA_WLROLE_MAX ||

	    wl_rinfo_v1->connect_cnt > BTC_TDMA_WLROLE_MAX) {

		btc->dm.trx_para_level = 5;

		return true;

	}
@@ -2877,19 +2909,27 @@ static void _action_wl_rfk(struct rtw89_dev *rtwdev) 


static void _set_btg_ctrl(struct rtw89_dev *rtwdev)

{

	const struct rtw89_chip_info *chip = rtwdev->chip;

	struct rtw89_btc *btc = &rtwdev->btc;

	struct rtw89_btc_wl_info *wl = &btc->cx.wl;

	struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;

	struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1;

	struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;

	bool is_btg = false;

	bool is_btg;

	u8 mode;



	if (btc->ctrl.manual)

		return;



	if (chip->chip_id == RTL8852A)

		mode = wl_rinfo->link_mode;

	else

		mode = wl_rinfo_v1->link_mode;



	/* notify halbb ignore GNT_BT or not for WL BB Rx-AGC control */

	if (wl_rinfo->link_mode == BTC_WLINK_5G) /* always 0 if 5G */

	if (mode == BTC_WLINK_5G) /* always 0 if 5G */

		is_btg = false;

	else if (wl_rinfo->link_mode == BTC_WLINK_25G_DBCC &&

	else if (mode == BTC_WLINK_25G_DBCC &&

		 wl_dinfo->real_band[RTW89_PHY_1] != RTW89_BAND_2G)

		is_btg = false;

	else
@@ -2901,7 +2941,7 @@ static void _set_btg_ctrl(struct rtw89_dev *rtwdev) 


	btc->dm.wl_btg_rx = is_btg;



	if (wl_rinfo->link_mode == BTC_WLINK_25G_MCC)

	if (mode == BTC_WLINK_25G_MCC)

		return;



	rtw89_ctrl_btg(rtwdev, is_btg);
@@ -2974,6 +3014,7 @@ static void rtw89_tx_time_iter(void *data, struct ieee80211_sta *sta) 


static void _set_wl_tx_limit(struct rtw89_dev *rtwdev)

{

	const struct rtw89_chip_info *chip = rtwdev->chip;

	struct rtw89_btc *btc = &rtwdev->btc;

	struct rtw89_btc_cx *cx = &btc->cx;

	struct rtw89_btc_dm *dm = &btc->dm;
@@ -2983,16 +3024,22 @@ static void _set_wl_tx_limit(struct rtw89_dev *rtwdev) 
	struct rtw89_btc_bt_hfp_desc *hfp = &b->hfp_desc;

	struct rtw89_btc_bt_hid_desc *hid = &b->hid_desc;

	struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;

	struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1;

	struct rtw89_txtime_data data = {.rtwdev = rtwdev};

	u8 mode = wl_rinfo->link_mode;

	u8 tx_retry = 0;

	u32 tx_time = 0;

	u16 enable = 0;

	u8 mode;

	u8 tx_retry;

	u32 tx_time;

	u16 enable;

	bool reenable = false;



	if (btc->ctrl.manual)

		return;



	if (chip->chip_id == RTL8852A)

		mode = wl_rinfo->link_mode;

	else

		mode = wl_rinfo_v1->link_mode;



	if (btc->dm.freerun || btc->ctrl.igno_bt || b->profile_cnt.now == 0 ||

	    mode == BTC_WLINK_5G || mode == BTC_WLINK_NOLINK) {

		enable = 0;
@@ -3036,13 +3083,21 @@ static void _set_wl_tx_limit(struct rtw89_dev *rtwdev) 


static void _set_bt_rx_agc(struct rtw89_dev *rtwdev)

{

	const struct rtw89_chip_info *chip = rtwdev->chip;

	struct rtw89_btc *btc = &rtwdev->btc;

	struct rtw89_btc_wl_info *wl = &btc->cx.wl;

	struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;

	struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1;

	struct rtw89_btc_bt_info *bt = &btc->cx.bt;

	bool bt_hi_lna_rx = false;

	u8 mode;



	if (chip->chip_id == RTL8852A)

		mode = wl_rinfo->link_mode;

	else

		mode = wl_rinfo_v1->link_mode;



	if (wl_rinfo->link_mode != BTC_WLINK_NOLINK && btc->dm.wl_btg_rx)

	if (mode != BTC_WLINK_NOLINK && btc->dm.wl_btg_rx)

		bt_hi_lna_rx = true;



	if (bt_hi_lna_rx == bt->hi_lna_rx)
@@ -3519,6 +3574,156 @@ static void _update_wl_info(struct rtw89_dev *rtwdev) 
	_fw_set_drv_info(rtwdev, CXDRVINFO_ROLE);

}



static void _update_wl_info_v1(struct rtw89_dev *rtwdev)

{

	struct rtw89_btc *btc = &rtwdev->btc;

	struct rtw89_btc_wl_info *wl = &btc->cx.wl;

	struct rtw89_btc_wl_link_info *wl_linfo = wl->link_info;

	struct rtw89_btc_wl_role_info_v1 *wl_rinfo = &wl->role_info_v1;

	struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;

	u8 cnt_connect = 0, cnt_connecting = 0, cnt_active = 0;

	u8 cnt_2g = 0, cnt_5g = 0, phy;

	u32 wl_2g_ch[2] = {}, wl_5g_ch[2] = {};

	bool b2g = false, b5g = false, client_joined = false;

	u8 i;



	memset(wl_rinfo, 0, sizeof(*wl_rinfo));



	for (i = 0; i < RTW89_PORT_NUM; i++) {

		if (!wl_linfo[i].active)

			continue;



		cnt_active++;

		wl_rinfo->active_role_v1[cnt_active - 1].role = wl_linfo[i].role;

		wl_rinfo->active_role_v1[cnt_active - 1].pid = wl_linfo[i].pid;

		wl_rinfo->active_role_v1[cnt_active - 1].phy = wl_linfo[i].phy;

		wl_rinfo->active_role_v1[cnt_active - 1].band = wl_linfo[i].band;

		wl_rinfo->active_role_v1[cnt_active - 1].noa = (u8)wl_linfo[i].noa;

		wl_rinfo->active_role_v1[cnt_active - 1].connected = 0;



		wl->port_id[wl_linfo[i].role] = wl_linfo[i].pid;



		phy = wl_linfo[i].phy;



		if (rtwdev->dbcc_en && phy < RTW89_PHY_MAX) {

			wl_dinfo->role[phy] = wl_linfo[i].role;

			wl_dinfo->op_band[phy] = wl_linfo[i].band;

			_update_dbcc_band(rtwdev, phy);

			_fw_set_drv_info(rtwdev, CXDRVINFO_DBCC);

		}



		if (wl_linfo[i].connected == MLME_NO_LINK) {

			continue;

		} else if (wl_linfo[i].connected == MLME_LINKING) {

			cnt_connecting++;

		} else {

			cnt_connect++;

			if ((wl_linfo[i].role == RTW89_WIFI_ROLE_P2P_GO ||

			     wl_linfo[i].role == RTW89_WIFI_ROLE_AP) &&

			     wl_linfo[i].client_cnt > 1)

				client_joined = true;

		}



		wl_rinfo->role_map.val |= BIT(wl_linfo[i].role);

		wl_rinfo->active_role_v1[cnt_active - 1].ch = wl_linfo[i].ch;

		wl_rinfo->active_role_v1[cnt_active - 1].bw = wl_linfo[i].bw;

		wl_rinfo->active_role_v1[cnt_active - 1].connected = 1;



		/* only care 2 roles + BT coex */

		if (wl_linfo[i].band != RTW89_BAND_2G) {

			if (cnt_5g <= ARRAY_SIZE(wl_5g_ch) - 1)

				wl_5g_ch[cnt_5g] = wl_linfo[i].ch;

			cnt_5g++;

			b5g = true;

		} else {

			if (cnt_2g <= ARRAY_SIZE(wl_2g_ch) - 1)

				wl_2g_ch[cnt_2g] = wl_linfo[i].ch;

			cnt_2g++;

			b2g = true;

		}

	}



	wl_rinfo->connect_cnt = cnt_connect;



	/* Be careful to change the following sequence!! */

	if (cnt_connect == 0) {

		wl_rinfo->link_mode = BTC_WLINK_NOLINK;

		wl_rinfo->role_map.role.none = 1;

	} else if (!b2g && b5g) {

		wl_rinfo->link_mode = BTC_WLINK_5G;

	} else if (wl_rinfo->role_map.role.nan) {

		wl_rinfo->link_mode = BTC_WLINK_2G_NAN;

	} else if (cnt_connect > BTC_TDMA_WLROLE_MAX) {

		wl_rinfo->link_mode = BTC_WLINK_OTHER;

	} else  if (b2g && b5g && cnt_connect == 2) {

		if (rtwdev->dbcc_en) {

			switch (wl_dinfo->role[RTW89_PHY_0]) {

			case RTW89_WIFI_ROLE_STATION:

				wl_rinfo->link_mode = BTC_WLINK_2G_STA;

				break;

			case RTW89_WIFI_ROLE_P2P_GO:

				wl_rinfo->link_mode = BTC_WLINK_2G_GO;

				break;

			case RTW89_WIFI_ROLE_P2P_CLIENT:

				wl_rinfo->link_mode = BTC_WLINK_2G_GC;

				break;

			case RTW89_WIFI_ROLE_AP:

				wl_rinfo->link_mode = BTC_WLINK_2G_AP;

				break;

			default:

				wl_rinfo->link_mode = BTC_WLINK_OTHER;

				break;

			}

		} else {

			wl_rinfo->link_mode = BTC_WLINK_25G_MCC;

		}

	} else if (!b5g && cnt_connect == 2) {

		if (wl_rinfo->role_map.role.station &&

		    (wl_rinfo->role_map.role.p2p_go ||

		    wl_rinfo->role_map.role.p2p_gc ||

		    wl_rinfo->role_map.role.ap)) {

			if (wl_2g_ch[0] == wl_2g_ch[1])

				wl_rinfo->link_mode = BTC_WLINK_2G_SCC;

			else

				wl_rinfo->link_mode = BTC_WLINK_2G_MCC;

		} else {

			wl_rinfo->link_mode = BTC_WLINK_2G_MCC;

		}

	} else if (!b5g && cnt_connect == 1) {

		if (wl_rinfo->role_map.role.station)

			wl_rinfo->link_mode = BTC_WLINK_2G_STA;

		else if (wl_rinfo->role_map.role.ap)

			wl_rinfo->link_mode = BTC_WLINK_2G_AP;

		else if (wl_rinfo->role_map.role.p2p_go)

			wl_rinfo->link_mode = BTC_WLINK_2G_GO;

		else if (wl_rinfo->role_map.role.p2p_gc)

			wl_rinfo->link_mode = BTC_WLINK_2G_GC;

		else

			wl_rinfo->link_mode = BTC_WLINK_OTHER;

	}



	/* if no client_joined, don't care P2P-GO/AP role */

	if (wl_rinfo->role_map.role.p2p_go || wl_rinfo->role_map.role.ap) {

		if (!client_joined) {

			if (wl_rinfo->link_mode == BTC_WLINK_2G_SCC ||

			    wl_rinfo->link_mode == BTC_WLINK_2G_MCC) {

				wl_rinfo->link_mode = BTC_WLINK_2G_STA;

				wl_rinfo->connect_cnt = 1;

			} else if (wl_rinfo->link_mode == BTC_WLINK_2G_GO ||

				 wl_rinfo->link_mode == BTC_WLINK_2G_AP) {

				wl_rinfo->link_mode = BTC_WLINK_NOLINK;

				wl_rinfo->connect_cnt = 0;

			}

		}

	}



	rtw89_debug(rtwdev, RTW89_DBG_BTC,

		    "[BTC], cnt_connect = %d, connecting = %d, link_mode = %d\n",

		    cnt_connect, cnt_connecting, wl_rinfo->link_mode);



	_fw_set_drv_info(rtwdev, CXDRVINFO_ROLE);

}



#define BTC_CHK_HANG_MAX 3

#define BTC_SCB_INV_VALUE GENMASK(31, 0)
@@ -3669,23 +3874,31 @@ static bool _chk_wl_rfk_request(struct rtw89_dev *rtwdev) 
static

void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason)

{

	const struct rtw89_chip_info *chip = rtwdev->chip;

	struct rtw89_btc *btc = &rtwdev->btc;

	struct rtw89_btc_dm *dm = &rtwdev->btc.dm;

	struct rtw89_btc_cx *cx = &btc->cx;

	struct rtw89_btc_wl_info *wl = &btc->cx.wl;

	struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;

	u8 mode = wl_rinfo->link_mode;

	struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1;

	u8 mode;



	lockdep_assert_held(&rtwdev->mutex);

	rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s(): reason=%d, mode=%d\n",

		    __func__, reason, mode);

	rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s(): wl_only=%d, bt_only=%d\n",

		    __func__, dm->wl_only, dm->bt_only);



	dm->run_reason = reason;

	_update_dm_step(rtwdev, reason);

	_update_btc_state_map(rtwdev);



	if (chip->chip_id == RTL8852A)

		mode = wl_rinfo->link_mode;

	else

		mode = wl_rinfo_v1->link_mode;



	rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s(): reason=%d, mode=%d\n",

		    __func__, reason, mode);

	rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s(): wl_only=%d, bt_only=%d\n",

		    __func__, dm->wl_only, dm->bt_only);



	/* Be careful to change the following function sequence!! */

	if (btc->ctrl.manual) {

		rtw89_debug(rtwdev, RTW89_DBG_BTC,
@@ -4239,6 +4452,7 @@ void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif 
			      struct rtw89_sta *rtwsta, enum btc_role_state state)

{

	const struct rtw89_chan *chan = rtw89_chan_get(rtwdev, RTW89_SUB_ENTITY_0);

	const struct rtw89_chip_info *chip = rtwdev->chip;

	struct ieee80211_vif *vif = rtwvif_to_vif(rtwvif);

	struct ieee80211_sta *sta = rtwsta_to_sta(rtwsta);

	struct rtw89_btc *btc = &rtwdev->btc;
@@ -4305,7 +4519,10 @@ void rtw89_btc_ntfy_role_info(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif 
	wlinfo = &wl->link_info[r.pid];



	memcpy(wlinfo, &r, sizeof(*wlinfo));

	if (chip->chip_id == RTL8852A)

		_update_wl_info(rtwdev);

	else

		_update_wl_info_v1(rtwdev);



	if (wlinfo->role == RTW89_WIFI_ROLE_STATION &&

	    wlinfo->connected == MLME_NO_LINK)
@@ -4819,18 +5036,25 @@ static void _show_wl_role_info(struct rtw89_dev *rtwdev, struct seq_file *m) 


static void _show_wl_info(struct rtw89_dev *rtwdev, struct seq_file *m)

{

	const struct rtw89_chip_info *chip = rtwdev->chip;

	struct rtw89_btc *btc = &rtwdev->btc;

	struct rtw89_btc_cx *cx = &btc->cx;

	struct rtw89_btc_wl_info *wl = &cx->wl;

	struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;

	struct rtw89_btc_wl_role_info_v1 *wl_rinfo_v1 = &wl->role_info_v1;

	u8 mode;



	if (!(btc->dm.coex_info_map & BTC_COEX_INFO_WL))

		return;



	seq_puts(m, "========== [WL Status] ==========\n");



	seq_printf(m, " %-15s : link_mode:%d, ",

		   "[status]", (u32)wl_rinfo->link_mode);

	if (chip->chip_id == RTL8852A)

		mode = wl_rinfo->link_mode;

	else

		mode = wl_rinfo_v1->link_mode;



	seq_printf(m, " %-15s : link_mode:%d, ", "[status]", mode);



	seq_printf(m,

		   "rf_off:%d, power_save:%d, scan:%s(band:%d/phy_map:0x%x), ",

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

+37 −0
Original line number Diff line number Diff line
@@ -1123,6 +1123,27 @@ struct rtw89_btc_wl_active_role { 
	u16 rx_rate;

};



struct rtw89_btc_wl_active_role_v1 {

	u8 connected: 1;

	u8 pid: 3;

	u8 phy: 1;

	u8 noa: 1;

	u8 band: 2;



	u8 client_ps: 1;

	u8 bw: 7;



	u8 role;

	u8 ch;



	u16 tx_lvl;

	u16 rx_lvl;

	u16 tx_rate;

	u16 rx_rate;



	u32 noa_duration; /* ms */

};



struct rtw89_btc_wl_role_info_bpos {

	u16 none: 1;

	u16 station: 1;
@@ -1150,6 +1171,21 @@ struct rtw89_btc_wl_role_info { /* struct size must be n*4 bytes */ 
	struct rtw89_btc_wl_active_role active_role[RTW89_PORT_NUM];

};



struct rtw89_btc_wl_role_info_v1 { /* struct size must be n*4 bytes */

	u8 connect_cnt;

	u8 link_mode;

	union rtw89_btc_wl_role_info_map role_map;

	struct rtw89_btc_wl_active_role_v1 active_role_v1[RTW89_PORT_NUM];

	u32 mrole_type; /* btc_wl_mrole_type */

	u32 mrole_noa_duration; /* ms */



	u32 dbcc_en: 1;

	u32 dbcc_chg: 1;

	u32 dbcc_2g_phy: 2; /* which phy operate in 2G, HW_PHY_0 or HW_PHY_1 */

	u32 link_mode_chg: 1;

	u32 rsvd: 27;

};



struct rtw89_btc_wl_ver_info {

	u32 fw_coex; /* match with which coex_ver */

	u32 fw;
@@ -1255,6 +1291,7 @@ struct rtw89_btc_wl_info { 
	struct rtw89_btc_wl_ver_info  ver_info;

	struct rtw89_btc_wl_afh_info afh_info;

	struct rtw89_btc_wl_role_info role_info;

	struct rtw89_btc_wl_role_info_v1 role_info_v1;

	struct rtw89_btc_wl_scan_info scan_info;

	struct rtw89_btc_wl_dbcc_info dbcc_info;

	struct rtw89_btc_rf_para rf_para;

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

+100 −13
Original line number Diff line number Diff line
@@ -1448,7 +1448,12 @@ int rtw89_fw_h2c_cxdrv_init(struct rtw89_dev *rtwdev) 
	return -EBUSY;

}



#define PORT_DATA_OFFSET 4

#define H2C_LEN_CXDRVINFO_ROLE_DBCC_LEN 12

#define H2C_LEN_CXDRVINFO_ROLE (4 + 12 * RTW89_PORT_NUM + H2C_LEN_CXDRVHDR)

#define H2C_LEN_CXDRVINFO_ROLE_V1 (4 + 16 * RTW89_PORT_NUM + \

				   H2C_LEN_CXDRVINFO_ROLE_DBCC_LEN + \

				   H2C_LEN_CXDRVHDR)

int rtw89_fw_h2c_cxdrv_role(struct rtw89_dev *rtwdev)

{

	struct rtw89_btc *btc = &rtwdev->btc;
@@ -1457,6 +1462,7 @@ int rtw89_fw_h2c_cxdrv_role(struct rtw89_dev *rtwdev) 
	struct rtw89_btc_wl_role_info_bpos *bpos = &role_info->role_map.role;

	struct rtw89_btc_wl_active_role *active = role_info->active_role;

	struct sk_buff *skb;

	u8 offset = 0;

	u8 *cmd;

	int i;
@@ -1488,19 +1494,19 @@ int rtw89_fw_h2c_cxdrv_role(struct rtw89_dev *rtwdev) 
	RTW89_SET_FWCMD_CXROLE_ROLE_NAN(cmd, bpos->nan);



	for (i = 0; i < RTW89_PORT_NUM; i++, active++) {

		RTW89_SET_FWCMD_CXROLE_ACT_CONNECTED(cmd, active->connected, i);

		RTW89_SET_FWCMD_CXROLE_ACT_PID(cmd, active->pid, i);

		RTW89_SET_FWCMD_CXROLE_ACT_PHY(cmd, active->phy, i);

		RTW89_SET_FWCMD_CXROLE_ACT_NOA(cmd, active->noa, i);

		RTW89_SET_FWCMD_CXROLE_ACT_BAND(cmd, active->band, i);

		RTW89_SET_FWCMD_CXROLE_ACT_CLIENT_PS(cmd, active->client_ps, i);

		RTW89_SET_FWCMD_CXROLE_ACT_BW(cmd, active->bw, i);

		RTW89_SET_FWCMD_CXROLE_ACT_ROLE(cmd, active->role, i);

		RTW89_SET_FWCMD_CXROLE_ACT_CH(cmd, active->ch, i);

		RTW89_SET_FWCMD_CXROLE_ACT_TX_LVL(cmd, active->tx_lvl, i);

		RTW89_SET_FWCMD_CXROLE_ACT_RX_LVL(cmd, active->rx_lvl, i);

		RTW89_SET_FWCMD_CXROLE_ACT_TX_RATE(cmd, active->tx_rate, i);

		RTW89_SET_FWCMD_CXROLE_ACT_RX_RATE(cmd, active->rx_rate, i);

		RTW89_SET_FWCMD_CXROLE_ACT_CONNECTED(cmd, active->connected, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_PID(cmd, active->pid, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_PHY(cmd, active->phy, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_NOA(cmd, active->noa, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_BAND(cmd, active->band, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_CLIENT_PS(cmd, active->client_ps, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_BW(cmd, active->bw, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_ROLE(cmd, active->role, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_CH(cmd, active->ch, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_TX_LVL(cmd, active->tx_lvl, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_RX_LVL(cmd, active->rx_lvl, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_TX_RATE(cmd, active->tx_rate, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_RX_RATE(cmd, active->rx_rate, i, offset);

	}



	rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,
@@ -1520,6 +1526,87 @@ int rtw89_fw_h2c_cxdrv_role(struct rtw89_dev *rtwdev) 
	return -EBUSY;

}



int rtw89_fw_h2c_cxdrv_role_v1(struct rtw89_dev *rtwdev)

{

	struct rtw89_btc *btc = &rtwdev->btc;

	struct rtw89_btc_wl_info *wl = &btc->cx.wl;

	struct rtw89_btc_wl_role_info_v1 *role_info = &wl->role_info_v1;

	struct rtw89_btc_wl_role_info_bpos *bpos = &role_info->role_map.role;

	struct rtw89_btc_wl_active_role_v1 *active = role_info->active_role_v1;

	struct sk_buff *skb;

	u8 *cmd, offset;

	int i;



	skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, H2C_LEN_CXDRVINFO_ROLE_V1);

	if (!skb) {

		rtw89_err(rtwdev, "failed to alloc skb for h2c cxdrv_role\n");

		return -ENOMEM;

	}

	skb_put(skb, H2C_LEN_CXDRVINFO_ROLE_V1);

	cmd = skb->data;



	RTW89_SET_FWCMD_CXHDR_TYPE(cmd, CXDRVINFO_ROLE);

	RTW89_SET_FWCMD_CXHDR_LEN(cmd, H2C_LEN_CXDRVINFO_ROLE_V1 - H2C_LEN_CXDRVHDR);



	RTW89_SET_FWCMD_CXROLE_CONNECT_CNT(cmd, role_info->connect_cnt);

	RTW89_SET_FWCMD_CXROLE_LINK_MODE(cmd, role_info->link_mode);



	RTW89_SET_FWCMD_CXROLE_ROLE_NONE(cmd, bpos->none);

	RTW89_SET_FWCMD_CXROLE_ROLE_STA(cmd, bpos->station);

	RTW89_SET_FWCMD_CXROLE_ROLE_AP(cmd, bpos->ap);

	RTW89_SET_FWCMD_CXROLE_ROLE_VAP(cmd, bpos->vap);

	RTW89_SET_FWCMD_CXROLE_ROLE_ADHOC(cmd, bpos->adhoc);

	RTW89_SET_FWCMD_CXROLE_ROLE_ADHOC_MASTER(cmd, bpos->adhoc_master);

	RTW89_SET_FWCMD_CXROLE_ROLE_MESH(cmd, bpos->mesh);

	RTW89_SET_FWCMD_CXROLE_ROLE_MONITOR(cmd, bpos->moniter);

	RTW89_SET_FWCMD_CXROLE_ROLE_P2P_DEV(cmd, bpos->p2p_device);

	RTW89_SET_FWCMD_CXROLE_ROLE_P2P_GC(cmd, bpos->p2p_gc);

	RTW89_SET_FWCMD_CXROLE_ROLE_P2P_GO(cmd, bpos->p2p_go);

	RTW89_SET_FWCMD_CXROLE_ROLE_NAN(cmd, bpos->nan);



	offset = PORT_DATA_OFFSET;

	for (i = 0; i < RTW89_PORT_NUM; i++, active++) {

		RTW89_SET_FWCMD_CXROLE_ACT_CONNECTED(cmd, active->connected, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_PID(cmd, active->pid, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_PHY(cmd, active->phy, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_NOA(cmd, active->noa, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_BAND(cmd, active->band, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_CLIENT_PS(cmd, active->client_ps, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_BW(cmd, active->bw, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_ROLE(cmd, active->role, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_CH(cmd, active->ch, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_TX_LVL(cmd, active->tx_lvl, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_RX_LVL(cmd, active->rx_lvl, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_TX_RATE(cmd, active->tx_rate, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_RX_RATE(cmd, active->rx_rate, i, offset);

		RTW89_SET_FWCMD_CXROLE_ACT_NOA_DUR(cmd, active->noa_duration, i, offset);

	}



	offset = H2C_LEN_CXDRVINFO_ROLE_V1 - H2C_LEN_CXDRVINFO_ROLE_DBCC_LEN;

	RTW89_SET_FWCMD_CXROLE_MROLE_TYPE(cmd, role_info->mrole_type, offset);

	RTW89_SET_FWCMD_CXROLE_MROLE_NOA(cmd, role_info->mrole_noa_duration, offset);

	RTW89_SET_FWCMD_CXROLE_DBCC_EN(cmd, role_info->dbcc_en, offset);

	RTW89_SET_FWCMD_CXROLE_DBCC_CHG(cmd, role_info->dbcc_chg, offset);

	RTW89_SET_FWCMD_CXROLE_DBCC_2G_PHY(cmd, role_info->dbcc_2g_phy, offset);

	RTW89_SET_FWCMD_CXROLE_LINK_MODE_CHG(cmd, role_info->link_mode_chg, offset);



	rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,

			      H2C_CAT_OUTSRC, BTFC_SET,

			      SET_DRV_INFO, 0, 0,

			      H2C_LEN_CXDRVINFO_ROLE_V1);



	if (rtw89_h2c_tx(rtwdev, skb, false)) {

		rtw89_err(rtwdev, "failed to send h2c\n");

		goto fail;

	}



	return 0;

fail:

	dev_kfree_skb_any(skb);



	return -EBUSY;

}



#define H2C_LEN_CXDRVINFO_CTRL (4 + H2C_LEN_CXDRVHDR)

int rtw89_fw_h2c_cxdrv_ctrl(struct rtw89_dev *rtwdev)

{

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

+62 −26

File changed.

Preview size limit exceeded, changes collapsed.