| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108 |
- From 95945fe79069ee6b7ccce2b14fb9f8b93db33918 Mon Sep 17 00:00:00 2001
- From: Phil Sutter <phil@nwl.cc>
- Date: Sun, 15 Jun 2014 18:29:27 +0200
- Subject: [PATCH] various fixups for ath5k, fixing system freezes
- ---
- drivers/net/wireless/ath/ath5k/base.c | 3 +++
- drivers/net/wireless/ath/ath5k/dma.c | 9 +++++++++
- drivers/net/wireless/ath/ath5k/initvals.c | 6 ++++++
- drivers/net/wireless/ath/ath5k/phy.c | 4 ++--
- drivers/net/wireless/ath/ath5k/reset.c | 2 ++
- 5 files changed, 22 insertions(+), 2 deletions(-)
- diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
- index ef35da8..4b18434 100644
- --- a/drivers/net/wireless/ath/ath5k/base.c
- +++ b/drivers/net/wireless/ath/ath5k/base.c
- @@ -751,6 +751,9 @@ ath5k_txbuf_setup(struct ath5k_hw *ah, struct ath5k_buf *bf,
- bf->skbaddr = dma_map_single(ah->dev, skb->data, skb->len,
- DMA_TO_DEVICE);
-
- + if (dma_mapping_error(ah->dev, bf->skbaddr))
- + return -ENOSPC;
- +
- ieee80211_get_tx_rates(info->control.vif, (control) ? control->sta : NULL, skb, bf->rates,
- ARRAY_SIZE(bf->rates));
-
- diff --git a/drivers/net/wireless/ath/ath5k/dma.c b/drivers/net/wireless/ath/ath5k/dma.c
- index e6c52f7..72bf600 100644
- --- a/drivers/net/wireless/ath/ath5k/dma.c
- +++ b/drivers/net/wireless/ath/ath5k/dma.c
- @@ -869,10 +869,19 @@ ath5k_hw_dma_init(struct ath5k_hw *ah)
- * guess we can tweak it and see how it goes ;-)
- */
- if (ah->ah_version != AR5K_AR5210) {
- +#if !defined(CONFIG_ATHEROS_AR71XX) && !defined(CONFIG_ATH79)
- AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
- AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B);
- AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
- AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_128B);
- +#else
- + /* WAR for AR71xx PCI bug */
- + AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
- + AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B);
- + AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
- + AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_4B);
- +#endif
- +
- }
-
- /* Pre-enable interrupts on 5211/5212*/
- diff --git a/drivers/net/wireless/ath/ath5k/initvals.c b/drivers/net/wireless/ath/ath5k/initvals.c
- index ee1c2fa..ba84ab5 100644
- --- a/drivers/net/wireless/ath/ath5k/initvals.c
- +++ b/drivers/net/wireless/ath/ath5k/initvals.c
- @@ -62,8 +62,14 @@ static const struct ath5k_ini ar5210_ini[] = {
- { AR5K_IMR, 0 },
- { AR5K_IER, AR5K_IER_DISABLE },
- { AR5K_BSR, 0, AR5K_INI_READ },
- +#if !defined(CONFIG_ATHEROS_AR71XX) && !defined(CONFIG_ATH79)
- { AR5K_TXCFG, AR5K_DMASIZE_128B },
- { AR5K_RXCFG, AR5K_DMASIZE_128B },
- +#else
- + /* WAR for AR71xx PCI bug */
- + { AR5K_TXCFG, AR5K_DMASIZE_128B },
- + { AR5K_RXCFG, AR5K_DMASIZE_4B },
- +#endif
- { AR5K_CFG, AR5K_INIT_CFG },
- { AR5K_TOPS, 8 },
- { AR5K_RXNOFRM, 8 },
- diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
- index 1a2973b..0fce1c7 100644
- --- a/drivers/net/wireless/ath/ath5k/phy.c
- +++ b/drivers/net/wireless/ath/ath5k/phy.c
- @@ -3709,8 +3709,8 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,
- AR5K_REG_MS(AR5K_TUNE_MAX_TXPOWER, AR5K_TPC_CHIRP),
- AR5K_TPC);
- } else {
- - ath5k_hw_reg_write(ah, AR5K_PHY_TXPOWER_RATE_MAX |
- - AR5K_TUNE_MAX_TXPOWER, AR5K_PHY_TXPOWER_RATE_MAX);
- + ath5k_hw_reg_write(ah, AR5K_TUNE_MAX_TXPOWER,
- + AR5K_PHY_TXPOWER_RATE_MAX);
- }
-
- return 0;
- diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
- index a3399c4..66d0ecc 100644
- --- a/drivers/net/wireless/ath/ath5k/reset.c
- +++ b/drivers/net/wireless/ath/ath5k/reset.c
- @@ -1154,6 +1154,7 @@ ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
- tsf_lo = 0;
- mode = 0;
-
- +#if 0
- /*
- * Sanity check for fast flag
- * Fast channel change only available
- @@ -1161,6 +1162,7 @@ ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
- */
- if (fast && (ah->ah_radio != AR5K_RF2413) &&
- (ah->ah_radio != AR5K_RF5413))
- +#endif
- fast = false;
-
- /* Disable sleep clock operation
- --
- 1.8.5.3
|
