1. 11 10月, 2014 15 次提交
  2. 10 10月, 2014 12 次提交
  3. 09 10月, 2014 13 次提交
    • D
      Merge branch 'gianfar' · ea97caee
      David S. Miller 提交于
      Claudiu Manoil says:
      
      ====================
      gianfar: ARM port driver updates (1/2)
      
      This is the first round of driver portability fixes and clean-up
      with the main purpose to make gianfar portable on ARM, for the ARM
      based SoC that integrates the eTSEC ethernet controller - "ls1021a".
      The patches primarily address compile time errors, when compiling
      gianfar on ARM.  They replace PPC specific functions and macros
      with architecture independent ones, solve arch specific header
      inclusions, guard code that relates to PPC only, and even address
      some simple endianess issues (see MAC address setup patch).
      The patches addressing the bulk of remaining endianess issues,
      like handling DMA fields (BD and FCB), will follow with the second
      round.
      ====================
      Reviewed-by: NKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ea97caee
    • C
      gianfar: Replace eieio with wmb for non-PPC archs · d55398ba
      Claudiu Manoil 提交于
      Replace PPC specific eieio() with arch independent wmb()
      for other architectures, i.e. ARM.
      The eieio() macro is not defined on ARM and generates
      build error.
      Signed-off-by: NClaudiu Manoil <claudiu.manoil@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d55398ba
    • C
      gianfar: Replace spin_event_timeout() with arch independent · a4feee89
      Claudiu Manoil 提交于
      Use arch independent code to replace the powerpc dependent
      spin_event_timeout() from gfar_halt_nodisable().
      Added GRS/GTS read accessors to clean-up the implementation
      of gfar_halt_nodisable().
      Signed-off-by: NClaudiu Manoil <claudiu.manoil@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a4feee89
    • C
      gianfar: Make MAC addr setup endian safe, cleanup · 83bfc3c4
      Claudiu Manoil 提交于
      Fix the 32-bit memory access that is not endian safe,
      i.e. not giving the desired byte layout for a LE CPU:
      tempval = *((u32 *) (tmpbuf + 4)), where 'char tmpbuf[]'.
      
      Get rid of rendundant local vars (tmpbuf[] and idx) and
      forced casts.  Cleanup comments.
      Signed-off-by: NClaudiu Manoil <claudiu.manoil@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      83bfc3c4
    • C
      gianfar: Exclude PPC specific errata handling from ARM builds · d6ef0bcc
      Claudiu Manoil 提交于
      This excludes the PPC specific instructions for PPC based SoC
      (MPC85xx family) version identification from ARM builds.
      The PPC specific macro mfspr() from asm/reg.h is not defined
      by the ARM architecture.
      Signed-off-by: NClaudiu Manoil <claudiu.manoil@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d6ef0bcc
    • C
      gianfar: Include missing headers for ARM builds · fd31a952
      Claudiu Manoil 提交于
      Include linux/of_address.h for of_iomap() and linux/of_irq.h
      for irq_of_parse_and_map().
      
      This wasn't an issue for PPC, because these were implicitly
      included from asm/prom.h (via linux/of.h) for PPC builds only.
      ARM builds need these includes explicitly.
      Signed-off-by: NClaudiu Manoil <claudiu.manoil@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fd31a952
    • C
      net/fsl_pq_mdio: Replace spin_event_timeout() with arch independent · e4b081f5
      Claudiu Manoil 提交于
      spin_event_timeout() is PPC dependent, use an arch independent
      equivalent instead.
      Signed-off-by: NClaudiu Manoil <claudiu.manoil@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e4b081f5
    • C
      net/fsl_pq_mdio: Use ioread/iowrite32be() portable accessors · f5bbd262
      Claudiu Manoil 提交于
      in_be32()/out_be32() are not defined by ARM.
      Signed-off-by: NClaudiu Manoil <claudiu.manoil@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f5bbd262
    • C
      net/fsl_pq_mdio: Fix asm/ucc.h compile error for ARM · 9a4cbd53
      Claudiu Manoil 提交于
      The UCC specific code included in fsl_pq_mdio.c (with
      function calls from asm/ucc.h) is already guarded
      by these config options, so this ARM build fix only
      provides consistency with the rest UCC specific code.
      Signed-off-by: NClaudiu Manoil <claudiu.manoil@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9a4cbd53
    • F
      netlabel: kernel-doc warning fix · 59f35b81
      Fabian Frederick 提交于
      no secid argument in netlbl_cfg_unlbl_static_del
      Signed-off-by: NFabian Frederick <fabf@skynet.be>
      Acked-by: NPaul Moore <paul@paul-moore.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      59f35b81
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 35a9ad8a
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d5935b07
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f86dc4b0
      Linus Torvalds 提交于
      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