Ticket #1017: ar5418_dmasize.diff

ath/if_ath_hal_extensions.h

@@ -143 +143 @@
-#define DEFAULT_AR5K_PHY_SPUR_THRESH            2
-#define DEFAULT_AR5K_PHY_SIG_FIRSTEP            0
-
+/*
+ * Transmit configuration register
+ */
+#define AR5K_TXCFG              0x0030                  /* Register Address */
+#define AR5K_TXCFG_SDMAMR       0x00000007      /* DMA size */
+#define AR5K_TXCFG_SDMAMR_S     0
+
+/*
+ * Receive configuration register
+ */
+#define AR5K_RXCFG              0x0034                  /* Register Address */
+#define AR5K_RXCFG_SDMAMW       0x00000007      /* DMA size */
+#define AR5K_RXCFG_SDMAMW_S     0
+
+/*
+ * DMA size definitions (2^(n+2))
+ */
+enum ath5k_dmasize {
+        AR5K_DMASIZE_4B = 0,
+        AR5K_DMASIZE_8B,
+        AR5K_DMASIZE_16B,
+        AR5K_DMASIZE_32B,
+        AR5K_DMASIZE_64B,
+        AR5K_DMASIZE_128B,
+        AR5K_DMASIZE_256B,
+        AR5K_DMASIZE_512B
+};
+
-static inline unsigned long field_width(unsigned long mask, unsigned long shift)
-{
-        unsigned long r = 0;
@@ -429 +457 @@
-        VERIFICATION_WARNING(ah, AR5K_PHY_SPUR, AR5K_PHY_SPUR_THRESH, 0);
-}
-
+static inline void ath_hal_set_dmasize_pcie(struct ath_hal *ah) {
+        SET_FIELD(ah, AR5K_TXCFG, AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B);
+        SET_FIELD(ah, AR5K_RXCFG, AR5K_RXCFG_SDMAMW, AR5K_DMASIZE_128B);
+}
+
-#endif /* _IF_ATH_HAL_EXTENSIONS_H_ */

ath/if_athvar.h

@@ -692 +692 @@
-        unsigned int    sc_txcont:1;            /* Is continuous transmit enabled? */
-        unsigned int    sc_dfs_testmode:1;      /* IF this is on, AP vaps will stay in
-                                                 * 'channel availability check' indefinately,
-
-
+
+
+
-        unsigned int sc_txcont_power; /* Continuous transmit power in 0.5dBm units */
-        unsigned int sc_txcont_rate;  /* Continuous transmit rate in Mbps */
-

ath/if_ath_pci.c

@@ -252 +252 @@
-                dev_info, dev->name, athname ? athname : "Atheros ???",
-                (unsigned long long)phymem, dev->irq);
-
+        if (vdevice == AR5418_DEVID)
+                sc->aps_sc.sc_dmasize_stomp = 1;
+
-        /* ready to process interrupts */
-        sc->aps_sc.sc_invalid = 0;
-

ath/if_ath.c

@@ -632 +632 @@
-                IPRINTF(sc, "Interference mitigation is supported.  Currently %s.\n",
-                        (sc->sc_useintmit ? "enabled" : "disabled"));
-        }
+
+        sc->sc_dmasize_stomp = 0;
+
-        /*
-         * Check if the MAC has multi-rate retry support.
-         * We do this by trying to setup a fake extended
@@ -1708 +1711 @@
-#endif
-/* XXX: Any other features they clobber? */
-        ath_override_intmit_if_disabled(sc);
+        if (sc->sc_dmasize_stomp)
+                ath_hal_set_dmasize_pcie(sc->sc_ah);
-        if (sc->sc_softled)
-                ath_hal_gpioCfgOutput(sc->sc_ah, sc->sc_ledpin);
-        ath_update_txpow(sc);           /* update tx power state */