Module Name: src
Committed By: skrll
Date: Sat Sep 7 16:47:23 UTC 2013
Modified Files:
src/sys/dev/usb: usbdi.h usbdivar.h
Log Message:
Some lock comments.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/usb/usbdi.h
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/usb/usbdivar.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/dev/usb/usbdi.h
diff -u src/sys/dev/usb/usbdi.h:1.87 src/sys/dev/usb/usbdi.h:1.88
--- src/sys/dev/usb/usbdi.h:1.87 Tue Jan 22 13:27:59 2013
+++ src/sys/dev/usb/usbdi.h Sat Sep 7 16:47:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.h,v 1.87 2013/01/22 13:27:59 jmcneill Exp $ */
+/* $NetBSD: usbdi.h,v 1.88 2013/09/07 16:47:23 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -278,9 +278,16 @@ struct usbif_attach_arg {
/* No match */
#define UMATCH_NONE 0
+
+/*
+ * IPL_USB is defined as IPL_VM for drivers that have not been made MP safe.
+ * IPL_VM (currently) takes the kernel lock.
+ *
+ * Eventually, IPL_USB can/should be changed
+ */
#define splusb splsoftnet
-#define splhardusb splbio
-#define IPL_USB IPL_BIO
+#define splhardusb splvm
#define IPL_SOFTUSB IPL_SOFTNET
+#define IPL_USB IPL_VM
#endif /* _USBDI_H_ */
Index: src/sys/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.103 src/sys/dev/usb/usbdivar.h:1.104
--- src/sys/dev/usb/usbdivar.h:1.103 Sun Mar 24 22:38:45 2013
+++ src/sys/dev/usb/usbdivar.h Sat Sep 7 16:47:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.103 2013/03/24 22:38:45 skrll Exp $ */
+/* $NetBSD: usbdivar.h,v 1.104 2013/09/07 16:47:23 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
/*
* Discussion about locking in the USB code:
*
- * The host controller presents one lock at IPL_SOFTUSB.
+ * The host controller presents one lock at IPL_SOFTUSB (aka IPL_SOFTNET).
*
* List of hardware interface methods, and whether the lock is held
* when each is called by this module:
