03 Nov, 2016

2 commits

  • RFC 2734 defines the datagram_size field in fragment encapsulation
    headers thus:

    datagram_size: The encoded size of the entire IP datagram. The
    value of datagram_size [...] SHALL be one less than the value of
    Total Length in the datagram's IP header (see STD 5, RFC 791).

    Accordingly, the eth1394 driver of Linux 2.6.36 and older set and got
    this field with a -/+1 offset:

    ether1394_tx() /* transmit */
    ether1394_encapsulate_prep()
    hdr->ff.dg_size = dg_size - 1;

    ether1394_data_handler() /* receive */
    if (hdr->common.lf == ETH1394_HDR_LF_FF)
    dg_size = hdr->ff.dg_size + 1;
    else
    dg_size = hdr->sf.dg_size + 1;

    Likewise, I observe OS X 10.4 and Windows XP Pro SP3 to transmit 1500
    byte sized datagrams in fragments with datagram_size=1499 if link
    fragmentation is required.

    Only firewire-net sets and gets datagram_size without this offset. The
    result is lacking interoperability of firewire-net with OS X, Windows
    XP, and presumably Linux' eth1394. (I did not test with the latter.)
    For example, FTP data transfers to a Linux firewire-net box with max_rec
    smaller than the 1500 bytes MTU
    - from OS X fail entirely,
    - from Win XP start out with a bunch of fragmented datagrams which
    time out, then continue with unfragmented datagrams because Win XP
    temporarily reduces the MTU to 576 bytes.

    So let's fix firewire-net's datagram_size accessors.

    Note that firewire-net thereby loses interoperability with unpatched
    firewire-net, but only if link fragmentation is employed. (This happens
    with large broadcast datagrams, and with large datagrams on several
    FireWire CardBus cards with smaller max_rec than equivalent PCI cards,
    and it can be worked around by setting a small enough MTU.)

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

    Stefan Richter
     
  • The IP-over-1394 driver firewire-net lacked input validation when
    handling incoming fragmented datagrams. A maliciously formed fragment
    with a respectively large datagram_offset would cause a memcpy past the
    datagram buffer.

    So, drop any packets carrying a fragment with offset + length larger
    than datagram_size.

    In addition, ensure that
    - GASP header, unfragmented encapsulation header, or fragment
    encapsulation header actually exists before we access it,
    - the encapsulated datagram or fragment is of nonzero size.

    Reported-by: Eyal Itkin
    Reviewed-by: Eyal Itkin
    Fixes: CVE 2016-8633
    Cc: stable@vger.kernel.org
    Signed-off-by: Stefan Richter

    Stefan Richter
     

09 Oct, 2016

1 commit


05 May, 2016

1 commit

  • Replace all trans_start updates with netif_trans_update helper.
    change was done via spatch:

    struct net_device *d;
    @@
    - d->trans_start = jiffies
    + netif_trans_update(d)

    Compile tested only.

    Cc: user-mode-linux-devel@lists.sourceforge.net
    Cc: linux-xtensa@linux-xtensa.org
    Cc: linux1394-devel@lists.sourceforge.net
    Cc: linux-rdma@vger.kernel.org
    Cc: netdev@vger.kernel.org
    Cc: MPT-FusionLinux.pdl@broadcom.com
    Cc: linux-scsi@vger.kernel.org
    Cc: linux-can@vger.kernel.org
    Cc: linux-parisc@vger.kernel.org
    Cc: linux-omap@vger.kernel.org
    Cc: linux-hams@vger.kernel.org
    Cc: linux-usb@vger.kernel.org
    Cc: linux-wireless@vger.kernel.org
    Cc: linux-s390@vger.kernel.org
    Cc: devel@driverdev.osuosl.org
    Cc: b.a.t.m.a.n@lists.open-mesh.org
    Cc: linux-bluetooth@vger.kernel.org
    Signed-off-by: Florian Westphal
    Acked-by: Felipe Balbi
    Acked-by: Mugunthan V N
    Acked-by: Antonio Quartulli
    Signed-off-by: David S. Miller

    Florian Westphal
     

25 Mar, 2016

1 commit


23 Mar, 2016

1 commit


22 Mar, 2016

