Module Name: src
Committed By: snj
Date: Wed Jan 3 20:02:37 UTC 2018
Modified Files:
src/sys/dev/usb [netbsd-7]: ehci.c motg.c ohci.c uhci.c xhci.c
src/sys/external/bsd/dwc2 [netbsd-7]: dwc2.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1529):
sys/dev/usb/ehci.c: revision 1.257
sys/dev/usb/motg.c: revision 1.19
sys/dev/usb/ohci.c: revision 1.276
sys/dev/usb/uhci.c: revision 1.279
sys/dev/usb/xhci.c: revision 1.77
sys/external/bsd/dwc2/dwc2.c: revision 1.47
s/PR_NOWAIT/PR_WAITOK/ in HCD allocx (allocate xfer) method
To generate a diff of this commit:
cvs rdiff -u -r1.228.2.1 -r1.228.2.2 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.6.4.3 -r1.6.4.4 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.253.2.3 -r1.253.2.4 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.264.2.2 -r1.264.2.3 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.23.2.6 -r1.23.2.7 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.31.2.2 -r1.31.2.3 src/sys/external/bsd/dwc2/dwc2.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/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.228.2.1 src/sys/dev/usb/ehci.c:1.228.2.2
--- src/sys/dev/usb/ehci.c:1.228.2.1 Wed Apr 5 19:54:19 2017
+++ src/sys/dev/usb/ehci.c Wed Jan 3 20:02:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.228.2.1 2017/04/05 19:54:19 snj Exp $ */
+/* $NetBSD: ehci.c,v 1.228.2.2 2018/01/03 20:02:37 snj Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.228.2.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.228.2.2 2018/01/03 20:02:37 snj Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -1508,7 +1508,7 @@ ehci_allocx(struct usbd_bus *bus, unsign
struct ehci_softc *sc = EHCI_BUS2SC(bus);
struct usbd_xfer *xfer;
- xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+ xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
if (xfer != NULL) {
memset(xfer, 0, sizeof(struct ehci_xfer));
#ifdef DIAGNOSTIC
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.6.4.3 src/sys/dev/usb/motg.c:1.6.4.4
--- src/sys/dev/usb/motg.c:1.6.4.3 Wed Apr 5 19:54:19 2017
+++ src/sys/dev/usb/motg.c Wed Jan 3 20:02:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.6.4.3 2017/04/05 19:54:19 snj Exp $ */
+/* $NetBSD: motg.c,v 1.6.4.4 2018/01/03 20:02:37 snj Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.6.4.3 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.6.4.4 2018/01/03 20:02:37 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_motg.h"
@@ -752,7 +752,7 @@ motg_allocx(struct usbd_bus *bus, unsign
struct motg_softc *sc = MOTG_BUS2SC(bus);
struct usbd_xfer *xfer;
- xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+ xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
if (xfer != NULL) {
memset(xfer, 0, sizeof(struct motg_xfer));
#ifdef DIAGNOSTIC
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.253.2.3 src/sys/dev/usb/ohci.c:1.253.2.4
--- src/sys/dev/usb/ohci.c:1.253.2.3 Wed Apr 5 19:54:19 2017
+++ src/sys/dev/usb/ohci.c Wed Jan 3 20:02:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.253.2.3 2017/04/05 19:54:19 snj Exp $ */
+/* $NetBSD: ohci.c,v 1.253.2.4 2018/01/03 20:02:37 snj Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.253.2.3 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.253.2.4 2018/01/03 20:02:37 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1065,7 +1065,7 @@ ohci_allocx(struct usbd_bus *bus, unsign
ohci_softc_t *sc = OHCI_BUS2SC(bus);
struct usbd_xfer *xfer;
- xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+ xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
if (xfer != NULL) {
memset(xfer, 0, sizeof(struct ohci_xfer));
#ifdef DIAGNOSTIC
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.264.2.2 src/sys/dev/usb/uhci.c:1.264.2.3
--- src/sys/dev/usb/uhci.c:1.264.2.2 Sun Jul 23 06:11:47 2017
+++ src/sys/dev/usb/uhci.c Wed Jan 3 20:02:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.264.2.2 2017/07/23 06:11:47 snj Exp $ */
+/* $NetBSD: uhci.c,v 1.264.2.3 2018/01/03 20:02:37 snj Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.2.2 2017/07/23 06:11:47 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.2.3 2018/01/03 20:02:37 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -657,7 +657,7 @@ uhci_allocx(struct usbd_bus *bus, unsign
struct uhci_softc *sc = UHCI_BUS2SC(bus);
struct usbd_xfer *xfer;
- xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+ xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
if (xfer != NULL) {
memset(xfer, 0, sizeof(struct uhci_xfer));
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.23.2.6 src/sys/dev/usb/xhci.c:1.23.2.7
--- src/sys/dev/usb/xhci.c:1.23.2.6 Wed Jan 3 19:48:45 2018
+++ src/sys/dev/usb/xhci.c Wed Jan 3 20:02:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.23.2.6 2018/01/03 19:48:45 snj Exp $ */
+/* $NetBSD: xhci.c,v 1.23.2.7 2018/01/03 20:02:37 snj Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.23.2.6 2018/01/03 19:48:45 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.23.2.7 2018/01/03 20:02:37 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2168,7 +2168,7 @@ xhci_allocx(struct usbd_bus *bus, unsign
XHCIHIST_FUNC(); XHCIHIST_CALLED();
- xfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+ xfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
if (xfer != NULL) {
memset(xfer, 0, sizeof(struct xhci_xfer));
#ifdef DIAGNOSTIC
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.31.2.2 src/sys/external/bsd/dwc2/dwc2.c:1.31.2.3
--- src/sys/external/bsd/dwc2/dwc2.c:1.31.2.2 Wed Apr 5 19:54:22 2017
+++ src/sys/external/bsd/dwc2/dwc2.c Wed Jan 3 20:02:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.31.2.2 2017/04/05 19:54:22 snj Exp $ */
+/* $NetBSD: dwc2.c,v 1.31.2.3 2018/01/03 20:02:37 snj Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.31.2.2 2017/04/05 19:54:22 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.31.2.3 2018/01/03 20:02:37 snj Exp $");
#include "opt_usb.h"
@@ -207,7 +207,7 @@ dwc2_allocx(struct usbd_bus *bus, unsign
DPRINTFN(10, "\n");
DWC2_EVCNT_INCR(sc->sc_ev_xferpoolget);
- dxfer = pool_cache_get(sc->sc_xferpool, PR_NOWAIT);
+ dxfer = pool_cache_get(sc->sc_xferpool, PR_WAITOK);
if (dxfer != NULL) {
memset(dxfer, 0, sizeof(*dxfer));
