Module Name: src
Committed By: skrll
Date: Tue Sep 2 14:55:56 UTC 2014
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_dwctwo.c
src/sys/arch/powerpc/ibm4xx/dev: dwctwo_plb.c
src/sys/external/bsd/dwc2: dwc2.h
Log Message:
Use IPL_SCHED for dwctwo(4) - no need for the KERNEL_LOCK.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/bcm2835_dwctwo.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/dwc2/dwc2.h
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/broadcom/bcm2835_dwctwo.c
diff -u src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.1 src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.2
--- src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.1 Thu Sep 5 20:49:25 2013
+++ src/sys/arch/arm/broadcom/bcm2835_dwctwo.c Tue Sep 2 14:55:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_dwctwo.c,v 1.1 2013/09/05 20:49:25 skrll Exp $ */
+/* $NetBSD: bcm2835_dwctwo.c,v 1.2 2014/09/02 14:55:56 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_dwctwo.c,v 1.1 2013/09/05 20:49:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_dwctwo.c,v 1.2 2014/09/02 14:55:56 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,7 +130,7 @@ bcmdwc2_attach(device_t parent, device_t
aprint_naive(": USB controller\n");
aprint_normal(": USB controller\n");
- sc->sc_ih = bcm2835_intr_establish(aaa->aaa_intr, IPL_USB,
+ sc->sc_ih = bcm2835_intr_establish(aaa->aaa_intr, IPL_SCHED,
dwc2_intr, &sc->sc_dwc2);
if (sc->sc_ih == NULL) {
Index: src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c:1.2 src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c:1.3
--- src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c:1.2 Thu Nov 21 13:52:27 2013
+++ src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c Tue Sep 2 14:55:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwctwo_plb.c,v 1.2 2013/11/21 13:52:27 kiyohara Exp $ */
+/* $NetBSD: dwctwo_plb.c,v 1.3 2014/09/02 14:55:56 skrll Exp $ */
/*
* Copyright (c) 2013 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwctwo_plb.c,v 1.2 2013/11/21 13:52:27 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwctwo_plb.c,v 1.3 2014/09/02 14:55:56 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -112,7 +112,7 @@ dwctwo_plb_attach(device_t parent, devic
bus_space_map(sc->sc_iot, paa->plb_addr, DWCTWO_SIZE, 0, &sc->sc_ioh);
sc->sc_bus.dmatag = paa->plb_dmat;
- intr_establish(paa->plb_irq, IST_LEVEL, IPL_USB, dwc2_intr, sc);
+ intr_establish(paa->plb_irq, IST_LEVEL, IPL_SCHED, dwc2_intr, sc);
/* Enable the USB interface. */
mtsdr(DCR_SDR0_PFC1, mfsdr(DCR_SDR0_PFC1) | SDR0_PFC1_USBEN);
Index: src/sys/external/bsd/dwc2/dwc2.h
diff -u src/sys/external/bsd/dwc2/dwc2.h:1.2 src/sys/external/bsd/dwc2/dwc2.h:1.3
--- src/sys/external/bsd/dwc2/dwc2.h:1.2 Fri Nov 1 15:03:39 2013
+++ src/sys/external/bsd/dwc2/dwc2.h Tue Sep 2 14:55:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.h,v 1.2 2013/11/01 15:03:39 skrll Exp $ */
+/* $NetBSD: dwc2.h,v 1.3 2014/09/02 14:55:56 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@ enum usb_otg_state {
#define usleep_range(l, u) do { DELAY(u); } while (0)
#define spinlock_t kmutex_t
-#define spin_lock_init(lock) mutex_init(lock, MUTEX_DEFAULT, IPL_VM)
+#define spin_lock_init(lock) mutex_init(lock, MUTEX_DEFAULT, IPL_SCHED)
#define spin_lock(l) do { mutex_spin_enter(l); } while (0)
#define spin_unlock(l) do { mutex_spin_exit(l); } while (0)
