09 Mar, 2014

1 commit

  • Pull workqueue fix from Tejun Heo:
    "This pull request contains a workqueue usage fix for firewire.

    For quite a long time now, workqueue only treats two work items
    identical iff both their addresses and callbacks match. This is to
    avoid introducing false dependency through the work item being
    recycled while being executed. This changes non-reentrancy guarantee
    for the users of PREPARE[_DELAYED]_WORK() - if the function changes,
    reentrancy isn't guaranteed against the previous instance. Firewire
    depended on such nonreentrancy guarantee.

    This is fixed by doing the work item multiplexing from firewire proper
    while keeping the work function unchanged"

    * 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
    firewire: don't use PREPARE_DELAYED_WORK

    Linus Torvalds
     

07 Mar, 2014

2 commits

  • PREPARE_[DELAYED_]WORK() are being phased out. They have few users
    and a nasty surprise in terms of reentrancy guarantee as workqueue
    considers work items to be different if they don't have the same work
    function.

    firewire core-device and sbp2 have been been multiplexing work items
    with multiple work functions. Introduce fw_device_workfn() and
    sbp2_lu_workfn() which invoke fw_device->workfn and
    sbp2_logical_unit->workfn respectively and always use the two
    functions as the work functions and update the users to set the
    ->workfn fields instead of overriding work functions using
    PREPARE_DELAYED_WORK().

    This fixes a variety of possible regressions since a2c1c57be8d9
    "workqueue: consider work function when searching for busy work items"
    due to which fw_workqueue lost its required non-reentrancy property.

    Signed-off-by: Tejun Heo
    Acked-by: Stefan Richter
    Cc: linux1394-devel@lists.sourceforge.net
    Cc: stable@vger.kernel.org # v3.9+
    Cc: stable@vger.kernel.org # v3.8.2+
    Cc: stable@vger.kernel.org # v3.4.60+
    Cc: stable@vger.kernel.org # v3.2.40+

    Tejun Heo
     
  • Since commit bd972688eb24
    "firewire: ohci: Fix 'failed to read phy reg' on FW643 rev8",
    there is a high chance that firewire-ohci fails to initialize LSI née
    Agere controllers.
    https://bugzilla.kernel.org/show_bug.cgi?id=65151

    Peter Hurley points out the reason: IEEE 1394a:2000 clause 5A.1 (or
    IEEE 1394:2008 clause 17.2.1) say: "The PHY shall insure that no more
    than 10 ms elapse from the reassertion of LPS until the interface is
    reset. The link shall not assert LReq until the reset is complete."
    In other words, the link needs to give the PHY at least 10 ms to get
    the interface operational.

    With just the msleep(1) in bd972688eb24, the first read_phy_reg()
    during ohci_enable() may happen before the phy-link interface reset was
    finished, and fail. Due to the high variability of msleep(n) with small
    n, this failure was not fully reproducible, and not apparent at all with
    low CONFIG_HZ setting.

    On the other hand, Peter can no longer reproduce the issue with FW643
    rev8. The read phy reg failures that happened back then may have had an
    unrelated cause. So, just revert bd972688eb24, except for the valid
    comment on TSB82AA2 cards.

    Reported-by: Mikhail Gavrilov
    Reported-by: Jay Fenlason
    Reported-by: Clemens Ladisch
    Reported-by: Peter Hurley
    Cc: stable@vger.kernel.org # v3.10+
    Signed-off-by: Stefan Richter

    Stefan Richter
     

28 Feb, 2014

1 commit

  • Commit 8408dc1c14c1 "firewire: net: use dev_printk API" introduced a
    use-after-free in a failure path. fwnet_transmit_packet_failed(ptask)
    may free ptask, then the dev_err() call dereferenced it. The fix is
    straightforward; simply reorder the two calls.

    Reported-by: Dan Carpenter
    Cc: stable@vger.kernel.org # v3.4+
    Signed-off-by: Stefan Richter

    Stefan Richter
     

