mac80211: use upstream patches for rtl8xxxu
[openwrt/staging/chunkeey.git] / package / kernel / mac80211 / patches / 652-0010-rtl8xxxu-Make-DMA-aggregation-optional-by-setting-a-.patch
1 From 82cce22acd8ec7c75087825f23c053a642e7b672 Mon Sep 17 00:00:00 2001
2 From: Jes Sorensen <Jes.Sorensen@redhat.com>
3 Date: Mon, 27 Jun 2016 12:32:08 -0400
4 Subject: [PATCH] rtl8xxxu: Make DMA aggregation optional by setting a module
5 parameter
6
7 Let the default to off until we have more data on the right default
8 tuning values.
9
10 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
12 ---
13 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 11 +++++++++--
14 1 file changed, 9 insertions(+), 2 deletions(-)
15
16 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
17 +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
18 @@ -44,6 +44,7 @@
19
20 int rtl8xxxu_debug = RTL8XXXU_DEBUG_EFUSE;
21 static bool rtl8xxxu_ht40_2g;
22 +static bool rtl8xxxu_dma_aggregation;
23
24 MODULE_AUTHOR("Jes Sorensen <Jes.Sorensen@redhat.com>");
25 MODULE_DESCRIPTION("RTL8XXXu USB mac80211 Wireless LAN Driver");
26 @@ -62,6 +63,8 @@ module_param_named(debug, rtl8xxxu_debug
27 MODULE_PARM_DESC(debug, "Set debug mask");
28 module_param_named(ht40_2g, rtl8xxxu_ht40_2g, bool, 0600);
29 MODULE_PARM_DESC(ht40_2g, "Enable HT40 support on the 2.4GHz band");
30 +module_param_named(dma_aggregation, rtl8xxxu_dma_aggregation, bool, 0600);
31 +MODULE_PARM_DESC(dma_aggregation, "Enable DMA packet aggregation");
32
33 #define USB_VENDOR_ID_REALTEK 0x0bda
34 #define RTL8XXXU_RX_URBS 32
35 @@ -4411,14 +4414,18 @@ void rtl8xxxu_gen1_init_aggregation(stru
36
37 usb_spec = rtl8xxxu_read8(priv, REG_USB_SPECIAL_OPTION);
38 usb_spec &= ~USB_SPEC_USB_AGG_ENABLE;
39 + rtl8xxxu_write8(priv, REG_USB_SPECIAL_OPTION, usb_spec);
40
41 agg_ctrl = rtl8xxxu_read8(priv, REG_TRXDMA_CTRL);
42 agg_ctrl &= ~TRXDMA_CTRL_RXDMA_AGG_EN;
43
44 - agg_ctrl |= TRXDMA_CTRL_RXDMA_AGG_EN;
45 + if (!rtl8xxxu_dma_aggregation) {
46 + rtl8xxxu_write8(priv, REG_TRXDMA_CTRL, agg_ctrl);
47 + return;
48 + }
49
50 + agg_ctrl |= TRXDMA_CTRL_RXDMA_AGG_EN;
51 rtl8xxxu_write8(priv, REG_TRXDMA_CTRL, agg_ctrl);
52 - rtl8xxxu_write8(priv, REG_USB_SPECIAL_OPTION, usb_spec);
53
54 /*
55 * The number of packets we can take looks to be buffer size / 512