Module Name: src
Committed By: skrll
Date: Wed Aug 19 06:23:35 UTC 2015
Modified Files:
src/sys/arch/arm/allwinner: awin_otg.c
src/sys/dev/usb: ehci.c motg.c ohci.c uhci.c xhci.c
Log Message:
More IPL_SCHED -> IPL_USB
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/allwinner/awin_otg.c
cvs rdiff -u -r1.242 -r1.243 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.255 -r1.256 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.265 -r1.266 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/xhci.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/arch/arm/allwinner/awin_otg.c
diff -u src/sys/arch/arm/allwinner/awin_otg.c:1.5 src/sys/arch/arm/allwinner/awin_otg.c:1.6
--- src/sys/arch/arm/allwinner/awin_otg.c:1.5 Thu Oct 16 00:02:47 2014
+++ src/sys/arch/arm/allwinner/awin_otg.c Wed Aug 19 06:23:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_otg.c,v 1.5 2014/10/16 00:02:47 jmcneill Exp $ */
+/* $NetBSD: awin_otg.c,v 1.6 2015/08/19 06:23:35 skrll Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_otg.c,v 1.5 2014/10/16 00:02:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_otg.c,v 1.6 2015/08/19 06:23:35 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -137,7 +137,7 @@ awin_otg_attach(device_t parent, device_
sc->sc_motg.sc_ep_max = 5;
sc->sc_motg.sc_ep_fifosize = 512;
- sc->sc_ih = intr_establish(loc->loc_intr, IPL_SCHED, IST_LEVEL,
+ sc->sc_ih = intr_establish(loc->loc_intr, IPL_USB, IST_LEVEL,
awin_otg_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt %d\n",
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.242 src/sys/dev/usb/ehci.c:1.243
--- src/sys/dev/usb/ehci.c:1.242 Sat Jul 11 03:06:25 2015
+++ src/sys/dev/usb/ehci.c Wed Aug 19 06:23:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.242 2015/07/11 03:06:25 msaitoh Exp $ */
+/* $NetBSD: ehci.c,v 1.243 2015/08/19 06:23:35 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.242 2015/07/11 03:06:25 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.243 2015/08/19 06:23:35 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -370,7 +370,7 @@ ehci_init(ehci_softc_t *sc)
#endif
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
cv_init(&sc->sc_softwake_cv, "ehciab");
cv_init(&sc->sc_doorbell, "ehcidi");
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.12 src/sys/dev/usb/motg.c:1.13
--- src/sys/dev/usb/motg.c:1.12 Sat Sep 13 19:02:00 2014
+++ src/sys/dev/usb/motg.c Wed Aug 19 06:23:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.12 2014/09/13 19:02:00 jmcneill Exp $ */
+/* $NetBSD: motg.c,v 1.13 2015/08/19 06:23:35 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 2014/09/13 19:02:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.13 2015/08/19 06:23:35 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -444,7 +444,7 @@ motg_init(struct motg_softc *sc)
"motgxfer", NULL, IPL_USB, NULL, NULL, NULL);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
/* Set up the bus struct. */
sc->sc_bus.methods = &motg_bus_methods;
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.255 src/sys/dev/usb/ohci.c:1.256
--- src/sys/dev/usb/ohci.c:1.255 Mon Mar 30 11:54:43 2015
+++ src/sys/dev/usb/ohci.c Wed Aug 19 06:23:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.255 2015/03/30 11:54:43 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.256 2015/08/19 06:23:35 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.255 2015/03/30 11:54:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.256 2015/08/19 06:23:35 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -645,7 +645,7 @@ ohci_init(ohci_softc_t *sc)
callout_init(&sc->sc_tmo_rhsc, CALLOUT_MPSAFE);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
cv_init(&sc->sc_softwake_cv, "ohciab");
sc->sc_rhsc_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.265 src/sys/dev/usb/uhci.c:1.266
--- src/sys/dev/usb/uhci.c:1.265 Sun Mar 1 08:10:57 2015
+++ src/sys/dev/usb/uhci.c Wed Aug 19 06:23:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.265 2015/03/01 08:10:57 skrll Exp $ */
+/* $NetBSD: uhci.c,v 1.266 2015/08/19 06:23:35 skrll 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.265 2015/03/01 08:10:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.266 2015/08/19 06:23:35 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -529,7 +529,7 @@ uhci_init(uhci_softc_t *sc)
callout_init(&sc->sc_poll_handle, CALLOUT_MPSAFE);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
cv_init(&sc->sc_softwake_cv, "uhciab");
/* Set up the bus struct. */
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28 src/sys/dev/usb/xhci.c:1.29
--- src/sys/dev/usb/xhci.c:1.28 Tue Nov 18 10:18:45 2014
+++ src/sys/dev/usb/xhci.c Wed Aug 19 06:23:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.28 2014/11/18 10:18:45 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.29 2015/08/19 06:23:35 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28 2014/11/18 10:18:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.29 2015/08/19 06:23:35 skrll Exp $");
#include "opt_usb.h"
@@ -872,7 +872,7 @@ xhci_init(struct xhci_softc *sc)
xhci_op_read_4(sc, XHCI_USBCMD));
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
cv_init(&sc->sc_softwake_cv, "xhciab");
sc->sc_xferpool = pool_cache_init(sizeof(struct xhci_xfer), 0, 0, 0,
