2009-06-21 14:38:15 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath5k/reset.c
|
|
|
|
+++ b/drivers/net/wireless/ath/ath5k/reset.c
|
2009-08-20 15:09:03 +00:00
|
|
|
@@ -1368,10 +1368,18 @@ int ath5k_hw_reset(struct ath5k_hw *ah,
|
|
|
|
* guess we can tweak it and see how it goes ;-)
|
|
|
|
*/
|
2009-06-21 14:38:15 +00:00
|
|
|
if (ah->ah_version != AR5K_AR5210) {
|
2009-08-20 15:09:03 +00:00
|
|
|
+#ifndef CONFIG_ATHEROS_AR71XX
|
2009-06-21 14:38:15 +00:00
|
|
|
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 */
|
2009-08-20 15:09:03 +00:00
|
|
|
+ AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
|
|
|
|
+ AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_4B);
|
2009-06-21 14:38:15 +00:00
|
|
|
+ AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
|
|
|
|
+ AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_4B);
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Pre-enable interrupts on 5211/5212*/
|
|
|
|
--- a/drivers/net/wireless/ath/ath5k/initvals.c
|
|
|
|
+++ b/drivers/net/wireless/ath/ath5k/initvals.c
|
2009-08-20 15:09:03 +00:00
|
|
|
@@ -58,8 +58,14 @@ static const struct ath5k_ini ar5210_ini
|
|
|
|
{ AR5K_IMR, 0 },
|
2009-06-21 14:38:15 +00:00
|
|
|
{ AR5K_IER, AR5K_IER_DISABLE },
|
|
|
|
{ AR5K_BSR, 0, AR5K_INI_READ },
|
|
|
|
+#ifndef CONFIG_ATHEROS_AR71XX
|
2009-08-20 15:09:03 +00:00
|
|
|
{ AR5K_TXCFG, AR5K_DMASIZE_128B },
|
2009-06-21 14:38:15 +00:00
|
|
|
{ AR5K_RXCFG, AR5K_DMASIZE_128B },
|
|
|
|
+#else
|
|
|
|
+ /* WAR for AR71xx PCI bug */
|
2009-08-20 15:09:03 +00:00
|
|
|
+ { AR5K_TXCFG, AR5K_DMASIZE_4B },
|
2009-06-21 14:38:15 +00:00
|
|
|
+ { AR5K_RXCFG, AR5K_DMASIZE_4B },
|
|
|
|
+#endif
|
|
|
|
{ AR5K_CFG, AR5K_INIT_CFG },
|
|
|
|
{ AR5K_TOPS, 8 },
|
|
|
|
{ AR5K_RXNOFRM, 8 },
|