From: Greg KH To: torvalds@transmeta.com Cc: linux-usb-devel@lists.sourceforge.net Subject: [BK PATCH] USB changes for 2.5.28 Pull from: http://linuxusb.bkbits.net/linus-2.5 drivers/usb/input/hid-lg3dff.c | 444 ----- drivers/usb/Config.help | 13 drivers/usb/class/Config.help | 4 drivers/usb/class/audio.c | 4 drivers/usb/core/usb.c | 4 drivers/usb/host/Config.help | 3 drivers/usb/host/ehci-hcd.c | 128 + drivers/usb/host/ehci-q.c | 8 drivers/usb/host/ehci-sched.c | 43 drivers/usb/host/ohci-dbg.c | 13 drivers/usb/host/ohci-hcd.c | 144 + drivers/usb/host/ohci-hub.c | 10 drivers/usb/host/ohci-q.c | 451 ++--- drivers/usb/host/ohci.h | 21 drivers/usb/image/scanner.h | 7 drivers/usb/input/Config.help | 23 drivers/usb/input/Config.in | 3 drivers/usb/input/Makefile | 5 drivers/usb/input/fixp-arith.h | 8 drivers/usb/input/hid-core.c | 8 drivers/usb/input/hid-ff.c | 16 drivers/usb/input/hid-lgff.c | 493 +++--- drivers/usb/input/wacom.c | 14 drivers/usb/misc/Config.help | 2 drivers/usb/misc/emi26.c | 8 drivers/usb/net/pegasus.c | 4 drivers/usb/net/usbnet.c | 12 drivers/usb/serial/Config.help | 10 drivers/usb/serial/Config.in | 1 drivers/usb/serial/Makefile | 1 drivers/usb/serial/digi_acceleport.c | 4 drivers/usb/serial/io_fw_down3.h | 799 ++++++++++ drivers/usb/serial/io_ti.c | 2684 +++++++++++++++++++++++++++++++++++ drivers/usb/serial/io_ti.h | 180 ++ drivers/usb/serial/io_usbvend.h | 113 + drivers/usb/serial/usbserial.c | 7 drivers/usb/storage/Config.help | 13 drivers/usb/storage/Config.in | 10 drivers/usb/storage/usb.c | 72 39 files changed, 4663 insertions(+), 1124 deletions(-) ------ ChangeSet@1.488, 2002-07-26 11:59:47-07:00, greg@kroah.com USB: added driver to support the I/O Networks TI based usb-serial devices. drivers/usb/serial/Config.help | 10 drivers/usb/serial/Config.in | 1 drivers/usb/serial/Makefile | 1 drivers/usb/serial/io_fw_down3.h | 799 +++++++++++ drivers/usb/serial/io_ti.c | 2684 +++++++++++++++++++++++++++++++++++++++ drivers/usb/serial/io_ti.h | 180 ++ drivers/usb/serial/io_usbvend.h | 113 + 7 files changed, 3781 insertions(+), 7 deletions(-) ------ ChangeSet@1.487, 2002-07-26 11:52:38-07:00, greg@kroah.com USB: usb-serial.c update the version number, and document the previous changes. drivers/usb/serial/usbserial.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) ------ ChangeSet@1.486, 2002-07-26 11:46:28-07:00, greg@kroah.com USB: deleted hid-lg3dff.c as it's no longer needed. drivers/usb/input/hid-lg3dff.c | 444 ----------------------------------------- 1 files changed, 444 deletions(-) ------ ChangeSet@1.485, 2002-07-26 11:11:54-07:00, david-b@pacbell.net [PATCH] ohci-hcd cardbus unplug, remove interrupt length limit, * handle another cardbus unplug misbehavior - root hub kept polling, never stopped - starts to update hcd->state to match internal state * code to count/queue TDs for interrupt/bulk is now shared - removes (low level) interrupt transfer size limitation - both types already handled urb queueing - re-indents some TD queuing code (most of patch, by volume) * cleanup - use new container_of() macro, not list_entry() - report a previously unreported error (control data >4K) - simplify intr/bulk toggle reset - tweak TD debug dump - more object code shrinkage (often fits in 3 pages) Note that the control data size error is just a long-standing limitation of this driver, not a USB limitation! It could be fixed, if anyone starts to run into it. drivers/usb/host/ohci-dbg.c | 13 +- drivers/usb/host/ohci-hcd.c | 36 ++++--- drivers/usb/host/ohci-hub.c | 10 +- drivers/usb/host/ohci-q.c | 207 ++++++++++++++++++++++---------------------- drivers/usb/host/ohci.h | 2 5 files changed, 143 insertions(+), 125 deletions(-) ------ ChangeSet@1.484, 2002-07-26 11:00:34-07:00, ahaas@neosoft.com [PATCH] designated initializer patch for drivers_usb_input_wacom.c Here's a patch for extra designated initializer conversions in drivers/usb/input/wacom.c. Patch is against 2.5.27. drivers/usb/input/wacom.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) ------ ChangeSet@1.483, 2002-07-26 11:00:20-07:00, ahaas@neosoft.com [PATCH] designated initializers for drivers_usb_storage_usb.c Here's a patch for additional designated initializers for drivers/usb/storage/usb.c. Patch is against 2.5.27. drivers/usb/storage/usb.c | 72 +++++++++++++++++++++++----------------------- 1 files changed, 36 insertions(+), 36 deletions(-) ------ ChangeSet@1.482, 2002-07-26 11:00:07-07:00, ahaas@neosoft.com [PATCH] designated initializer patch for drivers_usb_input_hid-core.c Here's an patch for additional designated initializers for drivers/usb/input/hid-core.c. Patch is against 2.5.27. drivers/usb/input/hid-core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ------ ChangeSet@1.481, 2002-07-26 10:59:53-07:00, gnb@alphalink.com.au [PATCH] PATCH 2.5: kconfig missing EXPERIMENTAL 3 (10_13) Symbols CONFIG_USB_STORAGE_DATAFAB, CONFIG_USB_STORAGE_HP8200e, CONFIG_USB_STORAGE_SDDR09, CONFIG_USB_STORAGE_SDDR55, and CONFIG_USB_STORAGE_JUMPSHOT depend on CONFIG_EXPERIMENTAL but do not say so in their banners. drivers/usb/storage/Config.in | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) ------ ChangeSet@1.480, 2002-07-26 10:59:37-07:00, ahaas@neosoft.com [PATCH] designated initializers in drivers_usb_class_audio.c Here's a patch for additional designated initializers in drivers/usb/class/audio.c. Patch is against 2.5.27. drivers/usb/class/audio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ------ ChangeSet@1.479, 2002-07-26 10:59:05-07:00, ahaas@neosoft.com [PATCH] designated initializer patch for drivers_usb_net_pegasus.c Here's a patch for additional designated initializers for drivers/usb/net/pegasus.c. Patch is against 2.5.27. drivers/usb/net/pegasus.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ------ ChangeSet@1.478, 2002-07-26 10:58:44-07:00, ahaas@neosoft.com [PATCH] designated initializers for drivers_usb_net_usbnet.c Here's a patch for additional designated initializers for drivers/usb/net/usbnet.c. Patch is against 2.5.27. drivers/usb/net/usbnet.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) ------ ChangeSet@1.477, 2002-07-26 10:58:30-07:00, ahaas@neosoft.com [PATCH] designated initializer patch for drivers_usb_misc_emi26.c Here's a patch for additional designated initializers in drivers/usb/misc/emi26.c. Patch is against 2.5.27. drivers/usb/misc/emi26.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ------ ChangeSet@1.476, 2002-07-26 10:46:53-07:00, vojtech@suse.cz [PATCH] Fixes needed to get Logitech WingMan 3D running Some fixes from Johann Deneux: Fixes needed to get WingMan Force 3D running. (Fix in fixp_cos and hid_init_reports). drivers/usb/input/fixp-arith.h | 8 +++++++- drivers/usb/input/hid-core.c | 4 +--- 2 files changed, 8 insertions(+), 4 deletions(-) ------ ChangeSet@1.475, 2002-07-26 10:42:24-07:00, johann.deneux@it.uu.se [PATCH] Merged hid-lgff.c and hid-lg3d.c Here is a patch wich moves hid-lg3d.c into hid-lgff.c. This allows to share the init code. A side-effect of this merge is that rumble pads are now handled the same way joysticks are. Instead of having one timer per effect, executing only when needed, we have one timer executing at regular intervals going over each effect. drivers/usb/input/Config.help | 11 drivers/usb/input/Config.in | 3 drivers/usb/input/Makefile | 5 drivers/usb/input/hid-ff.c | 16 - drivers/usb/input/hid-lgff.c | 493 ++++++++++++++++++++++-------------------- 5 files changed, 279 insertions(+), 249 deletions(-) ------ ChangeSet@1.474, 2002-07-26 10:01:36-07:00, greg@kroah.com USB: fix compiler warning in drivers/usb/serial/digi_acceleport.c drivers/usb/serial/digi_acceleport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ------ ChangeSet@1.473, 2002-07-25 15:07:01-07:00, greg@kroah.com [PATCH] USB: fixed the interface names to have the proper bus id. Thanks to David Brownell for pointing out where my previous patch was wrong. drivers/usb/core/usb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ------ ChangeSet@1.472, 2002-07-25 12:58:34-07:00, apolkosnik@directvinternet.com [PATCH] new USB scanner IDs just a couple of extra IDs for Canon USB Scanners drivers/usb/image/scanner.h | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) ------ ChangeSet@1.471, 2002-07-25 12:58:17-07:00, david-b@pacbell.net [PATCH] ohci unlink cleanups Attached is a patch that cleans up a few more issues in the OHCI unlink code. There may still be an ISO-IN data problem, I'll look at that separately since it seems unrelated to unlink issues. - Simplify/correct ED lifecycle * UNLINK is now for real: descheduled and waiting for SOF * finish_unlinks() expects descheduled EDs (may reschedule) * only ed_deschedule() turns off hardware schedule processing * no more NEW state * no more ED_URB_DEL flag (it added extra states) * new IDLE state, "not scheduled" (replaces previous UNLINKing) - Bugfixes * ed_get(), potential memleak is now gone * urb_enqueue(), won't submit to dead/sleeping hc * free_config(), rescans after SOF when needed * ed_schedule(), use wmb() * ed_schedule() and finish_unlinks(), more thorough about restarting control or bulk processing * finish_unlinks(), more cautious about reentering - General: * ed->ed_rm_list renamed ed_next; to be used more later * slightly shrink object code * rename some functions This leaves one notable issue in the unlink paths: the driver never waits for SOF after descheduling (empty) EDs. That's racey in most cases, though there are a few light-traffic cases where that's correct (in part because the ED is empty). Easy to fix once the rest of this is known to behave. drivers/usb/host/ohci-hcd.c | 108 +++++++++++++------ drivers/usb/host/ohci-q.c | 244 +++++++++++++++++++++----------------------- drivers/usb/host/ohci.h | 19 ++- 3 files changed, 204 insertions(+), 167 deletions(-) ------ ChangeSet@1.470, 2002-07-25 12:58:01-07:00, david-b@pacbell.net [PATCH] ehci-hcd more polite on cardbus This patch makes the EHCI driver behave reasonably well in the cardbus configurations I can test ... basically, it now sees when a card is gone, and cleans up accordingly. There are also some related cleanups: hardware handshakes will time out (not that I've ever seen them fail), and some state management puts a bit more effort into being strictly to-spec. drivers/usb/host/ehci-hcd.c | 128 +++++++++++++++++++++++++++++++++--------- drivers/usb/host/ehci-q.c | 8 -- drivers/usb/host/ehci-sched.c | 43 +++++++++----- 3 files changed, 133 insertions(+), 46 deletions(-) ------ ChangeSet@1.469, 2002-07-25 12:57:48-07:00, bhards@bigpond.net.au [PATCH] trivial USB Config.help cleanups except that the repository that you are pushing to is 20 changesets ahead of your repository. Please do a "bk pull" to get these changes or do a "bk pull -nl" to see what they are. drivers/usb/Config.help | 13 +++++++++---- drivers/usb/class/Config.help | 4 ++++ drivers/usb/host/Config.help | 3 ++- drivers/usb/input/Config.help | 12 ++++++++---- drivers/usb/misc/Config.help | 2 +- drivers/usb/storage/Config.help | 13 ++++++++++++- 6 files changed, 36 insertions(+), 11 deletions(-) ------