20 Jan, 2014

1 commit

  • This makes all of a machine's memory accessible to remote debugging via
    FireWire, using the physical response unit (i.e. RDMA) of OHCI-1394 link
    layer controllers.

    This requires actual support by the controller. The only ones currently
    known to support it are Agere/LSI FW643. Most if not all other OHCI-1394
    controllers do not implement the optional Physical Upper Bound register.
    With them, RDMA will continue to be limited to the lowermost 4 GB.

    firewire-ohci's startup message in the kernel log is augmented to tell
    whether the controller does expose more than 4 GB to RDMA.

    While OHCI-1394 allows for a maximum Physical Upper Bound of
    0xffff'0000'0000 (near 256 TB), this implementation sets it to
    0x8000'0000'0000 (128 TB) in order to avoid interference with applications
    that require interrupt-served asynchronous request reception at
    respectively low addresses.

    Note, this change does not switch remote DMA on. It only increases the
    range of remote access to all memory (instead of just 4 GB) whenever
    remote DMA was switched on by other means. The latter is achieved by
    setting firewire-ohci's remote_dma parameter, or if the physical DMA
    filter is opened through firewire-sbp2.

    Derived from patch "firewire: Enable physical DMA above 4GB" by
    Peter Hurley from March 27, 2013.

    Signed-off-by: Stefan Richter

    Stefan Richter
     

13 Jan, 2014

1 commit


15 Dec, 2013

1 commit

  • Commit 54b2b50c20a6 "[SCSI] Disable WRITE SAME for RAID and virtual
    host adapter drivers" disabled WRITE SAME support for all SBP-2 attached
    targets. But as described in the changelog of commit b0ea5f19d3d8
    "firewire: sbp2: allow WRITE SAME and REPORT SUPPORTED OPERATION CODES",
    it is not required to blacklist WRITE SAME.

    Bring the feature back by reverting the sbp2.c hunk of commit 54b2b50c20a6.

    Signed-off-by: Stefan Richter
    Cc: stable@kernel.org

    Stefan Richter
     

29 Nov, 2013

1 commit

  • Some host adapters do not pass commands through to the target disk
    directly. Instead they provide an emulated target which may or may not
    accurately report its capabilities. In some cases the physical device
    characteristics are reported even when the host adapter is processing
    commands on the device's behalf. This can lead to adapter firmware hangs
    or excessive I/O errors.

    This patch disables WRITE SAME for devices connected to host adapters
    that provide an emulated target. Driver writers can disable WRITE SAME
    by setting the no_write_same flag in the host adapter template.

    [jejb: fix up rejections due to eh_deadline patch]
    Signed-off-by: Martin K. Petersen
    Cc: stable@kernel.org
    Signed-off-by: James Bottomley

    Martin K. Petersen
     

15 Nov, 2013

1 commit


30 Aug, 2013

2 commits

  • Put bus_reset_work into its own workqueue. By doing this, forward
    progress of bus_reset_work() is guaranteed if the work is switched over
    to a rescuer thread.

    Switching work to a rescuer thread happens if a new worker thread could
    not be allocated in certain time (MAYDAY_INITIAL_TIMEOUT, typically 10
    ms). This might not be possible under high memory pressure or even on a
    heavily loaded embedded system running a slow serial console.

    The former deadlock occured in the following situation:
    The rescuer thread ran
    fw_device_init->read_config_rom->read_rom->fw_run_transaction.
    fw_run_transaction blocked waiting for the completion object.
    This completion object would have been completed in bus_reset_work,
    but this work was never executed in the rescuer thread due to its
    strictly sequential behaviour.

    [Stefan R.: Removed WQ_NON_REENTRANT flag from allocation because
    it is no longer needed in current kernels. Add it back if you backport
    to kernels older than 3.7, i.e. one which does not contain dbf2576e37da
    "workqueue: make all workqueues non-reentrant". Swapped order of
    destroy_workqueue and pci_unregister_driver.]

    Signed-off-by: Stephan Gatzka
    Signed-off-by: Stefan Richter

    Stephan Gatzka
     
  • This is a prerequisite to allocate a per driver self_id workqueue.
    This reverts the ohci.c part of patch
    fe2af11c220c7bb3a67f7aec0594811e5c59e019.

    Signed-off-by: Stephan Gatzka
    Signed-off-by: Stefan Richter

    Stephan Gatzka
     

