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

Commit f892914c authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192ce: Fix kernel crashes due to missing callback entry 

In the major update of the rtlwifi-family of drivers, one of the callback entries
was missed, which leads to memory corruption. Unfortunately, this corruption
never caused a kernel oops, but showed up in other parts of the system.
This patch is one of three needed to fix the kernel regression reported at
https://bugzilla.kernel.org/show_bug.cgi?id=88951

.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Reported-by: default avatarCatalin Iacob <iacobcatalin@gmail.com>
Tested-by: default avatarCatalin Iacob <iacobcatalin@gmail.com>
Cc: Catalin Iacob <iacobcatalin@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 99a82f73

drivers/net/wireless/rtlwifi/rtl8192ce/sw.c

+3 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ static struct rtl_hal_ops rtl8192ce_hal_ops = { 
	.led_control = rtl92ce_led_control,

	.set_desc = rtl92ce_set_desc,

	.get_desc = rtl92ce_get_desc,

	.is_tx_desc_closed = rtl92ce_is_tx_desc_closed,

	.tx_polling = rtl92ce_tx_polling,

	.enable_hw_sec = rtl92ce_enable_hw_security_config,

	.set_key = rtl92ce_set_key,
@@ -271,6 +272,8 @@ static struct rtl_hal_cfg rtl92ce_hal_cfg = { 
	.maps[MAC_RCR_ACRC32] = ACRC32,

	.maps[MAC_RCR_ACF] = ACF,

	.maps[MAC_RCR_AAP] = AAP,

	.maps[MAC_HIMR] = REG_HIMR,

	.maps[MAC_HIMRE] = REG_HIMRE,



	.maps[EFUSE_TEST] = REG_EFUSE_TEST,

	.maps[EFUSE_CTRL] = REG_EFUSE_CTRL,

drivers/net/wireless/rtlwifi/rtl8192ce/trx.c

+17 −0
Original line number Diff line number Diff line
@@ -739,6 +739,23 @@ u32 rtl92ce_get_desc(u8 *p_desc, bool istx, u8 desc_name) 
	return ret;

}



bool rtl92ce_is_tx_desc_closed(struct ieee80211_hw *hw,

			       u8 hw_queue, u16 index)

{

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));

	struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[hw_queue];

	u8 *entry = (u8 *)(&ring->desc[ring->idx]);

	u8 own = (u8)rtl92ce_get_desc(entry, true, HW_DESC_OWN);



	/*beacon packet will only use the first

	 *descriptor defautly,and the own may not

	 *be cleared by the hardware

	 */

	if (own)

		return false;

	return true;

}



void rtl92ce_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

drivers/net/wireless/rtlwifi/rtl8192ce/trx.h

+2 −0
Original line number Diff line number Diff line
@@ -723,6 +723,8 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw, 
void rtl92ce_set_desc(struct ieee80211_hw *hw, u8 *pdesc, bool istx,

		      u8 desc_name, u8 *val);

u32 rtl92ce_get_desc(u8 *pdesc, bool istx, u8 desc_name);

bool rtl92ce_is_tx_desc_closed(struct ieee80211_hw *hw,

			       u8 hw_queue, u16 index);

void rtl92ce_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);

void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,

			     bool b_firstseg, bool b_lastseg,