emeryth
/
openwrt_zsun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath9k: add another fix for some rx/tx dma stop issues, refresh patches 

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

Backport of r46008

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46010 3c298f89-4303-0410-b956-a3cf2f4a3e73
zsun
nbd 2015-06-17 09:11:08 +00:00
parent b57bb8034d
commit 73a879de66
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
package/kernel/mac80211/patches/384-ath9k-force-rx_clear-when-disabling-rx.patch Normal file
View File

@ -0,0 +1,31 @@
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 7 Jun 2015 13:53:35 +0200
Subject: [PATCH] ath9k: force rx_clear when disabling rx
This makes stopping Rx more reliable and should reduce the frequency of
Rx related DMA stop warnings
Cc: stable@vger.kernel.org
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -677,13 +677,15 @@ void ath9k_hw_startpcureceive(struct ath
ath9k_ani_reset(ah, is_scanning);
- REG_CLR_BIT(ah, AR_DIAG_SW, (AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT));
+ REG_CLR_BIT(ah, AR_DIAG_SW,
+ AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT | AR_DIAG_FORCE_RX_CLEAR);
}
EXPORT_SYMBOL(ath9k_hw_startpcureceive);
void ath9k_hw_abortpcurecv(struct ath_hw *ah)
{
- REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_ABORT | AR_DIAG_RX_DIS);
+ REG_SET_BIT(ah, AR_DIAG_SW,
+ AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT | AR_DIAG_FORCE_RX_CLEAR);
ath9k_hw_disable_mib_counters(ah);
}

4
package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -693,7 +693,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
@@ -695,7 +695,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
{
#define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */
struct ath_common *common = ath9k_hw_common(ah);
@ -9,7 +9,7 @@
int i;
/* Enable access to the DMA observation bus */
@@ -723,6 +723,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
@@ -725,6 +725,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
}
if (i == 0) {

4
package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
View File

@ -99,7 +99,7 @@
};
/* Hard-reset the chip. Do not call this directly.
@@ -5538,6 +5578,8 @@ static int b43_one_core_attach(struct b4
@@ -5542,6 +5582,8 @@ static int b43_one_core_attach(struct b4
if (!wldev)
goto out;
@ -108,7 +108,7 @@
wldev->use_pio = b43_modparam_pio;
wldev->dev = dev;
wldev->wl = wl;
@@ -5628,6 +5670,9 @@ static struct b43_wl *b43_wireless_init(
@@ -5632,6 +5674,9 @@ static struct b43_wl *b43_wireless_init(
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;