1 commit

  • 'struct timeval' uses a 32 bit field for its 'seconds' value which
    will overflow in year 2038 and beyond. This patch replaces the use
    of timeval in nosy.c with timespec64 which doesn't suffer from y2038
    issue. The code is correct as is - since it is only using the
    microseconds portion of timeval. However, this patch does the
    replacement as part of a larger effort to remove all instances of
    'struct timeval' from the kernel (that would help identify cases
    where the code is actually broken).

    Signed-off-by: Tina Ruchandani
    Reviewed-by: Arnd Bergmann
    Signed-off-by: Stefan Richter

    Tina Ruchandani
     

20 Mar, 2016

1 commit

  • Pull firewire updates from Stefan Richter:
    "IEEE 1394 subsystem patches:

    - move away from outmoded timekeeping API
    - error reporting fix
    - documentation bits"

    * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
    firewire: ABI documentation: libhinawa uses firewire-cdev
    firewire: ABI documentation: jujuutils were renamed to linux-firewire-utils
    firewire: ohci: propagate return code from soft_reset to probe and resume
    firewire: nosy: Replace timeval with timespec64

    Linus Torvalds
     

12 Nov, 2015

1 commit


07 Nov, 2015

1 commit

  • …d avoiding waking kswapd

    __GFP_WAIT has been used to identify atomic context in callers that hold
    spinlocks or are in interrupts. They are expected to be high priority and
    have access one of two watermarks lower than "min" which can be referred
    to as the "atomic reserve". __GFP_HIGH users get access to the first
    lower watermark and can be called the "high priority reserve".

    Over time, callers had a requirement to not block when fallback options
    were available. Some have abused __GFP_WAIT leading to a situation where
    an optimisitic allocation with a fallback option can access atomic
    reserves.

    This patch uses __GFP_ATOMIC to identify callers that are truely atomic,
    cannot sleep and have no alternative. High priority users continue to use
    __GFP_HIGH. __GFP_DIRECT_RECLAIM identifies callers that can sleep and
    are willing to enter direct reclaim. __GFP_KSWAPD_RECLAIM to identify
    callers that want to wake kswapd for background reclaim. __GFP_WAIT is
    redefined as a caller that is willing to enter direct reclaim and wake
    kswapd for background reclaim.

    This patch then converts a number of sites

    o __GFP_ATOMIC is used by callers that are high priority and have memory
    pools for those requests. GFP_ATOMIC uses this flag.

    o Callers that have a limited mempool to guarantee forward progress clear
    __GFP_DIRECT_RECLAIM but keep __GFP_KSWAPD_RECLAIM. bio allocations fall
    into this category where kswapd will still be woken but atomic reserves
    are not used as there is a one-entry mempool to guarantee progress.

    o Callers that are checking if they are non-blocking should use the
    helper gfpflags_allow_blocking() where possible. This is because
    checking for __GFP_WAIT as was done historically now can trigger false
    positives. Some exceptions like dm-crypt.c exist where the code intent
    is clearer if __GFP_DIRECT_RECLAIM is used instead of the helper due to
    flag manipulations.

    o Callers that built their own GFP flags instead of starting with GFP_KERNEL
    and friends now also need to specify __GFP_KSWAPD_RECLAIM.

    The first key hazard to watch out for is callers that removed __GFP_WAIT
    and was depending on access to atomic reserves for inconspicuous reasons.
    In some cases it may be appropriate for them to use __GFP_HIGH.

    The second key hazard is callers that assembled their own combination of
    GFP flags instead of starting with something like GFP_KERNEL. They may
    now wish to specify __GFP_KSWAPD_RECLAIM. It's almost certainly harmless
    if it's missed in most cases as other activity will wake kswapd.

    Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
    Acked-by: Vlastimil Babka <vbabka@suse.cz>
    Acked-by: Michal Hocko <mhocko@suse.com>
    Acked-by: Johannes Weiner <hannes@cmpxchg.org>
    Cc: Christoph Lameter <cl@linux.com>
    Cc: David Rientjes <rientjes@google.com>
    Cc: Vitaly Wool <vitalywool@gmail.com>
    Cc: Rik van Riel <riel@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

    Mel Gorman
     

05 Nov, 2015

