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

Commit e226edec authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Greg Kroah-Hartman
Browse files

wifi: rtlwifi: 8192de: correct checking of IQK reload 



commit 93fbc1ebd978cf408ef5765e9c1630fce9a8621b upstream.

Since IQK could spend time, we make a cache of IQK result matrix that looks
like iqk_matrix[channel_idx].val[x][y], and we can reload the matrix if we
have made a cache. To determine a cache is made, we check
iqk_matrix[channel_idx].val[0][0].

The initial commit 7274a8c2 ("rtlwifi: rtl8192de: Merge phy routines")
make a mistake that checks incorrect iqk_matrix[channel_idx].val[0] that
is always true, and this mistake is found by commit ee3db469dd31
("wifi: rtlwifi: remove always-true condition pointed out by GCC 12"), so
I recall the vendor driver to find fix and apply the correctness.

Fixes: 7274a8c2 ("rtlwifi: rtl8192de: Merge phy routines")
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220801113345.42016-1-pkshih@realtek.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 783393e1

drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c

+4 −5
Original line number Diff line number Diff line
@@ -2414,11 +2414,10 @@ void rtl92d_phy_reload_iqk_setting(struct ieee80211_hw *hw, u8 channel) 
			RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,

				 "Just Read IQK Matrix reg for channel:%d....\n",

				 channel);

			if (rtlphy->iqk_matrix[indexforchannel].value[0][0] != 0)

				_rtl92d_phy_patha_fill_iqk_matrix(hw, true,

					rtlphy->iqk_matrix[

					indexforchannel].value,	0,

					(rtlphy->iqk_matrix[

					indexforchannel].value[0][2] == 0));

					rtlphy->iqk_matrix[indexforchannel].value, 0,

					rtlphy->iqk_matrix[indexforchannel].value[0][2] == 0);

			if (IS_92D_SINGLEPHY(rtlhal->version)) {

				if ((rtlphy->iqk_matrix[

					indexforchannel].value[0][4] != 0)