Hi Sarah,
Here is v2 of my patch-series / pull-req for you to pull into your xhci tree
for 3.14 .
This new version has the following changes:
"usb-core: Track if an endpoint has streams":
Remove unnecessary ep type check from usb_free_streams, the check if
the endpoint has streams is sufficient.
"uas: Drop fixed endpoint config handling"
New patch dropping workaround code for early uas prototype hardware.
"uas: Verify endpoint descriptors from uas_use_uas_driver()"
Drop fixed endpoint config handling.
"uas: Add a usbcore.nouas kernel cmdline option"
Dropped.
"usb-storage: Modify and export adjust_quirks so that it can be used by uas"
"uas: Honor no-uas quirk set in usb-storage's quirks module parameter"
2 new patches replacing "uas: Add a usbcore.nouas kernel cmdline option".
"uas: Add Hans de Goede as uas maintainer"
Also remove Matthew Wilcox and Sarah Sharp as maintainers at their request.
I'm going to only send the changed patches as a follow up to this mail,
rather then re-sending the entire series again.
The following changes since commit 7d49f0bac41ee9b012af1efe2f725d91a87a8fe9:
USB: Maintainers change for usb serial drivers (2013-10-31 08:53:52 -0700)
are available in the git repository at:
git://linuxtv.org/hgoede/gspca.git usb-next-for-sarah
for you to fetch changes up to 843af30c55c1441de2775f3a1ef624ab7605c8a3:
uas: Remove comment about registering a uas scsi controller for each usb bus
(2013-11-16 12:29:27 +0100)
----------------------------------------------------------------
Gerd Hoffmann (6):
xhci: fix usb3 streams
uas: properly reinitialize in uas_eh_bus_reset_handler
uas: make work list per-device
uas: add dead request list
uas: replace BUG_ON() + WARN_ON() with WARN_ON_ONCE()
uas: remove BROKEN
Hans de Goede (63):
xhci: Free streams when they are still allocated on a set_interface call
xhci: Check size rather then number of streams when allocating stream ctxs
xhci: For streams the css flag most be read from the stream-ctx on ep stop
xhci: Set SCT field for Set TR dequeue on streams
xhci: For streams the dequeue ptr must be read from the stream ctx
xhci: use usb_ss_max_streams in xhci_check_streams_endpoint
usb-core: Fix usb_free_streams return value documentation
usb-core: Move USB_MAXENDPOINTS definitions to usb.h
usb-core: Track if an endpoint has streams
usb-core: Free bulk streams on interface release
usbfs: Kill urbs on interface before doing a set_interface
usbfs: proc_do_submiturb use a local variable for number_of_packets
usbfs: Add support for bulk stream ids
usbfs: Add ep_to_host_endpoint helper function
usbfs: Add support for allocating / freeing streams
uas: Urbs must be anchored before submitting them
uas: Properly set interface to altsetting 0 on probe failure
uas: Avoid unnecessary unlock / lock calls around unlink_data_urbs
uas: uas_alloc_cmd_urb: drop unused stream_id parameter
uas: Fix uas not working when plugged into an ehci port
uas: Fix reset locking
uas: Fix reset handling for externally triggered reset
uas: s/response_ui/response_iu/
uas: Fix response iu struct definition
uas: Pack iu struct definitions
uas: Use proper packet size when submitting reponse urbs
uas: Use all available stream ids
uas: Add a uas_find_uas_alt_setting helper function
uas: Move uas detect code to uas-detect.h
xhci: xhci_mem_cleanup: make sure cmd_ring_reserved_trbs really is 0
xhci: The trb_address_map radix tree expects 1KB segment memory aligment
xhci: Handle MaxPSASize == 0
usb: Clear host_endpoint->streams when implicitly freeing streams
usb: Reset USB-3 devices on USB-3 link bounce
uas: Add the posibilty to blacklist uas devices from using the uas driver
usb-storage: Don't bind to uas devices if the uas driver is enabled
usb-storage: Modify and export adjust_quirks so that it can be used by uas
uas: Honor no-uas quirk set in usb-storage's quirks module parameter
uas: Add uas_find_endpoints() helper function
uas: Fix bounds check in uas_find_endpoints
uas: Move uas_find_endpoints to uas-detect.h
uas: Drop fixed endpoint config handling
uas: Verify endpoint descriptors from uas_use_uas_driver()
uas: Not being able to alloc streams when connected through usb-3 is an
error
uas: task_mgmt: Kill the sense-urb if we fail to submit the cmd urb
uas: Don't allow more then one task to run at the same time
uas: Use GFP_NOIO rather then GFP_ATOMIC where possible
uas: Add suspend/resume support
uas: Reset device on reboot
uas: Fix task-management not working when connected over USB-2
uas: uas_alloc_data_urb: Remove unnecessary use_streams check
uas: Properly complete inflight commands on bus-reset or disconnect
uas: add uas_mark_cmd_dead helper function
uas: cmdinfo: use only one list head
uas: Fix command / task mgmt submission racing with disconnect
uas: Fix memory management
uas: Clear cmdinfo on command queue-ing
uas: Use the right error codes for different kinds of errors
uas: Improve error reporting
uas: Add some data in/out ready iu sanity checks
uas: Make sure sg elements are properly aligned
uas: Add Hans de Goede as uas maintainer
uas: Remove comment about registering a uas scsi controller for each usb
bus
Sarah Sharp (1):
xhci: Remove segments from radix tree on failed insert.
MAINTAINERS | 3 +-
drivers/usb/core/config.c | 1 -
drivers/usb/core/devio.c | 158 ++++++++-
drivers/usb/core/driver.c | 23 +-
drivers/usb/core/hcd.c | 37 +-
drivers/usb/core/hub.c | 27 +-
drivers/usb/core/message.c | 7 +-
drivers/usb/host/xhci-mem.c | 212 ++++++++---
drivers/usb/host/xhci-ring.c | 41 ++-
drivers/usb/host/xhci.c | 29 +-
drivers/usb/host/xhci.h | 5 +-
drivers/usb/storage/Kconfig | 2 +-
drivers/usb/storage/uas-detect.h | 92 +++++
drivers/usb/storage/uas.c | 696 +++++++++++++++++++++++--------------
drivers/usb/storage/unusual_devs.h | 5 +
drivers/usb/storage/unusual_uas.h | 52 +++
drivers/usb/storage/usb.c | 26 +-
drivers/usb/storage/usb.h | 3 +
include/linux/usb.h | 4 +
include/linux/usb/uas.h | 14 +-
include/linux/usb_usual.h | 6 +-
include/uapi/linux/usbdevice_fs.h | 12 +-
22 files changed, 1082 insertions(+), 373 deletions(-)
create mode 100644 drivers/usb/storage/uas-detect.h
create mode 100644 drivers/usb/storage/unusual_uas.h
Thanks & Regards,
Hans
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html