summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2012-04-04 20:42:32 +0000
committeradrian <adrian@FreeBSD.org>2012-04-04 20:42:32 +0000
commitc754ab5e303c512f38c815a6394d57e6e4dc162c (patch)
tree4802c2653977164b209cac129921841169ae8093
parent5c66ff4b78172c9217ab0b525e09303432761968 (diff)
downloadFreeBSD-src-c754ab5e303c512f38c815a6394d57e6e4dc162c.zip
FreeBSD-src-c754ab5e303c512f38c815a6394d57e6e4dc162c.tar.gz
Disable a specific Merlin hardware workaround which may cause hangs on some
PCIe controllers. Obtained from: Atheros / Linux
-rw-r--r--sys/dev/ath/ath_hal/ar5416/ar5416reg.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416reg.h b/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
index 6b00664..b1adc8b 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
@@ -212,9 +212,10 @@
#define AR_WA_RESET_EN 0x00040000 /* ena AR_WA_UNTIE_RESET_EN */
#define AR_WA_ANALOG_SHIFT 0x00100000
#define AR_WA_POR_SHORT 0x00200000 /* PCIE phy reset control */
+#define AR_WA_D3_L1_DISABLE 0x00800000 /* bit 23 */
#define AR_WA_DEFAULT 0x0000073f
-#define AR9280_WA_DEFAULT 0x0040073f
+#define AR9280_WA_DEFAULT 0x0040073b /* disable bit 2, see commit */
#define AR9285_WA_DEFAULT 0x004a05cb
#define AR_PCIE_PM_CTRL_ENA 0x00080000
OpenPOWER on IntegriCloud