19 Aug, 2013

2 commits

  • a) Sort device IDs by vendor -- device -- revision.

    b) Write quirk flags in hexadecimal. This affects the user-visible
    output of "modinfo firewire-ohci". Since more flags have been added
    recently, it is now easier to cope with them in hexadecimal represen-
    tation. Besides, the device-specific combination of quirk flags is
    shown in hexadecimal in the kernel log too. (And firewire-sbp2
    presents its own quirk flags in modinfo as hexadecimals as well.)

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • We have got

    struct descriptor *descriptors;
    dma_addr_t descriptors_bus;

    dma_addr_t buffer_bus;
    struct descriptor buffer[0];

    void *misc_buffer;
    dma_addr_t misc_buffer_bus;

    __be32 *config_rom;
    dma_addr_t config_rom_bus;
    __be32 *next_config_rom;
    dma_addr_t next_config_rom_bus;

    But then we have got

    __le32 *self_id_cpu;
    dma_addr_t self_id_bus;

    Better apply the pattern of xyz vs. xyz_bus to self_id vs. self_id_bus
    as well. The _cpu suffix looks particularly weird in conversions from
    little endian to CPU endian.

    Signed-off-by: Stefan Richter

    Stefan Richter
     

30 Jul, 2013

2 commits

  • An idr related patch introduced the following sparse warning:
    drivers/firewire/core-cdev.c:488:33: warning: incorrect type in initializer (different base types)
    drivers/firewire/core-cdev.c:488:33: expected bool [unsigned] [usertype] preload
    drivers/firewire/core-cdev.c:488:33: got restricted gfp_t
    So let's convert from gfp_t bitfield to Boolean explicitly and safely.

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • dbf2576e37 ("workqueue: make all workqueues non-reentrant") made
    WQ_NON_REENTRANT no-op and the flag is going away. Remove its usages.

    This patch doesn't introduce any behavior changes.

    Signed-off-by: Tejun Heo
    Signed-off-by: Stefan Richter

    Tejun Heo
     

28 Jul, 2013

1 commit

  • Commit 18d627113b83 (firewire: prevent dropping of completed iso packet
    header data) was intended to be an obvious bug fix, but libdc1394 and
    FlyCap2 depend on the old behaviour by ignoring all returned information
    and thus not noticing that not all packets have been received yet. The
    result was that the video frame buffers would be saved before they
    contained the correct data.

    Reintroduce the old behaviour for old clients.

    Tested-by: Stepan Salenikovich
    Tested-by: Josep Bosch
    Cc: # 3.4+
    Signed-off-by: Clemens Ladisch
    Signed-off-by: Stefan Richter

    Clemens Ladisch
     

10 Jun, 2013

2 commits

  • After all IEEE 1394 high-level drivers being converted to bus-specific
    .probe/.remove methods, remove support of the obsolete generic methods.

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • FireWire upper layer drivers are converted from generic
    struct driver.probe() and .remove()
    to bus-specific
    struct fw_driver.probe() and .remove().

    The new .probe() adds a const struct ieee1394_device_id *id argument,
    indicating the entry in the driver's device identifiers table which
    matched the fw_unit to be probed. This new argument is used by the
    snd-firewire-speakers driver to look up device-specific parameters and
    methods. There is at least one other FireWire audio driver currently in
    development in which this will be useful too.

    The new .remove() drops the unused error return code.

    Although all in-tree drivers are being converted to the new methods,
    support for the old methods is left in place in this commit. This
    allows public developer trees to merge this commit and then move to the
    new fw_driver methods.

    Signed-off-by: Stefan Richter
    Acked-by: Clemens Ladisch (for sound/firewire/)
    Cc: Peter Hurley (for drivers/staging/fwserial/)

    Stefan Richter
     

