diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-13 08:32:22 (GMT) |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-11 09:41:35 (GMT) |
commit | 5a2cc190eb3fe58fe519795c509b01b25795992e (patch) | |
tree | 9a319736bd77979ab5dbdc26d29424d84eb235b0 /drivers/net | |
parent | f844a0ead401c3ce0f01a8bb4d6cea2f0f6ad863 (diff) | |
download | linux-5a2cc190eb3fe58fe519795c509b01b25795992e.tar.xz |
mlx4: Move the Mellanox driver
Moves the Mellanox driver into drivers/net/ethernet/mellanox/ and
make the necessary Kconfig and Makefile changes.
CC: Roland Dreier <roland@kernel.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 24 | ||||
-rw-r--r-- | drivers/net/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/Kconfig | 22 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/Makefile | 5 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/Kconfig | 27 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/Makefile (renamed from drivers/net/mlx4/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/alloc.c (renamed from drivers/net/mlx4/alloc.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/catas.c (renamed from drivers/net/mlx4/catas.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/cmd.c (renamed from drivers/net/mlx4/cmd.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/cq.c (renamed from drivers/net/mlx4/cq.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_cq.c (renamed from drivers/net/mlx4/en_cq.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_ethtool.c (renamed from drivers/net/mlx4/en_ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_main.c (renamed from drivers/net/mlx4/en_main.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c (renamed from drivers/net/mlx4/en_netdev.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_port.c (renamed from drivers/net/mlx4/en_port.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_port.h (renamed from drivers/net/mlx4/en_port.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_resources.c (renamed from drivers/net/mlx4/en_resources.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_rx.c (renamed from drivers/net/mlx4/en_rx.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_selftest.c (renamed from drivers/net/mlx4/en_selftest.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_tx.c (renamed from drivers/net/mlx4/en_tx.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/eq.c (renamed from drivers/net/mlx4/eq.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/fw.c (renamed from drivers/net/mlx4/fw.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/fw.h (renamed from drivers/net/mlx4/fw.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/icm.c (renamed from drivers/net/mlx4/icm.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/icm.h (renamed from drivers/net/mlx4/icm.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/intf.c (renamed from drivers/net/mlx4/intf.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c (renamed from drivers/net/mlx4/main.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mcg.c (renamed from drivers/net/mlx4/mcg.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mlx4.h (renamed from drivers/net/mlx4/mlx4.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mlx4_en.h (renamed from drivers/net/mlx4/mlx4_en.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mr.c (renamed from drivers/net/mlx4/mr.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/pd.c (renamed from drivers/net/mlx4/pd.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/port.c (renamed from drivers/net/mlx4/port.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/profile.c (renamed from drivers/net/mlx4/profile.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/qp.c (renamed from drivers/net/mlx4/qp.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/reset.c (renamed from drivers/net/mlx4/reset.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/sense.c (renamed from drivers/net/mlx4/sense.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/srq.c (renamed from drivers/net/mlx4/srq.c) | 0 |
40 files changed, 56 insertions, 25 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 2701ee9..56c033a 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1554,30 +1554,6 @@ config PASEMI_MAC This driver supports the on-chip 1/10Gbit Ethernet controller on PA Semi's PWRficient line of chips. -config MLX4_EN - tristate "Mellanox Technologies 10Gbit Ethernet support" - depends on PCI && INET - select MLX4_CORE - select INET_LRO - help - This driver supports Mellanox Technologies ConnectX Ethernet - devices. - -config MLX4_CORE - tristate - depends on PCI - default n - -config MLX4_DEBUG - bool "Verbose debugging output" if (MLX4_CORE && EXPERT) - depends on MLX4_CORE - default y - ---help--- - This option causes debugging code to be compiled into the - mlx4_core driver. The output can be turned on via the - debug_level module parameter (which can also be set after - the driver is loaded through sysfs). - config TEHUTI tristate "Tehuti Networks 10G Ethernet" depends on PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index c8a176f..73e357e 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -157,7 +157,6 @@ obj-$(CONFIG_BFIN_MAC) += bfin_mac.o obj-$(CONFIG_DM9000) += dm9000.o obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o -obj-$(CONFIG_MLX4_CORE) += mlx4/ obj-$(CONFIG_ENC28J60) += enc28j60.o obj-$(CONFIG_ETHOC) += ethoc.o obj-$(CONFIG_GRETH) += greth.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 225918d..8bbddc9 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -20,6 +20,7 @@ source "drivers/net/ethernet/chelsio/Kconfig" source "drivers/net/ethernet/emulex/Kconfig" source "drivers/net/ethernet/intel/Kconfig" source "drivers/net/ethernet/i825xx/Kconfig" +source "drivers/net/ethernet/mellanox/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/racal/Kconfig" source "drivers/net/ethernet/sfc/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 734f7c9..e5f2954 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ +obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ obj-$(CONFIG_SFC) += sfc/ diff --git a/drivers/net/ethernet/mellanox/Kconfig b/drivers/net/ethernet/mellanox/Kconfig new file mode 100644 index 0000000..e0694912 --- /dev/null +++ b/drivers/net/ethernet/mellanox/Kconfig @@ -0,0 +1,22 @@ +# +# Mellanox driver configuration +# + +config NET_VENDOR_MELLANOX + bool "Mellanox devices" + depends on PCI && INET + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about Mellanox cards. If you say Y, you will be asked + for your specific card in the following questions. + +if NET_VENDOR_MELLANOX + +source "drivers/net/ethernet/mellanox/mlx4/Kconfig" + +endif # NET_VENDOR_MELLANOX diff --git a/drivers/net/ethernet/mellanox/Makefile b/drivers/net/ethernet/mellanox/Makefile new file mode 100644 index 0000000..37afb96 --- /dev/null +++ b/drivers/net/ethernet/mellanox/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Mellanox device drivers. +# + +obj-$(CONFIG_MLX4_CORE) += mlx4/ diff --git a/drivers/net/ethernet/mellanox/mlx4/Kconfig b/drivers/net/ethernet/mellanox/mlx4/Kconfig new file mode 100644 index 0000000..1bb9353 --- /dev/null +++ b/drivers/net/ethernet/mellanox/mlx4/Kconfig @@ -0,0 +1,27 @@ +# +# Mellanox driver configuration +# + +config MLX4_EN + tristate "Mellanox Technologies 10Gbit Ethernet support" + depends on PCI && INET + select MLX4_CORE + select INET_LRO + ---help--- + This driver supports Mellanox Technologies ConnectX Ethernet + devices. + +config MLX4_CORE + tristate + depends on PCI + default n + +config MLX4_DEBUG + bool "Verbose debugging output" if (MLX4_CORE && EXPERT) + depends on MLX4_CORE + default y + ---help--- + This option causes debugging code to be compiled into the + mlx4_core driver. The output can be turned on via the + debug_level module parameter (which can also be set after + the driver is loaded through sysfs). diff --git a/drivers/net/mlx4/Makefile b/drivers/net/ethernet/mellanox/mlx4/Makefile index d1aa45a..d1aa45a 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/ethernet/mellanox/mlx4/Makefile diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/ethernet/mellanox/mlx4/alloc.c index 116cae3..116cae3 100644 --- a/drivers/net/mlx4/alloc.c +++ b/drivers/net/ethernet/mellanox/mlx4/alloc.c diff --git a/drivers/net/mlx4/catas.c b/drivers/net/ethernet/mellanox/mlx4/catas.c index 32f9471..32f9471 100644 --- a/drivers/net/mlx4/catas.c +++ b/drivers/net/ethernet/mellanox/mlx4/catas.c diff --git a/drivers/net/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c index 23cee7b..23cee7b 100644 --- a/drivers/net/mlx4/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c diff --git a/drivers/net/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c index bd8ef9f..bd8ef9f 100644 --- a/drivers/net/mlx4/cq.c +++ b/drivers/net/ethernet/mellanox/mlx4/cq.c diff --git a/drivers/net/mlx4/en_cq.c b/drivers/net/ethernet/mellanox/mlx4/en_cq.c index ec4b6d0..ec4b6d0 100644 --- a/drivers/net/mlx4/en_cq.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_cq.c diff --git a/drivers/net/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c index eb09625..eb09625 100644 --- a/drivers/net/mlx4/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c index 6bfea23..6bfea23 100644 --- a/drivers/net/mlx4/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 4b0f32e..4b0f32e 100644 --- a/drivers/net/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c diff --git a/drivers/net/mlx4/en_port.c b/drivers/net/ethernet/mellanox/mlx4/en_port.c index 5ada5b46..5ada5b46 100644 --- a/drivers/net/mlx4/en_port.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_port.c diff --git a/drivers/net/mlx4/en_port.h b/drivers/net/ethernet/mellanox/mlx4/en_port.h index e3d73e4..e3d73e4 100644 --- a/drivers/net/mlx4/en_port.h +++ b/drivers/net/ethernet/mellanox/mlx4/en_port.h diff --git a/drivers/net/mlx4/en_resources.c b/drivers/net/ethernet/mellanox/mlx4/en_resources.c index 0dfb4ec..0dfb4ec 100644 --- a/drivers/net/mlx4/en_resources.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_resources.c diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index 37cc9e5..37cc9e5 100644 --- a/drivers/net/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c diff --git a/drivers/net/mlx4/en_selftest.c b/drivers/net/ethernet/mellanox/mlx4/en_selftest.c index 9fdbcec..9fdbcec 100644 --- a/drivers/net/mlx4/en_selftest.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_selftest.c diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c index 6e03de0..6e03de0 100644 --- a/drivers/net/mlx4/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c diff --git a/drivers/net/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c index 1ad1f60..1ad1f60 100644 --- a/drivers/net/mlx4/eq.c +++ b/drivers/net/ethernet/mellanox/mlx4/eq.c diff --git a/drivers/net/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c index 7eb8ba8..7eb8ba8 100644 --- a/drivers/net/mlx4/fw.c +++ b/drivers/net/ethernet/mellanox/mlx4/fw.c diff --git a/drivers/net/mlx4/fw.h b/drivers/net/ethernet/mellanox/mlx4/fw.h index 1e8ecc3..1e8ecc3 100644 --- a/drivers/net/mlx4/fw.h +++ b/drivers/net/ethernet/mellanox/mlx4/fw.h diff --git a/drivers/net/mlx4/icm.c b/drivers/net/ethernet/mellanox/mlx4/icm.c index 02393fd..02393fd 100644 --- a/drivers/net/mlx4/icm.c +++ b/drivers/net/ethernet/mellanox/mlx4/icm.c diff --git a/drivers/net/mlx4/icm.h b/drivers/net/ethernet/mellanox/mlx4/icm.h index b10c07a..b10c07a 100644 --- a/drivers/net/mlx4/icm.h +++ b/drivers/net/ethernet/mellanox/mlx4/icm.h diff --git a/drivers/net/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c index 73c94fc..73c94fc 100644 --- a/drivers/net/mlx4/intf.c +++ b/drivers/net/ethernet/mellanox/mlx4/intf.c diff --git a/drivers/net/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index f0ee35d..f0ee35d 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c index cd17845..cd17845 100644 --- a/drivers/net/mlx4/mcg.c +++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h index a2fcd84..a2fcd84 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h index ed84811..ed84811 100644 --- a/drivers/net/mlx4/mlx4_en.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h diff --git a/drivers/net/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c index 9c188bd..9c188bd 100644 --- a/drivers/net/mlx4/mr.c +++ b/drivers/net/ethernet/mellanox/mlx4/mr.c diff --git a/drivers/net/mlx4/pd.c b/drivers/net/ethernet/mellanox/mlx4/pd.c index 1286b88..1286b88 100644 --- a/drivers/net/mlx4/pd.c +++ b/drivers/net/ethernet/mellanox/mlx4/pd.c diff --git a/drivers/net/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c index 609e0ec..609e0ec 100644 --- a/drivers/net/mlx4/port.c +++ b/drivers/net/ethernet/mellanox/mlx4/port.c diff --git a/drivers/net/mlx4/profile.c b/drivers/net/ethernet/mellanox/mlx4/profile.c index b967647..b967647 100644 --- a/drivers/net/mlx4/profile.c +++ b/drivers/net/ethernet/mellanox/mlx4/profile.c diff --git a/drivers/net/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c index ec9350e..ec9350e 100644 --- a/drivers/net/mlx4/qp.c +++ b/drivers/net/ethernet/mellanox/mlx4/qp.c diff --git a/drivers/net/mlx4/reset.c b/drivers/net/ethernet/mellanox/mlx4/reset.c index 11e7c1c..11e7c1c 100644 --- a/drivers/net/mlx4/reset.c +++ b/drivers/net/ethernet/mellanox/mlx4/reset.c diff --git a/drivers/net/mlx4/sense.c b/drivers/net/ethernet/mellanox/mlx4/sense.c index e2337a7..e2337a7 100644 --- a/drivers/net/mlx4/sense.c +++ b/drivers/net/ethernet/mellanox/mlx4/sense.c diff --git a/drivers/net/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c index 3b07b80..3b07b80 100644 --- a/drivers/net/mlx4/srq.c +++ b/drivers/net/ethernet/mellanox/mlx4/srq.c |