gmane.linux.kernel.firewire.devel

[PATCH libraw1394 3/3] Remove unused code

Stefan Richter — 2012-05-25T22:21:41

Signed-off-by: Stefan Richter <stefanr< at >s5r6.in-berlin.de>
---
 src/fw-iso.c |    9 ---------
 src/fw.c     |   64 +++++++---------------------------------------------------
 2 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/src/fw-iso.c b/src/fw-iso.c
index ea0a249..15fa233 100644
--- a/src/fw-iso.c
+++ b/src/fw-iso.c
< at >< at > -431,14 +431,10 < at >< at > int fw_iso_xmit_sync(raw1394handle_t handle)
 
 int fw_iso_recv_flush(fw_handle_t handle)
 {
-#ifdef FW_CDEV_IOC_FLUSH_ISO /* added in kernel 3.4 */
 struct fw_cdev_flush_iso flush;
 
 flush.handle = handle->iso.kernel_handle;
 return ioctl(handle->iso.fd, FW_CDEV_IOC_FLUSH_ISO, &flush);
-#else
-return 0;
-#endif /* defined(FW_CDEV_IOC_FLUSH_ISO) */
 }
 
 static unsigned int
< at >< at > -655,7 +651,6 < at >< at > void fw_iso_shutdown(fw_handle_t handle)
 int fw_read_cycle_timer(fw_handle_t handle,
 u_int32_t *cycle_timer, u_int64_t *local_time)
 {
-#ifdef FW_CDEV_IOC_GET_CYCLE_TIMER /* added in kernel 2.6.24 */
 int err;
 struct fw_cdev_get_cycle_timer ctr = { 0 };
 
< at >

[PATCH libraw1394 2/3] Include local firewire-*.h instead ofsystem-wide

Stefan Richter — 2012-05-25T22:20:47

This guarantees that all features of libraw1394 are actually built in.
Before, some features and fixes would be silently dropped if too old
system headers (typically provided by a package called linux-headers)
were present.

An alternative would be to keep using system headers but add warnings
during the ./configure stage if old headers were encountered.  But this
helps only the person who builds libraw1394 (if there is a person
involved at all), not the users who have no reliable way to determine
how the library binary was built.

Another alternative would be to change the former soft dependency on
certain linux-headers versions into a hard dependency, i.e. fail the
build in absence of too old headers.  This would add an inconvenience
in setting up the build environment though:  The system headers would
have to be updated or a private copy of linux/firewire-*.h be specified
by way of the --with-fw-dir configure switch.

Anyhow.  The libraw1394 sources now already bring a suitable copy of
the two header file

[PATCH libraw1394 1/3] Add firewire-{cdev,constants}.h from Linux v3.4

Stefan Richter — 2012-05-25T22:19:53

Add copies of the Linux kernel header files but don't #include them just yet.
These are exact copies of the files from linux-3.4.  In case that we eventually
want updates from later kernels, a diff of the kernel's firewire-c*.h between
v3.4 and then should do the trick.

Signed-off-by: Stefan Richter <stefanr< at >s5r6.in-berlin.de>
---
 src/firewire-cdev.h      | 1039 ++++++++++++++++++++++++++++++++++++++++++++++
 src/firewire-constants.h |   92 ++++
 2 files changed, 1131 insertions(+)
 create mode 100644 src/firewire-cdev.h
 create mode 100644 src/firewire-constants.h

diff --git a/src/firewire-cdev.h b/src/firewire-cdev.h
new file mode 100644
index 0000000..d500369
--- /dev/null
+++ b/src/firewire-cdev.h
< at >< at > -0,0 +1,1039 < at >< at >
+/*
+ * Char device interface.
+ *
+ * Copyright (C) 2005-2007  Kristian Hoegsberg <krh< at >bitplanet.net>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software

[PATCH libraw1394 0/3] Copy firewire-cdev headers into libraw1394sources

Stefan Richter — 2012-05-25T22:18:02

The following patches are available in the "testing" branch at

    git://git.kernel.org/pub/scm/libs/ieee1394/libraw1394.git testing

and will also be posted right away for review.  If there are no complaints,
I will fetch it into the master branch and cut a 2.0.9 release from this
soon.

Motives for the changes are explained in patch 2/3.  I don't recommend to
do something like this in each and every firewire-cdev based program; I
just felt that this is preferable for the case of a base library that
libraw1394 is, especially after an incident in which obscure problems with
audio devices were caused by a libraw1394 which was built with outdated
kernel headers.

Stefan Richter (3):
      Add firewire-{cdev,constants}.h from Linux v3.4
      Include local firewire-*.h instead of system-wide <linux/firewire-*.h>
      Remove unused code

 configure.ac             |    7 -
 src/Makefile.am          |   11 +-
 src/firewire-cdev.h      | 1038 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/

Changes to the FireWire kernel drivers in Linux 3.4

Stefan Richter — 2012-05-24T20:44:47

Hi all,

Linux kernel 3.4 has been released last Sunday.  These are the IEEE 1394
related changes:

<linux/firewire-cdev.h> API:
  - Added FW_CDEV_IOC_FLUSH_ISO ioctl which lets an application get any
    currently completed isochronous packets reported.  A corresponding
    libraw1394 update to use this ioctl in raw1394_iso_recv_flush() has
    been committed to libraw1394.git too and will show up in the next
    libraw1394 release.

firewire-core, -net, -ohci, -sbp2:
  - All messages to the kernel log are now consistently prefixed by driver
    name and device name or number.

firewire-ohci:
  - Fix premature completion of multichannel isochronous reception DMA.
    Also fixed in kernel 3.3.1, 3.2.14, 3.0.27.
  - Fix missing completion notification in isochronous I/O in case of big
    intervals between interrupt packets or with big packet headers.

firewire-sbp2:
  - If the target's unit directory contains a Unit_Unique_ID entry, use it
    instead of the node unique ID as the target's GUID in the ieee139

[git pull] FireWire updates post v3.4

Stefan Richter — 2012-05-24T19:14:55

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

[PATCH] firewire: ohci: lazy bus time initialization

Clemens Ladisch — 2012-05-24T17:29:19

The Bus_Time CSR is virtually never used, so we can avoid burning CPU in
interrupt context for 1 or 3 IsochronousCycleTimer accesses every minute
by not tracking the bus time until the CSR is actually accessed for the
first time.

Signed-off-by: Clemens Ladisch <clemens< at >ladisch.de>
---
 drivers/firewire/ohci.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
< at >< at > -191,6 +191,7 < at >< at > struct fw_ohci {
 unsigned quirks;
 unsigned int pri_req_max;
 u32 bus_time;
+bool bus_time_running;
 bool is_root;
 bool csr_state_setclear_abdicate;
 int n_ir;
< at >< at > -1741,6 +1742,13 < at >< at > static u32 update_bus_time(struct fw_ohci *ohci)
 {
 u32 cycle_time_seconds = get_cycle_time(ohci) >> 25;

+if (unlikely(!ohci->bus_time_running)) {
+reg_write(ohci, OHCI1394_IntMaskSet, OHCI1394_cycle64Seconds);
+ohci->bus_time = (lower_32_bits(get_seconds()) & ~0x7f) |
+                 (cycle_time_seconds & 0x40);
+ohci->bus_time_running = true;

[PATCH 2/2] firewire: core: allocate the low memory region

Clemens Ladisch — 2012-05-24T17:28:58

Prevent userspace applications from allocating low memory address
ranges.  Otherwise, if some application happens to allocate such
a range and intends for a remote node to access it, and if that node
also implements SBP-2 (which will become more likely with the upcoming
SBP-2 target support), these accesses would be routed by the physical
DMA unit to some wrong memory address.

Signed-off-by: Clemens Ladisch <clemens< at >ladisch.de>
---
 drivers/firewire/core-transaction.c |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
< at >< at > -525,9 +525,10 < at >< at > const struct fw_address_region fw_high_memory_region =
 { .start = 0x000100000000ULL, .end = 0xffffe0000000ULL,  };
 EXPORT_SYMBOL(fw_high_memory_region);

-#if 0
-const struct fw_address_region fw_low_memory_region =
+static const struct fw_address_region low_memory_region =
 { .start = 0x000000000000ULL, .end = 0x000100000000ULL,  };
+
+#if 0
 const struc

[PATCH 1/2] firewire: core: make address handler length 64 bits

Clemens Ladisch — 2012-05-24T17:28:17

The type of the length field of the fw_address_handler structure was
size_t, which restricted it to 32 bits on 32-bit architectures.

While making it u32 would match the userspace API, all calculations on
this field use 64 bits anyway, and the ability to use 4 GB or larger
address ranges is useful in the kernel.

Signed-off-by: Clemens Ladisch <clemens< at >ladisch.de>
---
 include/linux/firewire.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
< at >< at > -307,7 +307,7 < at >< at > struct fw_transaction {

 struct fw_address_handler {
 u64 offset;
-size_t length;
+u64 length;
 fw_address_callback_t address_callback;
 void *callback_data;
 struct list_head link;

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile

cycle64Seconds IRQ (was Re: firewire_ohci : Register access failure- please notify linux1394-devel< at >lists.sf.net)

Stefan Richter — 2012-05-24T06:36:41

Even though his did not help with the O2Micro controller problem, it seems
a generally useful change to me.  Why burn CPU in interrupt context for
1 or 3 IsochronousCycleTimer accesses every minute if it just needed for
the Bus_Time CSR which is virtually never used.  Do you agree and could
resend it as proper patch?

Re: [GIT PULL] sbp-target merge for v3.5-rc1

Stefan Richter — 2012-05-23T05:01:47

[...]
[...]
[...]

As noted in the changelogs:
Acked-by: Stefan Richter <stefanr< at >s5r6.in-berlin.de>

Re: [Bug 43244] New: firewire_ohci prevents boot

Stefan Richter — 2012-05-21T20:08:30

If there is anything more than that on the text console when the PC locks
up and you have a digital camera at your disposal, just take a photograph,
attach it to bugzilla, and post the link.

If there is nothing interesting to photograph, then you could try
netconsole.  You need a second PC on which you configure syslogd to
receive log messages from the test PC.  On the test PC, you need to have
netconsole loaded before the lockup and need to specify the target.

Here is what works for me:

On the logging PC at 192.168.0.37:
----------------------------------
$ tail -3 /etc/syslog-ng/syslog-ng.conf 
# netconsole:
source net { udp(ip("192.168.0.37") port(6666)); };
log { source(net); destination(messages); };

On the test PC:
---------------
# alias netconsole
alias netconsole='modprobe netconsole netconsole="< at >/,< at >192.168.0.37/" && dmesg -n 7'

Since you crash at boot, I guess it's easiest to link netconsole
statically into the kernel and of course specify the parameter in the
bootloader's kernel command line

Re: [PATCH] firewire-sbp2: Initialise sbp2_orb->rcode formanagement ORBs

Stefan Richter — 2012-05-19T10:29:49

[...]
[...]

Chris, I obviously haven't done anything about this potentially too short
retry period yet; it is still on my list.

Perhaps we should not count the number of retries but watch the time that
retries take.  I.e. accumulate the time that each try takes; break out of
the retry loop after a maximum time; but reset the accumulated time at a
bus reset as a precaution for buses with many nodes coming online at
different times.

Re: [PATCH 4/4] firewire: sbp2: remove overzealous alignmentconstraints

Stefan Richter — 2012-05-18T19:08:55

On May 18 Clemens Ladisch wrote at linux1394-devel:

SBP-2 clause 3.1.2.24 requires that system memory accepts quadlet r/w
access.  Memory which is not aligned at quadlet boundaries is not
accessible by quadlet accesses per IEEE 1394 clause 6.2.5.2.2.


This code was added after recommendation to set it explicitly in the
driver:
http://marc.info/?l=linux-scsi&m=120137366708017
http://thread.gmane.org/gmane.linux.kernel.firewire.devel/11424

It is probably not going to happen that somebody decreases the SCSI
default.  But perhaps we should still keep this explicit...?

[PATCH 4/4] firewire: sbp2: remove overzealous alignment constraints

Clemens Ladisch — 2012-05-18T16:42:05

The SBP-2/3 specifications do not require any alignment of data
buffers; only their own data structures need to be quadlet-aligned.

This patch is perfectly safe because there is no actual change:
the SCSI framework uses a default block queue DMA alignment of
32 bits anyway.

Signed-off-by: Clemens Ladisch <clemens< at >ladisch.de>
---
 drivers/firewire/sbp2.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
< at >< at > -207,9 +207,8 < at >< at > static const struct device *lu_dev(const struct sbp2_logical_unit *lu)
 #define SBP2_MAX_CDB_SIZE16

 /*
- * The default maximum s/g segment size of a FireWire controller is
- * usually 0x10000, but SBP-2 only allows 0xffff. Since buffers have to
- * be quadlet-aligned, we set the length limit to 0xffff & ~3.
+ * The maximum SBP-2 data buffer size is 0xffff.  We quadlet-align this
+ * for compatibility with earlier versions of this driver.
  */
 #define SBP2_MAX_SEG_SIZE0xfffc

< at >< at > -1530,9 +1529,6 < at >< at > static in

[PATCH 3/4] firewire: sbp2: remove superfluousblk_queue_max_segment_size() call

Clemens Ladisch — 2012-05-18T16:41:28

The SCSI framework automatically initializes the block queue's segment
size with the DMA device's segment size.

Signed-off-by: Clemens Ladisch <clemens< at >ladisch.de>
---
 drivers/firewire/sbp2.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
< at >< at > -1564,8 +1564,6 < at >< at > static int sbp2_scsi_slave_configure(struct scsi_device *sdev)
 if (lu->tgt->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS)
 blk_queue_max_hw_sectors(sdev->request_queue, 128 * 1024 / 512);

-blk_queue_max_segment_size(sdev->request_queue, SBP2_MAX_SEG_SIZE);
-
 return 0;
 }


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/