10 May, 2013

1 commit

  • Pull firewure updates from Stefan Richter:
    - fix controller removal when controller is in suspended state
    - fix video reception on VIA VT6306 with gstreamer, MythTV, and maybe dv4l
    - fix a startup issue with Agere/LSI FW643-e2
    - error logging improvements and other small updates

    * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
    firewire: ohci: dump_stack() for PHY regs read/write failures
    firewire: ohci: Improve bus reset error messages
    firewire: ohci: Alias dev_* log functions
    firewire: ohci: Fix 'failed to read phy reg' on FW643 rev8
    firewire: ohci: fix VIA VT6306 video reception
    firewire: ohci: Check LPS before register access on pci removal
    firewire: ohci: Fix double free_irq()
    firewire: remove unnecessary alloc/OOM messages
    firewire: sbp2: replace BUG_ON by WARN_ON
    firewire: core: remove an always false test
    firewire: Remove two unneeded checks for macros

    Linus Torvalds
     

01 May, 2013

4 commits

  • A stack trace is an invaluable tool in determining the basis
    and cause of PHY regs read/write failures.

    Include PHY reg addr (and value for writes) in the diagnostic.

    [Stefan R: changed whitespace]

    Signed-off-by: Peter Hurley
    Signed-off-by: Stefan Richter

    Peter Hurley
     
  • Many of the error messages possible from bus_reset_work() do not
    contain enough information to distinguish which error condition
    occurred nor enough information to evaluate the error afterwards.

    Differentiate all error conditions in bus_reset_work(); add
    additional information to make error diagnosis possible.

    [Stefan R: fixed self-ID endian conversion]

    Signed-off-by: Peter Hurley
    Signed-off-by: Stefan Richter

    Peter Hurley
     
  • Convert dev_xxxx(ohci->card.device, ...) log functions to
    ohci_xxxx(ohci, ...).

    [Stefan R: Peter argues that this increases readability of the code.]
    [Stefan R: changed whitespace]

    Signed-off-by: Peter Hurley
    Signed-off-by: Stefan Richter

    Peter Hurley
     
  • With the LSI FW643 rev 8 [1], the first commanded bus reset at
    the conclusion of ohci_enable() has been observed to fail with
    the following messages:

    [ 4.884015] firewire_ohci 0000:01:00.0: failed to read phy reg
    ....
    [ 5.684012] firewire_ohci 0000:01:00.0: failed to read phy reg

    With drivers/firewire/ohci.c instrumented, the error condition [2]
    indicates the PHY arbitration state machine has timed out prior to
    enabling PHY LCtrl.

    Furthermore, instrumenting ohci_enable() shows that LPS has been
    enabled within 1 ms.

    Test LPS latching every 1 ms rather than every 50ms.

    [1] lspci -v

    01:00.0 FireWire (IEEE 1394): LSI Corporation FW643 [TrueFire] PCIe 1394b Controller (rev 08) (prog-if 10 [OHCI])
    Subsystem: LSI Corporation FW643 [TrueFire] PCIe 1394b Controller
    Flags: bus master, fast devsel, latency 0, IRQ 92
    Memory at fbeff000 (64-bit, non-prefetchable) [size=4K]
    Capabilities: [44] Power Management version 3
    Capabilities: [4c] MSI: Enable+ Count=1/1 Maskable- 64bit+
    Capabilities: [60] Express Endpoint, MSI 00
    Capabilities: [100] Advanced Error Reporting
    Capabilities: [140] Virtual Channel
    Capabilities: [170] Device Serial Number 08-14-43-82-00-00-41-fc
    Kernel driver in use: firewire_ohci
    Kernel modules: firewire-ohci

    [2] instrumented WARNING in read_phy_reg()

    [ 4.576010] ------------[ cut here ]------------
    [ 4.576035] WARNING: at ./drivers/firewire/ohci.c:570 read_phy_reg+0x93/0xe0 [firewire_ohci]()
    [ 4.576050] Hardware name: Precision WorkStation T5400
    [ 4.576058] failed to read phy reg:1 (phy(5) @ config enhance:19)
    [ 4.576068] Modules linked in: hid_logitech_dj hid_generic(+) usbhid
    [ 4.576140] Pid: 61, comm: kworker/2:1 Not tainted 3.8.0-2+fwtest-xeon #2+fwtest
    [ 4.576149] Call Trace:
    [ 4.576160] [] warn_slowpath_common+0x7f/0xc0
    [ 4.576168] [] warn_slowpath_fmt+0x46/0x50
    [ 4.576178] [] read_phy_reg+0x93/0xe0 [firewire_ohci]
    [ 4.576188] [] ohci_read_phy_reg+0x39/0x60 [firewire_ohci]
    [ 4.576203] [] fw_send_phy_config+0xbf/0xe0 [firewire_core]
    [ 4.576214] [] br_work+0x46/0xb0 [firewire_core]
    [ 4.576225] [] process_one_work+0x13c/0x500
    [ 4.576238] [] ? fw_card_initialize+0x180/0x180 [firewire_core]
    [ 4.576248] [] worker_thread+0x16d/0x470
    [ 4.576257] [] ? busy_worker_rebind_fn+0x100/0x100
    [ 4.576266] [] kthread+0xc0/0xd0
    [ 4.576275] [] ? pcpu_dump_alloc_info+0x1cb/0x2c4
    [ 4.576284] [] ? kthread_create_on_node+0x130/0x130
    [ 4.576297] [] ret_from_fork+0x7c/0xb0
    [ 4.576305] [] ? kthread_create_on_node+0x130/0x130
    [ 4.576313] ---[ end trace cbc940994b300302 ]---

    [Stefan R: Peter also reports a change of behavior with LSI FW323.
    Before the patch, there would often occur a lock transaction failure
    during firewire-core startup:
    [ 6.056022] firewire_core 0000:07:06.0: BM lock failed (timeout), making local node (ffc0) root
    This failure no longer happens after the patch, without an obvious
    reason for the failure or the fix.]

    [Stefan R: Added quirk flag, quirk table entry, and comment.]

    Reported-by: Tim Jordan
    Signed-off-by: Peter Hurley
    Signed-off-by: Stefan Richter

    Peter Hurley
     

