1. 20 3月, 2014 10 次提交
  2. 19 3月, 2014 12 次提交
  3. 18 3月, 2014 18 次提交
    • D
      Merge branch 'altera_tse' · 33125df3
      David S. Miller 提交于
      Vince Bridgers says:
      
      ====================
      Altera Triple Speed Ethernet (TSE) Driver
      
      This is the version 6 submission for the Altera Triple Speed Ethernet (TSE)
      driver. All comments received during the version 2, 3, 4, and 5 submissions
      have been accepted. Please find the change log and a description of the
      submission below.
      
      If you find the submission acceptable, please consider this patch set for
      inclusion into the Linux kernel.
      
      V6: Address comments from V5 review
          - add call to skb_tx_timestamp in the drivers transmit path
          - correct use of unsigned int where it was cast to pointer. Use types
            appropriate for intended and correct use to let the compiler warn us
            when type usage is incorrect.
          - use correct semantics for pointer arithmetic in same code path
      
      V5: Address comments from V4 review
          - Add descriptions of statistics to driver documentation. The statstics
            supported by the driver/controller map to IEEE and RFC statistics, and
            the names and mappings are described in the user documentation.
          - Change "unsigned int" to u32 in device structure definitions
          - Change used of netdev_warn to netif_warn in altera_sgdma.c
          - Change stat name rx_fifo_drops to ether_drops to match the event
            actually counted by the hardware.
      
      V4: Address comments from V3 review
          - Change statistics names in ethtool module to follow common use in
            other ethernet drivers.
          - remove an unnecessary case in ethtool module
          - change logging to use netdev_* where possible instead of dev_*
          - remove logging for OOM errors since those are already logged
      
      V3: Address comments from V2 review
          - Reorder patch submission so that net/ethernet Makefile and Kconfig
            are committed last, thus not breaking bisect
          - Use of_get_mac_address instead of of_get_property
          - Change supplemental and hash configuration bindings to boolean/empty,
            and more meaningful names
          - Add check for failure from calls to of_phy_connect and
            connect_local_phy
          - Correct code to find mdio child node
          - Update bindings document
          - Remove cast to u64 when not necessary
          - add use of const for statistics strings
      
      V2: Address comments from initial RFC review.
          - The driver files were broken up by major sections of functionality.
            These include MSGDMA, SGDMA, Misc, and Main.
          - Add patch for MAINTAINERS file, add the maintainer for this submission
          - Use 32-bit lower/upper physical address accessor functions so the driver
            is 64-bit ready.
          - Use standard bindings where applicable. Especially phy-addr, and change
            "altr,rx-fifo-depth" to "rx-fifo-depth" and "altr,tx-fifo-depth" to
            "tx-fifo-depth".
          - Add use of max-frame-size property
          - Update bindings documents accordingly
          - Correct interrupt handler to use budget parameter in the convential way
          - Use macros consistently to define bit fields across files
          - Correct include exclusion macro in altera_msgdmahw.h (typo)
          - Remove use of barriers, these were not necessary since the DMA APIs
            ensure memory & buffer consistency
          - Remove use of netif_carrier_off in driver
          - move probing of phy from the open function to the probe function
          - use of_get_phy_mode instead of custom function
          - Use the .data field in the device structure to obtain a pointer
            to SGDMA or MSGDMA device specific properties and functions.
          - remove custom function to access devicetree since Altera specific
            bindings requiring it's use have been deprecated in favor of
            standard bindings.
      
      The Altera TSE is a 10/100/1000 Mbps Ethernet soft IP component that can be
      configured and synthesized using Quartus, and programmed into Altera FPGAs.
      Two types of soft DMA IP components are supported by this driver - the Altera
      SGDMA and the MSGDMA. The MSGDMA DMA component is preferred over the SGDMA,
      since the SGDMA will be deprecated in favor of the MSGDMA. Software supporting
      both is provided for customers still using the SGDMA and to demonstrate how
      multiple types of DMA engines may be supported by the TSE driver in the event
      customers wish to develop their own custom soft DMA engine for particular
      applications.
      
      The design has been tested on Altera's Cyclone 4, 5, and Cyclone 5 SOC
      development kits using an ARM A9 processor and an Altera NIOS2 processor.
      Differences in CPU/DMA coherency management and address alignment are
      addressed by proper use of driver APIs and semantics.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      33125df3
    • V
      net: ethernet: Change Ethernet Makefile and Kconfig for Altera TSE driver · f7b18249
      Vince Bridgers 提交于
      This patch changes the Ethernet Makefile and Kconfig files to add the Altera
      Ethernet driver component.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f7b18249
    • V
      MAINTAINERS: Add entry for Altera Triple Speed Ethernet Driver · 16b8b922
      Vince Bridgers 提交于
      Add a MAINTAINERS entry covering the Altera Triple Speed
      Ethernet Driver, with support for the MSGDMA and SGDMA
      soft DMA IP components.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      16b8b922
    • V
      Altera TSE: Add Altera Ethernet Driver Makefile and Kconfig · ed33ef64
      Vince Bridgers 提交于
      This patch adds the Altera Triple Speed Ethernet Makfile and
      Kconfig file.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ed33ef64
    • V
      Altera TSE: Add main and header file for Altera Ethernet Driver · bbd2190c
      Vince Bridgers 提交于
      This patch adds the main driver and header file for the Altera Triple
      Speed Ethernet driver.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bbd2190c
    • V
      Altera TSE: Add Miscellaneous Files for Altera Ethernet Driver · 6c3324a9
      Vince Bridgers 提交于
      This patch adds miscellaneous files for the Altera Ethernet Driver,
      including ethtool support.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6c3324a9
    • V
      Altera TSE: Add Altera Ethernet Driver SGDMA file components · f64f8808
      Vince Bridgers 提交于
      This patch adds the SGDMA soft IP support for the Altera Triple
      Speed Ethernet driver.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f64f8808
    • V
      Altera TSE: Add Altera Ethernet Driver MSGDMA File Components · 94fb0ef4
      Vince Bridgers 提交于
      This patch adds the MSGDMA soft IP support for the Altera Triple
      Speed Ethernet driver.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      94fb0ef4
    • V
      Documentation: networking: Add Altera Ethernet (TSE) Documentation · 04add4ab
      Vince Bridgers 提交于
      This patch adds a bindings description for the Altera Triple Speed Ethernet
      (TSE) driver. The bindings support the legacy SGDMA soft IP as well as the
      preferred MSGDMA soft IP. The TSE can be configured and synthesized in soft
      logic using Altera's Quartus toolchain. Please consult the bindings document
      for supported options.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      04add4ab
    • V
      dts: Add bindings for the Altera Triple Speed Ethernet driver · d6da06fc
      Vince Bridgers 提交于
      This patch adds a bindings description for the Altera Triple Speed Ethernet
      (TSE) driver. The bindings support the legacy SGDMA soft IP as well as the
      preferred MSGDMA soft IP. The TSE can be configured and synthesized in soft
      logic using Altera's Quartus toolchain. Please consult the bindings document
      for supported options.
      Signed-off-by: NVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d6da06fc
    • E
      netfilter: conntrack: Fix UP builds · d5d20912
      Eric Dumazet 提交于
      ARRAY_SIZE(nf_conntrack_locks) is undefined if spinlock_t is an
      empty structure. Replace it by CONNTRACK_LOCKS
      
      Fixes: 93bb0ceb ("netfilter: conntrack: remove central spinlock nf_conntrack_lock")
      Reported-by: Nkbuild test robot <fengguang.wu@intel.com>
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Cc: Jesper Dangaard Brouer <brouer@redhat.com>
      Cc: Pablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d5d20912
    • D
      Merge branch 'at86rf230' · e73087af
      David S. Miller 提交于
      Alexander Aring says:
      
      ====================
      at86rf230: various fixes and devicetree support
      
      this patch series fix some bugs with the at86rf231 chip and cleaup some code.
      Also add devicetree support for the at86rf230 driver.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e73087af
    • A
      at86rf230: add support for devicetree · fa2d3e94
      Alexander Aring 提交于
      This patch adds devicetree support for the at86rf230 driver.
      
      Possible gpios to configure are "reset-gpio" and "sleep-gpio".
      Also add support to configure the "irq-type" for the irq polarity
      register.
      Signed-off-by: NAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fa2d3e94
    • A
      at86rf230: make reset pin optionally · 3fa27571
      Alexander Aring 提交于
      This patch make the reset pin optionally. Some devices like the atben
      from qi-hardware don't have a reset pin externally. The usually way is
      to turn power off/on for the atben device to initiate a device reset.
      Signed-off-by: NAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3fa27571
    • A
      at86rf230: change reset timings · 56f023fb
      Alexander Aring 提交于
      While checkpatch another patch I got a:
      
      "WARNING: msleep < 20ms can sleep for up to 20ms"
      
      The datasheet of at86rf231 and at86rf212 says a minimum delay for reset
      pulse width and spi access latency after reset is 625 nanoseconds.
      
      This patch removes the 1 milliseconds sleep and replace it with a 1
      microseconds udelay which should be also okay for the reset pulse width.
      
      To change the state from RESET -> TRX_OFF the at86rf230 device needs 120
      microseconds, this is a worst case of all at86rf* chips.
      Signed-off-by: NAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      56f023fb
    • A
      at86rf230: move locking state in xmit · 7e814618
      Alexander Aring 提交于
      There is no need to lock the clearing of IRQ_TRX_END in status.
      Signed-off-by: NAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7e814618
    • A
      at86rf230: fix unexpected state change · 7332fcb8
      Alexander Aring 提交于
      This patch fix a unexpected state change for the at86rf231 chip.
      We can't change into STATE_FORCE_TX_ON while the chip is in one of
      SLEEP, P_ON, RESET, TRX_OFF, and all *_NOCLK states.
      
      In this case we are in the TRX_OFF state. See datasheet [1] page 71 for
      more information.
      
      Without this patch you will get the following message on a at86rf231 device:
      
      [   20.065218] unexpected state change: 8, asked for 4
      [   20.070527] ------------[ cut here ]------------
      [   20.075414] WARNING: CPU: 0 PID: 160 at net/mac802154/ieee802154_dev.c:43 mac802154_slave_open+0x70/0xb8()
      [   20.085594] Modules linked in: autofs4
      [   20.089667] CPU: 0 PID: 160 Comm: ifconfig Not tainted 3.14.0-20140108-1-00993-g905c192 #162
      [   20.098612] [<c00127b8>] (unwind_backtrace) from [<c0010b1c>] (show_stack+0x10/0x14)
      [   20.106819] [<c0010b1c>] (show_stack) from [<c0033838>] (warn_slowpath_common+0x60/0x80)
      [   20.115311] [<c0033838>] (warn_slowpath_common) from [<c00338e8>] (warn_slowpath_null+0x18/0x20)
      [   20.124590] [<c00338e8>] (warn_slowpath_null) from [<c057b7e8>] (mac802154_slave_open+0x70/0xb8)
      [   20.133880] [<c057b7e8>] (mac802154_slave_open) from [<c0488a58>] (__dev_open+0xa8/0x108)
      [   20.142553] [<c0488a58>] (__dev_open) from [<c0488cb0>] (__dev_change_flags+0x8c/0x148)
      [   20.151051] [<c0488cb0>] (__dev_change_flags) from [<c0488d84>] (dev_change_flags+0x18/0x48)
      [   20.159968] [<c0488d84>] (dev_change_flags) from [<c04e2e9c>] (devinet_ioctl+0x2b0/0x63c)
      [   20.168623] [<c04e2e9c>] (devinet_ioctl) from [<c04712e4>] (sock_ioctl+0x23c/0x29c)
      [   20.176727] [<c04712e4>] (sock_ioctl) from [<c00e3cb8>] (do_vfs_ioctl+0x4a8/0x578)
      [   20.184671] [<c00e3cb8>] (do_vfs_ioctl) from [<c00e3dd4>] (SyS_ioctl+0x4c/0x78)
      [   20.192402] [<c00e3dd4>] (SyS_ioctl) from [<c000da00>] (ret_fast_syscall+0x0/0x48)
      [   20.200392] ---[ end trace 9a34542f4ea08e47 ]---
      
      This patch was tested on at86rf231 and at86rf212.
      
      [1] http://www.atmel.com/images/doc8111.pdfSigned-off-by: NAlexander Aring <alex.aring@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7332fcb8
    • D
      Merge branch 'sh_eth' · d5c065e3
      David S. Miller 提交于
      Sergei Shtylyov says:
      
      ====================
      Beautify 'sh_eth' driver's messages
      
      This patchset converts te driver to using netdev_*() and netif_*() to print out
      its messages whenever possible.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d5c065e3