wcb4xxp: Print serial number of gen 2 cards.

Now prints the serial number of the card to the kernel log for cards which
support this feature. This include the wcb23x and wcb43x series.

Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>

Makefile

@@ -196,7 +196,8 @@ test:
 docs: $(GENERATED_DOCS)
 
 README.html: README
-	$(ASCIIDOC_CMD) -o $@ $<
+	date=`stat -c "%y" $<`
+	$(ASCIIDOC_CMD)  -a revdate="$$date" -o $@ $<
 
 dahdi-api.html: drivers/dahdi/dahdi-base.c
 	build_tools/kernel-doc --kernel $(KSRC) $^ >$@

README

@@ -12,6 +12,16 @@ Supported Hardware
 ------------------
 Digital Cards
 ~~~~~~~~~~~~~
+- wcte43x:
+  * Digium TE435: PCI express quad-port T1/E1/J1
+  * Digium TE436: PCI quad-port T1/E1/J1
+  * Digium TE235: PCI express dual-port T1/E1/J1
+  * Digium TE236: PCI dual-port T1/E1/J1
+- wcte13xp:
+  * Digium TE131: PCI express single-port T1/E1/J1
+  * Digium TE133: PCI express single-port T1/E1/J1 with echocan
+  * Digium TE132: PCI single-port T1/E1/J1
+  * Digium TE134: PCI single-port T1/E1/J1 with echocan
 - wct4xxp:
   * Digium TE205P/TE207P/TE210P/TE212P: PCI dual-port T1/E1/J1
   * Digium TE405P/TE407P/TE410P/TE412P: PCI quad-port T1/E1/J1
@@ -34,6 +44,11 @@ Digital Cards
 
 Analog Cards
 ~~~~~~~~~~~~
+- wcaxx:
+  * Digium A8A: PCI up to 8 mixed FXS/FXO ports
+  * Digium A8B: PCI express up to 8 mixed FXS/FXO ports
+  * Digium A4A: PCI up to 4 mixed FXS/FXO ports
+  * Digium A4B: PCI express up to 4 mixed FXS/FXO ports 
 - wctdm24xxp: 
   * Digium TDM2400P/AEX2400: up to 24 analog ports
   * Digium TDM800P/AEX800: up to 8 analog ports

build_tools/make_version

@@ -2,119 +2,18 @@
 
 if [ -f ${1}/.version ]; then
 	cat ${1}/.version
-elif [ -f ${1}/.svnrevision ]; then
-	echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
-elif [ -d ${1}/.svn ]; then
-    PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/${2}/:: | sed -e 's:/: :g'`
-    BRANCH=0
-    TEAM=0
-    
-    REV=`svnversion -c ${1} | cut -d: -f2`
-    
-    if [ "${PARTS}" = "trunk" ]
-	then
-	echo SVN-'trunk'-r${REV}
-	exit 0
-    fi
-    
-    for PART in $PARTS
-      do
-      if [ ${BRANCH} != 0 ]
-	  then
-	  RESULT="${RESULT}-${PART}"
-	  break
-      fi
-      
-      if [ ${TEAM} != 0 ]
-	  then
-	  RESULT="${RESULT}-${PART}"
-	  continue
-      fi
-      
-      if [ "${PART}" = "branches" ]
-	  then
-	  BRANCH=1
-	  RESULT="branch"
-	  continue
-      fi
-      
-      if [ "${PART}" = "tags" ]
-	  then
-	  BRANCH=1
-	  RESULT="tag"
-	  continue
-      fi
-      
-      if [ "${PART}" = "team" ]
-	  then
-	  TEAM=1
-	  continue
-      fi
-    done
-    
-    echo SVN-${RESULT##-}-r${REV}
 elif [ -d ${1}/.git ]; then
-    # If the first log commit messages indicates that this is checked into
-    # subversion, we'll just use the SVN- form of the revision.
-    MODIFIED=""
-    SVN_REV=`git log --pretty=full -1 | grep -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
-    if [ -z "$SVN_REV" ]; then
-        VERSION=`git describe --tags --dirty=M 2> /dev/null | sed -e "s/^v\([0-9]\)/\1/"`
-        if [ $? -ne 0 ]; then
-            if [ "`git ls-files -m | wc -l`" != "0" ]; then
-                MODIFIED="M"
-            fi
-            # Some older versions of git do not support all the above
-            # options.
-            VERSION=GIT-`git rev-parse --short --verify HEAD`${MODIFIED}
-        fi
-        echo ${VERSION}
-    else
-        PARTS=`LANG=C git log --pretty=full | grep -F "git-svn-id:" | head -1 | awk '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 's/@.*$//g'`
-        BRANCH=0
-        TEAM=0
-
+    VERSION=`git describe --tags --dirty=M 2> /dev/null | sed -e "s/^v\([0-9]\)/\1/"`
+    if [ $? -ne 0 ]; then
+        MODIFIED=""
         if [ "`git ls-files -m | wc -l`" != "0" ]; then
             MODIFIED="M"
         fi
