1. 19 Jan, 2020 5 commits
    • Dejin Zheng's avatar
      net: phy: adin: fix a warning about msleep · 0c58ac1e
      Dejin Zheng authored
      found a warning by the following command:
      ./scripts/checkpatch.pl -f drivers/net/phy/adin.c
      
      WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.rst
       #628: FILE: drivers/net/phy/adin.c:628:
      +	msleep(10);
      Signed-off-by: default avatarDejin Zheng <zhengdejin5@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0c58ac1e
    • David S. Miller's avatar
      Merge branch 'Rate-adaptation-for-Felix-DSA-switch' · d82f2872
      David S. Miller authored
      Vladimir Oltean says:
      
      ====================
      Rate adaptation for Felix DSA switch
      
      When operating the MAC at 2.5Gbps (2500Base-X and USXGMII/QSXGMII) and
      in combination with certain PHYs, it is possible that the copper side
      may operate at lower link speeds. In this case, it is the PHY who has a
      MAC inside of it that emits pause frames towards the switch's MAC,
      telling it to slow down so that the transmission is lossless.
      
      These patches are the support needed for the switch side of things to
      work.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d82f2872
    • Alex Marginean's avatar
      net: dsa: felix: Allow PHY to AN 10/100/1000 with 2500 serdes link · 74984a19
      Alex Marginean authored
      If the serdes link is set to 2500 using interfce type 2500base-X, lower
      link speeds over on the line side should still be supported.
      Rate adaptation is done out of band, in our case using AQR PHYs this is
      done using flow control.
      Signed-off-by: default avatarAlex Marginean <alexandru.marginean@nxp.com>
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      74984a19
    • Alex Marginean's avatar
      net: dsa: felix: Handle PAUSE RX regardless of AN result · f3660937
      Alex Marginean authored
      Flow control is used with 2500Base-X and AQR PHYs to do rate adaptation
      between line side 100/1000 links and MAC running at 2.5G.
      
      This is independent of the flow control configuration settled on line
      side though AN.
      
      In general, allowing the MAC to handle flow control even if not
      negotiated with the link partner should not be a problem, so the patch
      just enables it in all cases.
      Signed-off-by: default avatarAlex Marginean <alexandru.marginean@nxp.com>
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f3660937
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 7f013ede
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter updates for net-next
      
      The following patchset contains Netfilter updates for net-next, they are:
      
      1) Incorrect uapi header comment in bitwise, from Jeremy Sowden.
      
      2) Fetch flow statistics if flow is still active.
      
      3) Restrict flow matching on hardware based on input device.
      
      4) Add nf_flow_offload_work_alloc() helper function.
      
      5) Remove the last client of the FLOW_OFFLOAD_DYING flag, use teardown
         instead.
      
      6) Use atomic bitwise operation to operate with flow flags.
      
      7) Add nf_flowtable_hw_offload() helper function to check for the
         NF_FLOWTABLE_HW_OFFLOAD flag.
      
      8) Add NF_FLOW_HW_REFRESH to retry hardware offload from the flowtable
         software datapath.
      
      9) Remove indirect calls in xt_hashlimit, from Florian Westphal.
      
      10) Add nf_flow_offload_tuple() helper to consolidate code.
      
      11) Add nf_flow_table_offload_cmd() helper function.
      
      12) A few whitespace cleanups in nf_tables in bitwise and the bitmap/hash
          set types, from Jeremy Sowden.
      
      13) Cleanup netlink attribute checks in bitwise, from Jeremy Sowden.
      
      14) Replace goto by return in error path of nft_bitwise_dump(), from
          Jeremy Sowden.
      
      15) Add bitwise operation netlink attribute, also from Jeremy.
      
      16) Add nft_bitwise_init_bool(), from Jeremy Sowden.
      
      17) Add nft_bitwise_eval_bool(), also from Jeremy.
      
      18) Add nft_bitwise_dump_bool(), from Jeremy Sowden.
      
      19) Disallow hardware offload for other that NFT_BITWISE_BOOL,
          from Jeremy Sowden.
      
      20) Add NFTA_BITWISE_DATA netlink attribute, again from Jeremy.
      
      21) Add support for bitwise shift operation, from Jeremy Sowden.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7f013ede
  2. 18 Jan, 2020 1 commit
    • David S. Miller's avatar
      Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 9aaa2949
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2020-01-17
      
      This series contains updates to igc, i40e, fm10k and ice drivers.
      
      Sasha fixes a typo in a code comment that referred to silicon that is
      not supported in the igc driver.  Cleaned up a defined that was not
      being used.  Added support for another i225 SKU which does not have an
      NVM.  Added support for TCP segmentation offload (TSO) into igc.  Added
      support for PHY power management control to provide a reliable and
      accurate indication of PHY reset completion.
      
      Jake adds support for the new txqueue parameter to the transmit timeout
      function in fm10k which reduces the code complexity when determining
      which transmit queue is stuck.
      
      Julio Faracco makes the similar changes that Jake did for fm10k, for
      i40e and ice drivers.  Added support for the new txqueue parameter in
      the transmit timeout functions for i40e and ice.
      
      Colin Ian King cleans up a redundant initialization of a local variable.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9aaa2949
  3. 17 Jan, 2020 20 commits
  4. 16 Jan, 2020 14 commits