diff options
| author | Laura Abbott <labbott@redhat.com> | 2019-08-15 15:23:45 -0400 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2019-09-16 10:48:43 -0400 |
| commit | affb211a9a3464577a32f8eb6bc8072500eff1a5 (patch) | |
| tree | 27c46d7ebed1d89f9b2c67ab0f4dd0252ef0d4cf | |
| parent | 8cd931114e65baf5eb02920c83b4ac650c9e18b2 (diff) | |
| download | kernel-affb211a9a3464577a32f8eb6bc8072500eff1a5.tar.gz kernel-affb211a9a3464577a32f8eb6bc8072500eff1a5.tar.xz kernel-affb211a9a3464577a32f8eb6bc8072500eff1a5.zip | |
Remove ancient ath9k workaround
It's been years. Let's see if we actually still need this.
Signed-off-by: Laura Abbott <labbott@redhat.com>
| -rw-r--r-- | ath9k-rx-dma-stop-check.patch | 38 | ||||
| -rw-r--r-- | kernel.spec | 2 |
2 files changed, 0 insertions, 40 deletions
diff --git a/ath9k-rx-dma-stop-check.patch b/ath9k-rx-dma-stop-check.patch deleted file mode 100644 index 40cbafc7b..000000000 --- a/ath9k-rx-dma-stop-check.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org> -Date: Wed, 6 Feb 2013 09:57:47 -0500 -Subject: [PATCH] ath9k: rx dma stop check - ---- - drivers/net/wireless/ath/ath9k/mac.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c -index bba85d1a6cd1..ebbee8f17130 100644 ---- 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 *ah, bool *reset) - { - #define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */ - struct ath_common *common = ath9k_hw_common(ah); -- u32 mac_status, last_mac_status = 0; -+ u32 mac_status = 0, last_mac_status = 0; - int i; - - /* Enable access to the DMA observation bus */ -@@ -723,6 +723,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset) - } - - if (i == 0) { -+ if (!AR_SREV_9300_20_OR_LATER(ah) && -+ (mac_status & 0x700) == 0) { -+ /* -+ * DMA is idle but the MAC is still stuck -+ * processing events -+ */ -+ *reset = true; -+ return true; -+ } -+ - ath_err(common, - "DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n", - AH_RX_STOP_DMA_TIMEOUT / 1000, diff --git a/kernel.spec b/kernel.spec index fc2eeee0f..71f7022ae 100644 --- a/kernel.spec +++ b/kernel.spec @@ -507,8 +507,6 @@ Patch116: crash-driver.patch Patch117: lis3-improve-handling-of-null-rate.patch -Patch120: ath9k-rx-dma-stop-check.patch - Patch122: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch # This no longer applies, let's see if it needs to be updated |