From owner-p4-projects@FreeBSD.ORG  Mon Jun 18 18:00:45 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0458116A46D; Mon, 18 Jun 2007 18:00:45 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CD10016A400
	for <perforce@FreeBSD.org>; Mon, 18 Jun 2007 18:00:44 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id A3EFA13C465
	for <perforce@FreeBSD.org>; Mon, 18 Jun 2007 18:00:44 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5II0iu0043812
	for <perforce@FreeBSD.org>; Mon, 18 Jun 2007 18:00:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5II0idC043799
	for perforce@freebsd.org; Mon, 18 Jun 2007 18:00:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 18 Jun 2007 18:00:44 GMT
Message-Id: <200706181800.l5II0idC043799@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 121925 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jun 2007 18:00:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=121925

Change 121925 by hselasky@hselasky_mini_itx on 2007/06/18 18:00:10

	Remove "usbd_transfer_start_safe()" and fix a regression
	with regard to "usbd_do_request()" calls without Giant
	locked.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/uhub.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#42 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#27 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/uhub.c#13 (text+ko) ====

@@ -625,7 +625,9 @@
 
 	/* start the interrupt endpoint */
 
-	usbd_transfer_start_safe(sc->sc_xfer[0]);
+	mtx_lock(sc->sc_xfer[0]->priv_mtx);
+	usbd_transfer_start(sc->sc_xfer[0]);
+	mtx_unlock(sc->sc_xfer[0]->priv_mtx);
 
 	return 0;
 

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#42 (text+ko) ====

@@ -644,7 +644,6 @@
 void		usbd_std_ctrl_copy_out(struct usbd_xfer *xfer);
 uint8_t		usbd_std_ctrl_enter(struct usbd_xfer *xfer);
 void		usbd_start_hardware(struct usbd_xfer *xfer);
-void		usbd_transfer_start_safe(struct usbd_xfer *xfer);
 void		usbd_transfer_start(struct usbd_xfer *xfer);
 void		usbd_transfer_stop(struct usbd_xfer *xfer);
 void		__usbd_callback(struct usbd_xfer *xfer);

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#27 (text+ko) ====

@@ -697,15 +697,6 @@
 	return;
 }
 
-void
-usbd_transfer_start_safe(struct usbd_xfer *xfer)
-{
-	mtx_lock(xfer->priv_mtx);
-	usbd_transfer_start(xfer);
-	mtx_unlock(xfer->priv_mtx);
-	return;
-}
-
 /*---------------------------------------------------------------------------*
  *	usbd_transfer_start - start an USB transfer
  *
@@ -1221,12 +1212,16 @@
 	    usbd_copy_in(&(xfer->buf_data), sizeof(*req), data, length);
 	}
 
-	if (mtx) {
-	    usbd_transfer_start(xfer);
-	} else {
-	    usbd_transfer_start_safe(xfer);
+	if (mtx == NULL) {
+	    /* XXX This code will go away
+	     * when we have fixed all the
+	     * callers
+	     */
+	    mtx_lock(xfer->priv_mtx);
 	}
 
+	usbd_transfer_start(xfer);
+
 	while (xfer->flags & USBD_DEV_TRANSFERRING) {
 
 	    level = mtx_drop_recurse(xfer->priv_mtx);
@@ -1238,6 +1233,11 @@
 	    mtx_pickup_recurse(xfer->priv_mtx, level);
 	}
 
+	if (mtx == NULL) {
+	    /* XXX */
+	    mtx_unlock(xfer->priv_mtx);
+	}
+
 	if(req->bmRequestType & UT_READ)
 	{
 	    usbd_copy_out(&(xfer->buf_data), sizeof(*req), data, length);