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

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

rtlwifi: add amplifier type for 8812ae 



With correct amplifier_type, the phy praser can choose correct parameters.

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 881d53ab

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c

+40 −1
Original line number Diff line number Diff line
@@ -2966,6 +2966,44 @@ static void _rtl8812ae_read_pa_type(struct ieee80211_hw *hw, u8 *hwinfo, 
	}

}



static void _rtl8812ae_read_amplifier_type(struct ieee80211_hw *hw, u8 *hwinfo,

					   bool autoload_fail)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_hal *rtlhal = rtl_hal(rtlpriv);



	u8 ext_type_pa_2g_a  = (hwinfo[0xBD] & BIT(2))      >> 2; /* 0xBD[2] */

	u8 ext_type_pa_2g_b  = (hwinfo[0xBD] & BIT(6))      >> 6; /* 0xBD[6] */

	u8 ext_type_pa_5g_a  = (hwinfo[0xBF] & BIT(2))      >> 2; /* 0xBF[2] */

	u8 ext_type_pa_5g_b  = (hwinfo[0xBF] & BIT(6))      >> 6; /* 0xBF[6] */

	/* 0xBD[1:0] */

	u8 ext_type_lna_2g_a = (hwinfo[0xBD] & (BIT(1) | BIT(0))) >> 0;

	/* 0xBD[5:4] */

	u8 ext_type_lna_2g_b = (hwinfo[0xBD] & (BIT(5) | BIT(4))) >> 4;

	/* 0xBF[1:0] */

	u8 ext_type_lna_5g_a = (hwinfo[0xBF] & (BIT(1) | BIT(0))) >> 0;

	/* 0xBF[5:4] */

	u8 ext_type_lna_5g_b = (hwinfo[0xBF] & (BIT(5) | BIT(4))) >> 4;



	_rtl8812ae_read_pa_type(hw, hwinfo, autoload_fail);



	/* [2.4G] Path A and B are both extPA */

	if ((rtlhal->pa_type_2g & (BIT(5) | BIT(4))) == (BIT(5) | BIT(4)))

		rtlhal->type_gpa  = ext_type_pa_2g_b  << 2 | ext_type_pa_2g_a;



	/* [5G] Path A and B are both extPA */

	if ((rtlhal->pa_type_5g & (BIT(1) | BIT(0))) == (BIT(1) | BIT(0)))

		rtlhal->type_apa  = ext_type_pa_5g_b  << 2 | ext_type_pa_5g_a;



	/* [2.4G] Path A and B are both extLNA */

	if ((rtlhal->lna_type_2g & (BIT(7) | BIT(3))) == (BIT(7) | BIT(3)))

		rtlhal->type_glna = ext_type_lna_2g_b << 2 | ext_type_lna_2g_a;



	/* [5G] Path A and B are both extLNA */

	if ((rtlhal->lna_type_5g & (BIT(7) | BIT(3))) == (BIT(7) | BIT(3)))

		rtlhal->type_alna = ext_type_lna_5g_b << 2 | ext_type_lna_5g_a;

}



static void _rtl8821ae_read_pa_type(struct ieee80211_hw *hw, u8 *hwinfo,

				    bool autoload_fail)

{
@@ -3114,7 +3152,8 @@ static void _rtl8821ae_read_adapter_info(struct ieee80211_hw *hw, bool b_pseudo_ 
					       hwinfo);



	if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {

		_rtl8812ae_read_pa_type(hw, hwinfo, rtlefuse->autoload_failflag);

		_rtl8812ae_read_amplifier_type(hw, hwinfo,

					       rtlefuse->autoload_failflag);

		_rtl8812ae_read_bt_coexist_info_from_hwpg(hw,

				rtlefuse->autoload_failflag, hwinfo);

	} else {