rtw89: coex: Add v1 version TDMA format and parameters (ce986f3d) · Commits · jan.koester / Linux

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

+60 −13

Original line number	Original line	Diff line number	Diff line
	@@ -923,8 +923,13 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
	break;		break;
	case BTC_RPT_TYPE_TDMA:		case BTC_RPT_TYPE_TDMA:
	pcinfo = &pfwinfo->rpt_fbtc_tdma.cinfo;		pcinfo = &pfwinfo->rpt_fbtc_tdma.cinfo;
	pfinfo = (u8 *)(&pfwinfo->rpt_fbtc_tdma.finfo);		if (chip->chip_id == RTL8852A) {
			pfinfo = (u8 *)&pfwinfo->rpt_fbtc_tdma.finfo;
	pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_tdma.finfo);		pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_tdma.finfo);
			} else {
			pfinfo = (u8 *)&pfwinfo->rpt_fbtc_tdma.finfo_v1;
			pcinfo->req_len = sizeof(pfwinfo->rpt_fbtc_tdma.finfo_v1);
			}
	pcinfo->req_fver = chip->fcxtdma_ver;		pcinfo->req_fver = chip->fcxtdma_ver;
	pcinfo->rx_len = rpt_len;		pcinfo->rx_len = rpt_len;
	pcinfo->rx_cnt++;		pcinfo->rx_cnt++;
	@@ -1037,7 +1042,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
	memcpy(pfinfo, rpt_content, pcinfo->req_len);		memcpy(pfinfo, rpt_content, pcinfo->req_len);
	pcinfo->valid = 1;		pcinfo->valid = 1;

	if (rpt_type == BTC_RPT_TYPE_TDMA) {		if (rpt_type == BTC_RPT_TYPE_TDMA && chip->chip_id == RTL8852A) {
	rtw89_debug(rtwdev, RTW89_DBG_BTC,		rtw89_debug(rtwdev, RTW89_DBG_BTC,
	"[BTC], %s(): check %d %zu\n", __func__,		"[BTC], %s(): check %d %zu\n", __func__,
	BTC_DCNT_TDMA_NONSYNC, sizeof(dm->tdma_now));		BTC_DCNT_TDMA_NONSYNC, sizeof(dm->tdma_now));
	@@ -1050,7 +1055,8 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
	dm->tdma_now.type, dm->tdma_now.rxflctrl,		dm->tdma_now.type, dm->tdma_now.rxflctrl,
	dm->tdma_now.txpause, dm->tdma_now.wtgle_n,		dm->tdma_now.txpause, dm->tdma_now.wtgle_n,
	dm->tdma_now.leak_n, dm->tdma_now.ext_ctrl,		dm->tdma_now.leak_n, dm->tdma_now.ext_ctrl,
	dm->tdma_now.rsvd0, dm->tdma_now.rsvd1);		dm->tdma_now.rxflctrl_role,
			dm->tdma_now.option_ctrl);

	rtw89_debug(rtwdev, RTW89_DBG_BTC,		rtw89_debug(rtwdev, RTW89_DBG_BTC,
	"[BTC], %s(): %d rpt_fbtc_tdma %x %x %x %x %x %x %x %x\n",		"[BTC], %s(): %d rpt_fbtc_tdma %x %x %x %x %x %x %x %x\n",
	@@ -1061,14 +1067,46 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
	pfwinfo->rpt_fbtc_tdma.finfo.wtgle_n,		pfwinfo->rpt_fbtc_tdma.finfo.wtgle_n,
	pfwinfo->rpt_fbtc_tdma.finfo.leak_n,		pfwinfo->rpt_fbtc_tdma.finfo.leak_n,
	pfwinfo->rpt_fbtc_tdma.finfo.ext_ctrl,		pfwinfo->rpt_fbtc_tdma.finfo.ext_ctrl,
	pfwinfo->rpt_fbtc_tdma.finfo.rsvd0,		pfwinfo->rpt_fbtc_tdma.finfo.rxflctrl_role,
	pfwinfo->rpt_fbtc_tdma.finfo.rsvd1);		pfwinfo->rpt_fbtc_tdma.finfo.option_ctrl);
	}		}

	_chk_btc_err(rtwdev, BTC_DCNT_TDMA_NONSYNC,		_chk_btc_err(rtwdev, BTC_DCNT_TDMA_NONSYNC,
	memcmp(&dm->tdma_now,		memcmp(&dm->tdma_now,
	&pfwinfo->rpt_fbtc_tdma.finfo,		&pfwinfo->rpt_fbtc_tdma.finfo,
	sizeof(dm->tdma_now)));		sizeof(dm->tdma_now)));
			} else if (rpt_type == BTC_RPT_TYPE_TDMA) {
			rtw89_debug(rtwdev, RTW89_DBG_BTC,
			"[BTC], %s(): check %d %zu\n", __func__,
			BTC_DCNT_TDMA_NONSYNC, sizeof(dm->tdma_now));

			if (memcmp(&dm->tdma_now, &pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma,
			sizeof(dm->tdma_now)) != 0) {
			rtw89_debug(rtwdev, RTW89_DBG_BTC,
			"[BTC], %s(): %d tdma_now %x %x %x %x %x %x %x %x\n",
			__func__, BTC_DCNT_TDMA_NONSYNC,
			dm->tdma_now.type, dm->tdma_now.rxflctrl,
			dm->tdma_now.txpause, dm->tdma_now.wtgle_n,
			dm->tdma_now.leak_n, dm->tdma_now.ext_ctrl,
			dm->tdma_now.rxflctrl_role,
			dm->tdma_now.option_ctrl);
			rtw89_debug(rtwdev, RTW89_DBG_BTC,
			"[BTC], %s(): %d rpt_fbtc_tdma %x %x %x %x %x %x %x %x\n",
			__func__, BTC_DCNT_TDMA_NONSYNC,
			pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.type,
			pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.rxflctrl,
			pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.txpause,
			pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.wtgle_n,
			pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.leak_n,
			pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.ext_ctrl,
			pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.rxflctrl_role,
			pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma.option_ctrl);
			}

			_chk_btc_err(rtwdev, BTC_DCNT_TDMA_NONSYNC,
			memcmp(&dm->tdma_now,
			&pfwinfo->rpt_fbtc_tdma.finfo_v1.tdma,
			sizeof(dm->tdma_now)));
	}		}

	if (rpt_type == BTC_RPT_TYPE_SLOT) {		if (rpt_type == BTC_RPT_TYPE_SLOT) {
	@@ -1220,10 +1258,12 @@ static void _parse_btc_report(struct rtw89_dev *rtwdev,

	static void _append_tdma(struct rtw89_dev *rtwdev)		static void _append_tdma(struct rtw89_dev *rtwdev)
	{		{
			const struct rtw89_chip_info *chip = rtwdev->chip;
	struct rtw89_btc *btc = &rtwdev->btc;		struct rtw89_btc *btc = &rtwdev->btc;
	struct rtw89_btc_dm *dm = &btc->dm;		struct rtw89_btc_dm *dm = &btc->dm;
	struct rtw89_btc_btf_tlv *tlv = NULL;		struct rtw89_btc_btf_tlv *tlv;
	struct rtw89_btc_fbtc_tdma *v = NULL;		struct rtw89_btc_fbtc_tdma *v;
			struct rtw89_btc_fbtc_tdma_v1 *v1;
	u16 len = btc->policy_len;		u16 len = btc->policy_len;

	if (!btc->update_policy_force &&		if (!btc->update_policy_force &&
	@@ -1235,12 +1275,19 @@ static void _append_tdma(struct rtw89_dev *rtwdev)
	}		}

	tlv = (struct rtw89_btc_btf_tlv *)&btc->policy[len];		tlv = (struct rtw89_btc_btf_tlv *)&btc->policy[len];
	v = (struct rtw89_btc_fbtc_tdma *)&tlv->val[0];
	tlv->type = CXPOLICY_TDMA;		tlv->type = CXPOLICY_TDMA;
			if (chip->chip_id == RTL8852A) {
			v = (struct rtw89_btc_fbtc_tdma *)&tlv->val[0];
	tlv->len = sizeof(*v);		tlv->len = sizeof(*v);

	memcpy(v, &dm->tdma, sizeof(*v));		memcpy(v, &dm->tdma, sizeof(*v));
	btc->policy_len += BTC_TLV_HDR_LEN + sizeof(*v);		btc->policy_len += BTC_TLV_HDR_LEN + sizeof(*v);
			} else {
			tlv->len = sizeof(*v1);
			v1 = (struct rtw89_btc_fbtc_tdma_v1 *)&tlv->val[0];
			v1->fver = chip->fcxtdma_ver;
			v1->tdma = dm->tdma;
			btc->policy_len += BTC_TLV_HDR_LEN + sizeof(*v1);
			}

	rtw89_debug(rtwdev, RTW89_DBG_BTC,		rtw89_debug(rtwdev, RTW89_DBG_BTC,
	"[BTC], %s(): type:%d, rxflctrl=%d, txpause=%d, wtgle_n=%d, leak_n=%d, ext_ctrl=%d\n",		"[BTC], %s(): type:%d, rxflctrl=%d, txpause=%d, wtgle_n=%d, leak_n=%d, ext_ctrl=%d\n",

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

+15 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1367,8 +1367,15 @@ struct rtw89_btc_fbtc_tdma {
	u8 wtgle_n;		u8 wtgle_n;
	u8 leak_n;		u8 leak_n;
	u8 ext_ctrl;		u8 ext_ctrl;
	u8 rsvd0;		u8 rxflctrl_role;
	u8 rsvd1;		u8 option_ctrl;
			} __packed;

			struct rtw89_btc_fbtc_tdma_v1 {
			u8 fver; /* chip_info::fcxtdma_ver */
			u8 rsvd;
			__le16 rsvd1;
			struct rtw89_btc_fbtc_tdma tdma;
	} __packed;		} __packed;

	#define CXMREG_MAX 30		#define CXMREG_MAX 30
	@@ -1682,7 +1689,8 @@ struct rtw89_btc_dm {
	u32 wl_btg_rx: 1;		u32 wl_btg_rx: 1;
	u32 trx_para_level: 8;		u32 trx_para_level: 8;
	u32 wl_stb_chg: 1;		u32 wl_stb_chg: 1;
	u32 rsvd: 3;		u32 tdma_instant_excute: 1;
			u32 rsvd: 2;

	u16 slot_dur[CXST_MAX];		u16 slot_dur[CXST_MAX];

	@@ -1764,7 +1772,10 @@ struct rtw89_btc_report_ctrl_state {

	struct rtw89_btc_rpt_fbtc_tdma {		struct rtw89_btc_rpt_fbtc_tdma {
	struct rtw89_btc_rpt_cmn_info cinfo; /* common info, by driver */		struct rtw89_btc_rpt_cmn_info cinfo; /* common info, by driver */
			union {
	struct rtw89_btc_fbtc_tdma finfo; /* info from fw */		struct rtw89_btc_fbtc_tdma finfo; /* info from fw */
			struct rtw89_btc_fbtc_tdma_v1 finfo_v1; /* info from fw for 52C*/
			};
	};		};

	struct rtw89_btc_rpt_fbtc_slots {		struct rtw89_btc_rpt_fbtc_slots {