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

Commit 6d622692 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: btcoexist: Fix antenna selection code 



In commit 87d8a9f3 ("rtlwifi: btcoex: call bind to setup btcoex"),
the code turns on a call to exhalbtc_bind_bt_coex_withadapter(). This
routine contains a bug that causes incorrect antenna selection for those
HP laptops with only one antenna and an incorrectly programmed EFUSE.
These boxes are the ones that need the ant_sel module parameter.

Fixes: 87d8a9f3 ("rtlwifi: btcoex: call bind to setup btcoex")
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Ping-Ke Shih <pkshih@realtek.com>
Cc: Yan-Hsuan Chuang <yhchuang@realtek.com>
Cc: Birming Chiu <birming@realtek.com>
Cc: Shaofu <shaofu@realtek.com>
Cc: Steven Ting <steventing@realtek.com>
Cc: Stable <stable@vger.kernel.org> # 4.13+
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent a33fcba6

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

+16 −7
Original line number Diff line number Diff line
@@ -173,6 +173,16 @@ static u8 halbtc_get_wifi_central_chnl(struct btc_coexist *btcoexist) 


u8 rtl_get_hwpg_single_ant_path(struct rtl_priv *rtlpriv)

{

	struct rtl_mod_params *mod_params = rtlpriv->cfg->mod_params;



	/* override ant_num / ant_path */

	if (mod_params->ant_sel) {

		rtlpriv->btcoexist.btc_info.ant_num =

			(mod_params->ant_sel == 1 ? ANT_X2 : ANT_X1);



		rtlpriv->btcoexist.btc_info.single_ant_path =

			(mod_params->ant_sel == 1 ? 0 : 1);

	}

	return rtlpriv->btcoexist.btc_info.single_ant_path;

}
@@ -183,6 +193,7 @@ u8 rtl_get_hwpg_bt_type(struct rtl_priv *rtlpriv) 


u8 rtl_get_hwpg_ant_num(struct rtl_priv *rtlpriv)

{

	struct rtl_mod_params *mod_params = rtlpriv->cfg->mod_params;

	u8 num;



	if (rtlpriv->btcoexist.btc_info.ant_num == ANT_X2)
@@ -190,6 +201,10 @@ u8 rtl_get_hwpg_ant_num(struct rtl_priv *rtlpriv) 
	else

		num = 1;



	/* override ant_num / ant_path */

	if (mod_params->ant_sel)

		num = (mod_params->ant_sel == 1 ? ANT_X2 : ANT_X1) + 1;



	return num;

}
@@ -876,7 +891,7 @@ bool exhalbtc_bind_bt_coex_withadapter(void *adapter) 
{

	struct btc_coexist *btcoexist = &gl_bt_coexist;

	struct rtl_priv *rtlpriv = adapter;

	u8 ant_num = 2, chip_type, single_ant_path = 0;

	u8 ant_num = 2, chip_type;



	if (btcoexist->binded)

		return false;
@@ -911,12 +926,6 @@ bool exhalbtc_bind_bt_coex_withadapter(void *adapter) 
	ant_num = rtl_get_hwpg_ant_num(rtlpriv);

	exhalbtc_set_ant_num(rtlpriv, BT_COEX_ANT_TYPE_PG, ant_num);



	/* set default antenna position to main  port */

	btcoexist->board_info.btdm_ant_pos = BTC_ANTENNA_AT_MAIN_PORT;



	single_ant_path = rtl_get_hwpg_single_ant_path(rtlpriv);

	exhalbtc_set_single_ant_path(single_ant_path);



	if (rtl_get_hwpg_package_type(rtlpriv) == 0)

		btcoexist->board_info.tfbga_package = false;

	else if (rtl_get_hwpg_package_type(rtlpriv) == 1)