1. 01 10月, 2017 2 次提交
    • F
      Revert "net: dsa: bcm_sf2: Defer port enabling to calling port_enable" · 21a2774e
      Florian Fainelli 提交于
      This reverts commit e85ec74a ("net: dsa: bcm_sf2: Defer port
      enabling to calling port_enable") because this now makes an unbind
      followed by a bind to fail connecting to the ingrated PHY.
      
      What this patch missed is that we need the PHY to be enabled with
      bcm_sf2_gphy_enable_set() before probing it on the MDIO bus. This is
      correctly done in the ops->setup() function, but by the time
      ops->port_enable() runs, this is too late. Upon unbind we would power
      down the PHY, and so when we would bind again, the PHY would be left
      powered off.
      
      Fixes: e85ec74a ("net: dsa: bcm_sf2: Defer port enabling to calling port_enable")
      Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      21a2774e
    • D
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · a6992ebe
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      40GbE Intel Wired LAN Driver Updates 2017-09-29
      
      This series contains updates to i40e and i40evf only.
      
      Jake provides several of the changes starting with the renaming of a
      variable to clarify what the value is actually calculating. Found we
      were misusing the __I40E_RECOVERY_PENDING bit to determine when we
      should actually request a new IRQ in i40e_setup_misc_vector(), which
      lead to a design mistake, so to resolve the issue, use a separate
      state bit for miscellaneous IRQ setup and fix up the design while we
      are at it.  Cleaned up the old legacy PM support in the driver since
      we support the newer generic PM callbacks.  Fixed a failure to
      hibernate issue, where on some platforms with a large number of CPUs,
      we would allocate many IRQ vectors which we would try to migrate to
      CPU0 when hibernating.
      
      Sudheer cleans up a check for unqualified module inside i40e_up_complete()
      because the link state information is in flux at time, so log messages
      are getting logged with incorrect link state information.  Also provided
      additional log message cleanups and simplify member variable access in
      the printing of the link messages.
      
      Mariusz relaxes the firmware check since Fortville and Fort Park NICs
      can and do have different firmware versions, so only warn for older
      Fortville firmware.  Fixed an errata with a flow director statistic that
      was not wrapping as expected, simply reset after reading.
      
      Mitch prevents consternation by lowering the log level to debug on a
      message seen regularly on VF reset or unload, which is meaningless under
      normal circumstances.  Refactor the firmware version checking since
      Fortville and Fort Park devices can have different firmware versions.
      
      Alan fixes a ring to vector mapping, where the past implementation
      attempted to map each Tx and Rx ring to its own vector, however we use
      combined queues so we should be mapping the Tx/Rx rings together on one
      vector.  Adds the ability for the VF to request a different number of
      queues allocated to it.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a6992ebe
  2. 30 9月, 2017 18 次提交
  3. 29 9月, 2017 20 次提交