Module Name: src
Committed By: skrll
Date: Wed Aug 19 06:16:18 UTC 2015
Modified Files:
src/sys/dev/pci: ehci_pci.c ohci_pci.c uhci_pci.c
Log Message:
Interrupt handlers aren't MP-safe yet so use IPL_USB which is IPL_VM
which takes the kernel lock.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/ohci_pci.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/uhci_pci.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/pci/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.60 src/sys/dev/pci/ehci_pci.c:1.61
--- src/sys/dev/pci/ehci_pci.c:1.60 Wed Jul 15 03:54:53 2015
+++ src/sys/dev/pci/ehci_pci.c Wed Aug 19 06:16:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.60 2015/07/15 03:54:53 msaitoh Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.61 2015/08/19 06:16:18 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.60 2015/07/15 03:54:53 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.61 2015/08/19 06:16:18 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -177,7 +177,7 @@ ehci_pci_attach(device_t parent, device_
* Allocate IRQ
*/
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, ehci_intr, sc);
+ sc->sc_ih = pci_intr_establish(pc, ih, IPL_USB, ehci_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/ohci_pci.c
diff -u src/sys/dev/pci/ohci_pci.c:1.53 src/sys/dev/pci/ohci_pci.c:1.54
--- src/sys/dev/pci/ohci_pci.c:1.53 Sun Sep 21 14:30:22 2014
+++ src/sys/dev/pci/ohci_pci.c Wed Aug 19 06:16:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_pci.c,v 1.53 2014/09/21 14:30:22 christos Exp $ */
+/* $NetBSD: ohci_pci.c,v 1.54 2015/08/19 06:16:18 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.53 2014/09/21 14:30:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.54 2015/08/19 06:16:18 skrll Exp $");
#include "ehci.h"
@@ -142,7 +142,7 @@ ohci_pci_attach(device_t parent, device_
* Allocate IRQ
*/
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, ohci_intr, sc);
+ sc->sc_ih = pci_intr_establish(pc, ih, IPL_USB, ohci_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/uhci_pci.c
diff -u src/sys/dev/pci/uhci_pci.c:1.58 src/sys/dev/pci/uhci_pci.c:1.59
--- src/sys/dev/pci/uhci_pci.c:1.58 Sun Sep 21 14:30:22 2014
+++ src/sys/dev/pci/uhci_pci.c Wed Aug 19 06:16:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_pci.c,v 1.58 2014/09/21 14:30:22 christos Exp $ */
+/* $NetBSD: uhci_pci.c,v 1.59 2015/08/19 06:16:18 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.58 2014/09/21 14:30:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.59 2015/08/19 06:16:18 skrll Exp $");
#include "ehci.h"
@@ -132,7 +132,7 @@ uhci_pci_attach(device_t parent, device_
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, uhci_intr, sc);
+ sc->sc_ih = pci_intr_establish(pc, ih, IPL_USB, uhci_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
