Date: Wed, 4 Apr 2012 20:42:32 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r233885 - head/sys/dev/ath/ath_hal/ar5416 Message-ID: <201204042042.q34KgWBJ024077@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Wed Apr 4 20:42:32 2012 New Revision: 233885 URL: http://svn.freebsd.org/changeset/base/233885 Log: Disable a specific Merlin hardware workaround which may cause hangs on some PCIe controllers. Obtained from: Atheros / Linux Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h Wed Apr 4 19:58:50 2012 (r233884) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h Wed Apr 4 20:42:32 2012 (r233885) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204042042.q34KgWBJ024077>