1c1
< /* $FreeBSD: head/sys/dev/usb2/core/usb2_transfer.c 184610 2008-11-04 02:31:03Z alfred $ */
---
> /* $FreeBSD: head/sys/dev/usb2/core/usb2_transfer.c 184824 2008-11-10 20:54:31Z thompsa $ */
805d804
< info->usb2_mtx = &udev->bus->mtx;
828c827
< &udev->bus->mtx, USB_PRI_HIGH)) {
---
> &udev->bus->bus_mtx, USB_PRI_HIGH)) {
881,882c880
< xfer->priv_mtx = priv_mtx;
< xfer->usb2_mtx = &udev->bus->mtx;
---
> xfer->xfer_mtx = priv_mtx;
886,887c884,885
< usb2_callout_init_mtx(&xfer->timeout_handle, xfer->usb2_mtx,
< CALLOUT_RETURNUNLOCKED);
---
> usb2_callout_init_mtx(&xfer->timeout_handle,
> &udev->bus->bus_mtx, CALLOUT_RETURNUNLOCKED);
1023c1021
< * "usb2_mtx" before returning !
---
> * the bus mutex before returning !
1025c1023
< mtx_lock(info->usb2_mtx);
---
> USB_BUS_LOCK(info->bus);
1046c1044
< mtx_assert(info->usb2_mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(info->bus, MA_OWNED);
1052c1050
< usb2_pause_mtx(info->usb2_mtx, temp);
---
> usb2_pause_mtx(&info->bus->bus_mtx, temp);
1054c1052
< mtx_unlock(info->usb2_mtx);
---
> USB_BUS_UNLOCK(info->bus);
1108,1109c1106,1107
< mtx_lock(xfer->priv_mtx);
< mtx_lock(xfer->usb2_mtx);
---
> USB_XFER_LOCK(xfer);
> USB_BUS_LOCK(xfer->udev->bus);
1133,1134c1131,1132
< mtx_unlock(xfer->usb2_mtx);
< mtx_unlock(xfer->priv_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
> USB_XFER_UNLOCK(xfer);
1157c1155
< mtx_lock(info->usb2_mtx);
---
> USB_BUS_LOCK(info->bus);
1169c1167
< mtx_unlock(info->usb2_mtx);
---
> USB_BUS_UNLOCK(info->bus);
1361c1359
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1365c1363
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1369,1370c1367,1368
< mtx_assert(xfer->priv_mtx, MA_OWNED);
< mtx_assert(xfer->usb2_mtx, MA_NOTOWNED);
---
> USB_XFER_LOCK_ASSERT(xfer, MA_OWNED);
> USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_NOTOWNED);
1378c1376
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1380c1378
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1390c1388
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1392c1390
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1424c1422
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1428c1426
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1431c1429
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1433c1431
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1442c1440
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1444c1442
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1459c1457
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1461c1459
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1516c1514
< mtx_assert(xfer->priv_mtx, MA_OWNED);
---
> USB_XFER_LOCK_ASSERT(xfer, MA_OWNED);
1518c1516
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1534c1532
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1543c1541
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1561c1559
< mtx_assert(xfer->priv_mtx, MA_OWNED);
---
> USB_XFER_LOCK_ASSERT(xfer, MA_OWNED);
1573c1571
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1576c1574
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1597c1595
< mtx_assert(xfer->priv_mtx, MA_OWNED);
---
> USB_XFER_LOCK_ASSERT(xfer, MA_OWNED);
1608c1606
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1660c1658
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1679c1677
< mtx_assert(xfer->priv_mtx, MA_OWNED);
---
> USB_XFER_LOCK_ASSERT(xfer, MA_OWNED);
1685c1683
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1688c1686
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1696c1694
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1700c1698
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1722,1723c1720,1721
< if (xfer->priv_mtx != &Giant) {
< mtx_assert(xfer->priv_mtx, MA_NOTOWNED);
---
> if (xfer->xfer_mtx != &Giant) {
> USB_XFER_LOCK_ASSERT(xfer, MA_NOTOWNED);
1725c1723
< mtx_lock(xfer->priv_mtx);
---
> USB_XFER_LOCK(xfer);
1735c1733
< usb2_cv_wait(&xfer->usb2_root->cv_drain, xfer->priv_mtx);
---
> usb2_cv_wait(&xfer->usb2_root->cv_drain, xfer->xfer_mtx);
1737c1735
< mtx_unlock(xfer->priv_mtx);
---
> USB_XFER_UNLOCK(xfer);
1789c1787
< mtx_unlock(info->usb2_mtx);
---
> USB_BUS_UNLOCK(info->bus);
1796c1794
< mtx_lock(info->usb2_mtx);
---
> USB_BUS_LOCK(info->bus);
1818,1820c1816,1817
< if (!mtx_owned(xfer->usb2_mtx)) {
< panic("%s: called unlocked!\n", __FUNCTION__);
< }
---
> USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
>
1857,1860c1854,1855
< if (!mtx_owned(xfer->usb2_mtx)) {
< panic("%s: called unlocked!\n", __FUNCTION__);
< }
< if (!mtx_owned(xfer->priv_mtx)) {
---
> USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
> if (!mtx_owned(xfer->xfer_mtx)) {
1891,1892c1886,1887
< mtx_unlock(xfer->usb2_mtx);
< mtx_assert(xfer->usb2_mtx, MA_NOTOWNED);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
> USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_NOTOWNED);
1899c1894
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1906c1901
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1929c1924
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1968c1963
< mtx_assert(xfer->usb2_mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
1975c1970
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
2038c2033
< mtx_assert(xfer->usb2_mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
2064c2059
< if (mtx_owned(xfer->priv_mtx)) {
---
> if (mtx_owned(xfer->xfer_mtx)) {
2103c2098
< mtx_assert(xfer->usb2_mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
2120c2115
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
2138c2133
< mtx_assert(xfer->priv_mtx, MA_OWNED);
---
> USB_XFER_LOCK_ASSERT(xfer, MA_OWNED);
2141c2136
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
2145c2140
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
2163c2158
< mtx_assert(xfer->priv_mtx, MA_OWNED);
---
> USB_XFER_LOCK_ASSERT(xfer, MA_OWNED);
2166c2161
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
2170c2165
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
2190c2185
< mtx_assert(xfer->usb2_mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
2293c2288
< mtx_assert(xfer->usb2_mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
2327c2322
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
2329c2324
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
2356c2351
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
2359c2354
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
2451c2446
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
2463c2458
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
2547c2542
< mtx_lock(xfer->priv_mtx);
---
> USB_XFER_LOCK(xfer);
2562c2557
< mtx_unlock(xfer->priv_mtx);
---
> USB_XFER_UNLOCK(xfer);
2612c2607
< mtx_lock(&udev->bus->mtx);
---
> USB_BUS_LOCK(udev->bus);
2614c2609
< mtx_unlock(&udev->bus->mtx);
---
> USB_BUS_UNLOCK(udev->bus);
2658,2659c2653,2654
< mtx_assert(xfer1->priv_mtx, MA_OWNED);
< mtx_assert(xfer2->priv_mtx, MA_OWNED);
---
> USB_XFER_LOCK_ASSERT(xfer1, MA_OWNED);
> USB_XFER_LOCK_ASSERT(xfer2, MA_OWNED);
2789c2784
< mtx_lock(xfer->priv_mtx);
---
> USB_XFER_LOCK(xfer);
2791c2786
< mtx_unlock(xfer->priv_mtx);
---
> USB_XFER_UNLOCK(xfer);
2794c2789
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
2797c2792
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
2805c2800
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
2809c2804
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
2815c2810
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
2818c2813
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);