Module Name: src
Committed By: skrll
Date: Thu Jul 30 07:32:40 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic: amlogic_dwctwo.c
src/sys/arch/arm/broadcom: bcm2835_dwctwo.c
src/sys/arch/arm/rockchip: rockchip_dwctwo.c
src/sys/arch/mips/cavium/dev: octeon_dwctwo.c
src/sys/arch/powerpc/ibm4xx/dev: dwctwo_plb.c
src/sys/external/bsd/dwc2: dwc2.h
Log Message:
Use IPL_VM for dwc2_intr and mark as MP safe where possible.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/amlogic/amlogic_dwctwo.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/broadcom/bcm2835_dwctwo.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/rockchip/rockchip_dwctwo.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c
cvs rdiff -u -r1.4 -r1.5 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/amlogic/amlogic_dwctwo.c
diff -u src/sys/arch/arm/amlogic/amlogic_dwctwo.c:1.3 src/sys/arch/arm/amlogic/amlogic_dwctwo.c:1.4
--- src/sys/arch/arm/amlogic/amlogic_dwctwo.c:1.3 Wed Jul 22 10:32:16 2015
+++ src/sys/arch/arm/amlogic/amlogic_dwctwo.c Thu Jul 30 07:32:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_dwctwo.c,v 1.3 2015/07/22 10:32:16 skrll Exp $ */
+/* $NetBSD: amlogic_dwctwo.c,v 1.4 2015/07/30 07:32:40 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_dwctwo.c,v 1.3 2015/07/22 10:32:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_dwctwo.c,v 1.4 2015/07/30 07:32:40 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,8 +118,8 @@ amlogic_dwctwo_attach(device_t parent, d
aprint_naive("\n");
aprint_normal(": USB controller\n");
- sc->sc_ih = intr_establish(loc->loc_intr, IPL_SCHED,
- IST_LEVEL, dwc2_intr, &sc->sc_dwc2);
+ sc->sc_ih = intr_establish(loc->loc_intr, IPL_VM,
+ IST_LEVEL | IST_MPSAFE, dwc2_intr, &sc->sc_dwc2);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt %d\n",
loc->loc_intr);
Index: src/sys/arch/arm/broadcom/bcm2835_dwctwo.c
diff -u src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.4 src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.5
--- src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.4 Wed Jul 29 14:22:49 2015
+++ src/sys/arch/arm/broadcom/bcm2835_dwctwo.c Thu Jul 30 07:32:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_dwctwo.c,v 1.4 2015/07/29 14:22:49 skrll Exp $ */
+/* $NetBSD: bcm2835_dwctwo.c,v 1.5 2015/07/30 07:32:40 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.4 2015/07/29 14:22:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_dwctwo.c,v 1.5 2015/07/30 07:32:40 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,8 +130,8 @@ bcmdwc2_attach(device_t parent, device_t
aprint_naive(": USB controller\n");
aprint_normal(": USB controller\n");
- sc->sc_ih = intr_establish(aaa->aaa_intr, IPL_SCHED, IST_LEVEL,
- dwc2_intr, &sc->sc_dwc2);
+ sc->sc_ih = intr_establish(aaa->aaa_intr, IPL_VM,
+ IST_LEVEL | IST_MPSAFE, dwc2_intr, &sc->sc_dwc2);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt %d\n",
Index: src/sys/arch/arm/rockchip/rockchip_dwctwo.c
diff -u src/sys/arch/arm/rockchip/rockchip_dwctwo.c:1.3 src/sys/arch/arm/rockchip/rockchip_dwctwo.c:1.4
--- src/sys/arch/arm/rockchip/rockchip_dwctwo.c:1.3 Wed Jul 22 10:32:16 2015
+++ src/sys/arch/arm/rockchip/rockchip_dwctwo.c Thu Jul 30 07:32:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_dwctwo.c,v 1.3 2015/07/22 10:32:16 skrll Exp $ */
+/* $NetBSD: rockchip_dwctwo.c,v 1.4 2015/07/30 07:32:40 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rockchip_dwctwo.c,v 1.3 2015/07/22 10:32:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rockchip_dwctwo.c,v 1.4 2015/07/30 07:32:40 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,8 +125,8 @@ rkdwc2_attach(device_t parent, device_t
aprint_naive(": USB controller\n");
aprint_normal(": USB controller\n");
- sc->sc_ih = intr_establish(obio->obio_intr, IPL_SCHED,
- IST_LEVEL, dwc2_intr, &sc->sc_dwc2);
+ sc->sc_ih = intr_establish(obio->obio_intr, IPL_VM,
+ IST_LEVEL | IST_MPSAFE, dwc2_intr, &sc->sc_dwc2);
#if 0
IST_EDGE, dwc2_intr, &sc->sc_dwc2);
#endif
Index: src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
diff -u src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.4 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.5
--- src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.4 Wed Jul 22 10:32:16 2015
+++ src/sys/arch/mips/cavium/dev/octeon_dwctwo.c Thu Jul 30 07:32:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_dwctwo.c,v 1.4 2015/07/22 10:32:16 skrll Exp $ */
+/* $NetBSD: octeon_dwctwo.c,v 1.5 2015/07/30 07:32:40 skrll Exp $ */
/*
* Copyright (c) 2015 Masao Uebayashi <uebay...@tombiinc.com>
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_dwctwo.c,v 1.4 2015/07/22 10:32:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_dwctwo.c,v 1.5 2015/07/30 07:32:40 skrll Exp $");
#include "opt_octeon.h"
#include "opt_usb.h"
@@ -309,7 +309,7 @@ octeon_dwc2_attach(device_t parent, devi
config_found(sc->sc_dwc2.sc_dev, &sc->sc_dwc2.sc_bus, usbctlprint);
sc->sc_ih = octeon_intr_establish(ffs64(CIU_INTX_SUM0_USB) - 1,
- IPL_BIO, dwc2_intr, sc);
+ IPL_VM, dwc2_intr, sc);
if (sc->sc_ih == NULL)
panic("can't establish common interrupt\n");
}
Index: src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c:1.3 src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c:1.4
--- src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c:1.3 Tue Sep 2 14:55:56 2014
+++ src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c Thu Jul 30 07:32:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwctwo_plb.c,v 1.3 2014/09/02 14:55:56 skrll Exp $ */
+/* $NetBSD: dwctwo_plb.c,v 1.4 2015/07/30 07:32:40 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.3 2014/09/02 14:55:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwctwo_plb.c,v 1.4 2015/07/30 07:32:40 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_SCHED, dwc2_intr, sc);
+ intr_establish(paa->plb_irq, IST_LEVEL, IPL_VM, 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.4 src/sys/external/bsd/dwc2/dwc2.h:1.5
--- src/sys/external/bsd/dwc2/dwc2.h:1.4 Tue Dec 23 16:20:06 2014
+++ src/sys/external/bsd/dwc2/dwc2.h Thu Jul 30 07:32:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.h,v 1.4 2014/12/23 16:20:06 macallan Exp $ */
+/* $NetBSD: dwc2.h,v 1.5 2015/07/30 07:32:40 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -119,7 +119,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_SCHED)
+#define spin_lock_init(lock) mutex_init(lock, MUTEX_DEFAULT, IPL_VM)
#define spin_lock(l) do { mutex_spin_enter(l); } while (0)
#define spin_unlock(l) do { mutex_spin_exit(l); } while (0)
