diff options
| author |   mpi <mpi@openbsd.org> | 2017-09-21 07:44:06 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2017-09-21 07:44:06 +0000 |
| commit | d6dca38e8f134552a13f46cbee2cdaa2b6e3e343 (patch) | |
| tree | d9641c814231e6d5802aebd1e5055bf7d8e8fc05 | |
| parent | Fix some spacing. A couple of log_warx() -> log_warn() to (diff) | |
| download | wireguard-openbsd-d6dca38e8f134552a13f46cbee2cdaa2b6e3e343.tar.xz wireguard-openbsd-d6dca38e8f134552a13f46cbee2cdaa2b6e3e343.zip | |
Disable a splsoftassert() at least until ohci(4) has been fixed.
This assert triggers because of the floor check on amd64/sparc64
when ohci(4) processes its root-hub status change transfers at
IPL_BIO.
Previous to the removal of IPL_SOFTNET, the SPLUSBCHECK macro didn't
do anything, so it is safe to disable this check.
Issue reported by espie@ and krw@
| -rw-r--r-- | sys/dev/usb/usbdi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c index 8ef65ceece7..b0d3f38f36c 100644 --- a/sys/dev/usb/usbdi.c +++ b/sys/dev/usb/usbdi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi.c,v 1.95 2017/05/15 10:52:08 mpi Exp $ */ +/* $OpenBSD: usbdi.c,v 1.96 2017/09/21 07:44:06 mpi Exp $ */ /* $NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */ @@ -718,7 +718,10 @@ usb_transfer_complete(struct usbd_xfer *xfer) int polling = pipe->device->bus->use_polling; int status, flags; +#if 0 + /* XXX ohci_intr1() calls usb_transfer_complete() for RHSC. */ splsoftassert(IPL_SOFTUSB); +#endif DPRINTFN(5, ("usb_transfer_complete: pipe=%p xfer=%p status=%d " "actlen=%d\n", pipe, xfer, xfer->status, xfer->actlen)); |