-
-        if [ "${PARTS}" = "trunk" ]; then
-            echo SVN-'trunk'-r${SVN_REV}${MODIFIED}
-            exit 0
-        fi
-
-        for PART in $PARTS
-          do
-              if [ ${BRANCH} != 0 ]; then
-              RESULT="${RESULT}-${PART}"
-              break
-          fi
-
-          if [ ${TEAM} != 0 ]; then
-              RESULT="${RESULT}-${PART}"
-              continue
-          fi
-
-          if [ "${PART}" = "branches" ]; then
-              BRANCH=1
-              RESULT="branch"
-              continue
-          fi
-
-          if [ "${PART}" = "tags" ]; then
-              BRANCH=1
-              RESULT="tag"
-              continue
-          fi
-
-          if [ "${PART}" = "team" ]; then
-              TEAM=1
-              continue
-          fi
-        done
-
-        echo SVN-${RESULT##-}-r${SVN_REV}${MODIFIED}
+        # Some older versions of git do not support all the above
+        # options.
+        VERSION=GIT-`git rev-parse --short --verify HEAD`${MODIFIED}
     fi
+    echo ${VERSION}
 else
 	# Use the directory information in the absence of any other version
 	# information

drivers/dahdi/firmware/Makefile

@@ -31,14 +31,14 @@ VPMADT032_VERSION:=1.25.0
 HX8_VERSION:=2.06
 VPMOCT032_VERSION:=1.12.0
 WCT820_VERSION:=1.76
-TE133_VERSION:=780019
+TE133_VERSION:=7a001e
 TE134_VERSION:=780017
-TE435_VERSION:=e0019
+TE435_VERSION:=13001e
 TE436_VERSION:=10017
 A8A_VERSION:=1d0017
-A8B_VERSION:=1d0019
+A8B_VERSION:=1f001e
 A4A_VERSION:=a0017
-A4B_VERSION:=b0019
+A4B_VERSION:=d001e
 
 FIRMWARE_URL:=http://downloads.digium.com/pub/telephony/firmware/releases
 

drivers/dahdi/oct612x/oct612x-user.c

@@ -22,6 +22,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 
 #include <dahdi/kernel.h>
 

drivers/dahdi/pciradio.c

@@ -1784,7 +1784,8 @@ static int __devinit pciradio_init_one(struct pci_dev *pdev, const struct pci_de
 
 			}
 
-			if (request_irq(pdev->irq, pciradio_interrupt, DAHDI_IRQ_SHARED, "pciradio", rad)) {
+			if (request_irq(pdev->irq, pciradio_interrupt,
+					IRQF_SHARED, "pciradio", rad)) {
 				printk(KERN_NOTICE "pciradio: Unable to request IRQ %d\n", pdev->irq);
 				if (rad->freeregion)
 					release_region(rad->ioaddr, 0xff);

drivers/dahdi/tor2.c

@@ -543,7 +543,7 @@ static int __devinit tor2_probe(struct pci_dev *pdev, const struct pci_device_id
 	for (x = 0; x < 256; x++)
 		writel(0x7f7f7f7f, &tor->mem32[x]);
 
-	if (request_irq(tor->irq, tor2_intr, DAHDI_IRQ_SHARED_DISABLED, "tor2", tor)) {
+	if (request_irq(tor->irq, tor2_intr, IRQF_SHARED, "tor2", tor)) {
 		printk(KERN_ERR "Unable to request tormenta IRQ %d\n", tor->irq);
 		goto err_out_release_all;
 	}
@@ -1200,6 +1200,7 @@ DAHDI_IRQ_HANDLER(tor2_intr)
 	unsigned char c, rxc;
 	unsigned char abits, bbits;
 	struct tor2 *tor = (struct tor2 *) dev_id;	
+	unsigned long flags;
 
 	  /* make sure its a real interrupt for us */
 	if (!(readb(&tor->mem8[STATREG]) & INTACTIVE)) /* if not, just return */
@@ -1207,6 +1208,8 @@ DAHDI_IRQ_HANDLER(tor2_intr)
 		return IRQ_NONE;
 	   }
 
+	local_irq_save(flags);
+
 	if (tor->cardtype == TYPE_E1) {
 		/* set outbit, interrupt enable, and ack interrupt */
 		writeb(OUTBIT | INTENA | INTACK | E1DIV | tor->master,
@@ -1504,6 +1507,8 @@ DAHDI_IRQ_HANDLER(tor2_intr)
 	else
 		/* clear OUTBIT and enable interrupts */
 		writeb(INTENA | tor->master, &tor->mem8[CTLREG]);
+
+	local_irq_restore(flags);
 	return IRQ_RETVAL(1);
 }
 

drivers/dahdi/voicebus/voicebus.c

@@ -1885,7 +1885,7 @@ __voicebus_init(struct voicebus *vb, const char *board_name,
 		goto cleanup;
 
 #if !defined(CONFIG_VOICEBUS_TIMER)
-	retval = request_irq(vb->pdev->irq, vb_isr, DAHDI_IRQ_SHARED,
+	retval = request_irq(vb->pdev->irq, vb_isr, IRQF_SHARED,
 			     board_name, vb);
 	if (retval) {
 		dev_warn(&vb->pdev->dev, "Failed to request interrupt line.\n");

drivers/dahdi/wcaxx-base.c

@@ -3886,9 +3886,9 @@ static int wcaxx_check_firmware(struct wcaxx *wc)
 	u32 firmware_version;
 	const bool force_firmware = false;
 	const unsigned int A4A_VERSION = 0x0a0017;
-	const unsigned int A4B_VERSION = 0x0b0019;
+	const unsigned int A4B_VERSION = 0x0d001e;
 	const unsigned int A8A_VERSION = 0x1d0017;
-	const unsigned int A8B_VERSION = 0x1d0019;
+	const unsigned int A8B_VERSION = 0x1f001e;
 
 	if (wc->desc == &device_a8a) {
 		firmware_version = A8A_VERSION;

drivers/dahdi/wcb4xxp/wcb4xxp.h

@@ -248,8 +248,8 @@
 #define V_ROUT_TX_STIO2		(0x3 << 6)	/* output data to STIO2 */
 #define V_ROUT_RX_DIS		(0x0 << 6)	/* disabled, input data ignored */
 #define V_ROUT_RX_LOOP		(0x1 << 6)	/* internally looped, input data ignored */
-#define V_ROUT_RX_STIO2		(0x2 << 6)	/* channel data comes from STIO1 */
-#define V_ROUT_RX_STIO1		(0x3 << 6)	/* channel data comes from STIO2 */
+#define V_ROUT_RX_STIO2		(0x2 << 6)	/* channel data from STIO2 */
+#define V_ROUT_RX_STIO1		(0x3 << 6)	/* channel data from STIO1 */
 
 #define V_CH_SNUM_SHIFT		(1)
 #define V_CH_SNUM_MASK		(31 << 1)
@@ -367,6 +367,16 @@
 #define V_B2_RX_EN		(1 << 1)	/* 1=enable B2 RX */
 #define V_ST_TRI		(1 << 6)	/* 1=tristate S/T output buffer */
 
+/* User Flash Manager */
+#define UFM_PROGRAM	(1<<0)
+#define UFM_ERASE	(1<<1)
+#define UFM_DRSHIFT	(1<<2)
+#define UFM_DRDIN	(1<<3)
+#define UFM_DRCLK	(1<<4)
+#define UFM_ARSHIFT	(1<<5)
+#define UFM_ARDIN	(1<<6)
+#define UFM_ARCLK	(1<<7)
+
 #define NUM_REGS 0xff
 #define NUM_PCI 12
 
@@ -385,7 +395,8 @@
 
 struct b4xxp_span {
 	struct b4xxp *parent;
-	int port;				/* which S/T port this span belongs to */
+	int port;				/* virtual port */
+	int phy_port;				/* physical port */
 
 	unsigned char writechunk[WCB4XXP_CHANNELS_PER_SPAN * DAHDI_CHUNKSIZE];
 	unsigned char readchunk[WCB4XXP_CHANNELS_PER_SPAN * DAHDI_CHUNKSIZE];
@@ -426,7 +437,9 @@ enum cards_ids {	/* Cards ==> Brand & Model 		*/
 	BN4S0,		/* Beronet BN4S0			*/
 	BN8S0,		/* BeroNet BN8S0			*/
 	BSWYX_SX2,	/* Swyx 4xS0 SX2 QuadBri		*/
-	QUADBRI_EVAL	/* HFC-4S CCD Eval. Board		*/
+	QUADBRI_EVAL,	/* HFC-4S CCD Eval. Board		*/
+	B430P,		/* Digium B430P				*/
+	B230P		/* Digium B230P				*/
 	};
 
 /* This structure exists one per card */

drivers/dahdi/wcfxo.c

@@ -972,7 +972,7 @@ static int __devinit wcfxo_init_one(struct pci_dev *pdev, const struct pci_devic
 	/* Keep track of which device we are */
 	pci_set_drvdata(pdev, wc);
 
-	if (request_irq(pdev->irq, wcfxo_interrupt, DAHDI_IRQ_SHARED, "wcfxo", wc)) {
+	if (request_irq(pdev->irq, wcfxo_interrupt, IRQF_SHARED, "wcfxo", wc)) {
 		printk(KERN_NOTICE "wcfxo: Unable to request IRQ %d\n", pdev->irq);
 		if (wc->freeregion)
 			release_region(wc->ioaddr, 0xff);

drivers/dahdi/wct1xxp.c

@@ -1174,6 +1174,8 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
 	if (!ints)
 		return IRQ_NONE;
 
+	local_irq_save(flags);
+
 	outb(ints, wc->ioaddr + WC_INTSTAT);
 
 	if (!wc->intcount) {
@@ -1188,13 +1190,13 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
 		t1xxp_receiveprep(wc, ints);
 		t1xxp_transmitprep(wc, ints);
 	}
-	spin_lock_irqsave(&wc->lock, flags);
+	spin_lock(&wc->lock);
 
 #if 1
 	__handle_leds(wc);
 #endif
 
-	spin_unlock_irqrestore(&wc->lock, flags);
+	spin_unlock(&wc->lock);
 
 	/* Count down timers */
 	t1xxp_do_counters(wc);
@@ -1220,6 +1222,8 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
 	if (ints & 0x20)
 		printk(KERN_INFO "PCI Target abort\n");
 
+	local_irq_restore(flags);
+
 	return IRQ_RETVAL(1);
 }
 
@@ -1333,7 +1337,7 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic
 	/* Keep track of which device we are */
 	pci_set_drvdata(pdev, wc);
 	
-	if (request_irq(pdev->irq, t1xxp_interrupt, DAHDI_IRQ_SHARED_DISABLED, "t1xxp", wc)) {
+	if (request_irq(pdev->irq, t1xxp_interrupt, IRQF_SHARED, "t1xxp", wc)) {
 		printk(KERN_NOTICE "t1xxp: Unable to request IRQ %d\n", pdev->irq);
 		kfree(wc);
 		return -EIO;

drivers/dahdi/wct4xxp/base.c

@@ -5334,7 +5334,7 @@ t4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 #ifdef SUPPORT_GEN1
 	if (request_irq(pdev->irq, (wc->devtype->flags & FLAG_2NDGEN) ?
 					t4_interrupt_gen2 : t4_interrupt,
-			DAHDI_IRQ_SHARED,
+			IRQF_SHARED,
 			(wc->numspans == 8) ? "wct8xxp" :
 					      (wc->numspans == 2) ? "wct2xxp" :
 								    "wct4xxp",
@@ -5348,7 +5348,7 @@ t4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	}
 
 	if (request_irq(pdev->irq, t4_interrupt_gen2,
-			DAHDI_IRQ_SHARED, "t4xxp", wc)) {
+			IRQF_SHARED, "t4xxp", wc)) {
 #endif
 		dev_notice(&wc->dev->dev, "Unable to request IRQ %d\n",
 				pdev->irq);

drivers/dahdi/wctc4xxp/base.c

@@ -375,6 +375,7 @@ struct wcdte {
 #endif
 	struct timer_list watchdog;
 	u16 open_channels;
+	unsigned long reported_packet_errors;
 };
 
 struct wcdte_netdev_priv {
@@ -2019,14 +2020,16 @@ wctc4xxp_disable_polling(struct wcdte *wc)
 
 static void wctc4xxp_check_for_rx_errors(struct wcdte *wc)
 {
-	static unsigned long last_errors = 0;
+	/* get_packet_errors() returns the accumulated total errors */
 	unsigned long errors = wctc4xxp_get_packet_errors(wc->rxd);
-	if (last_errors != errors) {
+
+	/* Print warning when the number of errors changes */
+	if (wc->reported_packet_errors != errors) {
 		if (printk_ratelimit()) {
 			dev_err(&wc->pdev->dev,
 				"%lu errored receive packets.\n",
-				errors - last_errors);
-			last_errors = errors;
+				errors - wc->reported_packet_errors);
+			wc->reported_packet_errors = errors;
 		}
 	}
 }
@@ -3867,6 +3870,7 @@ static int wctc4xxp_reset_driver_state(struct wcdte *wc)
 		release_firmware(firmware);
 	spin_lock_irqsave(&wc->rxd->lock, flags);
 	wc->rxd->packet_errors = 0;
+	wc->reported_packet_errors = 0;
 	spin_unlock_irqrestore(&wc->rxd->lock, flags);
 	return res;
 }
@@ -4105,7 +4109,7 @@ wctc4xxp_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	pci_set_master(pdev);
 	pci_set_drvdata(pdev, wc);
 	res = request_irq(pdev->irq, wctc4xxp_interrupt,
-		DAHDI_IRQ_SHARED, wc->board_name, wc);
+			  IRQF_SHARED, wc->board_name, wc);
 	if (res) {
 		dev_err(&wc->pdev->dev,
 			"Unable to request IRQ %d\n", pdev->irq);

drivers/dahdi/wctdm.c

@@ -2684,7 +2684,8 @@ static int __devinit wctdm_init_one(struct pci_dev *pdev, const struct pci_devic
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, wctdm_interrupt, DAHDI_IRQ_SHARED, "wctdm", wc)) {
+			if (request_irq(pdev->irq, wctdm_interrupt,
+					IRQF_SHARED, "wctdm", wc)) {
 				printk(KERN_NOTICE "wctdm: Unable to request IRQ %d\n", pdev->irq);
 				if (wc->freeregion)
 					release_region(wc->ioaddr, 0xff);

drivers/dahdi/wcte11xp.c

@@ -1351,6 +1351,8 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
 	if (!ints)
 		return IRQ_NONE;
 
+	local_irq_save(flags);
+
 	outb(ints, wc->ioaddr + WC_INTSTAT);
 
 	if (!wc->intcount) {
@@ -1365,13 +1367,13 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
 		t1xxp_receiveprep(wc, ints);
 		t1xxp_transmitprep(wc, ints);
 	}
-	spin_lock_irqsave(&wc->lock, flags);
+	spin_lock(&wc->lock);
 
 #if 1
 	__handle_leds(wc);
 #endif
 
-	spin_unlock_irqrestore(&wc->lock, flags);
+	spin_unlock(&wc->lock);
 
 	/* Count down timers */
 	t1_do_counters(wc);
@@ -1398,6 +1400,7 @@ DAHDI_IRQ_HANDLER(t1xxp_interrupt)
 	if (ints & 0x20)
 		printk(KERN_NOTICE "PCI Target abort\n");
 
+	local_irq_restore(flags);
 	return IRQ_RETVAL(1);
 }
 
@@ -1534,7 +1537,8 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic
 	/* Keep track of which device we are */
 	pci_set_drvdata(pdev, wc);
 	
-	if (request_irq(pdev->irq, t1xxp_interrupt, DAHDI_IRQ_SHARED_DISABLED, "wcte11xp", wc)) {
+	if (request_irq(pdev->irq, t1xxp_interrupt,
+			IRQF_SHARED, "wcte11xp", wc)) {
 		printk(KERN_NOTICE "wcte11xp: Unable to request IRQ %d\n", pdev->irq);
 		kfree(wc);
 		return -EIO;

drivers/dahdi/wcte13xp-base.c

@@ -45,7 +45,7 @@
 
 static const char *TE133_FW_FILENAME = "dahdi-fw-te133.bin";
 static const char *TE134_FW_FILENAME = "dahdi-fw-te134.bin";
-static const u32 TE133_FW_VERSION = 0x780019;
+static const u32 TE133_FW_VERSION = 0x7a001e;
 static const u32 TE134_FW_VERSION = 0x780017;
 
 #define WC_MAX_IFACES 8

drivers/dahdi/wcte43x-base.c

@@ -66,7 +66,7 @@ static inline int delayed_work_pending(struct work_struct *work)
 
 static const char *TE435_FW_FILENAME = "dahdi-fw-te435.bin";
 static const char *TE436_FW_FILENAME = "dahdi-fw-te436.bin";
-static const u32 TE435_VERSION = 0xe0019;
+static const u32 TE435_VERSION = 0x13001e;
 static const u32 TE436_VERSION = 0x10017;
 
 /* #define RPC_RCLK */

drivers/dahdi/wcxb.c

@@ -66,7 +66,6 @@
 #define DRING_SIZE_MASK		(DRING_SIZE-1)
 #define DESC_EOR		(1 << 0)
 #define DESC_INT		(1 << 1)
-#define DESC_IO_ERROR		(1 << 30)
 #define DESC_OWN		(1 << 31)
 #define DESC_DEFAULT_STATUS	0xdeadbe00
 #define DMA_CHAN_SIZE		128
@@ -358,45 +357,25 @@ static void _wcxb_reset_dring(struct wcxb *xb)
 	hdesc->control |= cpu_to_be32(DESC_EOR);
 #ifdef DEBUG
 	xb->last_retry_count = 0;
+	xb->max_retry_count = 0;
+	xb->last_dma_time = 0;
+	xb->max_dma_time = 0;
 #endif
 	iowrite32be(xb->hw_dring_phys, xb->membase + TDM_DRING_ADDR);
 }
 
 static void wcxb_handle_dma(struct wcxb *xb)
 {
-#ifdef DEBUG
-	bool did_retry_dma = false;
-	u8 retry;
-#endif
 	struct wcxb_meta_desc *mdesc;
 	struct wcxb_hw_desc *tail = &(xb->hw_dring[xb->dma_tail]);
 
 	while (!(tail->control & cpu_to_be32(DESC_OWN))) {
 		u_char *frame;
 
-		if (tail->control & cpu_to_be32(DESC_IO_ERROR)) {
-			u32 ier;
-			unsigned long flags;
-
-			/* The firmware detected an error condition on the bus.
-			 * Force an underrun by disabling the descriptor
-			 * complete interrupt. When the driver processes the
-			 * underrun it will reset the TDM engine. */
-			xb->flags.io_error = 1;
-
-			spin_lock_irqsave(&xb->lock, flags);
-			ier = ioread32be(xb->membase + IER);
-			iowrite32be(ier & ~DESC_COMPLETE, xb->membase + IER);
-			spin_unlock_irqrestore(&xb->lock, flags);
-			return;
-		}
-
 #ifdef DEBUG
-		retry = be32_to_cpu(tail->status) & 0xff;
-		if (xb->last_retry_count != retry) {
-			xb->last_retry_count = retry;
-			did_retry_dma = true;
-		}
+		xb->last_retry_count =
+			((be32_to_cpu(tail->control) & 0x0000ff00) >> 8);
+		xb->last_dma_time = (be32_to_cpu(tail->status));
 #endif
 
 		mdesc = &xb->meta_dring[xb->dma_tail];
@@ -420,9 +399,17 @@ static void wcxb_handle_dma(struct wcxb *xb)
 	}
 
 #ifdef DEBUG
-	if (did_retry_dma) {
+	if (xb->last_retry_count > xb->max_retry_count) {
+		xb->max_retry_count = xb->last_retry_count;
 		dev_info(&xb->pdev->dev,
-			 "DMA retries detected: %d\n", xb->last_retry_count);
+			"New DMA max retries detected: %d\n",
+			xb->max_retry_count);
+	}
+	if (xb->last_dma_time > xb->max_dma_time) {
+		xb->max_dma_time = xb->last_dma_time;
+		dev_info(&xb->pdev->dev,
+			"New DMA max transfer time detected: %d\n",
+			xb->max_dma_time);
 	}
 #endif
 }
@@ -451,14 +438,7 @@ static irqreturn_t _wcxb_isr(int irq, void *dev_id)
 
 			spin_lock(&xb->lock);
 
-			if (xb->flags.io_error) {
-				/* Since an IO error is not necessarily because
-				 * the host could not keep up, we do not want to
-				 * bump the latency. */
-				xb->flags.io_error = 0;
-				dev_warn(&xb->pdev->dev,
-					 "IO error reported by firmware.\n");
-			} else if (!xb->flags.latency_locked) {
+			if (!xb->flags.latency_locked) {
 				/* bump latency */
 
 				xb->latency = min(xb->latency + 1,
@@ -705,7 +685,7 @@ int wcxb_init(struct wcxb *xb, const char *board_name, u32 int_mode)
 	xb->flags.have_msi = (int_mode) ? 0 : (0 == pci_enable_msi(pdev));
 
 	if (request_irq(pdev->irq, wcxb_isr,
-			(xb->flags.have_msi) ? 0 : DAHDI_IRQ_SHARED,
+			(xb->flags.have_msi) ? 0 : IRQF_SHARED,
 			board_name, xb)) {
 		dev_notice(&xb->pdev->dev, "Unable to request IRQ %d\n",
 			   pdev->irq);

drivers/dahdi/wcxb.h

@@ -24,7 +24,7 @@
 #define __WCXB_H__
 
 #define WCXB_DEFAULT_LATENCY	3U
-#define WCXB_DEFAULT_MAXLATENCY 20U
+#define WCXB_DEFAULT_MAXLATENCY 12U
 #define WCXB_DMA_CHAN_SIZE	128
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
@@ -66,7 +66,7 @@ struct wcxb {
 #ifdef WCXB_PCI_DEV_DOES_NOT_HAVE_IS_PCIE
 		u32	is_pcie:1;
 #endif
-		u32	io_error:1;
+		u32	dma_ins:1;
 	} flags;
 	void __iomem			*membase;
 	struct wcxb_meta_desc		*meta_dring;
@@ -78,6 +78,9 @@ struct wcxb {
 	unsigned long			framecount;
 #ifdef DEBUG
 	u8				last_retry_count;
+	u8				max_retry_count;
+	u32				last_dma_time;
+	u32				max_dma_time;
 #endif
 };
 

drivers/dahdi/xpp/card_pri.c

@@ -2399,11 +2399,11 @@ static DEVICE_ATTR_WRITER(pri_protocol_store, dev, buf, count)
 			buf, i);
 		return -EINVAL;
 	}
-	if (strnicmp(buf, "E1", 2) == 0)
+	if (strncasecmp(buf, "E1", 2) == 0)
 		new_protocol = PRI_PROTO_E1;
-	else if (strnicmp(buf, "T1", 2) == 0)
+	else if (strncasecmp(buf, "T1", 2) == 0)
 		new_protocol = PRI_PROTO_T1;
-	else if (strnicmp(buf, "J1", 2) == 0)
+	else if (strncasecmp(buf, "J1", 2) == 0)
 		new_protocol = PRI_PROTO_J1;
 	else {
 		XPD_NOTICE(xpd,

drivers/dahdi/xpp/firmwares/USB_FW.201.hex

@@ -1,5 +1,5 @@
 #
-# $Id: USB_FW.201.hex 10402 2012-02-15 15:34:50Z dima $
+# $Id: USB_FW.201.hex 11453 2015-03-29 18:27:25Z dima $
 #
 :03004300021F0099
 :03005300021F0089
@@ -27,7 +27,7 @@
 :050FF6000300000000F3
 :100F3C0041E0370041E0B60042E0B1000041E0384A
 :100F4C0000021BE0850218E07943E0B30000004D7D
-:0F0F5C00E03931303339354D202020202020005E
+:0F0F5C00E03931313435314D2020202020200064
 :101D71008B538A548955E5581558AE57700215573B
 :101D81004E6014AB530555E555AA54700205541421
 :081D9100F9ED12077780DF2253
@@ -164,7 +164,7 @@
 :100B7E00AB45AA46A9477401120777E4F550E55034
 :100B8E00C454F0AB45AA46A94790000112078985C7
 :100B9E004858854959854A5A755B08121A95AB48CB
-:100BAE00AA49A94A90000212074AFE5403FFEE54C6
+:100BAE00AA49A94A90000212074AFE5407FFEE54C2
 :100BBE0070F55124E0602924F0604B24F0605D2430
 :100BCE00F0606F24406003020C5675410185184297
 :100BDE00851943EF24FE600624FE703B801C801FA7

drivers/dahdi/xpp/firmwares/USB_FW.hex

@@ -1,5 +1,5 @@
 # 
-# $Id: USB_FW.hex 10401 2012-02-15 15:30:24Z dima $
+# $Id: USB_FW.hex 11452 2015-03-29 18:21:13Z dima $
 # 
 :03004300021F0099
 :03005300021F0089
@@ -27,7 +27,7 @@
 :051EF1000300000000E9
 :1011F50041E0370041E0B70042E0B2000041E0388D
 :1012050000021BE0860218E07A43E0B40000004EBD
-:10121500E03931303339354D502020202020200051
+:10121500E03931313435314D502020202020200057
 :101D9A008B518A528953E5561556AE557002155520
 :101DAA004E6014AB510553E553AA52700205521402
 :081DBA00F9ED12077180DF2230
@@ -165,7 +165,7 @@
 :100B7800AB43AA44A9457401120771E4F54EE54E4A
 :100B8800C454F0AB43AA44A94590000112078385D9
 :100B98004656854757854858755908121A94AB46E2
-:100BA800AA47A948900002120744FE5403FFEE54D6
+:100BA800AA47A948900002120744FE5407FFEE54D2
 :100BB80070F54F24E0602924F0604B24F0605D2438
 :100BC800F0606F24406003020C50753F01851840A7
 :100BD800851941EF24FE600624FE703B801C801FAF

drivers/dahdi/xpp/xproto.c

@@ -80,7 +80,8 @@ static const xproto_table_t *xproto_table(xpd_type_t cardtype)
 	return xprotocol_tables[cardtype];
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) || \
+	LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
 #define MODULE_REFCOUNT_FORMAT "%s refcount was %d\n"
 #else
 #define MODULE_REFCOUNT_FORMAT "%s refcount was %lu\n"

include/dahdi/kernel.h

@@ -76,10 +76,6 @@
 #define HAVE_NET_DEVICE_OPS
 #endif
 
-#define DAHDI_IRQ_SHARED IRQF_SHARED
-#define DAHDI_IRQ_DISABLED IRQF_DISABLED
-#define DAHDI_IRQ_SHARED_DISABLED IRQF_SHARED | IRQF_DISABLED
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
 #  ifdef RHEL_RELEASE_VERSION
 #    if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5, 6)
@@ -1502,6 +1498,8 @@ void dahdi_pci_disable_link_state(struct pci_dev *pdev, int state);
 #define list_first_entry(ptr, type, member) \
 	list_entry((ptr)->next, type, member)
 
+#define strncasecmp strnicmp
+
 #ifndef __packed
 #define __packed  __attribute__((packed))
 #endif 
@@ -1665,9 +1663,11 @@ struct mutex {
 				chan_printk(DEBUG, "-" #bits, chan, \
 					"%s: " fmt, __func__, ## __VA_ARGS__)))
 #define dahdi_dev_dbg(bits, dev, fmt, ...)         \
-			((void)((debug & (DAHDI_DBG_ ## bits)) && \
+		do { if (debug & (DAHDI_DBG_ ## bits)) { \
 			dev_printk(KERN_DEBUG, dev, \
-			"DBG-%s(%s): " fmt, #bits, __func__, ## __VA_ARGS__)))
+			"DBG-%s(%s): " fmt, #bits, __func__, ## __VA_ARGS__); \
+		} } while (0)
+
 #endif /* DAHDI_PRINK_MACROS_USE_debug */
 
 #endif /* _DAHDI_KERNEL_H */