svn commit: r220188 - in head/sys: conf dev/ath/ath_hal/ar5416

[Adrian Chadd]

Author: adrian
Date: Thu Mar 31 08:48:05 2011
New Revision: 220188
URL: http://svn.freebsd.org/changeset/base/220188

Log:
  Introduce AH_AR5416_INTERRUPT_MITIGATION which enables interrupt mitigation for
  the AR5416 and later. Rename the older HAL option to use this.

Modified:
  head/sys/conf/options
  head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
  head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Thu Mar 31 08:32:53 2011	(r220187)
+++ head/sys/conf/options	Thu Mar 31 08:48:05 2011	(r220188)
@@ -786,6 +786,9 @@ AH_USE_INIPDGAIN	opt_ah.h
 AH_MAXCHAN		opt_ah.h
 AH_RXCFG_SDMAMW_4BYTES	opt_ah.h
 
+# AR5416 and later interrupt mitigation
+AH_AR5416_INTERRUPT_MITIGATION	opt_ah.h
+
 # options for the Broadcom BCM43xx driver (bwi)
 BWI_DEBUG		opt_bwi.h
 BWI_DEBUG_VERBOSE	opt_bwi.h

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c	Thu Mar 31 08:32:53 2011	(r220187)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c	Thu Mar 31 08:48:05 2011	(r220188)
@@ -128,7 +128,7 @@ ar5416GetPendingInterrupts(struct ath_ha
 		}
 
 		/* Interrupt Mitigation on AR5416 */
-#ifdef AR5416_INT_MITIGATION
+#ifdef	AH_AR5416_INTERRUPT_MITIGATION
 		if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM))
 			*masked |= HAL_INT_RX;
 		if (isr & (AR_ISR_TXMINTR | AR_ISR_TXINTM))
@@ -194,7 +194,7 @@ ar5416SetInterrupts(struct ath_hal *ah, 
 	mask = ints & HAL_INT_COMMON;
 	mask2 = 0;
 
-#ifdef	AR5416_INT_MITIGATION
+#ifdef	AH_AR5416_INTERRUPT_MITIGATION
 	/*
 	 * Overwrite default mask if Interrupt mitigation
 	 * is specified for AR5416

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c	Thu Mar 31 08:32:53 2011	(r220187)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c	Thu Mar 31 08:48:05 2011	(r220188)
@@ -305,7 +305,7 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMO
 	 */
 	OS_REG_WRITE(ah, AR_OBS, 8);
 
-#ifdef AR5416_INT_MITIGATION
+#ifdef	AH_AR5416_INTERRUPT_MITIGATION
 	OS_REG_WRITE(ah, AR_MIRT, 0);
 
 	OS_REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);
@@ -538,7 +538,7 @@ ar5416InitIMR(struct ath_hal *ah, HAL_OP
 			| AR_IMR_RXERR | AR_IMR_RXORN
                         | AR_IMR_BCNMISC;
 
-#ifdef AR5416_INT_MITIGATION
+#ifdef	AH_AR5416_INTERRUPT_MITIGATION
        	ahp->ah_maskReg |= AR_IMR_TXINTM | AR_IMR_RXINTM
 			|  AR_IMR_TXMINTR | AR_IMR_RXMINTR;
 #else