CVS commit: [netbsd-8] src/sys/external/bsd/dwc2/dist

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Mon Aug 13 12:03:41 UTC 2018

Modified Files:
        src/sys/external/bsd/dwc2/dist [netbsd-8]: dwc2_hcdintr.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #971):

        sys/external/bsd/dwc2/dist/dwc2_hcdintr.c: revision 1.15

Fixup previous to not break ping protocol.  My bad.


To generate a diff of this commit:
cvs rdiff -u -r1.13.10.1 -r1.13.10.2 \
    src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c
diff -u src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c:1.13.10.1 src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c:1.13.10.2
--- src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c:1.13.10.1	Wed Aug  8 10:36:08 2018
+++ src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c	Mon Aug 13 12:03:41 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: dwc2_hcdintr.c,v 1.13.10.1 2018/08/08 10:36:08 martin Exp $	*/
+/*	$NetBSD: dwc2_hcdintr.c,v 1.13.10.2 2018/08/13 12:03:41 martin Exp $	*/
 
 /*
  * hcd_intr.c - DesignWare HS OTG Controller host-mode interrupt handling
@@ -40,7 +40,7 @@
  * This file contains the interrupt handlers for Host mode
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_hcdintr.c,v 1.13.10.1 2018/08/08 10:36:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_hcdintr.c,v 1.13.10.2 2018/08/13 12:03:41 martin Exp $");
 
 #include <sys/types.h>
 #include <sys/pool.h>
@@ -67,6 +67,9 @@ __KERNEL_RCSID(0, "$NetBSD: dwc2_hcdintr
 #define DWC2_NAKS_BEFORE_DELAY		3
 int dwc2_naks_before_delay = DWC2_NAKS_BEFORE_DELAY;
 
+#define DWC2_OUT_NAKS_BEFORE_DELAY	1
+int dwc2_out_naks_before_delay = DWC2_OUT_NAKS_BEFORE_DELAY;
+
 /* This function is for debug only */
 static void dwc2_track_missed_sofs(struct dwc2_hsotg *hsotg)
 {
@@ -1320,8 +1323,10 @@ static void dwc2_hc_nak_intr(struct dwc2
 			/*
 			 * Avoid interrupt storms.
 			 */
-			qtd->qh->want_wait = 1;
-		} else if (!chan->qh->ping_state) {
+			qtd->num_naks++;
+			qtd->qh->want_wait = qtd->num_naks >= dwc2_out_naks_before_delay;
+		}
+		if (!chan->qh->ping_state) {
 			dwc2_update_urb_state_abn(hsotg, chan, chnum, qtd->urb,
 						  qtd, DWC2_HC_XFER_NAK);
 			dwc2_hcd_save_data_toggle(hsotg, chan, chnum, qtd);