Linus,
please pull from the tag "firewire-updates" at
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git firewire-updates
to receive the following IEEE 1394 (FireWire) subsystem updates:
- Fix mismatch between DMA mapping direction (was wrong) and DMA synchronization
direction (was correct) of isochronous reception buffers of userspace drivers
if vma-mapped for R/W access. For example, libdc1394 was affected.
- more consistent retry stategy in device discovery/ rediscovery, and improved
failure diagnostics
- various small cleanups, e.g. use SCSI layer's DMA mapping API in firewire-sbp2
The last few commits happened rather late for this pull request but I feel comfortable
with them. ALSA firewire-lib changes were written by Clemens, hence are implicitly ACKed.
Axel Lin (1):
firewire: use module_pci_driver
Clemens Ladisch (10):
firewire: core: wait for inaccessible devices after bus reset
firewire: core: improve reread_config_rom() interface
firewire: move rcode_string() to core
firewire: core: log error in case of failed bus manager lock
firewire: core: log config rom reading errors
firewire: core: fw_device_refresh(): clean up error handling
firewire: sbp2: give correct DMA device to scsi framework
firewire: sbp2: use scsi_dma_(un)map
firewire: sbp2: remove superfluous blk_queue_max_segment_size() call
firewire: sbp2: document the absence of alignment requirements
Stefan Richter (4):
firewire: core: fix DMA mapping direction
firewire: ohci: correct signedness of a local variable
firewire: ohci: omit spinlock IRQ flags where possible
Merge tag 'v3.4' with SCSI updates, needed for subsequent firewire-sbp2 changes
drivers/firewire/core-card.c | 4 +-
drivers/firewire/core-cdev.c | 51 ++++++++++++---
drivers/firewire/core-device.c | 116 +++++++++++++++++------------------
drivers/firewire/core-iso.c | 80 +++++++++++++++---------
drivers/firewire/core-transaction.c | 26 ++++++++
drivers/firewire/core.h | 7 ++-
drivers/firewire/nosy.c | 20 ++----
drivers/firewire/ohci.c | 42 +++++--------
drivers/firewire/sbp2.c | 28 ++++-----
include/linux/firewire.h | 2 +
sound/firewire/cmp.c | 2 +-
sound/firewire/lib.c | 28 +--------
sound/firewire/lib.h | 1 -
13 files changed, 218 insertions(+), 189 deletions(-)
Thanks,
--
Stefan Richter
-=====-===-- -=-= ==---
http://arcgraph.de/sr/