[src/trunk]: src/sys/dev/usb PR# port-i386/18818: cannot enter ddb with usb k...

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

details:   https://anonhg.NetBSD.org/src/rev/c02bd00e3568
branches:  trunk
changeset: 767795:c02bd00e3568
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Jul 30 20:05:36 2011 +0000

description:
PR# port-i386/18818: cannot enter ddb with usb keyboard

- ohci: when polling, make sure sc_eintrs has the OHCI_WDH flag set
  otherwise ohci_intr1 won't actually read data
- usbdi: kick the host controller by calling its soft_intr callback when
  switching out of polling mode too

DDB with a USB keyboard works for me now with ohci.

diffstat:

 sys/dev/usb/ohci.c  |   5 +++--
 sys/dev/usb/usbdi.c |  10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r 634f19e1572a -r c02bd00e3568 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Sat Jul 30 19:29:12 2011 +0000
+++ b/sys/dev/usb/ohci.c        Sat Jul 30 20:05:36 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.216 2011/06/09 19:08:31 matt Exp $  */
+/*     $NetBSD: ohci.c,v 1.217 2011/07/30 20:05:36 jmcneill Exp $      */
 /*     $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $       */
 
 /*
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.216 2011/06/09 19:08:31 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.217 2011/07/30 20:05:36 jmcneill Exp $");
 
 #include "opt_usb.h"
 
@@ -1645,6 +1645,7 @@
        }
 #endif
 
+       sc->sc_eintrs |= OHCI_WDH;
        if (OREAD4(sc, OHCI_INTERRUPT_STATUS) & sc->sc_eintrs)
                ohci_intr1(sc);
 }
diff -r 634f19e1572a -r c02bd00e3568 sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Sat Jul 30 19:29:12 2011 +0000
+++ b/sys/dev/usb/usbdi.c       Sat Jul 30 20:05:36 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.c,v 1.132 2011/06/09 19:08:33 matt Exp $ */
+/*     $NetBSD: usbdi.c,v 1.133 2011/07/30 20:05:36 jmcneill Exp $     */
 /*     $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $      */
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.132 2011/06/09 19:08:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.133 2011/07/30 20:05:36 jmcneill Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_usb.h"
@@ -1073,9 +1073,9 @@
                dev->bus->use_polling++;
        else
                dev->bus->use_polling--;
-       /* When polling we need to make sure there is nothing pending to do. */
-       if (dev->bus->use_polling)
-               dev->bus->methods->soft_intr(dev->bus);
+
+       /* Kick the host controller when switching modes */
+       dev->bus->methods->soft_intr(dev->bus);
 }