3 commits

  • software_reset() may fail
    - due to unresponsive chip with -EBUSY (-16), or
    - due to ejected or unseated card with -ENODEV (-19).
    Let the PCI probe and resume routines log the actual error code instead
    of hardwired -EBUSY.

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • 32 bit systems using 'struct timeval' will break in the year 2038, so
    we replace the code appropriately. However, this driver is not broken
    in 2038 since we are using only the microseconds portion of the
    current time.

    This patch replaces timeval with timespec64.

    Signed-off-by: Amitoj Kaur Chawla
    Reviewed-by: Arnd Bergmann
    Signed-off-by: Stefan Richter

    Amitoj Kaur Chawla
     
  • Reported by Clifford and Craig for JMicron OHCI-1394 + SDHCI combo
    controllers: Often or even most of the time, the controller is
    initialized with the message "added OHCI v1.10 device as card 0, 4 IR +
    0 IT contexts, quirks 0x10". With 0 isochronous transmit DMA contexts
    (IT contexts), applications like audio output are impossible.

    However, OHCI-1394 demands that at least 4 IT contexts are implemented
    by the link layer controller, and indeed JMicron JMB38x do implement
    four of them. Only their IsoXmitIntMask register is unreliable at early
    access.

    With my own JMB381 single function controller I found:
    - I can reproduce the problem with a lower probability than Craig's.
    - If I put a loop around the section which clears and reads
    IsoXmitIntMask, then either the first or the second attempt will
    return the correct initial mask of 0x0000000f. I never encountered
    a case of needing more than a second attempt.
    - Consequently, if I put a dummy reg_read(...IsoXmitIntMaskSet)
    before the first write, the subsequent read will return the correct
    result.
    - If I merely ignore a wrong read result and force the known real
    result, later isochronous transmit DMA usage works just fine.

    So let's just fix this chip bug up by the latter method. Tested with
    JMB381 on kernel 3.13 and 4.3.

    Since OHCI-1394 generally requires 4 IT contexts at a minium, this
    workaround is simply applied whenever the initial read of IsoXmitIntMask
    returns 0, regardless whether it's a JMicron chip or not. I never heard
    of this issue together with any other chip though.

    I am not 100% sure that this fix works on the OHCI-1394 part of JMB380
    and JMB388 combo controllers exactly the same as on the JMB381 single-
    function controller, but so far I haven't had a chance to let an owner
    of a combo chip run a patched kernel.

    Strangely enough, IsoRecvIntMask is always reported correctly, even
    though it is probed right before IsoXmitIntMask.

    Reported-by: Clifford Dunn
    Reported-by: Craig Moore
    Cc: stable@vger.kernel.org
    Signed-off-by: Stefan Richter

    Stefan Richter
     

01 Jun, 2015

1 commit


04 Mar, 2015

1 commit


03 Mar, 2015

1 commit


03 Feb, 2015

