Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef8a97bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (54 commits)
  glge: remove unused #include <version.h>
  dnet: remove unused #include <version.h>
  tcp: miscounts due to tcp_fragment pcount reset
  tcp: add helper for counter tweaking due mid-wq change
  hso: fix for the 'invalid frame length' messages
  hso: fix for crash when unplugging the device
  fsl_pq_mdio: Fix compile failure
  fsl_pq_mdio: Revive UCC MDIO support
  ucc_geth: Pass proper device to DMA routines, otherwise oops happens
  i.MX31: Fixing cs89x0 network building to i.MX31ADS
  tc35815: Fix build error if NAPI enabled
  hso: add Vendor/Product ID's for new devices
  ucc_geth: Remove unused header
  gianfar: Remove unused header
  kaweth: Fix locking to be SMP-safe
  net: allow multiple dev per napi with GRO
  r8169: reset IntrStatus after chip reset
  ixgbe: Fix potential memory leak/driver panic issue while setting up Tx & Rx ring parameters
  ixgbe: fix ethtool -A|a behavior
  ixgbe: Patch to fix driver panic while freeing up tx & rx resources
  ...
parents 4f032ac4 6c8ad3b0

Documentation/networking/vxge.txt

0 → 100644
+100 −0
Original line number Diff line number Diff line 
Neterion's (Formerly S2io) X3100 Series 10GbE PCIe Server Adapter Linux driver

==============================================================================



Contents

--------



1) Introduction

2) Features supported

3) Configurable driver parameters

4) Troubleshooting



1) Introduction:

----------------

This Linux driver supports all Neterion's X3100 series 10 GbE PCIe I/O

Virtualized Server adapters.

The X3100 series supports four modes of operation, configurable via

firmware -

	Single function mode

	Multi function mode

	SRIOV mode

	MRIOV mode

The functions share a 10GbE link and the pci-e bus, but hardly anything else

inside the ASIC. Features like independent hw reset, statistics, bandwidth/

priority allocation and guarantees, GRO, TSO, interrupt moderation etc are

supported independently on each function.



(See below for a complete list of features supported for both IPv4 and IPv6)



2) Features supported:

----------------------



i)   Single function mode (up to 17 queues)



ii)  Multi function mode (up to 17 functions)



iii) PCI-SIG's I/O Virtualization

       - Single Root mode: v1.0 (up to 17 functions)

       - Multi-Root mode: v1.0 (up to 17 functions)



iv)  Jumbo frames

       X3100 Series supports MTU up to 9600 bytes, modifiable using

       ifconfig command.



v)   Offloads supported: (Enabled by default)

       Checksum offload (TCP/UDP/IP) on transmit and receive paths

       TCP Segmentation Offload (TSO) on transmit path

       Generic Receive Offload (GRO) on receive path



vi)  MSI-X: (Enabled by default)

       Resulting in noticeable performance improvement (up to 7% on certain

       platforms).



vii) NAPI: (Enabled by default)

       For better Rx interrupt moderation.



viii)RTH (Receive Traffic Hash): (Enabled by default)

       Receive side steering for better scaling.



ix)  Statistics

       Comprehensive MAC-level and software statistics displayed using

       "ethtool -S" option.



x)   Multiple hardware queues: (Enabled by default)

       Up to 17 hardware based transmit and receive data channels, with

       multiple steering options (transmit multiqueue enabled by default).



3) Configurable driver parameters:

----------------------------------



i)  max_config_dev

       Specifies maximum device functions to be enabled.

       Valid range: 1-8



ii) max_config_port

       Specifies number of ports to be enabled.

       Valid range: 1,2

       Default: 1



iii)max_config_vpath

       Specifies maximum VPATH(s) configured for each device function.

       Valid range: 1-17



iv) vlan_tag_strip

       Enables/disables vlan tag stripping from all received tagged frames that

       are not replicated at the internal L2 switch.

       Valid range: 0,1 (disabled, enabled respectively)

       Default: 1



v)  addr_learn_en

       Enable learning the mac address of the guest OS interface in

       virtualization environment.

       Valid range: 0,1 (disabled, enabled respectively)

       Default: 0



4) Troubleshooting:

-------------------



To resolve an issue with the source code or X3100 series adapter, please collect

the statistics, register dumps using ethool, relevant logs and email them to

support@neterion.com.

MAINTAINERS

+5 −2
Original line number Diff line number Diff line
@@ -3104,7 +3104,7 @@ M: shemminger@linux-foundation.org 
L:	netem@lists.linux-foundation.org

S:	Maintained



NETERION (S2IO) Xframe 10GbE DRIVER

NETERION (S2IO) 10GbE DRIVER (xframe/vxge)

P:	Ramkrishna Vepa

M:	ram.vepa@neterion.com

P:	Rastapur Santosh
@@ -3113,8 +3113,11 @@ P: Sivakumar Subramani 
M:	sivakumar.subramani@neterion.com

P:	Sreenivasa Honnur

M:	sreenivasa.honnur@neterion.com

P:	Anil Murthy

M:	anil.murthy@neterion.com

L:	netdev@vger.kernel.org

W:	http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous

W:	http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous

W:	http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous

S:	Supported



NETFILTER/IPTABLES/IPCHAINS

drivers/net/Kconfig

+18 −1
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ config ENC28J60_WRITEVERIFY 


config ETHOC

	tristate "OpenCores 10/100 Mbps Ethernet MAC support"

	depends on NET_ETHERNET

	depends on NET_ETHERNET && HAS_IOMEM

	select MII

	select PHYLIB

	help
@@ -2547,6 +2547,23 @@ config S2IO 
	  More specific information on configuring the driver is in 

	  <file:Documentation/networking/s2io.txt>.



config VXGE

	tristate "Neterion X3100 Series 10GbE PCIe Server Adapter"

	depends on PCI && INET

	---help---

	  This driver supports Neterion Inc's X3100 Series 10 GbE PCIe

	  I/O Virtualized Server Adapter.

	  More specific information on configuring the driver is in

	  <file:Documentation/networking/vxge.txt>.



config VXGE_DEBUG_TRACE_ALL

	bool "Enabling All Debug trace statments in driver"

	default n

	depends on VXGE

	---help---

	  Say Y here if you want to enabling all the debug trace statements in

	  driver. By  default only few debug trace statements are enabled.



config MYRI10GE

	tristate "Myricom Myri-10G Ethernet support"

	depends on PCI && INET

drivers/net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ obj-$(CONFIG_R8169) += r8169.o 
obj-$(CONFIG_AMD8111_ETH) += amd8111e.o

obj-$(CONFIG_IBMVETH) += ibmveth.o

obj-$(CONFIG_S2IO) += s2io.o

obj-$(CONFIG_VXGE) += vxge/

obj-$(CONFIG_MYRI10GE) += myri10ge/

obj-$(CONFIG_SMC91X) += smc91x.o

obj-$(CONFIG_SMC911X) += smc911x.o

drivers/net/dnet.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/version.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/moduleparam.h>