Commit 6dc28456 authored Apr 25, 2023 by Bitterblue Smith Committed by Kalle Valo May 05, 2023

wifi: rtl8xxxu: Support USB RX aggregation for the newer chips



The driver can receive several frames in the same USB transfer.
Add the code to handle this in rtl8xxxu_parse_rxdesc24(), even though
currently all the relevant chips send only one frame per USB transfer
(RTL8723BU, RTL8192EU, RTL8188FU, RTL8710BU).

This was tested with RTL8188FU, RTL8192EU, RTL8710BU, and RTL8192FU.

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/16d2d1ff-6438-10c9-347f-6e14dd358ccf@gmail.com

parent b9a07c44

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

+78 −41

Original line number	Diff line number	Diff line
		@@ -6322,38 +6322,65 @@ int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv priv, struct sk_buff skb)
		int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv priv, struct sk_buff skb)
		{
		struct ieee80211_hw *hw = priv->hw;
		struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
		struct rtl8xxxu_rxdesc24 *rx_desc =
		(struct rtl8xxxu_rxdesc24 *)skb->data;
		struct ieee80211_rx_status *rx_status;
		struct rtl8xxxu_rxdesc24 *rx_desc;
		struct rtl8723au_phy_stats *phy_stats;
		__le32 _rx_desc_le = (__le32 )skb->data;
		u32 _rx_desc = (u32 )skb->data;
		struct sk_buff *next_skb = NULL;
		__le32 *_rx_desc_le;
		u32 *_rx_desc;
		int drvinfo_sz, desc_shift;
		int i;
		int i, pkt_len, urb_len, pkt_offset;

		urb_len = skb->len;

		if (urb_len < sizeof(struct rtl8xxxu_rxdesc24)) {
		kfree_skb(skb);
		return RX_TYPE_ERROR;
		}

		do {
		rx_desc = (struct rtl8xxxu_rxdesc24 *)skb->data;
		_rx_desc_le = (__le32 *)skb->data;
		_rx_desc = (u32 *)skb->data;

		for (i = 0; i < (sizeof(struct rtl8xxxu_rxdesc24) / sizeof(u32)); i++)
		_rx_desc[i] = le32_to_cpu(_rx_desc_le[i]);

		pkt_len = rx_desc->pktlen;

		drvinfo_sz = rx_desc->drvinfo_sz * 8;
		desc_shift = rx_desc->shift;
		pkt_offset = roundup(pkt_len + drvinfo_sz + desc_shift +
		sizeof(struct rtl8xxxu_rxdesc24), 8);

		/*
		* Only clone the skb if there's enough data at the end to
		* at least cover the rx descriptor
		*/
		if (urb_len >= (pkt_offset + sizeof(struct rtl8xxxu_rxdesc24)))
		next_skb = skb_clone(skb, GFP_ATOMIC);

		rx_status = IEEE80211_SKB_RXCB(skb);
		memset(rx_status, 0, sizeof(struct ieee80211_rx_status));

		skb_pull(skb, sizeof(struct rtl8xxxu_rxdesc24));

		phy_stats = (struct rtl8723au_phy_stats *)skb->data;

		drvinfo_sz = rx_desc->drvinfo_sz * 8;
		desc_shift = rx_desc->shift;
		skb_pull(skb, drvinfo_sz + desc_shift);

		skb_trim(skb, pkt_len);

		if (rx_desc->rpt_sel) {
		struct device *dev = &priv->udev->dev;
		dev_dbg(dev, "%s: C2H packet\n", __func__);
		rtl8723bu_handle_c2h(priv, skb);
		return RX_TYPE_C2H;
		}
		} else {
		struct ieee80211_hdr hdr = (struct ieee80211_hdr )skb->data;

		if (rx_desc->phy_stats)
		priv->fops->parse_phystats(priv, rx_status, phy_stats,
		rx_desc->rxmcs, (struct ieee80211_hdr *)skb->data,
		rx_desc->rxmcs, hdr,
		rx_desc->crc32 \|\| rx_desc->icverr);

		rx_status->mactime = rx_desc->tsfl;
		@@ -6377,6 +6404,16 @@ int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv priv, struct sk_buff skb)
		rx_status->band = hw->conf.chandef.chan->band;

		ieee80211_rx_irqsafe(hw, skb);
		}

		skb = next_skb;
		if (skb)
		skb_pull(next_skb, pkt_offset);

		urb_len -= pkt_offset;
		next_skb = NULL;
		} while (skb && urb_len >= sizeof(struct rtl8xxxu_rxdesc24));

		return RX_TYPE_DATA_PKT;
		}