svn commit: r198042 - in stable/6/sys: . conf contrib/pf dev/cxgb pci

[Pyun YongHyeon]

Author: yongari
Date: Tue Oct 13 18:09:15 2009
New Revision: 198042
URL: http://svn.freebsd.org/changeset/base/198042

Log:
  MFC 191345:
    To make it easy whether xl(4) missed Tx completion interrupt check
    number of queued packets in watchdog timeout handler. If there are
    no queued packets just print a informational message and return
    without resetting controller. Also fix to invoke correct Tx
    completion handler as 3C905B needs different handler.

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/conf/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)
  stable/6/sys/pci/if_xl.c

Modified: stable/6/sys/pci/if_xl.c
==============================================================================
--- stable/6/sys/pci/if_xl.c	Tue Oct 13 18:07:56 2009	(r198041)
+++ stable/6/sys/pci/if_xl.c	Tue Oct 13 18:09:15 2009	(r198042)
@@ -3218,12 +3218,31 @@ xl_watchdog(struct xl_softc *sc)
 {
 	struct ifnet		*ifp = sc->xl_ifp;
 	u_int16_t		status = 0;
+	int			misintr;
 
 	XL_LOCK_ASSERT(sc);
 
 	if (sc->xl_wdog_timer == 0 || --sc->xl_wdog_timer != 0)
 		return (0);
 
+	xl_rxeof(sc);
+	xl_txeoc(sc);
+	misintr = 0;
+	if (sc->xl_type == XL_TYPE_905B) {
+		xl_txeof_90xB(sc);
+		if (sc->xl_cdata.xl_tx_cnt == 0)
+			misintr++;
+	} else {
+		xl_txeof(sc);
+		if (sc->xl_cdata.xl_tx_head == NULL)
+			misintr++;
+	}
+	if (misintr != 0) {
+		device_printf(sc->xl_dev,
+		    "watchdog timeout (missed Tx interrupts) -- recovering\n");
+		return (0);
+	}
+
 	ifp->if_oerrors++;
 	XL_SEL_WIN(4);
 	status = CSR_READ_2(sc, XL_W4_MEDIA_STATUS);
@@ -3233,9 +3252,6 @@ xl_watchdog(struct xl_softc *sc)
 		device_printf(sc->xl_dev,
 		    "no carrier - transceiver cable problem?\n");
 
-	xl_txeoc(sc);
-	xl_txeof(sc);
-	xl_rxeof(sc);
 	xl_reset(sc);
 	xl_init_locked(sc);