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

Commit eed145ab authored by Jes Sorensen's avatar Jes Sorensen Committed by Kalle Valo
Browse files

rtl8xxxu: Introduce fops bitflag indicating type of thermal meter 



Do not rely on TX descriptor size to determine the thermal meter
type.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent ee675cc3

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h

+1 −0
Original line number Diff line number Diff line
@@ -1342,6 +1342,7 @@ struct rtl8xxxu_fileops { 
	char rx_desc_size;

	u8 has_s0s1:1;

	u8 has_tx_report:1;

	u8 gen2_thermal_meter:1;

	u32 adda_1t_init;

	u32 adda_1t_path_on;

	u32 adda_2t_path_on_a;

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c

+1 −0
Original line number Diff line number Diff line
@@ -1505,6 +1505,7 @@ struct rtl8xxxu_fileops rtl8192eu_fops = { 
	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc40),

	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc24),

	.has_s0s1 = 0,

	.gen2_thermal_meter = 1,

	.adda_1t_init = 0x0fc01616,

	.adda_1t_path_on = 0x0fc01616,

	.adda_2t_path_on_a = 0x0fc01616,

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c

+1 −0
Original line number Diff line number Diff line
@@ -1667,6 +1667,7 @@ struct rtl8xxxu_fileops rtl8723bu_fops = { 
	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc24),

	.has_s0s1 = 1,

	.has_tx_report = 1,

	.gen2_thermal_meter = 1,

	.adda_1t_init = 0x01c00014,

	.adda_1t_path_on = 0x01c00014,

	.adda_2t_path_on_a = 0x01c00014,

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c

+1 −1
Original line number Diff line number Diff line
@@ -4195,7 +4195,7 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw) 
	/*

	 * This should enable thermal meter

	 */

	if (priv->fops->tx_desc_size == sizeof(struct rtl8xxxu_txdesc40))

	if (priv->fops->gen2_thermal_meter)

		rtl8xxxu_write_rfreg(priv,

				     RF_A, RF6052_REG_T_METER_8723B, 0x37cf8);

	else