[PATCH 2/4] firewire: sbp2: use scsi_dma_(un)map

Clemens Ladisch — 2012-05-18T16:40:19

Use the scsi_dma_map/scsi_dma_unmap helper to simplify the code
a little.

Signed-off-by: Clemens Ladisch <clemens< at >ladisch.de>
---
 drivers/firewire/sbp2.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
< at >< at > -1296,10 +1296,7 < at >< at > static struct fw_driver sbp2_driver = {
 static void sbp2_unmap_scatterlist(struct device *card_device,
    struct sbp2_command_orb *orb)
 {
-if (scsi_sg_count(orb->cmd))
-dma_unmap_sg(card_device, scsi_sglist(orb->cmd),
-     scsi_sg_count(orb->cmd),
-     orb->cmd->sc_data_direction);
+scsi_dma_unmap(orb->cmd);

 if (orb->request.misc & cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT))
 dma_unmap_single(card_device, orb->page_table_bus,
< at >< at > -1405,9 +1402,8 < at >< at > static int sbp2_map_scatterlist(struct sbp2_command_orb *orb,
 struct scatterlist *sg = scsi_sglist(orb->cmd);
 int i, n;

-n = dma_map_sg(device->card->device, sg, scsi_sg_count(orb->cmd),
-       orb->cmd->sc_data_direction);
-

[PATCH 1/4] firewire: sbp2: give correct DMA device to scsi framework

Clemens Ladisch — 2012-05-18T16:39:39

The sbp2 driver does DMA not on the unit but on the card device.

The driver worked even with the wrong device because at the moment, it
happens to reimplement the DMA functions of the SCSI framework.

Signed-off-by: Clemens Ladisch <clemens< at >ladisch.de>
---
 drivers/firewire/sbp2.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
< at >< at > -1163,7 +1163,8 < at >< at > static int sbp2_probe(struct device *dev)

 shost->max_cmd_len = SBP2_MAX_CDB_SIZE;

-if (scsi_add_host(shost, &unit->device) < 0)
+if (scsi_add_host_with_dma(shost, &unit->device,
+   device->card->device) < 0)
 goto fail_shost_put;

 /* implicit directory ID */

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in m

[PATCH 0/4] various SBP-2 DMA cleanups

Clemens Ladisch — 2012-05-18T16:38:20

 drivers/firewire/sbp2.c |   26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/

Re: [Bug 43244] New: firewire_ohci prevents boot

Clemens Ladisch — 2012-05-16T13:53:29

For Ubuntu, see <https://wiki.ubuntu.com/KernelTeam/GitKernelBuild>.

To enable PCI debugging, enable the configuration options
CONFIG_DEBUG_KERNEL and CONFIG_PCI_DEBUG.


Regards,
Clemens

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/

RE: [Bug 43247] O2 micro SD/MMC+1394 controller: 1394 device can'twork (Register access failure)

Jennifer Li (TP — 2012-05-16T10:33:44

Hi Stefan Richter,

Thanks for your reply. This is my test result. Please see the below.

OS: Fedora 16
Kernel version: 3.1.07 & 3.4 rc6

Best regards,
Jennifer
-----Original Message-----
From: Stefan Richter [mailto:stefanr< at >s5r6.in-berlin.de] 
Sent: Tuesday, May 15, 2012 3:24 PM
To: Jennifer Li (TP)
Cc: linux1394-devel< at >lists.sourceforge.net; Ayan George; Anael; Clemens
Ladisch
Subject: Re: [Bug 43247] O2 micro SD/MMC+1394 controller: 1394 device
can't work (Register access failure)

http://git.kernel.org/?p=linux/kernel/git/ieee1394/linux1394.git;a=short
log;h=refs/heads/o2micro
[Jennifer]
Please see the attached picture "screenshot.png".
I have tried to add the " options firewire-ohci cycle_timer_hard_fail=0
sclk_retries=0" in the conf files under "/etc/modprobe.d/". After that,
reboot it. 

time
[Jennifer]
Please see the attached file ochi.c.
I have added the patch on ohci.c. (without the solution (A) )


On May 15 bugzilla-daemon< at >bugzilla.kernel.org wrote:
02:24:16 ---

If
  - neither clearing regAccessF