mac80211: use upstream patches for rtl8xxxu

Also improves rtl8188eu support.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

1 files changed, 43 insertions, 0 deletions

diff --git a/package/kernel/mac80211/patches/652-0011-rtl8xxxu-gen1-Set-aggregation-timeout-REG_RXDMA_AGG_.patch b/package/kernel/mac80211/patches/652-0011-rtl8xxxu-gen1-Set-aggregation-timeout-REG_RXDMA_AGG_.patch
new file mode 100644
index 0000000000..f4deb234fe
--- /dev/null
+++ b/package/kernel/mac80211/patches/652-0011-rtl8xxxu-gen1-Set-aggregation-timeout-REG_RXDMA_AGG_.patch
@@ -0,0 +1,43 @@
+From 614e389f36a9d709469a74508d76c5df5141149a Mon Sep 17 00:00:00 2001
+From: Jes Sorensen <Jes.Sorensen@redhat.com>
+Date: Mon, 27 Jun 2016 12:32:09 -0400
+Subject: [PATCH] rtl8xxxu: gen1: Set aggregation timeout (REG_RXDMA_AGG_PG_TH
+ + 1) as well
+
+gen2 chips as well as 8188eu seems to use this register for setting
+DMA timeout threshold values, however the 8192cu is using
+REG_USB_DMA_AGG_TO. Set both to be on the safe side.
+
+Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
++++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+@@ -4410,7 +4410,7 @@ void rtl8xxxu_gen2_report_connect(struct
+ 
+ void rtl8xxxu_gen1_init_aggregation(struct rtl8xxxu_priv *priv)
+ {
+-	u8 agg_ctrl, usb_spec, page_thresh;
++	u8 agg_ctrl, usb_spec, page_thresh, timeout;
+ 
+ 	usb_spec = rtl8xxxu_read8(priv, REG_USB_SPECIAL_OPTION);
+ 	usb_spec &= ~USB_SPEC_USB_AGG_ENABLE;
+@@ -4442,7 +4442,14 @@ void rtl8xxxu_gen1_init_aggregation(stru
+ 
+ 	page_thresh = (priv->fops->rx_agg_buf_size / 512);
+ 	rtl8xxxu_write8(priv, REG_RXDMA_AGG_PG_TH, page_thresh);
+-	rtl8xxxu_write8(priv, REG_USB_DMA_AGG_TO, 4);
++	/*
++	 * REG_RXDMA_AGG_PG_TH + 1 seems to be the timeout register on
++	 * gen2 chips and rtl8188eu. The rtl8723au seems unhappy if we
++	 * don't set it, so better set both.
++	 */
++	timeout = 4;
++	rtl8xxxu_write8(priv, REG_RXDMA_AGG_PG_TH + 1, timeout);
++	rtl8xxxu_write8(priv, REG_USB_DMA_AGG_TO, timeout);
+ 	priv->rx_buf_aggregation = 1;
+ }
+