1. 16 3月, 2017 9 次提交
    • J
      net: stmmac: prepare stmmac_tx_err for multiple queues · 4e593262
      Joao Pinto 提交于
      This patch prepares stmmac_err for multiple queues.
      Signed-off-by: NJoao Pinto <jpinto@synopsys.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4e593262
    • J
      net: stmmac: rx/tx dma start/stop prepared for multiple queues · ae4f0d46
      Joao Pinto 提交于
      This patch prepares the RX/TX DMA stop/start process for multiple queues.
      Signed-off-by: NJoao Pinto <jpinto@synopsys.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ae4f0d46
    • J
      net: stmmac: enable/disable dma irq prepared for multiple queues · 4f513ecd
      Joao Pinto 提交于
      This patch prepares the DMA IRQ enable/disable process for multiple queues.
      Signed-off-by: NJoao Pinto <jpinto@synopsys.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4f513ecd
    • J
      net: stmmac: prepare dma op mode config for multiple queues · 6deee222
      Joao Pinto 提交于
      This patch prepares DMA Operation Mode configuration for multiple queues.
      The work consisted on breaking the DMA operation Mode configuration function
      into RX and TX scope and adapting its mechanism in stmmac_main.
      Signed-off-by: NJoao Pinto <jpinto@synopsys.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6deee222
    • D
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · e0304f58
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      40GbE Intel Wired LAN Driver Updates 2017-03-15
      
      This series contains updates to i40e and i40evf only.
      
      Aaron fixes an issue on x710 devices where simultaneous read accesses
      were interfering with each other, so make sure all devices acquire the
      NVM lock before reads on all devices.
      
      Shannon adds Wake On LAN support feature for x722 devices and cleaned
      up the opcodes so that they are in numerical order.
      
      Mitch adds a client interface to the VF driver, in preparation for the
      upcoming RDMA-capable hardware (and client driver).  Cleaned up the
      client interface in the PF driver, since it was originally over
      engineered to handle multiple clients on multiple netdevs, but that
      did not happen and now there will be one client per driver, so apply
      the "KISS" (Keep It Simple & Stupid) to the i40e client interface.
      Bumped the number of MAC filters an untrusted VF can create.
      
      Jake fixes an issue where a recent refactor of queue pairs accidentally
      added all remaining vecotrs to the num_lan_msix which can adversely
      affect performance.
      
      Lihong fixes an ethtool issue with x722 devices where "-e" will error
      out since its EEPROM has a scope limit at offset 0x5B9FFF, so set the
      EEPROM length to the scope limit.  Also fixed an issue where RSS
      offloading only worked on PF0.
      
      Filip cleans up and clarifies code comment so there is no confusion
      about MAC/VLAN filter initialization routine.
      
      Alex adds support for DMA_ATTR_SKIP_CPU_SYNC and DMA_ATTR_WEAK_ORDERING,
      which improves performance on architectures that implement either one.
      
      Harshitha cleans up confusion on flags disabled due to hardware limitation
      versus featured disabled by the user, so rename auto_disable_flags to
      hw_disabled_flags to avoid the confusion.
      
      v2: Merged patch #1 and #4 in first version to make patch #3 in this
          series based on feedback from David Miller.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e0304f58
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 101c4314
      David S. Miller 提交于
      Conflicts:
      	drivers/net/ethernet/broadcom/genet/bcmgenet.c
      	net/core/sock.c
      
      Conflicts were overlapping changes in bcmgenet and the
      lockdep handling of sockets.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      101c4314
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 95422dec
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "This is a rather large set of fixes. The bulk are for lpfc correcting
        a lot of issues in the new NVME driver code which just went in in the
        merge window.
      
        The others are:
      
         - fix a hang in the vmware paravirt driver caused by incorrect
           handling of the new MSI vector allocation
      
         - long standing bug in storvsc, which recent block changes turned
           from being a harmless annoyance into a hang
      
         - yet more fallout (in mpt3sas) from the changes to device blocking
      
        The remainder are small fixes and updates"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (34 commits)
        scsi: lpfc: Add shutdown method for kexec
        scsi: storvsc: Workaround for virtual DVD SCSI version
        scsi: lpfc: revise version number to 11.2.0.10
        scsi: lpfc: code cleanups in NVME initiator discovery
        scsi: lpfc: code cleanups in NVME initiator base
        scsi: lpfc: correct rdp diag portnames
        scsi: lpfc: remove dead sli3 nvme code
        scsi: lpfc: correct double print
        scsi: lpfc: Rename LPFC_MAX_EQ_DELAY to LPFC_MAX_EQ_DELAY_EQID_CNT
        scsi: lpfc: Rework lpfc Kconfig for NVME options
        scsi: lpfc: add transport eh_timed_out reference
        scsi: lpfc: Fix eh_deadline setting for sli3 adapters.
        scsi: lpfc: add NVME exchange aborts
        scsi: lpfc: Fix nvme allocation bug on failed nvme_fc_register_localport
        scsi: lpfc: Fix IO submission if WQ is full
        scsi: lpfc: Fix NVME CMD IU byte swapped word 1 problem
        scsi: lpfc: Fix RCTL value on NVME LS request and response
        scsi: lpfc: Fix crash during Hardware error recovery on SLI3 adapters
        scsi: lpfc: fix missing spin_unlock on sql_list_lock
        scsi: lpfc: don't dereference dma_buf->iocbq before null check
        ...
      95422dec
    • L
      Merge tag 'gfs2-4.11-rc3.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · aabcf5fc
      Linus Torvalds 提交于
      Pull gfs2 fix from Bob Peterson:
       "This is an emergency patch for 4.11-rc3
      
        The GFS2 developers uncovered a really nasty problem that can lead to
        random corruption and kernel panic, much like the last one. Andreas
        Gruenbacher wrote a simple one-line patch to fix the problem."
      
      * tag 'gfs2-4.11-rc3.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        gfs2: Avoid alignment hole in struct lm_lockname
      aabcf5fc
    • L
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · defc7d75
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
      
       - self-test failure of crc32c on powerpc
      
       - regressions of ecb(aes) when used with xts/lrw in s5p-sss
      
       - a number of bugs in the omap RNG driver
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: s5p-sss - Fix spinlock recursion on LRW(AES)
        hwrng: omap - Do not access INTMASK_REG on EIP76
        hwrng: omap - use devm_clk_get() instead of of_clk_get()
        hwrng: omap - write registers after enabling the clock
        crypto: s5p-sss - Fix completing crypto request in IRQ handler
        crypto: powerpc - Fix initialisation of crc32c context
      defc7d75
  2. 15 3月, 2017 31 次提交