svn commit: r280119 - head/sys/dev/wpi

[Adrian Chadd]

Author: adrian
Date: Sun Mar 15 21:30:20 2015
New Revision: 280119
URL: https://svnweb.freebsd.org/changeset/base/280119

Log:
  Workaround delays caused by vmem_check().
  
  PR:		kern/197143
  Submitted by:	Andriy Voskoboinyk <s3erios at gmail.com>

Modified:
  head/sys/dev/wpi/if_wpi.c
  head/sys/dev/wpi/if_wpireg.h

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Sun Mar 15 21:29:36 2015	(r280118)
+++ head/sys/dev/wpi/if_wpi.c	Sun Mar 15 21:30:20 2015	(r280119)
@@ -2188,10 +2188,12 @@ wpi_notif_intr(struct wpi_softc *sc)
 			break;
 		}
 		}
-	}
 
-	/* Tell the firmware what we have processed. */
-	wpi_update_rx_ring(sc);
+		if (sc->rxq.cur % 8 == 0) {
+			/* Tell the firmware what we have processed. */
+			wpi_update_rx_ring(sc);
+		}
+	}
 }
 
 /*

Modified: head/sys/dev/wpi/if_wpireg.h
==============================================================================
--- head/sys/dev/wpi/if_wpireg.h	Sun Mar 15 21:29:36 2015	(r280118)
+++ head/sys/dev/wpi/if_wpireg.h	Sun Mar 15 21:30:20 2015	(r280119)
@@ -20,7 +20,13 @@
 #define WPI_TX_RING_COUNT	256
 #define WPI_TX_RING_LOMARK	192
 #define WPI_TX_RING_HIMARK	224
+
+#ifdef DIAGNOSTIC
+#define WPI_RX_RING_COUNT_LOG	8
+#else
 #define WPI_RX_RING_COUNT_LOG	6
+#endif
+
 #define WPI_RX_RING_COUNT	(1 << WPI_RX_RING_COUNT_LOG)
 
 #define WPI_NTXQUEUES		8