1 commit

  • The kernel was using the vendor ID 0xd00d1e, which was inherited from
    the old ieee1394 driver stack. However, this ID was not registered, and
    invalid.

    Instead, use the vendor/model IDs that are now officially assigned to
    the kernel:
    https://ieee1394.wiki.kernel.org/index.php/IEEE_OUI_Assignments

    [stefanr:
    - The vendor ID 001f11 is Openmoko, Inc.'s identifier, registered at
    IEEE Registration Authority.
    - The range of model IDs 023900...0239ff are the Linux kernel 1394
    subsystem's identifiers, registered at Openmoko.
    - Model ID 023901 is picked by the subsystem developers as
    firewire-core's model ID.]

    Signed-off-by: Clemens Ladisch
    Signed-off-by: Stefan Richter

    Clemens Ladisch
     

31 Jan, 2015

1 commit

  • [Bart van Asche:] SCSI core never sets cmd->sc_data_direction to
    DMA_BIDIRECTIONAL; scsi_bidi_cmnd(cmd) should be used instead to
    test for a bidirectional command.

    [Christoph Hellwig:] Bidirectional commands won't ever be queued
    anyway, unless a LLD or transport driver sets QUEUE_FLAG_BIDI.

    So, simply remove the respective queuecommand check in the SBP-2
    transport driver.

    Signed-off-by: Stefan Richter

    Stefan Richter
     

22 Jan, 2015

1 commit


11 Dec, 2014

4 commits

  • firewire-core uses fw_card.lock to protect topology data and transaction
    data. firewire-sbp2 uses fw_card.lock for entirely unrelated purposes.

    Introduce a sbp2_target.lock to firewire-sbp2 and replace all
    fw_card.lock uses in the driver. fw_card.lock is now entirely private
    to firewire-core. This has no immediate advantage apart from making it
    clear in the code that firewire-sbp2 does not interact with the core
    via the core lock.

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • Users of card->lock Calling context
    ------------------------------------------------------------------------
    sbp2_status_write AR-req handler, tasklet
    complete_transaction AR-resp or AT-req handler, tasklet
    sbp2_send_orb among else scsi host .queuecommand, which may
    be called in some sort of atomic context
    sbp2_cancel_orbs sbp2_send_management_orb/
    sbp2_{login,reconnect,remove},
    worklet or process
    sbp2_scsi_abort, scsi eh thread
    sbp2_allow_block sbp2_login, worklet
    sbp2_conditionally_block among else complete_command_orb, tasklet
    sbp2_conditionally_unblock sbp2_{login,reconnect}, worklet
    sbp2_unblock sbp2_{login,remove}, worklet or process

    Drop the IRQ flags saving from sbp2_cancel_orbs,
    sbp2_conditionally_unblock, and sbp2_unblock.
    It was already omitted in sbp2_allow_block.

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • The assertion in the comment in sbp2_allow_block() is no longer true.
    Or maybe it never was true. At least now, the sole caller of
    sbp2_allow_block(), sbp2_login, can run concurrently to one of
    sbp2_unblock()'s callers, sbp2_remove.

    sbp2_login is performed by sbp2_logical_unit.work.
    sbp2_remove is performed by fw_device.work.
    sbp2_remove cancels sbp2_logical_unit.work, but only after it called
    sbp2_unblock.

    Signed-off-by: Stefan Richter

    Stefan Richter
     
  • fw_csr_string() truncates and terminates target strings like strlcpy()
    does. Unlike strlcpy(), it returns the target strlen, not the source
    strlen, hence users of fw_csr_string() are unable to detect truncation.

    Point this behavior out in the kerneldoc comment.

    Signed-off-by: Stefan Richter
    Reviewed-by: Takashi Sakamoto

    Stefan Richter
     

19 Nov, 2014

1 commit


14 Nov, 2014

1 commit

  • Found by the UC-KLEE tool: A user could supply less input to
    firewire-cdev ioctls than write- or write/read-type ioctl handlers
    expect. The handlers used data from uninitialized kernel stack then.

    This could partially leak back to the user if the kernel subsequently
    generated fw_cdev_event_'s (to be read from the firewire-cdev fd)
    which notably would contain the _u64 closure field which many of the
    ioctl argument structures contain.

    The fact that the handlers would act on random garbage input is a
    lesser issue since all handlers must check their input anyway.

    The fix simply always null-initializes the entire ioctl argument buffer
    regardless of the actual length of expected user input. That is, a
    runtime overhead of memset(..., 40) is added to each firewirew-cdev
    ioctl() call. [Comment from Clemens Ladisch: This part of the stack is
    most likely to be already in the cache.]

    Remarks:
    - There was never any leak from kernel stack to the ioctl output
    buffer itself. IOW, it was not possible to read kernel stack by a
    read-type or write/read-type ioctl alone; the leak could at most
    happen in combination with read()ing subsequent event data.
    - The actual expected minimum user input of each ioctl from
    include/uapi/linux/firewire-cdev.h is, in bytes:
    [0x00] = 32, [0x05] = 4, [0x0a] = 16, [0x0f] = 20, [0x14] = 16,
    [0x01] = 36, [0x06] = 20, [0x0b] = 4, [0x10] = 20, [0x15] = 20,
    [0x02] = 20, [0x07] = 4, [0x0c] = 0, [0x11] = 0, [0x16] = 8,
    [0x03] = 4, [0x08] = 24, [0x0d] = 20, [0x12] = 36, [0x17] = 12,
    [0x04] = 20, [0x09] = 24, [0x0e] = 4, [0x13] = 40, [0x18] = 4.

    Reported-by: David Ramos
    Cc:
    Signed-off-by: Stefan Richter

    Stefan Richter
     

07 Aug, 2014

1 commit

  • Pull networking updates from David Miller:
    "Highlights:

    1) Steady transitioning of the BPF instructure to a generic spot so
    all kernel subsystems can make use of it, from Alexei Starovoitov.

    2) SFC driver supports busy polling, from Alexandre Rames.

    3) Take advantage of hash table in UDP multicast delivery, from David
    Held.

    4) Lighten locking, in particular by getting rid of the LRU lists, in
    inet frag handling. From Florian Westphal.

    5) Add support for various RFC6458 control messages in SCTP, from
    Geir Ola Vaagland.

    6) Allow to filter bridge forwarding database dumps by device, from
    Jamal Hadi Salim.

    7) virtio-net also now supports busy polling, from Jason Wang.

    8) Some low level optimization tweaks in pktgen from Jesper Dangaard
    Brouer.

    9) Add support for ipv6 address generation modes, so that userland
    can have some input into the process. From Jiri Pirko.

    10) Consolidate common TCP connection request code in ipv4 and ipv6,
    from Octavian Purdila.

    11) New ARP packet logger in netfilter, from Pablo Neira Ayuso.

    12) Generic resizable RCU hash table, with intial users in netlink and
    nftables. From Thomas Graf.

    13) Maintain a name assignment type so that userspace can see where a
    network device name came from (enumerated by kernel, assigned
    explicitly by userspace, etc.) From Tom Gundersen.

    14) Automatic flow label generation on transmit in ipv6, from Tom
    Herbert.

    15) New packet timestamping facilities from Willem de Bruijn, meant to
    assist in measuring latencies going into/out-of the packet
    scheduler, latency from TCP data transmission to ACK, etc"

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1536 commits)
    cxgb4 : Disable recursive mailbox commands when enabling vi
    net: reduce USB network driver config options.
    tg3: Modify tg3_tso_bug() to handle multiple TX rings
    amd-xgbe: Perform phy connect/disconnect at dev open/stop
    amd-xgbe: Use dma_set_mask_and_coherent to set DMA mask
    net: sun4i-emac: fix memory leak on bad packet
    sctp: fix possible seqlock seadlock in sctp_packet_transmit()
    Revert "net: phy: Set the driver when registering an MDIO bus device"
    cxgb4vf: Turn off SGE RX/TX Callback Timers and interrupts in PCI shutdown routine
    team: Simplify return path of team_newlink
    bridge: Update outdated comment on promiscuous mode
    net-timestamp: ACK timestamp for bytestreams
    net-timestamp: TCP timestamping
    net-timestamp: SCHED timestamp on entering packet scheduler
    net-timestamp: add key to disambiguate concurrent datagrams
    net-timestamp: move timestamp flags out of sk_flags
    net-timestamp: extend SCM_TIMESTAMPING ancillary data struct
    cxgb4i : Move stray CPL definitions to cxgb4 driver
    tcp: reduce spurious retransmits due to transient SACK reneging
    qlcnic: Initialize dcbnl_ops before register_netdev
    ...

    Linus Torvalds
     