29 Apr, 2013

7 commits

  • Add quirk for VT6306 wake bit behavior.

    VT6306 seems to reread the wrong descriptor when the wake bit is
    written. work around by putting a copy of the branch address in the
    first descriptor of the block.

    [Stefan R: This fixes the known broken video reception via gstreamer
    on VIA VT6306. 100% repeatable testcase:
    $ gst-launch-0.10 dv1394src \! dvdemux \! dvdec \! xvimagesink
    with a camcorder or other DV source connected. Likewise for MPEG2-TS
    reception via gstreamer, e.g. from TV settop boxes.
    Perhaps this also fixes dv4l on VT6306, but this is as yet untested.
    Kino, dvgrab or FFADO had not been affected by this chip quirk.
    Additional comments from Andy:]

    I've looked into some problems with the wake bit on a vt6306 family
    chip (1106:3044, rev 46).

    I used this firewire card in a mythtv setup (ISO receive MPEG2 stream)
    with Debian 2.6.32 kernels for ~2 years without problems.

    Since upgrading to 3.2, I've been having problems with the input stream
    freezing -- input data stops until I restart mythtv (I expect closing
    and reopening the device would be sufficient). This happens
    infrequently, maybe one out of 20 recordings. I eventually determined
    that the problem is more likely to occur if the system is loaded.

    I isolated the kernel version as the triggering SW factor and then
    specifically the change from dualbuffer back to packet-per-buffer DMA
    mode.

    The possibility that the controller does not properly respond to the
    wake bit was suggested in
    https://bugzilla.redhat.com/show_bug.cgi?id=415841, but not proven.

    Based on the fact that dualbuffer mode worked while packet-per-buffer
    has trouble, I guessed that upon seeing the wake bit written, the vt6306
    controller only checks the branch address in the first descriptor of the
    block, even if that is not the correct place to look (because the block
    has multiple descriptors).

    This theory seems to be correct. When the ISO reception is hung, I am
    able to resume it by manually writing the branch address to the first
    descriptor in the block, and then writing the wake bit.

    I've had luck so far with the attached patch, so I'm including it. It's
    probably not a complete solution -- I haven't tested transmit modes to
    see whether they have a similar issue.

    I doubt that the quirk test is any cheaper than just writing the extra
    branch address in all cases, but it does reduce the risk of breaking
    other hardware.

    [Stefan R: omitted QUIRK_NO_MSI from VT6306 quirks table entry,
    changed whitespace]

    Signed-off-by: Andy Leiserson
    Signed-off-by: Stefan Richter

    Andy Leiserson
     
  • A pci device can be removed while in its suspended state. If the ohci
    host controller is suspended, the PHY is also in low-power mode and
    LPS is disabled. If LPS is disabled, most of the host registers aren't
    accessible, including IntMaskClear. Furthermore, access to these registers
    when LPS is disabled can cause hard lockups on some hardware. Since
    interrupts are already disabled in this mode, further action is
    unnecessary.

    Test LPS before attempting to write IntMaskClear to disable interrupts.

    [Stefan R: whitespace changes]

    Signed-off-by: Peter Hurley
    Signed-off-by: Stefan Richter

    Peter Hurley
     
  • A pci device can be removed while in its suspended state.
    Because the ohci driver freed the irq to suspend, free_irq() is
    called twice; once from pci_remove() and again from pci_suspend(),
    which issues the warning below [1].

    Rather than allocate the irq in the .enable() path, move the
    allocation to .probe(). Consequently, the irq is not reallocated
    upon pci_resume() and thus is not freed upon pci_suspend().

    [1] Warning reported by Mark Einon when
    suspending an MSI MS-1727 GT740 laptop on Ubuntu 3.5.0-22-generic

    WARNING: at ./kernel/irq/manage.c:1198 __free_irq+0xa3/0x1e0()
    Hardware name: MS-1727
    Trying to free already-free IRQ 16
    Modules linked in: ip6table_filter ip6_tables ebtable_nat ebtables
    Pid: 4, comm: kworker/0:0 Tainted: P O 3.5.0-22-generic #34-Ubuntu
    Call Trace:
    [] warn_slowpath_common+0x7f/0xc0
    [] warn_slowpath_fmt+0x46/0x50
    [] ? default_spin_lock_flags+0x9/0x10
    [] __free_irq+0xa3/0x1e0
    [] free_irq+0x54/0xc0
    [] pci_remove+0x6e/0x210 [firewire_ohci]
    [] pci_device_remove+0x3f/0x110
    [] __device_release_driver+0x7c/0xe0
    [] device_release_driver+0x2c/0x40
    [] bus_remove_device+0xe1/0x120
    [] device_del+0x12a/0x1c0
    [] device_unregister+0x16/0x30
    [] pci_stop_bus_device+0x94/0xa0
    [] acpiphp_disable_slot+0xb7/0x1a0 [acpiphp]
    [] ? get_slot_status+0x46/0xc0 [acpiphp]
    [] acpiphp_check_bridge.isra.15+0x2d/0xf0 [acpiphp]
    [] _handle_hotplug_event_bridge+0x372/0x4d0 [acpiphp]
    [] ? acpi_os_execute_deferred+0x2f/0x34
    [] ? kfree+0xed/0x110
    [] process_one_work+0x12a/0x420
    [] ? _handle_hotplug_event_func+0x1d0/0x1d0 [acpiphp]
    [] worker_thread+0x12e/0x2f0
    [] ? manage_workers.isra.26+0x200/0x200
    [] kthread+0x93/0xa0
    [] kernel_thread_helper+0x4/0x10
    [] ? kthread_freezable_should_stop+0x70/0x70
    [] ? gs_change+0x13/0x13

    Reported-by: Mark Einon
    Signed-off-by: Peter Hurley
    Signed-off-by: Stefan Richter

    Peter Hurley
     
  • These are redundant to log messages from the mm core.

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • No need to crash and burn if S/G element sizes cannot be set to our
    liking; just leave a message in the log.

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • struct fw_cdev_allocate_iso_resource.bandwidth is unsigned.

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • The old IEEE 1394 driver stack was removed in v2.6.37. That made the
    checks for two Kconfig (module) macros unneeded, since they will now
    always evaluate to true. Remove these two checks.

    Signed-off-by: Paul Bolle
    Signed-off-by: Stefan Richter

    Paul Bolle
     

