Module Name: src
Committed By: skrll
Date: Wed Dec 23 07:59:19 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c motg.c ohci.c xhci.c
src/sys/external/bsd/dwc2 [nick-nhusb]: dwc2.c
Log Message:
Transfer are only ever allocated from thread context now. Change IPL_USB
to IPL_NONE in pool_cache_init for the xfer struct pool.
To generate a diff of this commit:
cvs rdiff -u -r1.234.2.70 -r1.234.2.71 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.12.2.25 -r1.12.2.26 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.254.2.35 -r1.254.2.36 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.28.2.46 -r1.28.2.47 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.32.2.14 -r1.32.2.15 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.234.2.70 src/sys/dev/usb/ehci.c:1.234.2.71
--- src/sys/dev/usb/ehci.c:1.234.2.70 Mon Dec 21 12:26:38 2015
+++ src/sys/dev/usb/ehci.c Wed Dec 23 07:59:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.234.2.70 2015/12/21 12:26:38 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.234.2.71 2015/12/23 07:59:19 skrll 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.234.2.70 2015/12/21 12:26:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.71 2015/12/23 07:59:19 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -406,7 +406,7 @@ ehci_init(ehci_softc_t *sc)
cv_init(&sc->sc_doorbell, "ehcidi");
sc->sc_xferpool = pool_cache_init(sizeof(struct ehci_xfer), 0, 0, 0,
- "ehcixfer", NULL, IPL_USB, NULL, NULL, NULL);
+ "ehcixfer", NULL, IPL_NONE, NULL, NULL, NULL);
sc->sc_doorbell_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
ehci_doorbell, sc);
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.12.2.25 src/sys/dev/usb/motg.c:1.12.2.26
--- src/sys/dev/usb/motg.c:1.12.2.25 Sat Dec 19 09:59:03 2015
+++ src/sys/dev/usb/motg.c Wed Dec 23 07:59:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.12.2.25 2015/12/19 09:59:03 skrll Exp $ */
+/* $NetBSD: motg.c,v 1.12.2.26 2015/12/23 07:59:19 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include "opt_motg.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.25 2015/12/19 09:59:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.26 2015/12/23 07:59:19 skrll Exp $");
#include <sys/param.h>
@@ -461,7 +461,7 @@ motg_init(struct motg_softc *sc)
UWRITE1(sc, MUSB2_REG_INTUSBE, MUSB2_MASK_IRESET);
sc->sc_xferpool = pool_cache_init(sizeof(struct motg_xfer), 0, 0, 0,
- "motgxfer", NULL, IPL_USB, NULL, NULL, NULL);
+ "motgxfer", NULL, IPL_NONE, NULL, NULL, NULL);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.254.2.35 src/sys/dev/usb/ohci.c:1.254.2.36
--- src/sys/dev/usb/ohci.c:1.254.2.35 Sun Dec 6 15:39:35 2015
+++ src/sys/dev/usb/ohci.c Wed Dec 23 07:59:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.254.2.35 2015/12/06 15:39:35 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.254.2.36 2015/12/23 07:59:19 skrll 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.254.2.35 2015/12/06 15:39:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.36 2015/12/23 07:59:19 skrll Exp $");
#include "opt_usb.h"
@@ -857,7 +857,7 @@ ohci_init(ohci_softc_t *sc)
LIST_INIT(&sc->sc_hash_itds[i]);
sc->sc_xferpool = pool_cache_init(sizeof(struct ohci_xfer), 0, 0, 0,
- "ohcixfer", NULL, IPL_USB, NULL, NULL, NULL);
+ "ohcixfer", NULL, IPL_NONE, NULL, NULL, NULL);
rev = OREAD4(sc, OHCI_REVISION);
aprint_normal("OHCI version %d.%d%s\n",
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.46 src/sys/dev/usb/xhci.c:1.28.2.47
--- src/sys/dev/usb/xhci.c:1.28.2.46 Sat Oct 24 08:43:25 2015
+++ src/sys/dev/usb/xhci.c Wed Dec 23 07:59:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.28.2.46 2015/10/24 08:43:25 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.28.2.47 2015/12/23 07:59:19 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.46 2015/10/24 08:43:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.47 2015/12/23 07:59:19 skrll Exp $");
#include "opt_usb.h"
@@ -927,7 +927,7 @@ xhci_init(struct xhci_softc *sc)
cv_init(&sc->sc_softwake_cv, "xhciab");
sc->sc_xferpool = pool_cache_init(sizeof(struct xhci_xfer), 0, 0, 0,
- "xhcixfer", NULL, IPL_USB, NULL, NULL, NULL);
+ "xhcixfer", NULL, IPL_NONE, NULL, NULL, NULL);
/* Set up the bus struct. */
sc->sc_bus.ub_methods = &xhci_bus_methods;
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.32.2.14 src/sys/external/bsd/dwc2/dwc2.c:1.32.2.15
--- src/sys/external/bsd/dwc2/dwc2.c:1.32.2.14 Thu Oct 22 12:07:48 2015
+++ src/sys/external/bsd/dwc2/dwc2.c Wed Dec 23 07:59:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.32.2.14 2015/10/22 12:07:48 skrll Exp $ */
+/* $NetBSD: dwc2.c,v 1.32.2.15 2015/12/23 07:59:19 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.14 2015/10/22 12:07:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.15 2015/12/23 07:59:19 skrll Exp $");
#include "opt_usb.h"
@@ -1379,7 +1379,7 @@ dwc2_init(struct dwc2_softc *sc)
dwc2_rhc, sc);
sc->sc_xferpool = pool_cache_init(sizeof(struct dwc2_xfer), 0, 0, 0,
- "dwc2xfer", NULL, IPL_USB, NULL, NULL, NULL);
+ "dwc2xfer", NULL, IPL_NONE, NULL, NULL, NULL);
sc->sc_qhpool = pool_cache_init(sizeof(struct dwc2_qh), 0, 0, 0,
"dwc2qh", NULL, IPL_USB, NULL, NULL, NULL);
sc->sc_qtdpool = pool_cache_init(sizeof(struct dwc2_qtd), 0, 0, 0,
