1. 28 Jul, 2017 5 commits
    • Florian Fainelli's avatar
      net: phy: Remove stale comments referencing timer · fb5e7606
      Florian Fainelli authored
      Since commit a390d1f3 ("phylib: convert state_queue work to
      delayed_work"), the PHYLIB state machine was converted to use delayed
      workqueues, yet some functions were still referencing the PHY library
      timer in their comments, fix that and remove the now unused
      linux/timer.h include.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fb5e7606
    • David S. Miller's avatar
      Merge branch 'nfp-extend-firmware-request-logic' · 122323f7
      David S. Miller authored
      Jakub Kicinski says:
      
      ====================
      nfp: extend firmware request logic
      
      We have been pondering for some time how to support loading different
      application firmwares onto NFP.  We want to support both users selecting
      one of the firmware images provided by Netronome (which are optimized
      for different use cases each) as well as firmware images created  by
      users themselves or other companies.
      
      In the end we decided to go with the simplest solution - depending on
      the right firmware image being placed in /lib/firmware.  This vastly
      simplifies driver logic and also doesn't require any new API.
      
      Different NICs on one system may want to run different applications
      therefore we first try to load firmware specific to the device (by
      serial number of PCI slot) and if not present try the device model
      based name we have been using so far.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      122323f7
    • Jakub Kicinski's avatar
      nfp: only use direct firmware requests · 1680a370
      Jakub Kicinski authored
      request_firmware() will fallback to user space helper and may cause
      long delays when driver is loaded if udev doesn't correctly handle
      FW requests.  Since we never really made use of the user space
      helper functionality switch to the simpler request_firmware_direct()
      call.  The side effect of this change is that no warning will be
      printed when the FW image does not exists.  To help users figure
      out which FW file is missing print a info message when we request
      each file.
      Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1680a370
    • Jakub Kicinski's avatar
      nfp: look for firmware image by device serial number and PCI name · 9511f298
      Jakub Kicinski authored
      We generally look up firmware by card type, but that doesn't allow
      users who have more than one card of the same type in their system
      to select firmware per adapter.
      
      Unfortunately user space firmware helper seems fraught with
      difficulties and to be on its way out.  In particular support for
      handling firmware uevents have been dropped from systemd and most
      distributions don't enable the FW fallback by default any more.
      
      To allow users selecting firmware for a particular device look up
      firmware names by serial and pci_name().  Use the direct lookup to
      disable generating uevents when enabled in Kconfig and not print
      any warnings to logs if adapter-specific files are missing.  Users
      can place in /lib/firmware/netronome files named:
      
      pci-${pci_name}.nffw
      serial-${serial}.nffw
      
      to target a specific card.  E.g.:
      
      pci-0000:04:00.0.nffw
      pci-0000:82:00.0.nffw
      serial-00-aa-bb-11-22-33-10-ff.nffw
      
      We use the full serial number including the interface id, as it
      appears in lspci output (bytes separated by '-').
      Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9511f298
    • Jakub Kicinski's avatar
      nfp: remove the probe deferral when FW not present · 26a8985f
      Jakub Kicinski authored
      We use a hack to defer probe when firmware was not pre-loaded
      or found on disk.  This helps in case users forgot to include
      firmware in initramfs, the driver will most likely get another
      shot at probing after real root is mounted.
      
      This is not for what EPROBE_DEFER is supposed to be used, and
      when FW is completely missing every time new device is probed
      NFP will reprobe spamming kernel logs.
      
      Remove this hack, users will now have to make sure the right
      firmware image is present in initramfs if nfp.ko is placed
      there or built in.
      Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      26a8985f
  2. 27 Jul, 2017 8 commits
  3. 26 Jul, 2017 19 commits
  4. 25 Jul, 2017 8 commits