[svn-commits] rmeyerriecks: linux/trunk r9516 - in /linux/trunk/drivers/dahdi: wct4xxp/ wct...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Dec 8 16:12:02 CST 2010
Author: rmeyerriecks
Date: Wed Dec 8 16:11:58 2010
New Revision: 9516
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9516
Log:
dahdi: Fixed loopup/loopdown signals
The loopup/loopdown T1 maintenance feature in the single through quad-span
drivers now function properly, according to AT&T TR54016, by sending a
full rate pattern down the line. T1.403 ESF/Data Link patterns are not
supported currently.
Also grouped all the maint reset register clears under a single irq lock
to crank the performance up past 11.
Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>
Acked-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Kinsey Moore <kmoore at digium.com>
Modified:
linux/trunk/drivers/dahdi/wct4xxp/base.c
linux/trunk/drivers/dahdi/wcte12xp/base.c
linux/trunk/drivers/dahdi/wcte12xp/wcte12xp.h
Modified: linux/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=9516&r1=9515&r2=9516
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Wed Dec 8 16:11:58 2010
@@ -472,6 +472,10 @@
#define FMR0_SIM (1 << 0) /* Alarm Simulation */
#define FMR1_T 0x1D /* Framer Mode Register 1 */
#define FMR1_ECM (1 << 2) /* Error Counter 1sec Interrupt Enable */
+#define FMR5 0x21 /* Framer Mode Register 5 */
+#define FMR5_XLU (1 << 4) /* Transmit loopup code */
+#define FMR5_XLD (1 << 5) /* Transmit loopdown code */
+#define FMR5_EIBR (1 << 6) /* Internal Bit Robbing Access */
#define DEC_T 0x60 /* Diable Error Counter */
#define IERR_T 0x1B /* Single Bit Defect Insertion Register */
#define IBV 0 /* Bipolar violation */
@@ -1602,12 +1606,20 @@
case DAHDI_MAINT_LOOPUP:
dev_info(&wc->dev->dev, "Transmitting loopup code\n");
t4_clear_maint(span);
- t4_framer_out(wc, span->offset, 0x21, 0x50);
+ spin_lock_irqsave(&wc->reglock, flags);
+ reg = __t4_framer_in(wc, span->offset, FMR5);
+ __t4_framer_out(wc, span->offset, FMR5, (reg|FMR5_XLU));
+ spin_unlock_irqrestore(&wc->reglock, flags);
+ ts->span.maintstat = DAHDI_MAINT_REMOTELOOP;
break;
case DAHDI_MAINT_LOOPDOWN:
dev_info(&wc->dev->dev, "Transmitting loopdown code\n");
t4_clear_maint(span);
- t4_framer_out(wc, span->offset, 0x21, 0x60);
+ spin_lock_irqsave(&wc->reglock, flags);
+ reg = __t4_framer_in(wc, span->offset, FMR5);
+ __t4_framer_out(wc, span->offset, FMR5, (reg|FMR5_XLD));
+ spin_unlock_irqrestore(&wc->reglock, flags);
+ ts->span.maintstat = DAHDI_MAINT_NONE;
break;
case DAHDI_MAINT_FAS_DEFECT:
t4_framer_out(wc, span->offset, IERR_T, IFASE);
@@ -1686,23 +1698,32 @@
struct t4_span *ts = container_of(span, struct t4_span, span);
struct t4 *wc = ts->owner;
unsigned int reg;
+ unsigned long flags;
+
+ spin_lock_irqsave(&wc->reglock, flags);
/* Clear local loop */
- reg = t4_framer_in(wc, span->offset, LIM0_T);
- t4_framer_out(wc, span->offset, LIM0_T, (reg & ~LIM0_LL));
+ reg = __t4_framer_in(wc, span->offset, LIM0_T);
+ __t4_framer_out(wc, span->offset, LIM0_T, (reg & ~LIM0_LL));
/* Clear Remote Loop */
- reg = t4_framer_in(wc, span->offset, LIM1_T);
- t4_framer_out(wc, span->offset, LIM1_T, (reg & ~LIM1_RL));
+ reg = __t4_framer_in(wc, span->offset, LIM1_T);
+ __t4_framer_out(wc, span->offset, LIM1_T, (reg & ~LIM1_RL));
/* Clear Remote Payload Loop */
- reg = t4_framer_in(wc, span->offset, FMR2_T);
- t4_framer_out(wc, span->offset, FMR2_T, (reg & ~FMR2_PLB));
+ reg = __t4_framer_in(wc, span->offset, FMR2_T);
+ __t4_framer_out(wc, span->offset, FMR2_T, (reg & ~FMR2_PLB));
/* Clear PRBS */
- reg = t4_framer_in(wc, span->offset, LCR1_T);
- t4_framer_out(wc, span->offset, LCR1_T, (reg & ~(XPRBS | EPRM)));
-
+ reg = __t4_framer_in(wc, span->offset, LCR1_T);
+ __t4_framer_out(wc, span->offset, LCR1_T, (reg & ~(XPRBS | EPRM)));
+
+ /* Clear loopup/loopdown signals on the line */
+ reg = __t4_framer_in(wc, span->offset, FMR5);
+ __t4_framer_out(wc, span->offset, FMR5, (reg & ~(FMR5_XLU | FMR5_XLD)));
+ span->maintstat = DAHDI_MAINT_NONE;
+
+ spin_unlock_irqrestore(&wc->reglock, flags);
span->mainttimer = 0;
return 0;
@@ -2489,7 +2510,7 @@
}
__t4_framer_out(wc, unit, 0x1c, fmr0);
__t4_framer_out(wc, unit, 0x20, fmr4);
- __t4_framer_out(wc, unit, 0x21, 0x40); /* FMR5: Enable RBS mode */
+ __t4_framer_out(wc, unit, FMR5, FMR5_EIBR); /* FMR5: Enable RBS mode */
__t4_framer_out(wc, unit, 0x37, 0xf0 ); /* LIM1: Clear data in case of LOS, Set receiver threshold (0.5V), No remote loop, no DRS */
__t4_framer_out(wc, unit, 0x36, 0x08); /* LIM0: Enable auto long haul mode, no local loop (must be after LIM1) */
@@ -3130,6 +3151,10 @@
if ((!ts->span.mainttimer) && (d & 0x08)) {
/* Loop-up code detected */
if ((ts->loopupcnt++ > 80) && (ts->span.maintstat != DAHDI_MAINT_REMOTELOOP)) {
+ dev_notice(&wc->dev->dev,
+ "span %d: Loopup detected,"\
+ " enabling remote loop\n",
+ span+1);
__t4_framer_out(wc, span, 0x36, 0x08); /* LIM0: Disable any local loop */
__t4_framer_out(wc, span, 0x37, 0xf6 ); /* LIM1: Enable remote loop */
ts->span.maintstat = DAHDI_MAINT_REMOTELOOP;
@@ -3140,6 +3165,10 @@
if ((!ts->span.mainttimer) && (d & 0x10)) {
/* Loop-down code detected */
if ((ts->loopdowncnt++ > 80) && (ts->span.maintstat == DAHDI_MAINT_REMOTELOOP)) {
+ dev_notice(&wc->dev->dev,
+ "span %d: Loopdown detected,"\
+ " disabling remote loop\n",
+ span+1);
__t4_framer_out(wc, span, 0x36, 0x08); /* LIM0: Disable any local loop */
__t4_framer_out(wc, span, 0x37, 0xf0 ); /* LIM1: Disable remote loop */
ts->span.maintstat = DAHDI_MAINT_NONE;
@@ -3389,7 +3418,7 @@
static inline void t4_framer_interrupt(struct t4 *wc, int span)
{
/* Check interrupts for a given span */
- unsigned char gis, isr0, isr1, isr2, isr3, isr4, reg;
+ unsigned char gis, isr0, isr1, isr2, isr3, isr4;
int readsize = -1;
struct t4_span *ts = wc->tspans[span];
struct dahdi_chan *sigchan;
@@ -3425,16 +3454,6 @@
ts->span.count.errsec += 1;
}
- if (isr3 & 0x08) {
- reg = t4_framer_in(wc, span, FRS1_T);
- dev_info(&wc->dev->dev, "FRS1: %d\n", reg);
- if (reg & LLBDD) {
- dev_info(&wc->dev->dev, "Line loop-back activation "\
- "signal detected with status: %01d "\
- "for span %d\n", reg & LLBAD, span+1);
- }
- }
-
if (isr0)
t4_check_sigbits(wc, span);
Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=9516&r1=9515&r2=9516
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Wed Dec 8 16:11:58 2010
@@ -1281,6 +1281,9 @@
if (reg < 0)
return -EIO;
t1_setreg(wc, LIM1, reg & ~(LIM1_RL | LIM1_JATT));
+
+ /* Clear loopup/loopdown signals on the line */
+ t1_setreg(wc, 0x21, 0x40);
return 0;
}
@@ -1699,6 +1702,8 @@
if ((!wc->span.mainttimer) && (d & 0x08)) {
/* Loop-up code detected */
if ((wc->loopupcnt++ > 80) && (wc->span.maintstat != DAHDI_MAINT_REMOTELOOP)) {
+ t1_notice(wc, "Loopup detected,"\
+ " enabling remote loop\n");
t1_setreg(wc, 0x36, 0x08); /* LIM0: Disable any local loop */
t1_setreg(wc, 0x37, 0xf6); /* LIM1: Enable remote loop */
wc->span.maintstat = DAHDI_MAINT_REMOTELOOP;
@@ -1709,6 +1714,8 @@
if ((!wc->span.mainttimer) && (d & 0x10)) {
/* Loop-down code detected */
if ((wc->loopdowncnt++ > 80) && (wc->span.maintstat == DAHDI_MAINT_REMOTELOOP)) {
+ t1_notice(wc, "Loopdown detected,"\
+ " disabling remote loop\n");
t1_setreg(wc, 0x36, 0x08); /* LIM0: Disable any local loop */
t1_setreg(wc, 0x37, 0xf0); /* LIM1: Disable remote loop */
wc->span.maintstat = DAHDI_MAINT_NONE;
Modified: linux/trunk/drivers/dahdi/wcte12xp/wcte12xp.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/wcte12xp.h?view=diff&rev=9516&r1=9515&r2=9516
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/wcte12xp.h (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/wcte12xp.h Wed Dec 8 16:11:58 2010
@@ -142,6 +142,9 @@
#define t1_info(t1, format, arg...) \
dev_info(&t1->vb.pdev->dev , format , ## arg)
+#define t1_notice(t1, format, arg...) \
+ dev_notice(&t1->vb.pdev->dev , format , ## arg)
+
/* Maintenance Mode Registers */
#define LIM0 0x36
#define LIM0_LL (1<<1)
More information about the svn-commits
mailing list