28 Mar, 2013

1 commit

  • Add a new constant ETH_P_802_3_MIN, the minimum ethernet type for
    an 802.3 frame. Frames with a lower value in the ethernet type field
    are Ethernet II.

    Also update all the users of this value that David Miller and
    I could find to use the new constant.

    Also correct a bug in util.c. The comparison with ETH_P_802_3_MIN
    should be >= not >.

    As suggested by Jesse Gross.

    Compile tested only.

    Cc: David Miller
    Cc: Jesse Gross
    Cc: Karsten Keil
    Cc: John W. Linville
    Cc: Johannes Berg
    Cc: Bart De Schuymer
    Cc: Stephen Hemminger
    Cc: Patrick McHardy
    Cc: Marcel Holtmann
    Cc: Gustavo Padovan
    Cc: Johan Hedberg
    Cc: linux-bluetooth@vger.kernel.org
    Cc: netfilter-devel@vger.kernel.org
    Cc: bridge@lists.linux-foundation.org
    Cc: linux-wireless@vger.kernel.org
    Cc: linux1394-devel@lists.sourceforge.net
    Cc: linux-media@vger.kernel.org
    Cc: netdev@vger.kernel.org
    Cc: dev@openvswitch.org
    Acked-by: Mauro Carvalho Chehab
    Acked-by: Stefan Richter
    Signed-off-by: Simon Horman
    Signed-off-by: David S. Miller

    Simon Horman
     

