FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wct4xxp: Hold the reglock longer when checking error counters.

Browse Source 
This is a very slight performance improvement. Eliminating the need to
save the IRQ flags is probably more of a boost than grabbing and
releasing the reglock.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9558 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2011-01-03 14:55:19 +00:00
parent a6c9b88c66
commit 8c790d07a8
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/dahdi/wct4xxp/base.c
View File

@ -3431,12 +3431,13 @@ static inline void t4_framer_interrupt(struct t4 *wc, int span)
/* 1st gen cards isn't used interrupts */ /* 1st gen cards isn't used interrupts */
gis = t4_framer_in(wc, span, FRMR_GIS); spin_lock_irqsave(&wc->reglock, flags);
isr0 = (gis & FRMR_GIS_ISR0) ? t4_framer_in(wc, span, FRMR_ISR0) : 0; gis = __t4_framer_in(wc, span, FRMR_GIS);
isr1 = (gis & FRMR_GIS_ISR1) ? t4_framer_in(wc, span, FRMR_ISR1) : 0; isr0 = (gis & FRMR_GIS_ISR0) ? __t4_framer_in(wc, span, FRMR_ISR0) : 0;
isr2 = (gis & FRMR_GIS_ISR2) ? t4_framer_in(wc, span, FRMR_ISR2) : 0; isr1 = (gis & FRMR_GIS_ISR1) ? __t4_framer_in(wc, span, FRMR_ISR1) : 0;
isr3 = (gis & FRMR_GIS_ISR3) ? t4_framer_in(wc, span, FRMR_ISR3) : 0; isr2 = (gis & FRMR_GIS_ISR2) ? __t4_framer_in(wc, span, FRMR_ISR2) : 0;
isr4 = (gis & FRMR_GIS_ISR4) ? t4_framer_in(wc, span, FRMR_ISR4) : 0; isr3 = (gis & FRMR_GIS_ISR3) ? __t4_framer_in(wc, span, FRMR_ISR3) : 0;
isr4 = (gis & FRMR_GIS_ISR4) ? __t4_framer_in(wc, span, FRMR_ISR4) : 0;
if ((debug & DEBUG_FRAMER) && !(isr3 & ISR3_SEC)) { if ((debug & DEBUG_FRAMER) && !(isr3 & ISR3_SEC)) {
dev_info(&wc->dev->dev, "gis: %02x, isr0: %02x, isr1: %02x, "\ dev_info(&wc->dev->dev, "gis: %02x, isr0: %02x, isr1: %02x, "\
@ -3445,14 +3446,15 @@ static inline void t4_framer_interrupt(struct t4 *wc, int span)
} }
/* Collect performance counters once per second */ /* Collect performance counters once per second */
if (isr3 & ISR3_SEC) { if (isr3 & ISR3_SEC) {
ts->span.count.fe += t4_framer_in(wc, span, FECL_T); ts->span.count.fe += __t4_framer_in(wc, span, FECL_T);
ts->span.count.crc4 += t4_framer_in(wc, span, CEC1L_T); ts->span.count.crc4 += __t4_framer_in(wc, span, CEC1L_T);
ts->span.count.cv += t4_framer_in(wc, span, CVCL_T); ts->span.count.cv += __t4_framer_in(wc, span, CVCL_T);
ts->span.count.ebit += t4_framer_in(wc, span, EBCL_T); ts->span.count.ebit += __t4_framer_in(wc, span, EBCL_T);
ts->span.count.be += t4_framer_in(wc, span, BECL_T); ts->span.count.be += __t4_framer_in(wc, span, BECL_T);
ts->span.count.prbs = t4_framer_in(wc, span, FRS1_T); ts->span.count.prbs = __t4_framer_in(wc, span, FRS1_T);
} }
spin_unlock_irqrestore(&wc->reglock, flags);
/* Collect errored second counter once per second */ /* Collect errored second counter once per second */
if (isr3 & ISR3_ES) { if (isr3 & ISR3_ES) {