Commit 7287f7e5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'master-2014-12-01' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 

John W. Linville says:

====================
pull request: wireless 2014-12-03

One last(?) batch of fixes hoping to make 3.18...

In this episode, we have another trio of rtlwifi fixes
repairing a little more damage from the major update of the
rtlwifi-family of drivers.  These editing mistakes caused some
memory corruption and missed a flag critical to proper interrupt
handling.  Together, these fix the kernel regression reported at
https://bugzilla.kernel.org/show_bug.cgi?id=88951

 by Catalin Iacob.

Please let me know if there are problems!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c9cdc74d 87141db0

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

+2 −1
Original line number Diff line number Diff line
@@ -1287,6 +1287,7 @@ void rtl92ce_enable_interrupt(struct ieee80211_hw *hw) 


	rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);

	rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);

	rtlpci->irq_enabled = true;

}



void rtl92ce_disable_interrupt(struct ieee80211_hw *hw)
@@ -1296,7 +1297,7 @@ void rtl92ce_disable_interrupt(struct ieee80211_hw *hw) 


	rtl_write_dword(rtlpriv, REG_HIMR, IMR8190_DISABLED);

	rtl_write_dword(rtlpriv, REG_HIMRE, IMR8190_DISABLED);

	synchronize_irq(rtlpci->pdev->irq);

	rtlpci->irq_enabled = false;

}



static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)

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

+20 −4
Original line number Diff line number Diff line
@@ -720,16 +720,15 @@ u32 rtl92ce_get_desc(u8 *p_desc, bool istx, u8 desc_name) 
			break;

		}

	} else {

		struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc;

		switch (desc_name) {

		case HW_DESC_OWN:

			ret = GET_RX_DESC_OWN(pdesc);

			ret = GET_RX_DESC_OWN(p_desc);

			break;

		case HW_DESC_RXPKT_LEN:

			ret = GET_RX_DESC_PKT_LEN(pdesc);

			ret = GET_RX_DESC_PKT_LEN(p_desc);

			break;

		case HW_DESC_RXBUFF_ADDR:

			ret = GET_RX_STATUS_DESC_BUFF_ADDR(pdesc);

			ret = GET_RX_DESC_BUFF_ADDR(p_desc);

			break;

		default:

			RT_ASSERT(false, "ERR rxdesc :%d not process\n",
@@ -740,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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE