linux-toradex.git/drivers/usb/core/hcd.c, branch v3.2.2

usb: fix number of mapped SG DMA entries

2012-01-12T19:29:43+00:00

commit bc677d5b64644c399cd3db6a905453e611f402ab upstream.

Add a new field num_mapped_sgs to struct urb so that we have a place to
store the number of mapped entries and can also retain the original
value of entries in num_sgs.  Previously, usb_hcd_map_urb_for_dma()
would overwrite this with the number of mapped entries, which would
break dma_unmap_sg() because it requires the original number of entries.

This fixes warnings like the following when using USB storage devices:
 ------------[ cut here ]------------
 WARNING: at lib/dma-debug.c:902 check_unmap+0x4e4/0x695()
 ehci_hcd 0000:00:12.2: DMA-API: device driver frees DMA sg list with different entry count [map count=4] [unmap count=1]
 Modules linked in: ohci_hcd ehci_hcd
 Pid: 0, comm: kworker/0:1 Not tainted 3.2.0-rc2+ #319
 Call Trace:
    [] warn_slowpath_common+0x80/0x98
  [] warn_slowpath_fmt+0x41/0x43
  [] check_unmap+0x4e4/0x695
  [] ? trace_hardirqs_off+0xd/0xf
  [] ? _raw_spin_unlock_irqrestore+0x33/0x50
  [] debug_dma_unmap_sg+0xeb/0x117
  [] usb_hcd_unmap_urb_for_dma+0x71/0x188
  [] unmap_urb_for_dma+0x20/0x22
  [] usb_hcd_giveback_urb+0x5d/0xc0
  [] ehci_urb_done+0xf7/0x10c [ehci_hcd]
  [] qh_completions+0x429/0x4bd [ehci_hcd]
  [] ehci_work+0x95/0x9c0 [ehci_hcd]
  ...
 ---[ end trace f29ac88a5a48c580 ]---
 Mapped at:
  [] debug_dma_map_sg+0x45/0x139
  [] usb_hcd_map_urb_for_dma+0x22e/0x478
  [] usb_hcd_submit_urb+0x63f/0x6fa
  [] usb_submit_urb+0x2c7/0x2de
  [] usb_sg_wait+0x55/0x161

Signed-off-by: Clemens Ladisch 
Signed-off-by: Greg Kroah-Hartman

Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2011-10-25T13:18:39+00:00

* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (63 commits)
  PM / Clocks: Remove redundant NULL checks before kfree()
  PM / Documentation: Update docs about suspend and CPU hotplug
  ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist.
  ARM: mach-shmobile: sh7372 A4R support (v4)
  ARM: mach-shmobile: sh7372 A3SP support (v4)
  PM / Sleep: Mark devices involved in wakeup signaling during suspend
  PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image
  PM / Hibernate: Do not initialize static and extern variables to 0
  PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too
  PM / Hibernate: Add resumedelay kernel param in addition to resumewait
  MAINTAINERS: Update linux-pm list address
  PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs
  PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvs
  PM / Hibernate: Add resumewait param to support MMC-like devices as resume file
  PM / Hibernate: Fix typo in a kerneldoc comment
  PM / Hibernate: Freeze kernel threads after preallocating memory
  PM: Update the policy on default wakeup settings
  PM / VT: Cleanup #if defined uglyness and fix compile error
  PM / Suspend: Off by one in pm_suspend()
  PM / Hibernate: Include storage keys in hibernation image on s390
  ...

xHCI/USB: Make xHCI driver have a BOS descriptor.

2011-10-18T20:42:06+00:00

To add USB 3.0 link power management (LPM), we need to know what the U1
and U2 exit latencies are for the xHCI host controller.  External USB 3.0
hubs report these values through the SuperSpeed Capabilities descriptor in
the BOS descriptor.  Make the USB 3.0 roothub for the xHCI host behave
like an external hub and return the BOS descriptors.

The U1 and U2 exit latencies will vary across each host controller, so we
need to dynamically fill those values in by reading the exit latencies out
of the xHC registers.  Make the roothub code in the USB core handle
hub_control() returning the length of the data copied.

Signed-off-by: Sarah Sharp 
Acked-by: Alan Stern 
Signed-off-by: Greg Kroah-Hartman

Merge branch 'pm-runtime' into pm-for-linus

2011-10-07T21:16:55+00:00

* pm-runtime:
  PM / Tracing: build rpm-traces.c only if CONFIG_PM_RUNTIME is set
  PM / Runtime: Replace dev_dbg() with trace_rpm_*()
  PM / Runtime: Introduce trace points for tracing rpm_* functions
  PM / Runtime: Don't run callbacks under lock for power.irq_safe set
  USB: Add wakeup info to debugging messages
  PM / Runtime: pm_runtime_idle() can be called in atomic context
  PM / Runtime: Add macro to test for runtime PM events
  PM / Runtime: Add might_sleep() to runtime PM functions

USB: Add wakeup info to debugging messages

2011-09-27T19:54:22+00:00

This patch (as1487) improves the usbcore debugging output for port
suspend and bus suspend, by stating whether or not remote wakeup is
enabled.

Signed-off-by: Alan Stern 
Acked-by: Greg Kroah-Hartman 
Signed-off-by: Rafael J. Wysocki

USB: Update USB default wakeup settings

2011-09-26T22:54:11+00:00

This patch (as1486) implements the kernel's new wakeup policy for USB
host controllers.  Since they don't generate wakeup requests on their
but merely forward requests from their root hubs toward the CPU, they
should be enabled for wakeup by default.

Also, to be compliant with both the old and new policies, root hubs
should not be enabled for remote wakeup by default.  Userspace must
enable it explicitly if it is desired.

Signed-off-by: Alan Stern 
Signed-off-by: Greg Kroah-Hartman

PM / Runtime: Add macro to test for runtime PM events

2011-08-19T21:49:48+00:00

This patch (as1482) adds a macro for testing whether or not a
pm_message value represents an autosuspend or autoresume (i.e., a
runtime PM) event.  Encapsulating this notion seems preferable to
open-coding the test all over the place.

Signed-off-by: Alan Stern 
Acked-by: Greg Kroah-Hartman 
Signed-off-by: Rafael J. Wysocki

USB: Avoid NULL pointer deref in usb_hcd_alloc_bandwidth.

2011-08-15T16:22:40+00:00

usb_ifnum_to_if() can return NULL if the USB device does not have a
configuration installed (usb_device->actconfig == NULL), or if we can't
find the interface number in the installed configuration.  Return an
error instead of crashing.

Signed-off-by: Sarah Sharp

USB: Add "authorized_default" parameter to the usbcore module

2011-06-06T23:41:47+00:00

The "authorized_default" module parameter of usbcore controls the default
for the authorized_default variable of each USB host controller.
-1 is authorized for all devices except wireless (default, old behaviour)
0 is unauthorized for all devices
1 is authorized for all devices

Signed-off-by: Carl-Daniel Hailfinger 
Signed-off-by: Greg Kroah-Hartman

USB: remove remaining usages of hcd->state from usbcore and fix regression

2011-05-19T23:34:04+00:00

This patch (as1467) removes the last usages of hcd->state from
usbcore.  We no longer check to see if an interrupt handler finds that
a controller has died; instead we rely on host controller drivers to
make an explicit call to usb_hc_died().

This fixes a regression introduced by commit
9b37596a2e860404503a3f2a6513db60c296bfdc (USB: move usbcore away from
hcd->state).  It used to be that when a controller shared an IRQ with
another device and an interrupt arrived while hcd->state was set to
HC_STATE_HALT, the interrupt handler would be skipped.  The commit
removed that test; as a result the current code doesn't skip calling
the handler and ends up believing the controller has died, even though
it's only temporarily stopped.  The solution is to ignore HC_STATE_HALT
following the handler's return.

As a consequence of this change, several of the host controller
drivers need to be modified.  They can no longer implicitly rely on
usbcore realizing that a controller has died because of hcd->state.
The patch adds calls to usb_hc_died() in the appropriate places.

The patch also changes a few of the interrupt handlers.  They don't
expect to be called when hcd->state is equal to HC_STATE_HALT, even if
the controller is still alive.  Early returns were added to avoid any
confusion.

Signed-off-by: Alan Stern 
Tested-by: Manuel Lauss 
CC: Rodolfo Giometti 
CC: Olav Kongas 
CC: 
Signed-off-by: Greg Kroah-Hartman