1. 09 Oct, 2014 12 commits
  2. 08 Oct, 2014 28 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 35a9ad8a
      Linus Torvalds authored
      Pull networking updates from David Miller:
       "Most notable changes in here:
      
         1) By far the biggest accomplishment, thanks to a large range of
            contributors, is the addition of multi-send for transmit.  This is
            the result of discussions back in Chicago, and the hard work of
            several individuals.
      
            Now, when the ->ndo_start_xmit() method of a driver sees
            skb->xmit_more as true, it can choose to defer the doorbell
            telling the driver to start processing the new TX queue entires.
      
            skb->xmit_more means that the generic networking is guaranteed to
            call the driver immediately with another SKB to send.
      
            There is logic added to the qdisc layer to dequeue multiple
            packets at a time, and the handling mis-predicted offloads in
            software is now done with no locks held.
      
            Finally, pktgen is extended to have a "burst" parameter that can
            be used to test a multi-send implementation.
      
            Several drivers have xmit_more support: i40e, igb, ixgbe, mlx4,
            virtio_net
      
            Adding support is almost trivial, so export more drivers to
            support this optimization soon.
      
            I want to thank, in no particular or implied order, Jesper
            Dangaard Brouer, Eric Dumazet, Alexander Duyck, Tom Herbert, Jamal
            Hadi Salim, John Fastabend, Florian Westphal, Daniel Borkmann,
            David Tat, Hannes Frederic Sowa, and Rusty Russell.
      
         2) PTP and timestamping support in bnx2x, from Michal Kalderon.
      
         3) Allow adjusting the rx_copybreak threshold for a driver via
            ethtool, and add rx_copybreak support to enic driver.  From
            Govindarajulu Varadarajan.
      
         4) Significant enhancements to the generic PHY layer and the bcm7xxx
            driver in particular (EEE support, auto power down, etc.) from
            Florian Fainelli.
      
         5) Allow raw buffers to be used for flow dissection, allowing drivers
            to determine the optimal "linear pull" size for devices that DMA
            into pools of pages.  The objective is to get exactly the
            necessary amount of headers into the linear SKB area pre-pulled,
            but no more.  The new interface drivers use is eth_get_headlen().
            From WANG Cong, with driver conversions (several had their own
            by-hand duplicated implementations) by Alexander Duyck and Eric
            Dumazet.
      
         6) Support checksumming more smoothly and efficiently for
            encapsulations, and add "foo over UDP" facility.  From Tom
            Herbert.
      
         7) Add Broadcom SF2 switch driver to DSA layer, from Florian
            Fainelli.
      
         8) eBPF now can load programs via a system call and has an extensive
            testsuite.  Alexei Starovoitov and Daniel Borkmann.
      
         9) Major overhaul of the packet scheduler to use RCU in several major
            areas such as the classifiers and rate estimators.  From John
            Fastabend.
      
        10) Add driver for Intel FM10000 Ethernet Switch, from Alexander
            Duyck.
      
        11) Rearrange TCP_SKB_CB() to reduce cache line misses, from Eric
            Dumazet.
      
        12) Add Datacenter TCP congestion control algorithm support, From
            Florian Westphal.
      
        13) Reorganize sk_buff so that __copy_skb_header() is significantly
            faster.  From Eric Dumazet"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1558 commits)
        netlabel: directly return netlbl_unlabel_genl_init()
        net: add netdev_txq_bql_{enqueue, complete}_prefetchw() helpers
        net: description of dma_cookie cause make xmldocs warning
        cxgb4: clean up a type issue
        cxgb4: potential shift wrapping bug
        i40e: skb->xmit_more support
        net: fs_enet: Add NAPI TX
        net: fs_enet: Remove non NAPI RX
        r8169:add support for RTL8168EP
        net_sched: copy exts->type in tcf_exts_change()
        wimax: convert printk to pr_foo()
        af_unix: remove 0 assignment on static
        ipv6: Do not warn for informational ICMP messages, regardless of type.
        Update Intel Ethernet Driver maintainers list
        bridge: Save frag_max_size between PRE_ROUTING and POST_ROUTING
        tipc: fix bug in multicast congestion handling
        net: better IFF_XMIT_DST_RELEASE support
        net/mlx4_en: remove NETDEV_TX_BUSY
        3c59x: fix bad split of cpu_to_le32(pci_map_single())
        net: bcmgenet: fix Tx ring priority programming
        ...
      35a9ad8a
    • Linus Torvalds's avatar
      Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d5935b07
      Linus Torvalds authored
      Pull ARM64 SoC changes from Arnd Bergmann:
       "Starting with 3.18, we are merging SoC-specific changes for arm64
        through the arm-soc tree, like we have been doing for arm32.
      
        This time, there is only one set of changes, adding support for the
        Cavium "Thunder" Soc family.  Since the changes are relatively small,
        this includes Kconfig, defconfig and DT changes.
      
        If all goes well, we will never require adding actual C source code
        for platform support in arm64, given that the architecture is more
        clearly defined and we have moved out a lot of the platform specifics
        into device drivers for arm32 already"
      
      * tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm64, defconfig: Enable Cavium Thunder SoC in defconfig
        arm64, thunder: Add Kconfig option for Cavium Thunder SoC Family
        arm64, thunder: Document devicetree bindings for Cavium Thunder SoC
        arm64, thunder: Add initial dts for Cavium Thunder SoC
      d5935b07
    • Linus Torvalds's avatar
      Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f86dc4b0
      Linus Torvalds authored
      Pull ARM SoC defconfig changes from Arnd Bergmann:
       "This is a collection of the various changes to defconfig files, most
        importantly enabling some additional platforms in the
        multi_v7_defconfig file"
      
      * tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (40 commits)
        ARM: configs: fix duplicate entry in multi_v7
        ARM: multi_v7_defconfig: add missing Tegra options
        ARM: bcm2835: enable USB_DWC2_HOST in defconfig
        ARM: meson: update multi_v7_defconfig
        ARM: multi_v7_defconfig: Enable Mediatek platform
        ARM: qcom: Update defconfig
        ARM: mvebu: add gpio-fan to mvebu_v7_defconfig
        ARM: mvebu: add LED class support built-in in mvebu_v7_defconfig
        ARM: shmobile: Enable r8a7794 SoC in shmobile_defconfig
        ARM: LPC32xx: defconfig update
        ARM: configs: Enable cpufreq-cpu0 for multi_v7_defconfig
        ARM: configs: Remove REGULATOR_VIRTUAL_CONSUMER from defconfigs
        ARM: tegra: enable Atmel touchpad in defconfig
        ARM: at91: sama5: update defconfig
        ARM: at91: at91sam9rl: update defconfig
        ARM: at91: at91sam9g45: update defconfig
        ARM: at91: at91sam9263: update defconfig
        ARM: at91: at91sam9261_9g10: update defconfig
        ARM: at91: at91sam9260_9g20: update defconfig
        ARM: at91: at91_dt: update defconfig
        ...
      f86dc4b0
    • Linus Torvalds's avatar
      Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 8b45bc89
      Linus Torvalds authored
      Pull ARM SoC driver updates from Arnd Bergmann:
       "These are changes for drivers that are intimately tied to some SoC and
        for some reason could not get merged through the respective subsystem
        maintainer tree.
      
        Most of the new code is for the Keystone Navigator driver, which is
        new base support that is going to be needed for their hardware
        accelerated network driver and other units.
      
        Most of the commits are for moving old code around from at91 and omap
        for things that are done in device drivers nowadays.
      
         - at91: move reset, poweroff, memory and clocksource code into
           drivers directories
         - socfpga: add edac driver (through arm-soc, as requested by Boris)
         - omap: move omap-intc code to drivers/irqchip
         - sunxi: added an RTC driver for sun6i
         - omap: mailbox driver related changes
         - keystone: support for the "Navigator" component
         - versatile: new reboot, led and soc drivers"
      
      * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (92 commits)
        bus: arm-ccn: Fix spurious warning message
        leds: add device tree bindings for register bit LEDs
        soc: add driver for the ARM RealView
        power: reset: driver for the Versatile syscon reboot
        leds: add a driver for syscon-based LEDs
        drivers/soc: ti: fix build break with modules
        MAINTAINERS: Add Keystone Multicore Navigator drivers entry
        soc: ti: add Keystone Navigator DMA support
        Documentation: dt: soc: add Keystone Navigator DMA bindings
        soc: ti: add Keystone Navigator QMSS driver
        Documentation: dt: soc: add Keystone Navigator QMSS bindings
        rtc: sunxi: Depend on platforms sun4i/sun7i that actually have the rtc
        rtc: sun6i: Add sun6i RTC driver
        irqchip: omap-intc: remove unnecessary comments
        irqchip: omap-intc: correct maximum number or MIR registers
        irqchip: omap-intc: enable TURBO idle mode
        irqchip: omap-intc: enable IP protection
        irqchip: omap-intc: remove unnecesary of_address_to_resource() call
        irqchip: omap-intc: comment style cleanup
        irqchip: omap-intc: minor improvement to omap_irq_pending()
        ...
      8b45bc89
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · eb785bef
      Linus Torvalds authored
      Pull ARM SoC DT updates from Arnd Bergmann:
       "As usual, this is the largest branch, though this time a little under
        half of the total changes with 307 individual non-merge changesets.
      
        The largest changes are the addition of new machines, in particular
        the Tegra based Chromebook, the Renesas r8a7794 SoC, and DT support
        for the old i.MX1 platform.
      
        Other changes include
         - at91: various sam9 and sama5 updates
         - exynos: much extended Peach Pi/Pit (Chromebook 2) support
         - keystone: new peripherals
         - meson: added DT for meson6 SoC
         - mvebu: new device support for Armada 370/375
         - qcom: improved support for IPQ8064 and MSM8x60
         - rockchip: much improved support for rk3288
         - shmobile: lots of updates all over the place
         - sunxi: dts license change
         - sunxi: more a23 device support
         - vexpress: CLCD DT description"
      
      * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (308 commits)
        ARM: DTS: meson: update DTSI to add watchdog node
        ARM: dts: keystone-k2l: fix mdio io start address
        ARM: dts: keystone-k2e: fix mdio io start address
        ARM: dts: keystone-k2e: update usb1 node for dma properties
        ARM: dts: keystone: fix io range for usb_phy0
        Revert "Merge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into next/dt"
        Revert "ARM: dts: hix5hd2: add wdg node"
        ARM: dts: add rk3288 i2s controller
        ARM: vexpress: Add CLCD Device Tree properties
        ARM: bcm2835: add I2S pinctrl to device tree
        ARM: meson: documentation: add bindings documentation
        ARM: meson: dts: add basic Meson/Meson6/Meson6-atv1200 DTSI/DTS
        ARM: dts: mt6589: Change compatible string for GIC
        ARM: dts: mediatek: Add compatible property for aquaris5
        ARM: dts: mt6589-aquaris5: Add boot argument earlyprintk
        ARM: dts: mt6589: Fix typo in GIC unit address
        ARM: dts: Build dtb for Mediatek board
        ARM: dts: keystone: fix bindings for pcie and usb clock nodes
        ARM: dts: keystone: k2l: Fix chip selects for SPI devices
        ARM: dts: keystone: add dsp gpio controllers nodes
        ...
      eb785bef
    • Linus Torvalds's avatar
      Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · cf377ad7
      Linus Torvalds authored
      Pull ARM SoC platform changes from Arnd Bergmann:
       "New and updated SoC support.  Among the things new for this release
        are:
      
         - at91: Added support for the new SAMA5D4 SoC, following the earlier
           SAMA5D3
         - bcm: Added support for BCM63XX family of DSL SoCs
         - hisi: Added support for HiP04 server-class SoC
         - meson: Initial support for the Amlogic Meson6 (aka 8726MX) platform
         - shmobile: added support for new r8a7794 (R-Car E2) automotive SoC
      
        Noteworthy changes to existing SoC support are:
      
         - imx: convert i.MX1 to device tree
         - omap: lots of power management work
         - omap: base support to enable moving to standard UART driver
         - shmobile: lots of progress for multiplatform support, still
           ongoing"
      
      * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (171 commits)
        ARM: hisi: depend on ARCH_MULTI_V7
        CNS3xxx: Fix debug UART.
        ARM: at91: fix nommu build regression
        ARM: meson: add basic support for MesonX SoCs
        ARM: meson: debug: add debug UART for earlyprintk support
        irq: Export handle_fasteoi_irq
        ARM: mediatek: Add earlyprintk support for mt6589
        ARM: hisi: Fix platmcpm compilation when ARMv6 is selected
        ARM: debug: fix alphanumerical order on debug uarts
        ARM: at91: document Atmel SMART compatibles
        ARM: at91: add sama5d4 support to sama5_defconfig
        ARM: at91: dt: add device tree file for SAMA5D4ek board
        ARM: at91: dt: add device tree file for SAMA5D4 SoC
        ARM: at91: SAMA5D4 SoC detection code and low level routines
        ARM: at91: introduce basic SAMA5D4 support
        clk: at91: add a driver for the h32mx clock
        ARM: pxa3xx: provide specific platform_devices for all ssp ports
        ARM: pxa: ssp: provide platform_device_id for PXA3xx
        ARM: OMAP4+: Remove static iotable mappings for SRAM
        ARM: OMAP4+: Move SRAM data to DT
        ...
      cf377ad7
    • Linus Torvalds's avatar
      Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 212fe84a
      Linus Torvalds authored
      Pull ARM SoC cleanups from Arnd Bergmann:
       "This time around, the cleanup branch contains mostly code removal.  A
        number of board files for at91, imx and msm have become obsolete
        because of the DT conversion and are now ready to be removed.  The
        OMAP platform has traditionally had its own DMA engine abstraction and
        as this is being phased out, a lot of the original code is now unused
        and can be removed as well.
      
        S3C24xx can be simplified now that the restart code is a proper device
        driver.
      
        Finally, a number of cleanups in shmobile are done to prepare for the
        addition of new code in other branches"
      
      * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
        ARM: at91: Remove the support for the RSI EWS board
        arm: mach-omap2: Convert pr_warning to pr_warn
        ARM: OMAP: Remove unused pieces of legacy DMA API
        ARM: at91: remove board file for Acme Systems Fox G20
        ARM: orion5x: Convert pr_warning to pr_warn
        ARM: S3C24XX: remove separate restart code
        ARM: EXYNOS: Do not calculate boot address twice
        ARM: sunxi: Remove sun4i reboot code from mach directory
        ARM: imx: Remove mach-mxt_td60 board file
        ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains()
        ARM: shmobile: r8a7740: Clean up pm domain table
        ARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains()
        ARM: shmobile: sh7372: Make domain_devices[] static __initdata
        ARM: shmobile: mackerel: Make domain_devices[] static __initdata
        clocksource: tcb_clksrc: sanitize IRQ request
        ARM: at91/tclib: mask interruptions at shutdown and probe
        ARM: at91/tclib: move initialization from alloc to probe
        ARM: at91/tclib: prefer using of devm_* functions
        ARM: clps711x: Switch CLPS711X subarch to use clk and clocksource driver
        ARM: shmobile: r8a7791 is now called "R-Car M2-W"
        ...
      212fe84a
    • Linus Torvalds's avatar
      Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4a4743e8
      Linus Torvalds authored
      Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
       "These are bug fixes for harmless problems that were not important
        enough to get fixed in 3.17.  The majority of these are OMAP specific,
        but there are also a couple for Marvell mvebu, cns3xxx, and others, as
        well as some updates for the MAINTAINERS file.
      
        In particular, Robert Jarzmik and Daniel Mack now volunteered to help
        out maintaining the PXA platform, Krzysztof Halasa took over the
        cns3xxx platform, Carlo Caione is the maintainer for the new Amlogic
        meson platform, and Matthias Brugger is now listed for the mediatek
        platform he recently contributed"
      
      * tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (42 commits)
        MAINTAINERS: update Shawn's email address
        MAINTAINERS: condense some Tegra related entries
        MAINTAINERS: add Alexandre Courbot for Tegra
        MAINTAINERS: CNS3xxx and IXP4xx update.
        MAINTAINERS: Add maintainers entry for Mediatek SoCs
        arm, vt8500, LLVMLlinux: Use mcr instead of mcr% for mach-vt8500
        MAINTAINERS: add a third maintainer to mach-bcm
        CNS3xxx: Fix PCIe read size limit.
        CNS3xxx: Fix logical PCIe topology.
        CNS3xxx: Fix debug UART.
        MAINTAINERS: Add entry for the Amlogic MesonX SoCs
        MAINTAINERS: update ARM pxa maintainers
        ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks
        ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings
        ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
        ARM: Kirkwood: Fix DT based DSA.
        ARM: OMAP2+: make of_device_ids const
        ARM: omap2: make arrays containing machine compatible strings const
        ARM: LPC32xx: Fix reset function
        ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
        ...
      4a4743e8
    • David S. Miller's avatar
    • Fabian Frederick's avatar
      netlabel: directly return netlbl_unlabel_genl_init() · 16b99a4f
      Fabian Frederick authored
      
      
      No need to store netlbl_unlabel_genl_init result and test it before returning.
      Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      16b99a4f
    • Eric Dumazet's avatar
      net: add netdev_txq_bql_{enqueue, complete}_prefetchw() helpers · 53511453
      Eric Dumazet authored
      
      
      Add two helpers so that drivers do not have to care of BQL being
      available or not.
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarJim Davis <jim.epost@gmail.com>
      Fixes: 29d40c90
      
       ("net/mlx4_en: Use prefetch in tx path")
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      53511453
    • Masanari Iida's avatar
      net: description of dma_cookie cause make xmldocs warning · 709c48b3
      Masanari Iida authored
      In commit 7bced397
      
      ,
      dma_cookie was removed from struct skbuff.
      But the description of dma_cookie still exist.
      So the "make xmldocs" output following warning.
      
      Warning(.//include/linux/skbuff.h:609): Excess struct/union
      /enum/typedef member 'dma_cookie' description in 'sk_buff'
      
      Remove description of dma_cookie fix the symptom.
      Signed-off-by: default avatarMasanari Iida <standby24x7@gmail.com>
      Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      709c48b3
    • Dan Carpenter's avatar
      cxgb4: clean up a type issue · fb5ac0de
      Dan Carpenter authored
      
      
      The tx_desc struct holds 8 __be64 values.  The original code in
      ring_tx_db() took a tx_desc pointer then casted it to an int pointer and
      then casted it to a u64 pointer.  It was confusing and triggered some
      static checker warnings.
      
      I have changed the cxgb_pio_copy() function to only take tx_desc
      pointers.  This isn't really a loss of flexibility because anything else
      was buggy to begin with.
      
      I also removed the casting on the destination pointer since that was
      unnecessary and a bit messy.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fb5ac0de
    • Dan Carpenter's avatar
      cxgb4: potential shift wrapping bug · 9fef8478
      Dan Carpenter authored
      
      
      "cntxt_id" is an unsigned int but "udb" is a u64 so there is a potential
      shift wrapping bug here.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9fef8478
    • Eric Dumazet's avatar
      i40e: skb->xmit_more support · 4567dc10
      Eric Dumazet authored
      
      
      Support skb->xmit_more in i40e is straightforward : we need to move
      around i40e_maybe_stop_tx() call to correctly test netif_xmit_stopped()
      before taking the decision to not kick the NIC.
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
      Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4567dc10
    • David S. Miller's avatar
      Merge branch 'fs_enet_napi' · 44783d87
      David S. Miller authored
      
      
      Christophe Leroy says:
      
      ====================
      net: fs_enet: Remove non NAPI RX and add NAPI for TX
      
      When using a MPC8xx as a router, 'perf' shows a significant time spent in
      fs_enet_interrupt() and fs_enet_start_xmit().
      'perf annotate' shows that the time spent in fs_enet_start_xmit is indeed spent
      between spin_unlock_irqrestore() and the following instruction, hence in
      interrupt handling. This is due to the TX complete interrupt that fires after
      each transmitted packet.
      This patchset first remove all non NAPI handling as NAPI has become the only
      mode for RX, then adds NAPI for handling TX complete.
      This improves NAT TCP throughput by 21% on MPC885 with FEC.
      
      Tested on MPC885 with FEC.
      
      [PATCH 1/2] net: fs_enet: Remove non NAPI RX
      [PATCH 2/2] net: fs_enet: Add NAPI TX
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      44783d87
    • LEROY Christophe's avatar
      net: fs_enet: Add NAPI TX · d43a396a
      LEROY Christophe authored
      
      
      When using a MPC8xx as a router, 'perf' shows a significant time spent in
      fs_enet_interrupt() and fs_enet_start_xmit().
      'perf annotate' shows that the time spent in fs_enet_start_xmit is indeed spent
      between spin_unlock_irqrestore() and the following instruction, hence in
      interrupt handling. This is due to the TX complete interrupt that fires after
      each transmitted packet.
      This patch modifies the handling of TX complete to use NAPI.
      With this patch, my NAT router offers a throughput improved by 21%
      
      Original performance:
      
      [root@localhost tmp]# scp toto pgs:/tmp
      toto                                          100%  256MB   2.8MB/s   01:31
      
      Performance with the patch:
      
      [root@localhost tmp]# scp toto pgs:/tmp
      toto                                          100%  256MB   3.4MB/s   01:16
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d43a396a
    • LEROY Christophe's avatar
      net: fs_enet: Remove non NAPI RX · 583d4a68
      LEROY Christophe authored
      
      
      In the probe function, use_napi is inconditionnaly set to 1. This patch removes
      all the code which is conditional to !use_napi, and removes use_napi which has
      then become useless.
      Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      583d4a68
    • Chun-Hao Lin's avatar
      r8169:add support for RTL8168EP · 935e2218
      Chun-Hao Lin authored
      
      
      RTL8168EP is Realtek PCIe Gigabit Ethernet controller with DASH support.
      It is a successor chip of RTL8168DP.
      
      For RTL8168EP, the read/write ocp register is via eri channel type 2, so I
      move ocp_xxx() related functions under rtl_eri_xxx. And use r8168dp_ocp_xxx()
      for RTL8168DP ocp read/write, r8168ep_ocp_xxx() for RTL8168EP ocp read/write.
      
      The way of checking dash enable is different with RTL8168DP. I use
      r8168dp_check_dash()for RTL8168DP and r8168ep_check_dash() for RTL8168EP,
      to check if dash is enabled.
      
      The driver_start() and driver_stop() of RTL8168EP is also different with
      RTL8168DP. I use rtl8168dp_driver_xxx() for RTL8168DP and
      rtl8168ep_driver_xxx for RTL8168EP.
      
      Right now, RTL8168EP phy mcu did not need firmware code patch, so I did not
      add firmware code for it.
      so I did not add firmware code for it.
      Signed-off-by: default avatarChun-Hao Lin <hau@realtek.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      935e2218
    • WANG Cong's avatar
      net_sched: copy exts->type in tcf_exts_change() · 5301e3e1
      WANG Cong authored
      We need to copy exts->type when committing the change, otherwise
      it would be always 0. This is a quick fix for -net and -stable,
      for net-next tcf_exts will be removed.
      
      Fixes: commit 33be6271
      
       ("net_sched: act: use standard struct list_head")
      Reported-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
      Cc: Jamal Hadi Salim <jhs@mojatatu.com>
      Cc: John Fastabend <john.fastabend@gmail.com>
      Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
      Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5301e3e1
    • Pawel Moll's avatar
      bus: arm-ccn: Fix spurious warning message · fa637bf0
      Pawel Moll authored
      
      
      Because CCN's cycle counter always runs, it will generate
      an interrupt on overflow even if the relevant perf event
      was not requested, causing a spurious warning message.
      
      Fixed now by warning on only normal counter unwanted
      overflows. Also cleaning the overflow mask at init now,
      not to warn on event previously requested by firmware.
      Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      fa637bf0
    • Shawn Guo's avatar
      MAINTAINERS: update Shawn's email address · 5df27823
      Shawn Guo authored
      
      
      My Freescale email address will be gone shortly.  Update my email to be
      the Linaro one.
      Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      5df27823
    • Stephen Warren's avatar
      MAINTAINERS: condense some Tegra related entries · 356d4142
      Stephen Warren authored
      
      
      There's little point having specific entries in MAINTAINERS for Tegra
      drivers that are already covered by the top-level Tegra architecture
      support entry, and maintained by people listed there. Remove the
      duplicates.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Acked-by: default avatarThierry Reding <treding@nvidia.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      356d4142
    • Stephen Warren's avatar
      MAINTAINERS: add Alexandre Courbot for Tegra · 554077c5
      Stephen Warren authored
      
      
      I'd like to propose Alexandre Courbot as an additional Tegra maintainer.
      He's been working on a variety of Tegra-related code for a while, and
      is now officially tasked with working on upstream support.
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Acked-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
      Acked-by: default avatarThierry Reding <treding@nvidia.com>
      --
      v2:
      * Use Alexandre's full name.
      * Use a non-NVIDIA email address to avoid Exchange Server patch corruption.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      554077c5
    • Arnd Bergmann's avatar
      Merge tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-meson into next/dt · ee48874d
      Arnd Bergmann authored
      Merge "Meson6 WDT support" from Carlo Caione:
      
      This patch adds the support for the Meson6 watchdog in the DTSI
      
      * tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-meson
      
      :
        ARM: DTS: meson: update DTSI to add watchdog node
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      ee48874d
    • Linus Torvalds's avatar
      Merge tag 'f2fs-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · da01e614
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "This patch-set introduces a couple of new features such as large
        sector size, FITRIM, and atomic/volatile writes.
      
        Several patches enhance power-off recovery and checkpoint routines.
      
        The fsck.f2fs starts to support fixing corrupted partitions with
        recovery hints provided by this patch-set.
      
        Summary:
         - retain some recovery information for fsck.f2fs
         - enhance checkpoint speed
         - enhance flush command management
         - bug fix for lseek
         - tune in-place-update policies
         - enhance roll-forward speed
         - revisit all the roll-forward and fsync rules
         - support larget sector size
         - support FITRIM
         - support atomic and volatile writes
      
        And several clean-ups and bug fixes are included"
      
      * tag 'f2fs-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (42 commits)
        f2fs: support volatile operations for transient data
        f2fs: support atomic writes
        f2fs: remove unused return value
        f2fs: clean up f2fs_ioctl functions
        f2fs: potential shift wrapping buf in f2fs_trim_fs()
        f2fs: call f2fs_unlock_op after error was handled
        f2fs: check the use of macros on block counts and addresses
        f2fs: refactor flush_nat_entries to remove costly reorganizing ops
        f2fs: introduce FITRIM in f2fs_ioctl
        f2fs: introduce cp_control structure
        f2fs: use more free segments until SSR is activated
        f2fs: change the ipu_policy option to enable combinations
        f2fs: fix to search whole dirty segmap when get_victim
        f2fs: fix to clean previous mount option when remount_fs
        f2fs: skip punching hole in special condition
        f2fs: support large sector size
        f2fs: fix to truncate blocks past EOF in ->setattr
        f2fs: update i_size when __allocate_data_block
        f2fs: use MAX_BIO_BLOCKS(sbi)
        f2fs: remove redundant operation during roll-forward recovery
        ...
      da01e614
    • Linus Torvalds's avatar
      Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux · 6dea0737
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
       "Highlights:
      
         - support the NFSv4.2 SEEK operation (allowing clients to support
           SEEK_HOLE/SEEK_DATA), thanks to Anna.
         - end the grace period early in a number of cases, mitigating a
           long-standing annoyance, thanks to Jeff
         - improve SMP scalability, thanks to Trond"
      
      * 'for-3.18' of git://linux-nfs.org/~bfields/linux: (55 commits)
        nfsd: eliminate "to_delegation" define
        NFSD: Implement SEEK
        NFSD: Add generic v4.2 infrastructure
        svcrdma: advertise the correct max payload
        nfsd: introduce nfsd4_callback_ops
        nfsd: split nfsd4_callback initialization and use
        nfsd: introduce a generic nfsd4_cb
        nfsd: remove nfsd4_callback.cb_op
        nfsd: do not clear rpc_resp in nfsd4_cb_done_sequence
        nfsd: fix nfsd4_cb_recall_done error handling
        nfsd4: clarify how grace period ends
        nfsd4: stop grace_time update at end of grace period
        nfsd: skip subsequent UMH "create" operations after the first one for v4.0 clients
        nfsd: set and test NFSD4_CLIENT_STABLE bit to reduce nfsdcltrack upcalls
        nfsd: serialize nfsdcltrack upcalls for a particular client
        nfsd: pass extra info in env vars to upcalls to allow for early grace period end
        nfsd: add a v4_end_grace file to /proc/fs/nfsd
        lockd: add a /proc/fs/lockd/nlm_end_grace file
        nfsd: reject reclaim request when client has already sent RECLAIM_COMPLETE
        nfsd: remove redundant boot_time parm from grace_done client tracking op
        ...
      6dea0737
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.18-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 25641c0c
      Linus Torvalds authored
      Pull NFS client updates from Trond Myklebust:
       "Highlights include:
      
        Stable fixes:
         - fix an NFSv4.1 state renewal regression
         - fix open/lock state recovery error handling
         - fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails
         - fix statd when reconnection fails
         - don't wake tasks during connection abort
         - don't start reboot recovery if lease check fails
         - fix duplicate proc entries
      
        Features:
        - pNFS block driver fixes and clean ups from Christoph
        - More code cleanups from Anna
        - Improve mmap() writeback performance
        - Replace use of PF_TRANS with a more generic mechanism for avoiding
          deadlocks in nfs_release_page"
      
      * tag 'nfs-for-3.18-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (66 commits)
        NFSv4.1: Fix an NFSv4.1 state renewal regression
        NFSv4: fix open/lock state recovery error handling
        NFSv4: Fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails
        NFS: Fabricate fscache server index key correctly
        SUNRPC: Add missing support for RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT
        NFSv3: Fix missing includes of nfs3_fs.h
        NFS/SUNRPC: Remove other deadlock-avoidance mechanisms in nfs_release_page()
        NFS: avoid waiting at all in nfs_release_page when congested.
        NFS: avoid deadlocks with loop-back mounted NFS filesystems.
        MM: export page_wakeup functions
        SCHED: add some "wait..on_bit...timeout()" interfaces.
        NFS: don't use STABLE writes during writeback.
        NFSv4: use exponential retry on NFS4ERR_DELAY for async requests.
        rpc: Add -EPERM processing for xs_udp_send_request()
        rpc: return sent and err from xs_sendpages()
        lockd: Try to reconnect if statd has moved
        SUNRPC: Don't wake tasks during connection abort
        Fixing lease renewal
        nfs: fix duplicate proc entries
        pnfs/blocklayout: Fix a 64-bit division/remainder issue in bl_map_stripe
        ...
      25641c0c