| Message ID | 1421773286-1039-4-git-send-email-Larry.Finger@lwfinger.net (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kalle Valo |
| Headers | show |
> From: Troy Tan <troy_tan@realsil.com.cn> > > When the buffer descriptor index exceeds 2, then a TX HANG condition > will result. > > Signed-off-by: Troy Tan <troy_tan@realsil.com.cn> > Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> > Cc: Stable <stable@vger.kernel.org> [V3.18] Thanks, 4 patches applied to wireless-drivers-next.git: b661a5da5776 rtlwifi: rtl8192ee: Fix adhoc fail 6e5f44361628 rtlwifi: rtl8192ee: Fix TX hang due to failure to update TX write point 92ff754240b8 rtlwifi: rtl8192ee: Fix parsing of received packet 21b39ddb5bb2 rtlwifi: rtl8192ee: Fix DMA stalls 3 patches skipped: [V2,for,3.19,1/7] rtlwifi: Remove logging statement that is no longer needed [V2,for,3.19,2/7] rtlwifi: rtl8192ee: Fix handling of new style descriptors [V2,for,3.19,6/7] rtlwifi: rtl8192ee: Fix problems with calculating free space in FIFO Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Kalle Valo <kvalo@codeaurora.org> writes: >> From: Troy Tan <troy_tan@realsil.com.cn> >> >> When the buffer descriptor index exceeds 2, then a TX HANG condition >> will result. >> >> Signed-off-by: Troy Tan <troy_tan@realsil.com.cn> >> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> >> Cc: Stable <stable@vger.kernel.org> [V3.18] > > Thanks, 4 patches applied to wireless-drivers-next.git: > > b661a5da5776 rtlwifi: rtl8192ee: Fix adhoc fail > 6e5f44361628 rtlwifi: rtl8192ee: Fix TX hang due to failure to update TX write point > 92ff754240b8 rtlwifi: rtl8192ee: Fix parsing of received packet > 21b39ddb5bb2 rtlwifi: rtl8192ee: Fix DMA stalls > > 3 patches skipped: I had to skip these three patches because of my mistake. So what I did was that I had merged ("fast forwarded") the net tree into my wireless-drivers tree and not realising I should not do that. So now I can't merge wireless-drivers into wireless-drivers-next anymore, as it will pull unnecessary net changes. > [V2,for,3.19,1/7] rtlwifi: Remove logging statement that is no longer > needed I'll apply this after 3.20-rc1 is released, it should apply then without problems (or the conflicts are easy for me to fix). Luckily this is just a cosmetic error and can wait for 3.20-rc2, right? > [V2,for,3.19,2/7] rtlwifi: rtl8192ee: Fix handling of new style descriptors > [V2,for,3.19,6/7] rtlwifi: rtl8192ee: Fix problems with calculating free space in FIFO Not sure what to do with these one. Should you rebase and send them now?
On 02/03/2015 07:23 AM, Kalle Valo wrote: > Kalle Valo <kvalo@codeaurora.org> writes: > >>> From: Troy Tan <troy_tan@realsil.com.cn> >>> >>> When the buffer descriptor index exceeds 2, then a TX HANG condition >>> will result. >>> >>> Signed-off-by: Troy Tan <troy_tan@realsil.com.cn> >>> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> >>> Cc: Stable <stable@vger.kernel.org> [V3.18] >> >> Thanks, 4 patches applied to wireless-drivers-next.git: >> >> b661a5da5776 rtlwifi: rtl8192ee: Fix adhoc fail >> 6e5f44361628 rtlwifi: rtl8192ee: Fix TX hang due to failure to update TX write point >> 92ff754240b8 rtlwifi: rtl8192ee: Fix parsing of received packet >> 21b39ddb5bb2 rtlwifi: rtl8192ee: Fix DMA stalls >> >> 3 patches skipped: > > I had to skip these three patches because of my mistake. So what I did > was that I had merged ("fast forwarded") the net tree into my > wireless-drivers tree and not realising I should not do that. So now I > can't merge wireless-drivers into wireless-drivers-next anymore, as it > will pull unnecessary net changes. > >> [V2,for,3.19,1/7] rtlwifi: Remove logging statement that is no longer >> needed > > I'll apply this after 3.20-rc1 is released, it should apply then without > problems (or the conflicts are easy for me to fix). Luckily this is just > a cosmetic error and can wait for 3.20-rc2, right? That is correct. 3.20-rc2 will be OK. I'll probably get a bunch of "your **** driver is spamming my logs, but I can ignore them". > >> [V2,for,3.19,2/7] rtlwifi: rtl8192ee: Fix handling of new style descriptors >> [V2,for,3.19,6/7] rtlwifi: rtl8192ee: Fix problems with calculating free space in FIFO > > Not sure what to do with these one. Should you rebase and send them now? These two fix real bugs and need to be in the kernel ASAP. Unfortunately, I saw you pass them off to DaveM and I deleted them from my "Submitted Patch" list. I can recreate them from my working copy of wireless-drivers, and I will resubmit. When I do, please process them as quickly as possible. Thanks, Larry -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/fw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/fw.c index 45c128b..c5d4b80 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ee/fw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ee/fw.c @@ -666,7 +666,6 @@ void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) struct sk_buff *skb = NULL; u32 totalpacketlen; - bool rtstatus; u8 u1rsvdpageloc[5] = { 0 }; bool b_dlok = false; @@ -728,10 +727,7 @@ void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) memcpy((u8 *)skb_put(skb, totalpacketlen), &reserved_page_packet, totalpacketlen); - rtstatus = rtl_cmd_send_packet(hw, skb); - - if (rtstatus) - b_dlok = true; + b_dlok = true; if (b_dlok) { RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD , diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c index 47beb49..9199559 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c @@ -85,29 +85,6 @@ static void _rtl92ee_enable_bcn_sub_func(struct ieee80211_hw *hw) _rtl92ee_set_bcn_ctrl_reg(hw, 0, BIT(1)); } -static void _rtl92ee_return_beacon_queue_skb(struct ieee80211_hw *hw) -{ - struct rtl_priv *rtlpriv = rtl_priv(hw); - struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); - struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[BEACON_QUEUE]; - unsigned long flags; - - spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags); - while (skb_queue_len(&ring->queue)) { - struct rtl_tx_buffer_desc *entry = - &ring->buffer_desc[ring->idx]; - struct sk_buff *skb = __skb_dequeue(&ring->queue); - - pci_unmap_single(rtlpci->pdev, - rtlpriv->cfg->ops->get_desc( - (u8 *)entry, true, HW_DESC_TXBUFF_ADDR), - skb->len, PCI_DMA_TODEVICE); - kfree_skb(skb); - ring->idx = (ring->idx + 1) % ring->entries; - } - spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags); -} - static void _rtl92ee_disable_bcn_sub_func(struct ieee80211_hw *hw) { _rtl92ee_set_bcn_ctrl_reg(hw, BIT(1), 0); @@ -403,9 +380,6 @@ static void _rtl92ee_download_rsvd_page(struct ieee80211_hw *hw) rtl_write_byte(rtlpriv, REG_DWBCN0_CTRL + 2, bcnvalid_reg | BIT(0)); - /* Return Beacon TCB */ - _rtl92ee_return_beacon_queue_skb(hw); - /* download rsvd page */ rtl92ee_set_fw_rsvdpagepkt(hw, false);