3394af677c
The ath patch number is already large and adding other patch for ath11k will add more confusion with the patch numbering. Since the support of ath11k based device is imminent, prepare the mac80211 ath patch dir and split it in the dedicated ath5k, ath9k, ath10k and ath11k (empty for now). Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
--- 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 },
|
|
--- a/drivers/net/wireless/ath/ath5k/dma.c
|
|
+++ b/drivers/net/wireless/ath/ath5k/dma.c
|
|
@@ -869,10 +869,18 @@ 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*/
|