Module Name: src
Committed By: riastradh
Date: Tue Dec 22 01:07:23 UTC 2020
Modified Files:
src/sys/dev/usb: ehci.c ohci.c uhci.c xhci.c
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
usb: Omit bogus assertions about struct usbd_pipe::up_intrxfer.
These assertions were only valid for pipes at UE_IN_DIR, UE_INTERRUPT
endpoints created with usbd_open_pipe_intr, which uses up_intrxfer to
pass the struct usbd_xfer object to usbd_close_pipe to free later.
In contrast, for pipes at UE_OUT_DIR, UE_INTERRUPT endpoints,
up_intrxfer is never initialized, so the assertion cannot be right.
In principle we might even have more than one outstanding interrupt
transfer at a time, rendering the point of the assertion moot anyway.
Found by interrupting a uhidev write to a u2f device.
ok nick
To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.313 -r1.314 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.304 -r1.305 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.74 -r1.75 src/sys/external/bsd/dwc2/dwc2.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/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.283 src/sys/dev/usb/ehci.c:1.284
--- src/sys/dev/usb/ehci.c:1.283 Mon Nov 30 05:33:32 2020
+++ src/sys/dev/usb/ehci.c Tue Dec 22 01:07:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.283 2020/11/30 05:33:32 msaitoh Exp $ */
+/* $NetBSD: ehci.c,v 1.284 2020/12/22 01:07:23 riastradh Exp $ */
/*
* Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.283 2020/11/30 05:33:32 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.284 2020/12/22 01:07:23 riastradh Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -4138,7 +4138,6 @@ ehci_device_intr_abort(struct usbd_xfer
EHCIHIST_FUNC(); EHCIHIST_CALLED();
DPRINTF("xfer=%#jx", (uintptr_t)xfer, 0, 0, 0);
- KASSERT(xfer->ux_pipe->up_intrxfer == xfer);
/*
* XXX - abort_xfer uses ehci_sync_hc, which syncs via the advance
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.313 src/sys/dev/usb/ohci.c:1.314
--- src/sys/dev/usb/ohci.c:1.313 Thu Dec 10 20:50:24 2020
+++ src/sys/dev/usb/ohci.c Tue Dec 22 01:07:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.313 2020/12/10 20:50:24 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.314 2020/12/22 01:07:23 riastradh Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012, 2016, 2020 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.313 2020/12/10 20:50:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.314 2020/12/22 01:07:23 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -3384,7 +3384,6 @@ ohci_device_intr_abort(struct usbd_xfer
ohci_softc_t *sc __diagused = OHCI_XFER2SC(xfer);
KASSERT(mutex_owned(&sc->sc_lock));
- KASSERT(xfer->ux_pipe->up_intrxfer == xfer);
usbd_xfer_abort(xfer);
}
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.304 src/sys/dev/usb/uhci.c:1.305
--- src/sys/dev/usb/uhci.c:1.304 Tue Jul 7 10:02:17 2020
+++ src/sys/dev/usb/uhci.c Tue Dec 22 01:07:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.304 2020/07/07 10:02:17 skrll Exp $ */
+/* $NetBSD: uhci.c,v 1.305 2020/12/22 01:07:23 riastradh Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2016, 2020 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.304 2020/07/07 10:02:17 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.305 2020/12/22 01:07:23 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2836,7 +2836,6 @@ uhci_device_intr_abort(struct usbd_xfer
uhci_softc_t *sc __diagused = UHCI_XFER2SC(xfer);
KASSERT(mutex_owned(&sc->sc_lock));
- KASSERT(xfer->ux_pipe->up_intrxfer == xfer);
UHCIHIST_FUNC(); UHCIHIST_CALLED();
DPRINTF("xfer=%#jx", (uintptr_t)xfer, 0, 0, 0);
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.135 src/sys/dev/usb/xhci.c:1.136
--- src/sys/dev/usb/xhci.c:1.135 Thu Oct 15 09:37:40 2020
+++ src/sys/dev/usb/xhci.c Tue Dec 22 01:07:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.135 2020/10/15 09:37:40 jmcneill Exp $ */
+/* $NetBSD: xhci.c,v 1.136 2020/12/22 01:07:23 riastradh Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.135 2020/10/15 09:37:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.136 2020/12/22 01:07:23 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -4412,7 +4412,6 @@ xhci_device_intr_abort(struct usbd_xfer
XHCIHIST_CALLARGS("%#jx", (uintptr_t)xfer, 0, 0, 0);
KASSERT(mutex_owned(&sc->sc_lock));
- KASSERT(xfer->ux_pipe->up_intrxfer == xfer);
usbd_xfer_abort(xfer);
}
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.74 src/sys/external/bsd/dwc2/dwc2.c:1.75
--- src/sys/external/bsd/dwc2/dwc2.c:1.74 Fri May 15 06:15:42 2020
+++ src/sys/external/bsd/dwc2/dwc2.c Tue Dec 22 01:07:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.74 2020/05/15 06:15:42 skrll Exp $ */
+/* $NetBSD: dwc2.c,v 1.75 2020/12/22 01:07:23 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.74 2020/05/15 06:15:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.75 2020/12/22 01:07:23 riastradh Exp $");
#include "opt_usb.h"
@@ -880,7 +880,6 @@ dwc2_device_intr_abort(struct usbd_xfer
struct dwc2_softc *sc __diagused = DWC2_XFER2SC(xfer);
KASSERT(mutex_owned(&sc->sc_lock));
- KASSERT(xfer->ux_pipe->up_intrxfer == xfer);
DPRINTF("xfer=%p\n", xfer);
usbd_xfer_abort(xfer);
