Fix the KTR option to compile by default - it was referencing
some unmerged interrupt status debugging code from my branch. * Add ah_intrstate[8] which will have the record of the last call to ath_hal_getintr(). * Wrap the KTR code behind ATH_KTR_INTR_DEBUG. * Add the HAL interrupt debugging behind AH_INTERRUPT_DEBUGGING. This is only done for the AR5416 and later NICs but it will be trivial to add to the earlier NICs if required. Neither are enabled by default, although to minimise HAL binary API differences, the ah_intrstate[] array is always compiled into the ath_hal struct.
This commit is contained in:
parent
eb6f0de09d
commit
31fdf3d6d2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=227365
@ -810,6 +810,8 @@ struct ath_hal {
|
|||||||
|
|
||||||
uint16_t *ah_eepromdata; /* eeprom buffer, if needed */
|
uint16_t *ah_eepromdata; /* eeprom buffer, if needed */
|
||||||
|
|
||||||
|
uint32_t ah_intrstate[8]; /* last int state */
|
||||||
|
|
||||||
HAL_OPS_CONFIG ah_config;
|
HAL_OPS_CONFIG ah_config;
|
||||||
const HAL_RATE_TABLE *__ahdecl(*ah_getRateTable)(struct ath_hal *,
|
const HAL_RATE_TABLE *__ahdecl(*ah_getRateTable)(struct ath_hal *,
|
||||||
u_int mode);
|
u_int mode);
|
||||||
|
@ -70,6 +70,13 @@ ar5416GetPendingInterrupts(struct ath_hal *ah, HAL_INT *masked)
|
|||||||
uint32_t isr, isr0, isr1, sync_cause = 0;
|
uint32_t isr, isr0, isr1, sync_cause = 0;
|
||||||
HAL_CAPABILITIES *pCap = &AH_PRIVATE(ah)->ah_caps;
|
HAL_CAPABILITIES *pCap = &AH_PRIVATE(ah)->ah_caps;
|
||||||
|
|
||||||
|
#ifdef AH_INTERRUPT_DEBUGGING
|
||||||
|
/*
|
||||||
|
* Blank the interrupt debugging area regardless.
|
||||||
|
*/
|
||||||
|
bzero(&ah->ah_intrstate, sizeof(ah->ah_intrstate));
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Verify there's a mac interrupt and the RTC is on.
|
* Verify there's a mac interrupt and the RTC is on.
|
||||||
*/
|
*/
|
||||||
@ -90,6 +97,16 @@ ar5416GetPendingInterrupts(struct ath_hal *ah, HAL_INT *masked)
|
|||||||
return AH_FALSE;
|
return AH_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef AH_INTERRUPT_DEBUGGING
|
||||||
|
ah->ah_intrstate[0] = isr;
|
||||||
|
ah->ah_intrstate[1] = OS_REG_READ(ah, AR_ISR_S0);
|
||||||
|
ah->ah_intrstate[2] = OS_REG_READ(ah, AR_ISR_S1);
|
||||||
|
ah->ah_intrstate[3] = OS_REG_READ(ah, AR_ISR_S2);
|
||||||
|
ah->ah_intrstate[4] = OS_REG_READ(ah, AR_ISR_S3);
|
||||||
|
ah->ah_intrstate[5] = OS_REG_READ(ah, AR_ISR_S4);
|
||||||
|
ah->ah_intrstate[6] = OS_REG_READ(ah, AR_ISR_S5);
|
||||||
|
#endif
|
||||||
|
|
||||||
if (isr != 0) {
|
if (isr != 0) {
|
||||||
struct ath_hal_5212 *ahp = AH5212(ah);
|
struct ath_hal_5212 *ahp = AH5212(ah);
|
||||||
uint32_t mask2;
|
uint32_t mask2;
|
||||||
|
@ -1376,6 +1376,7 @@ ath_intr(void *arg)
|
|||||||
ath_hal_getisr(ah, &status); /* NB: clears ISR too */
|
ath_hal_getisr(ah, &status); /* NB: clears ISR too */
|
||||||
DPRINTF(sc, ATH_DEBUG_INTR, "%s: status 0x%x\n", __func__, status);
|
DPRINTF(sc, ATH_DEBUG_INTR, "%s: status 0x%x\n", __func__, status);
|
||||||
CTR1(ATH_KTR_INTR, "ath_intr: mask=0x%.8x", status);
|
CTR1(ATH_KTR_INTR, "ath_intr: mask=0x%.8x", status);
|
||||||
|
#ifdef ATH_KTR_INTR_DEBUG
|
||||||
CTR5(ATH_KTR_INTR,
|
CTR5(ATH_KTR_INTR,
|
||||||
"ath_intr: ISR=0x%.8x, ISR_S0=0x%.8x, ISR_S1=0x%.8x, ISR_S2=0x%.8x, ISR_S5=0x%.8x",
|
"ath_intr: ISR=0x%.8x, ISR_S0=0x%.8x, ISR_S1=0x%.8x, ISR_S2=0x%.8x, ISR_S5=0x%.8x",
|
||||||
ah->ah_intrstate[0],
|
ah->ah_intrstate[0],
|
||||||
@ -1383,6 +1384,7 @@ ath_intr(void *arg)
|
|||||||
ah->ah_intrstate[2],
|
ah->ah_intrstate[2],
|
||||||
ah->ah_intrstate[3],
|
ah->ah_intrstate[3],
|
||||||
ah->ah_intrstate[6]);
|
ah->ah_intrstate[6]);
|
||||||
|
#endif
|
||||||
status &= sc->sc_imask; /* discard unasked for bits */
|
status &= sc->sc_imask; /* discard unasked for bits */
|
||||||
|
|
||||||
/* Short-circuit un-handled interrupts */
|
/* Short-circuit un-handled interrupts */
|
||||||
|
Loading…
Reference in New Issue
Block a user