Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6aad6075 authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtlwifi: Add BT_MP_INFO to c2h handler. 



We use H2C to ask BT's status, and C2H will return the status.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Yan-Hsuan Chuang <yhchuang@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 11f35c95

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c

+16 −1
Original line number Diff line number Diff line
@@ -327,7 +327,22 @@ static void halbtc_aggregation_check(struct btc_coexist *btcoexist) 


static u32 halbtc_get_bt_patch_version(struct btc_coexist *btcoexist)

{

	return 0;

	struct rtl_priv *rtlpriv = btcoexist->adapter;

	u8 cmd_buffer[4] = {0};

	u8 oper_ver = 0;

	u8 req_num = 0x0E;



	if (btcoexist->bt_info.bt_real_fw_ver)

		goto label_done;



	cmd_buffer[0] |= (oper_ver & 0x0f);	/* Set OperVer */

	cmd_buffer[0] |= ((req_num << 4) & 0xf0);	/* Set ReqNum */

	cmd_buffer[1] = 0; /* BT_OP_GET_BT_VERSION = 0 */

	rtlpriv->cfg->ops->fill_h2c_cmd(rtlpriv->mac80211.hw, 0x67, 4,

					&cmd_buffer[0]);



label_done:

	return btcoexist->bt_info.bt_real_fw_ver;

}



u32 halbtc_get_wifi_link_status(struct btc_coexist *btcoexist)

drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c

+28 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ static struct rtl_btc_ops rtl_btc_operation = { 
	.btc_periodical = rtl_btc_periodical,

	.btc_halt_notify = rtl_btc_halt_notify,

	.btc_btinfo_notify = rtl_btc_btinfo_notify,

	.btc_btmpinfo_notify = rtl_btc_btmpinfo_notify,

	.btc_is_limited_dig = rtl_btc_is_limited_dig,

	.btc_is_disable_edca_turbo = rtl_btc_is_disable_edca_turbo,

	.btc_is_bt_disabled = rtl_btc_is_bt_disabled,
@@ -165,6 +166,33 @@ void rtl_btc_btinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length) 
	exhalbtc_bt_info_notify(&gl_bt_coexist, tmp_buf, length);

}



void rtl_btc_btmpinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length)

{

	u8 extid, seq, len;

	u16 bt_real_fw_ver;

	u8 bt_fw_ver;



	if ((length < 4) || (!tmp_buf))

		return;



	extid = tmp_buf[0];

	/* not response from BT FW then exit*/

	if (extid != 1) /* C2H_TRIG_BY_BT_FW = 1 */

		return;



	len = tmp_buf[1] >> 4;

	seq = tmp_buf[2] >> 4;



	/* BT Firmware version response */

	if (seq == 0x0E) {

		bt_real_fw_ver = tmp_buf[3] | (tmp_buf[4] << 8);

		bt_fw_ver = tmp_buf[5];



		gl_bt_coexist.bt_info.bt_real_fw_ver = bt_real_fw_ver;

		gl_bt_coexist.bt_info.bt_fw_ver = bt_fw_ver;

	}

}



bool rtl_btc_is_limited_dig(struct rtl_priv *rtlpriv)

{

	return gl_bt_coexist.bt_info.limited_dig;

drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ void rtl_btc_mediastatus_notify(struct rtl_priv *rtlpriv, 
void rtl_btc_periodical(struct rtl_priv *rtlpriv);

void rtl_btc_halt_notify(void);

void rtl_btc_btinfo_notify(struct rtl_priv *rtlpriv, u8 *tmpbuf, u8 length);

void rtl_btc_btmpinfo_notify(struct rtl_priv *rtlpriv, u8 *tmp_buf, u8 length);

bool rtl_btc_is_limited_dig(struct rtl_priv *rtlpriv);

bool rtl_btc_is_disable_edca_turbo(struct rtl_priv *rtlpriv);

bool rtl_btc_is_bt_disabled(struct rtl_priv *rtlpriv);

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c

+7 −2
Original line number Diff line number Diff line
@@ -887,6 +887,7 @@ void rtl92ee_c2h_content_parsing(struct ieee80211_hw *hw, u8 c2h_cmd_id, 
				 u8 c2h_cmd_len, u8 *tmp_buf)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;



	switch (c2h_cmd_id) {

	case C2H_8192E_DBG:
@@ -905,12 +906,16 @@ void rtl92ee_c2h_content_parsing(struct ieee80211_hw *hw, u8 c2h_cmd_id, 
	case C2H_8192E_BT_INFO:

		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,

			 "[C2H], C2H_8723BE_BT_INFO!!\n");

		rtlpriv->btcoexist.btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,

		if (rtlpriv->cfg->ops->get_btc_status())

			btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,

						   c2h_cmd_len);

		break;

	case C2H_8192E_BT_MP:

		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,

			 "[C2H], C2H_8723BE_BT_MP!!\n");

		if (rtlpriv->cfg->ops->get_btc_status())

			btc_ops->btc_btmpinfo_notify(rtlpriv, tmp_buf,

						     c2h_cmd_len);

		break;

	case C2H_8192E_RA_RPT:

		_rtl92ee_c2h_ra_report_handler(hw, tmp_buf, c2h_cmd_len);

drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c

+7 −2
Original line number Diff line number Diff line
@@ -709,6 +709,7 @@ void rtl8723be_c2h_content_parsing(struct ieee80211_hw *hw, 
				   u8 c2h_cmd_len, u8 *tmp_buf)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;



	switch (c2h_cmd_id) {

	case C2H_8723B_DBG:
@@ -723,12 +724,16 @@ void rtl8723be_c2h_content_parsing(struct ieee80211_hw *hw, 
	case C2H_8723B_BT_INFO:

		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,

			 "[C2H], C2H_8723BE_BT_INFO!!\n");

		rtlpriv->btcoexist.btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,

		if (rtlpriv->cfg->ops->get_btc_status())

			btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,

						   c2h_cmd_len);

		break;

	case C2H_8723B_BT_MP:

		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,

			 "[C2H], C2H_8723BE_BT_MP!!\n");

		if (rtlpriv->cfg->ops->get_btc_status())

			btc_ops->btc_btmpinfo_notify(rtlpriv, tmp_buf,

						     c2h_cmd_len);

		break;

	default:

		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,