06 Aug, 2014

1 commit

  • Pull timer and time updates from Thomas Gleixner:
    "A rather large update of timers, timekeeping & co

    - Core timekeeping code is year-2038 safe now for 32bit machines.
    Now we just need to fix all in kernel users and the gazillion of
    user space interfaces which rely on timespec/timeval :)

    - Better cache layout for the timekeeping internal data structures.

    - Proper nanosecond based interfaces for in kernel users.

    - Tree wide cleanup of code which wants nanoseconds but does hoops
    and loops to convert back and forth from timespecs. Some of it
    definitely belongs into the ugly code museum.

    - Consolidation of the timekeeping interface zoo.

    - A fast NMI safe accessor to clock monotonic for tracing. This is a
    long standing request to support correlated user/kernel space
    traces. With proper NTP frequency correction it's also suitable
    for correlation of traces accross separate machines.

    - Checkpoint/restart support for timerfd.

    - A few NOHZ[_FULL] improvements in the [hr]timer code.

    - Code move from kernel to kernel/time of all time* related code.

    - New clocksource/event drivers from the ARM universe. I'm really
    impressed that despite an architected timer in the newer chips SoC
    manufacturers insist on inventing new and differently broken SoC
    specific timers.

    [ Ed. "Impressed"? I don't think that word means what you think it means ]

    - Another round of code move from arch to drivers. Looks like most
    of the legacy mess in ARM regarding timers is sorted out except for
    a few obnoxious strongholds.

    - The usual updates and fixlets all over the place"

    * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (114 commits)
    timekeeping: Fixup typo in update_vsyscall_old definition
    clocksource: document some basic timekeeping concepts
    timekeeping: Use cached ntp_tick_length when accumulating error
    timekeeping: Rework frequency adjustments to work better w/ nohz
    timekeeping: Minor fixup for timespec64->timespec assignment
    ftrace: Provide trace clocks monotonic
    timekeeping: Provide fast and NMI safe access to CLOCK_MONOTONIC
    seqcount: Add raw_write_seqcount_latch()
    seqcount: Provide raw_read_seqcount()
    timekeeping: Use tk_read_base as argument for timekeeping_get_ns()
    timekeeping: Create struct tk_read_base and use it in struct timekeeper
    timekeeping: Restructure the timekeeper some more
    clocksource: Get rid of cycle_last
    clocksource: Move cycle_last validation to core code
    clocksource: Make delta calculation a function
    wireless: ath9k: Get rid of timespec conversions
    drm: vmwgfx: Use nsec based interfaces
    drm: i915: Use nsec based interfaces
    timekeeping: Provide ktime_get_raw()
    hangcheck-timer: Use ktime_get_ns()
    ...

    Linus Torvalds
     

31 Jul, 2014

1 commit


28 Jul, 2014

1 commit


24 Jul, 2014

1 commit

  • Revert half of commit d151f9854f21: If isochronous I/O is attempted with
    packets larget than 1 kByte, VIA VT6315 rev 01 immediately stops to generate
    any interrupts if MSI are used. Fix this by going back to legacy interrupts.
    [Thread "Isochronous streaming with VT6315 OHCI",
    http://marc.info/?t=139049641500003]

    With smaller packets, the loss of IRQs happens too but only very rarely ---
    rarely eneough that it was not yet possible for me to determine whether
    QUIRK_NO_MSI is an actual fix for this rare variation of this chip bug.

    I am keeping QUIRK_CYCLE_TIMER off of VT6315 rev >= 1 because this has been
    verified by myself with certainty. On the other hand, I am also keeping
    QUIRK_CYCLE_TIMER on for VT6315 rev 0 because I don't know at this time
    whether this revision accesses Cycle Timer non-atomically like most of the
    other VIA OHCIs are known to do.

    Reported-by: Rémy Bruno
    Signed-off-by: Stefan Richter

    Stefan Richter
     

17 Jul, 2014

1 commit


16 Jul, 2014

1 commit

  • Extend alloc_netdev{,_mq{,s}}() to take name_assign_type as argument, and convert
    all users to pass NET_NAME_UNKNOWN.

    Coccinelle patch:

    @@
    expression sizeof_priv, name, setup, txqs, rxqs, count;
    @@

    (
    -alloc_netdev_mqs(sizeof_priv, name, setup, txqs, rxqs)
    +alloc_netdev_mqs(sizeof_priv, name, NET_NAME_UNKNOWN, setup, txqs, rxqs)
    |
    -alloc_netdev_mq(sizeof_priv, name, setup, count)
    +alloc_netdev_mq(sizeof_priv, name, NET_NAME_UNKNOWN, setup, count)
    |
    -alloc_netdev(sizeof_priv, name, setup)
    +alloc_netdev(sizeof_priv, name, NET_NAME_UNKNOWN, setup)
    )

    v9: move comments here from the wrong commit

    Signed-off-by: Tom Gundersen
    Reviewed-by: David Herrmann
    Signed-off-by: David S. Miller

    Tom Gundersen
     

15 Jul, 2014

1 commit


14 Jul, 2014

1 commit

  • Commit b3d681a4fc108f9653bbb44e4f4e72db2b8a5734 ("firewire: Use
    COMPILE_TEST for build testing") added COMPILE_TEST as an alternative
    dependency for the purpose of build testing the firewire core.
    However, this bypasses all other implicit dependencies assumed by PCI,
    like HAS_DMA.

    If NO_DMA=y:

    drivers/built-in.o: In function `fw_iso_buffer_destroy':
    (.text+0x36a096): undefined reference to `dma_unmap_page'
    drivers/built-in.o: In function `fw_iso_buffer_map_dma':
    (.text+0x36a164): undefined reference to `dma_map_page'
    drivers/built-in.o: In function `fw_iso_buffer_map_dma':
    (.text+0x36a172): undefined reference to `dma_mapping_error'
    drivers/built-in.o: In function `sbp2_send_management_orb':
    sbp2.c:(.text+0x36c6b4): undefined reference to `dma_map_single'
    sbp2.c:(.text+0x36c6c8): undefined reference to `dma_mapping_error'
    sbp2.c:(.text+0x36c772): undefined reference to `dma_map_single'
    sbp2.c:(.text+0x36c786): undefined reference to `dma_mapping_error'
    sbp2.c:(.text+0x36c854): undefined reference to `dma_unmap_single'
    sbp2.c:(.text+0x36c872): undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `sbp2_map_scatterlist':
    sbp2.c:(.text+0x36ccbc): undefined reference to `scsi_dma_map'
    sbp2.c:(.text+0x36cd36): undefined reference to `dma_map_single'
    sbp2.c:(.text+0x36cd4e): undefined reference to `dma_mapping_error'
    sbp2.c:(.text+0x36cd84): undefined reference to `scsi_dma_unmap'
    drivers/built-in.o: In function `sbp2_unmap_scatterlist':
    sbp2.c:(.text+0x36cda6): undefined reference to `scsi_dma_unmap'
    sbp2.c:(.text+0x36cdc6): undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `complete_command_orb':
    sbp2.c:(.text+0x36d6ac): undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `sbp2_scsi_queuecommand':
    sbp2.c:(.text+0x36d8e0): undefined reference to `dma_map_single'
    sbp2.c:(.text+0x36d8f6): undefined reference to `dma_mapping_error'

    Add an explicit dependency on HAS_DMA to fix this.

    Signed-off-by: Geert Uytterhoeven
    Reviewed-by: Jean Delvare
    Signed-off-by: Stefan Richter

    Geert Uytterhoeven
     

12 Jun, 2014

1 commit

  • do_posix_clock_monotonic_gettime() is a leftover from the initial
    posix timer implementation which maps to ktime_get_ts()

    Signed-off-by: Thomas Gleixner
    Cc: John Stultz
    Cc: Peter Zijlstra
    Acked-by: Stefan Richter
    Link: http://lkml.kernel.org/r/20140611234607.351283464@linutronix.de
    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     

05 Jun, 2014

1 commit

  • Pull sound updates from Takashi Iwai:
    "At this time, majority of changes come from ASoC world while we got a
    few new drivers in other places for FireWire and USB. There have been
    lots of ASoC core cleanups / refactoring, but very little visible to
    external users.

    ASoC:
    - Support for specifying aux CODECs in DT
    - Removal of the deprecated mux and enum macros
    - More moves towards full componentisation
    - Removal of some unused I/O code
    - Lots of cleanups, fixes and enhancements to the davinci, Freescale,
    Haswell and Realtek drivers
    - Several drivers exposed directly in Kconfig for use with
    simple-card
    - GPIO descriptor support for jacks
    - More updates and fixes to the Freescale SSI, Intel and rsnd drivers
    - New drivers for Cirrus CS42L56, Realtek RT5639, RT5642 and RT5651
    and ST STA350, Analog Devices ADAU1361, ADAU1381, ADAU1761 and
    ADAU1781, and Realtek RT5677

    HD-audio:
    - Clean up Dell headset quirks
    - Noise fixes for Dell and Sony laptops
    - Thinkpad T440 dock fix
    - Realtek codec updates (ALC293,ALC233,ALC3235)
    - Tegra HD-audio HDMI support

    FireWire-audio:
    - FireWire audio stack enhancement (AMDTP, MIDI), support for
    incoming isochronous stream and duplex streams with timestamp
    synchronization
    - BeBoB-based devices support
    - Fireworks-based device support

    USB-audio:
    - Behringer BCD2000 USB device support

    Misc:
    - Clean up of a few old drivers, atmel, fm801, etc"

    * tag 'sound-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (480 commits)
    ASoC: Fix wrong argument for card remove callbacks
    ASoC: free jack GPIOs before the sound card is freed
    ALSA: firewire-lib: Remove a comment about restriction of asynchronous operation
    ASoC: cache: Fix error code when not using ASoC level cache
    ALSA: hda/realtek - Fix COEF widget NID for ALC260 replacer fixup
    ALSA: hda/realtek - Correction of fixup codes for PB V7900 laptop
    ALSA: firewire-lib: Use IEC 61883-6 compliant labels for Raw Audio data
    ASoC: add RT5677 CODEC driver
    ASoC: intel: The Baytrail/MAX98090 driver depends on I2C
    ASoC: rt5640: Add the function "get_clk_info" to RL6231 shared support
    ASoC: rt5640: Add the function of the PLL clock calculation to RL6231 shared support
    ASoC: rt5640: Add RL6231 class device shared support for RT5640, RT5645 and RT5651
    ASoC: cache: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
    ASoC: Add helper functions to cast from DAPM context to CODEC/platform
    ALSA: bebob: sizeof() vs ARRAY_SIZE() typo
    ASoC: wm9713: correct mono out PGA sources
    ALSA: synth: emux: soundfont.c: Cleaning up memory leak
    ASoC: fsl: Remove dependencies of boards for SND_SOC_EUKREA_TLV320
    ASoC: fsl-ssi: Use regmap
    ASoC: fsl-ssi: reorder and document fsl_ssi_private
    ...

    Linus Torvalds
     

04 Jun, 2014

2 commits

  • …ee1394/linux1394 into next

    Pull firewire updates from Stefan Richter:
    "IEEE 1394 (FireWire) subsystem changes: One optimization for some VIA
    controllers, one fix, one kconfig brushup"

    * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
    firewire: ohci: enable MSI for VIA VT6315 rev 1, drop cycle timer quirk
    firewire: Use COMPILE_TEST for build testing
    firewire: net: fix NULL derefencing in fwnet_probe()

    Linus Torvalds
     
  • …el/git/tip/tip into next

    Pull core locking updates from Ingo Molnar:
    "The main changes in this cycle were:

    - reduced/streamlined smp_mb__*() interface that allows more usecases
    and makes the existing ones less buggy, especially in rarer
    architectures

    - add rwsem implementation comments

    - bump up lockdep limits"

    * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (33 commits)
    rwsem: Add comments to explain the meaning of the rwsem's count field
    lockdep: Increase static allocations
    arch: Mass conversion of smp_mb__*()
    arch,doc: Convert smp_mb__*()
    arch,xtensa: Convert smp_mb__*()
    arch,x86: Convert smp_mb__*()
    arch,tile: Convert smp_mb__*()
    arch,sparc: Convert smp_mb__*()
    arch,sh: Convert smp_mb__*()
    arch,score: Convert smp_mb__*()
    arch,s390: Convert smp_mb__*()
    arch,powerpc: Convert smp_mb__*()
    arch,parisc: Convert smp_mb__*()
    arch,openrisc: Convert smp_mb__*()
    arch,mn10300: Convert smp_mb__*()
    arch,mips: Convert smp_mb__*()
    arch,metag: Convert smp_mb__*()
    arch,m68k: Convert smp_mb__*()
    arch,m32r: Convert smp_mb__*()
    arch,ia64: Convert smp_mb__*()
    ...

    Linus Torvalds
     

30 May, 2014

1 commit

  • Commit af0cdf494781 "firewire: ohci: fix regression with VIA VT6315,
    disable MSI" acted upon a report against VT6315 rev 0:
    http://linux.derkeiler.com/Mailing-Lists/Kernel/2010-12/msg02301.html
    $ lspci -nn
    VIA Technologies, Inc. VT6315 Series Firewire Controller [1106:3403]

    I now got a card with
    $ lspci -nn
    VIA Technologies, Inc. VT6315 Series Firewire Controller [1106:3403] (rev 01)
    and this works fine with MSI enabled.

    Second, I tested this VT6315 rev 1 without CYCLE_TIMER quirk flag using
    http://me.in-berlin.de/~s5r6/linux1394/utils/test_cycle_time_v20100125.c
    and found that this chip does in fact access the cycle timer atomically.

    Things I can't test because I don't have the hardware:
    - whether VT6315 rev 0 really needs QUIRK_CYCLE_TIMER,
    - whether the VT6320 PCI device needs QUIRK_CYCLE_TIMER,
    - whether the VT6325 and VT6330 PCIe devices need QUIRK_CYCLE_TIMER
    and QUIRK_NO_MSI.

    Hence, just add a whitelist entry specifically for VT6315 rev >= 1
    without any quirk flags. Before this entry we need an extra entry to
    catch VT6315 rev

    Stefan Richter
     

29 May, 2014

1 commit

  • Undo a feature introduced in v3.14 by commit fcd46b34425d
    "firewire: Enable remote DMA above 4 GB". That change raised the
    minimum address at which protocol drivers and user programs can register
    for request reception from 0x0001'0000'0000 to 0x8000'0000'0000.
    It turned out that at least one vendor-specific protocol exists which
    uses lower addresses: https://bugzilla.kernel.org/show_bug.cgi?id=76921

    For the time being, revert most of commit fcd46b34425d so that affected
    protocols work like with kernel v3.13 and before. Just keep the valid
    documentation parts from the regressing commit, and the ability to
    identify controllers which could be programmed to accept >32 bit
    physical DMA addresses. The rest of fcd46b34425d should probably be
    brought back as an optional instead of default feature.

    Reported-by: Fabien Spindler
    Cc: # 3.14+
    Signed-off-by: Stefan Richter

    Stefan Richter