27 Mar, 2013

6 commits

  • Signed-off-by: YOSHIFUJI Hideaki
    Signed-off-by: David S. Miller

    YOSHIFUJI Hideaki / 吉藤英明
     
  • Inspection of upper layer protocol is considered harmful, especially
    if it is about ARP or other stateful upper layer protocol; driver
    cannot (and should not) have full state of them.

    IPv4 over Firewire module used to inspect ARP (both in sending path
    and in receiving path), and record peer's GUID, max packet size, max
    speed and fifo address. This patch removes such inspection by extending
    our "hardware address" definition to include other information as well:
    max packet size, max speed and fifo. By doing this, The neighbour
    module in networking subsystem can cache them.

    Note: As we have started ignoring sspd and max_rec in ARP/NDP, those
    information will not be used in the driver when sending.

    When a packet is being sent, the IP layer fills our pseudo header with
    the extended "hardware address", including GUID and fifo. The driver
    can look-up node-id (the real but rather volatile low-level address)
    by GUID, and then the module can send the packet to the wire using
    parameters provided in the extendedn hardware address.

    This approach is realistic because IP over IEEE1394 (RFC2734) and IPv6
    over IEEE1394 (RFC3146) share same "hardware address" format
    in their address resolution protocols.

    Here, extended "hardware address" is defined as follows:

    union fwnet_hwaddr {
    u8 u[16];
    struct {
    __be64 uniq_id; /* EUI-64 */
    u8 max_rec; /* max packet size */
    u8 sspd; /* max speed */
    __be16 fifo_hi; /* hi 16bits of FIFO addr */
    __be32 fifo_lo; /* lo 32bits of FIFO addr */
    } __packed uc;
    };

    Note that Hardware address is declared as union, so that we can map full
    IP address into this, when implementing MCAP (Multicast Cannel Allocation
    Protocol) for IPv6, but IP and ARP subsystem do not need to know this
    format in detail.

    One difference between original ARP (RFC826) and 1394 ARP (RFC2734)
    is that 1394 ARP Request/Reply do not contain the target hardware address
    field (aka ar$tha). This difference is handled in the ARP subsystem.

    CC: Stephan Gatzka
    Signed-off-by: YOSHIFUJI Hideaki
    Signed-off-by: David S. Miller

    YOSHIFUJI Hideaki / 吉藤英明
     
  • Stefan Richter says:
    | As far as I can tell, it would be best to ignore max_rec and sspd from ARP
    | and NDP but keep using the respective information from firewire-core
    | instead (handed over by fwnet_probe()).
    |
    | Why? As I noted earlier, RFC 2734:1999 and RFC 3146:2001 were apparently
    | written with a too simplistic notion of IEEE 1394 bus topology, resulting
    | in max_rec and sspd in ARP-1394 and NDP-1394 to be useless, IMO.
    |
    | Consider a bus like this:
    |
    | A ---- B ==== C
    |
    | A, B, C are all IP-over-1394 capable nodes. ---- is an S400 cable hop,
    | and ==== is an S800 cable hop.
    |
    | In case of unicasts or multicasts in which node A is involved as
    | transmitter or receiver, as well as in case of broadcasts, the speeds
    | S100, S200, S400 work and speed S400 is optimal.
    |
    | In case of anything else, IOW in case of unicasts or multicasts in which
    | only nodes B and C are involved, the speeds S100, S200, S400, S800 work
    | and speed S800 is optimal.
    |
    | Clearly, node A should indicate sspd = S400 in its ARP or NDP packets.
    | But which sspd should nodes B and C set there? Maybe they set S400, which
    | would work but would waste half of the available bandwidth in the second
    | case. Or maybe they set S800, which is OK in the second case but would
    | prohibit any communication with node A if blindly taken for correct.
    |
    | On the other hand, firewire-core *always* gives us the correct and optimum
    | peer-to-peer speed and asynchronous packet payload, no matter how simple
    | or complex the bus topology is and no matter in which temporal order nodes
    | join the bus and are discovered.

    CC: Stefan Richter
    Signed-off-by: YOSHIFUJI Hideaki
    Signed-off-by: David S. Miller

    YOSHIFUJI Hideaki / 吉藤英明
     
  • Allocate FIFO address before registering net_device.
    This is preparation to change the pseudo hardware address format
    for firewire devices to include the offset of the FIFO for receipt
    of unicast datagrams, instead of mangling ARP/NDP messages in the
    driver layer.

    Signed-off-by: YOSHIFUJI Hideaki
    Signed-off-by: David S. Miller

    YOSHIFUJI Hideaki / 吉藤英明
     
  • Send L2 multicast packet via GASP (Global asynchronous stream packet) by
    seeing the multicast bit in the L2 hardware address, not by seeing upper-
    layer protocol address.

    Signed-off-by: YOSHIFUJI Hideaki
    Signed-off-by: David S. Miller

    YOSHIFUJI Hideaki / 吉藤英明
     
  • Signed-off-by: YOSHIFUJI Hideaki
    Signed-off-by: David S. Miller

    YOSHIFUJI Hideaki / 吉藤英明
     

13 Mar, 2013

3 commits