1. 28 Dec, 2017 14 commits
    • David S. Miller's avatar
      Merge branch 'mlx4-misc-for-4.16' · 8d1666fd
      David S. Miller authored
      Tariq Toukan says:
      
      ====================
      mlx4 misc for 4.16
      
      This patchset contains misc cleanups and improvements
      to the mlx4 Core and Eth drivers.
      
      In patches 1 and 2 I reduce and reorder the branches in the RX csum flow.
      In patch 3 I align the FMR unmapping flow with the device spec, to allow
        a remapping afterwards.
      Patch 4 by Moni changes the default QoS settings so that a pause
        frame stops all traffic regardless of its prio.
      
      Series generated against net-next commit:
      836df24a net: hns3: hns3_get_channels() can be static
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8d1666fd
    • Moni Shoua's avatar
      net/mlx4_en: Change default QoS settings · a42b63c1
      Moni Shoua authored
      Change the default mapping between TC and TCG as follows:
      
      Prio     |             TC/TCG
               |      from             to
               |    (set by FW)      (set by SW)
      ---------+-----------------------------------
      0        |      0/0              0/7
      1        |      1/0              0/6
      2        |      2/0              0/5
      3        |      3/0              0/4
      4        |      4/0              0/3
      5        |      5/0              0/2
      6        |      6/0              0/1
      7        |      7/0              0/0
      
      These new settings cause that a pause frame for any prio stops
      traffic for all prios.
      
      Fixes: 564c274c ("net/mlx4_en: DCB QoS support")
      Signed-off-by: default avatarMoni Shoua <monis@mellanox.com>
      Signed-off-by: default avatarMaor Gottlieb <maorg@mellanox.com>
      Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a42b63c1
    • Tariq Toukan's avatar
      net/mlx4_core: Cleanup FMR unmapping flow · fd4a3e28
      Tariq Toukan authored
      Remove redundant and not essential operations in fmr unmap/free.
      According to device spec, in FMR unmap it is sufficient to set
      ownership bit to SW. This allows remapping afterwards.
      
      Fixes: 8ad11fb6 ("IB/mlx4: Implement FMRs")
      Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
      Signed-off-by: default avatarMoshe Shemesh <moshe@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fd4a3e28
    • Tariq Toukan's avatar
      net/mlx4_en: RX csum, reorder branches · dc484851
      Tariq Toukan authored
      Use early goto commands, and save else branches.
      This uses less indentations and brackets, making the code
      more readable.
      Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      dc484851
    • Tariq Toukan's avatar
      net/mlx4_en: RX csum, remove redundant branches and checks · 345ef18c
      Tariq Toukan authored
      Do not check IPv6 bit in cqe status if CONFIG_IPV6 is not enabled.
      Function check_csum() is reached only with IPv4 or IPv6 set (if enabled),
      if IPv6 is not set (or is not enabled) it is redundant to test the
      IPv4 bit.
      Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      345ef18c
    • Jiri Pirko's avatar
      net: sched: don't set extack message in case the qdisc will be created · 8ec69574
      Jiri Pirko authored
      If the qdisc is not found here, it is going to be created. Therefore,
      this is not an error path. Remove the extack message set and don't
      confuse user with error message in case the qdisc was created
      successfully.
      
      Fixes: 09215598 ("net: sched: sch_api: handle generic qdisc errors")
      Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8ec69574
    • David S. Miller's avatar
      Merge branch 'AVE-ethernet' · d3dbd7a6
      David S. Miller authored
      Kunihiko Hayashi says:
      
      ====================
      net: add UniPhier AVE ethernet support
      
      This series adds support for Socionext AVE ethernet controller implemented
      on UniPhier SoCs. This driver supports RGMII/RMII modes.
      
      v8: https://www.spinics.net/lists/netdev/msg474374.html
      
      The PHY patch included in v1 has already separated in:
      http://www.spinics.net/lists/netdev/msg454595.html
      
      Changes since v8:
      - move operators at the beginning of the line to the end of the previous line
      - dt-bindings: add blank lines before mdio and phy subnodes
      
      Changes since v7:
      - dt-bindings: fix mdio subnode description
      
      Changes since v6:
      - sort the order of local variables from longest to shortest line
      - fix ave_probe() which calls register_netdev() at the end of initialization
      - dt-bindings: remove phy node descriptions in mdio node
      
      Changes since v5:
      - replace license boilerplate with SPDX Identifier
      - remove inline directives and an unused function
      
      Changes since v4:
      - fix larger integer warning on AVE_PFMBYTE_MASK0
      
      Changes since v3:
      - remove checking dma address and use dma_set_mask() to restirct address
      - replace ave_mdio_busywait() with read_poll_timeout()
      - replace functions to access to registers with readl/writel() directly
      - replace a function to access to macaddr with ave_hw_write_macaddr()
      - change return value of ave_dma_map() to error value
      - move mdiobus_unregister() from ave_remove() to ave_uninit()
      - eliminate else block at the end of ave_dma_map()
      - add mask definitions for packet filter
      - sort bitmap definitions in descending order
      - add error check to some functions
      - rename and sort functions to clear sub-categories
      - fix error value consistency
      - remove unneeded initializers
      - change type of constant arrays
      
      Changes since v2:
      - replace clk_get() with devm_clk_get()
      - replace reset_control_get() with devm_reset_control_get_optional_shared()
      - add error return when the error occurs on the above *_get functions
      - sort soc data and compatible strings
      - remove clearly obvious comments
      - modify dt-bindings document consistent with these modifications
      
      Changes since v1:
      - add/remove devicetree properties and sub-node
        - remove "internal-phy-interrupt" and "desc-bits" property
        - add SoC data structures based on compatible strings
        - add node operation to apply "mdio" sub-node
      - add support for features
        - add support for {get,set}_pauseparam and pause frame operations
        - add support for ndo_get_stats64 instead of ndo_get_stats
      - replace with desiable functions
        - replace check for valid phy_mode with phy_interface{_mode}_is_rgmii()
        - replace phy attach message with phy_attached_info()
        - replace 32bit operation with {upper,lower}_32_bits() on ave_wdesc_addr()
        - replace nway_reset and get_link with generic functions
      - move operations to proper functions
        - move phy_start_aneg() to ndo_open,
          and remove unnecessary PHY interrupt operations
          See http://www.spinics.net/lists/netdev/msg454590.html
        - move irq initialization and descriptor memory allocation to ndo_open
        - move initialization of reset and clock and mdiobus to ndo_init
      - fix skbuffer operations
        - fix skb alignment operations and add Rx buffer adjustment for descriptor
          See http://www.spinics.net/lists/netdev/msg456014.html
        - add error returns when dma_map_single() failed
      - clean up code structures
        - clean up wait-loop and wake-queue conditions
        - add ave_wdesc_addr() and offset definitions
        - add ave_macaddr_init() to clean up mac-address operation
        - fix checking whether Tx entry is not enough
        - fix supported features of phydev
        - add necessary free/disable operations
        - add phydev check on ave_{get,set}_wol()
        - remove netif_carrier functions, phydev initializer, and Tx budget check
      - change obsolate codes
        - replace ndev->{base_addr,irq} with the members of ave_private
      - rename goto labels and mask definitions, and remove unused codes
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d3dbd7a6
    • Kunihiko Hayashi's avatar
      net: ethernet: socionext: add AVE ethernet driver · 4c270b55
      Kunihiko Hayashi authored
      The UniPhier platform from Socionext provides the AVE ethernet
      controller that includes MAC and MDIO bus supporting RGMII/RMII
      modes. The controller is named AVE.
      Signed-off-by: default avatarKunihiko Hayashi <hayashi.kunihiko@socionext.com>
      Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4c270b55
    • Kunihiko Hayashi's avatar
      dt-bindings: net: add DT bindings for Socionext UniPhier AVE · c5a9ef30
      Kunihiko Hayashi authored
      DT bindings for the AVE ethernet controller found on Socionext's
      UniPhier platforms.
      Signed-off-by: default avatarKunihiko Hayashi <hayashi.kunihiko@socionext.com>
      Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
      Acked-by: default avatarRob Herring <robh@kernel.org>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c5a9ef30
    • Ganesh Goudar's avatar
      cxgb4/cxgb4vf: support for XLAUI Port Type · b39ab140
      Ganesh Goudar authored
      Add support for new Backplane XLAUI port type.
      Signed-off-by: default avatarCasey Leedom <leedom@chelsio.com>
      Signed-off-by: default avatarGanesh Goudar <ganeshgr@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b39ab140
    • Ganesh Goudar's avatar
      cxgb4: display VNI correctly · b9525301
      Ganesh Goudar authored
      Fix incorrect VNI display in mps_tcam
      Signed-off-by: default avatarSantosh Rastapur <santosh@chelsio.com>
      Signed-off-by: default avatarGanesh Goudar <ganeshgr@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b9525301
    • kbuild test robot's avatar
      net: hns3: hns3_get_channels() can be static · 836df24a
      kbuild test robot authored
      Fixes: 482d2e9c ("net: hns3: add support to query tqps number")
      Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      836df24a
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next · fcffe2ed
      David S. Miller authored
      Daniel Borkmann says:
      
      ====================
      pull-request: bpf-next 2017-12-28
      
      The following pull-request contains BPF updates for your *net-next* tree.
      
      The main changes are:
      
      1) Fix incorrect state pruning related to recognition of zero initialized
         stack slots, where stacksafe exploration would mistakenly return a
         positive pruning verdict too early ignoring other slots, from Gianluca.
      
      2) Various BPF to BPF calls related follow-up fixes. Fix an off-by-one
         in maximum call depth check, and rework maximum stack depth tracking
         logic to fix a bypass of the total stack size check reported by Jann.
         Also fix a bug in arm64 JIT where prog->jited_len was uninitialized.
         Addition of various test cases to BPF selftests, from Alexei.
      
      3) Addition of a BPF selftest to test_verifier that is related to BPF to
         BPF calls which demonstrates a late caller stack size increase and
         thus out of bounds access. Fixed above in 2). Test case from Jann.
      
      4) Addition of correlating BPF helper calls, BPF to BPF calls as well
         as BPF maps to bpftool xlated dump in order to allow for better
         BPF program introspection and debugging, from Daniel.
      
      5) Fixing several bugs in BPF to BPF calls kallsyms handling in order
         to get it actually to work for subprogs, from Daniel.
      
      6) Extending sparc64 JIT support for BPF to BPF calls and fix a couple
         of build errors for libbpf on sparc64, from David.
      
      7) Allow narrower context access for BPF dev cgroup typed programs in
         order to adapt to LLVM code generation. Also adjust memlock rlimit
         in the test_dev_cgroup BPF selftest, from Yonghong.
      
      8) Add netdevsim Kconfig entry to BPF selftests since test_offload.py
         relies on netdevsim device being available, from Jakub.
      
      9) Reduce scope of xdp_do_generic_redirect_map() to being static,
         from Xiongwei.
      
      10) Minor cleanups and spelling fixes in BPF verifier, from Colin.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fcffe2ed
    • Jakub Kicinski's avatar
      nfp: bpf: allocate vNIC priv for keeping track of the offloaded program · 4f83435a
      Jakub Kicinski authored
      After TC offloads were converted to callbacks we have no choice
      but keep track of the offloaded filter in the driver.
      
      Since this change came a little late in the release cycle
      there were a number of conflicts and allocation of vNIC priv
      structure seems to have slipped away in linux-next.
      Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4f83435a
  2. 27 Dec, 2017 26 commits