[src/netbsd-8]: src/sys/external/bsd/dwc2/dist Pull up following revision(s) ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/48a4b74e2aab
branches:  netbsd-8
changeset: 851930:48a4b74e2aab
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Aug 13 12:03:41 2018 +0000

description:
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.

diffstat:

 sys/external/bsd/dwc2/dist/dwc2_hcdintr.c |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 393709167ea4 -r 48a4b74e2aab sys/external/bsd/dwc2/dist/dwc2_hcdintr.c
--- a/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c Sat Aug 11 14:56:05 2018 +0000
+++ b/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c Mon Aug 13 12:03:41 2018 +0000
@@ -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 @@
 #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 @@
                        /*
                         * 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);