chelsio: Move the Chelsio drivers
Jeff Kirsher [Thu, 7 Apr 2011 13:57:17 +0000 (06:57 -0700)]
Moves the drivers for the Chelsio chipsets into
drivers/net/ethernet/chelsio/ and the necessary Kconfig and Makefile
changes.

CC: Divy Le Ray <divy@chelsio.com>
CC: Dimitris Michailidis <dm@chelsio.com>
CC: Casey Leedom <leedom@chelsio.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

78 files changed:
MAINTAINERS
drivers/infiniband/hw/cxgb3/Makefile
drivers/infiniband/hw/cxgb4/Makefile
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/ethernet/Kconfig
drivers/net/ethernet/Makefile
drivers/net/ethernet/chelsio/Kconfig [new file with mode: 0644]
drivers/net/ethernet/chelsio/Makefile [new file with mode: 0644]
drivers/net/ethernet/chelsio/cxgb/Makefile [moved from drivers/net/chelsio/Makefile with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/common.h [moved from drivers/net/chelsio/common.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/cphy.h [moved from drivers/net/chelsio/cphy.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h [moved from drivers/net/chelsio/cpl5_cmd.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/cxgb2.c [moved from drivers/net/chelsio/cxgb2.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/elmer0.h [moved from drivers/net/chelsio/elmer0.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/espi.c [moved from drivers/net/chelsio/espi.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/espi.h [moved from drivers/net/chelsio/espi.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/fpga_defs.h [moved from drivers/net/chelsio/fpga_defs.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/gmac.h [moved from drivers/net/chelsio/gmac.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c [moved from drivers/net/chelsio/mv88e1xxx.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h [moved from drivers/net/chelsio/mv88e1xxx.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/mv88x201x.c [moved from drivers/net/chelsio/mv88x201x.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/my3126.c [moved from drivers/net/chelsio/my3126.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/pm3393.c [moved from drivers/net/chelsio/pm3393.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/regs.h [moved from drivers/net/chelsio/regs.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/sge.c [moved from drivers/net/chelsio/sge.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/sge.h [moved from drivers/net/chelsio/sge.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/subr.c [moved from drivers/net/chelsio/subr.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h [moved from drivers/net/chelsio/suni1x10gexp_regs.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/tp.c [moved from drivers/net/chelsio/tp.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/tp.h [moved from drivers/net/chelsio/tp.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/vsc7326.c [moved from drivers/net/chelsio/vsc7326.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h [moved from drivers/net/chelsio/vsc7326_reg.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/Makefile [moved from drivers/net/cxgb3/Makefile with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/adapter.h [moved from drivers/net/cxgb3/adapter.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/ael1002.c [moved from drivers/net/cxgb3/ael1002.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/aq100x.c [moved from drivers/net/cxgb3/aq100x.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/common.h [moved from drivers/net/cxgb3/common.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/cxgb3_ctl_defs.h [moved from drivers/net/cxgb3/cxgb3_ctl_defs.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h [moved from drivers/net/cxgb3/cxgb3_defs.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h [moved from drivers/net/cxgb3/cxgb3_ioctl.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c [moved from drivers/net/cxgb3/cxgb3_main.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c [moved from drivers/net/cxgb3/cxgb3_offload.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h [moved from drivers/net/cxgb3/cxgb3_offload.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/firmware_exports.h [moved from drivers/net/cxgb3/firmware_exports.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/l2t.c [moved from drivers/net/cxgb3/l2t.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/l2t.h [moved from drivers/net/cxgb3/l2t.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/mc5.c [moved from drivers/net/cxgb3/mc5.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/regs.h [moved from drivers/net/cxgb3/regs.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/sge.c [moved from drivers/net/cxgb3/sge.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/sge_defs.h [moved from drivers/net/cxgb3/sge_defs.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h [moved from drivers/net/cxgb3/t3_cpl.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/t3_hw.c [moved from drivers/net/cxgb3/t3_hw.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/t3cdev.h [moved from drivers/net/cxgb3/t3cdev.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/version.h [moved from drivers/net/cxgb3/version.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/vsc8211.c [moved from drivers/net/cxgb3/vsc8211.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb3/xgmac.c [moved from drivers/net/cxgb3/xgmac.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4/Makefile [moved from drivers/net/cxgb4/Makefile with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h [moved from drivers/net/cxgb4/cxgb4.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c [moved from drivers/net/cxgb4/cxgb4_main.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h [moved from drivers/net/cxgb4/cxgb4_uld.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4/l2t.c [moved from drivers/net/cxgb4/l2t.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4/l2t.h [moved from drivers/net/cxgb4/l2t.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4/sge.c [moved from drivers/net/cxgb4/sge.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c [moved from drivers/net/cxgb4/t4_hw.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4/t4_hw.h [moved from drivers/net/cxgb4/t4_hw.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4/t4_msg.h [moved from drivers/net/cxgb4/t4_msg.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4/t4_regs.h [moved from drivers/net/cxgb4/t4_regs.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h [moved from drivers/net/cxgb4/t4fw_api.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4vf/Makefile [moved from drivers/net/cxgb4vf/Makefile with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4vf/adapter.h [moved from drivers/net/cxgb4vf/adapter.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c [moved from drivers/net/cxgb4vf/cxgb4vf_main.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4vf/sge.c [moved from drivers/net/cxgb4vf/sge.c with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h [moved from drivers/net/cxgb4vf/t4vf_common.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h [moved from drivers/net/cxgb4vf/t4vf_defs.h with 100% similarity]
drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c [moved from drivers/net/cxgb4vf/t4vf_hw.c with 100% similarity]
drivers/scsi/cxgbi/cxgb3i/Kbuild
drivers/scsi/cxgbi/cxgb4i/Kbuild

index af9de64..0853d00 100644 (file)
@@ -1994,7 +1994,7 @@ M:        Divy Le Ray <divy@chelsio.com>
 L:     netdev@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
-F:     drivers/net/cxgb3/
+F:     drivers/net/ethernet/chelsio/cxgb3/
 
 CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
 M:     Steve Wise <swise@chelsio.com>
@@ -2008,7 +2008,7 @@ M:        Dimitris Michailidis <dm@chelsio.com>
 L:     netdev@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
-F:     drivers/net/cxgb4/
+F:     drivers/net/ethernet/chelsio/cxgb4/
 
 CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
 M:     Steve Wise <swise@chelsio.com>
@@ -2022,7 +2022,7 @@ M:        Casey Leedom <leedom@chelsio.com>
 L:     netdev@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
-F:     drivers/net/cxgb4vf/
+F:     drivers/net/ethernet/chelsio/cxgb4vf/
 
 STMMAC ETHERNET DRIVER
 M:     Giuseppe Cavallaro <peppe.cavallaro@st.com>
index 621619c..2761364 100644 (file)
@@ -1,4 +1,4 @@
-ccflags-y := -Idrivers/net/cxgb3
+ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb3
 
 obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o
 
index cd20b13..46b878c 100644 (file)
@@ -1,4 +1,4 @@
-ccflags-y := -Idrivers/net/cxgb4
+ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4
 
 obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o
 
index 2f9f208..77ab2e1 100644 (file)
@@ -1942,92 +1942,6 @@ if NETDEV_10000
 config MDIO
        tristate
 
-config CHELSIO_T1
-       tristate "Chelsio 10Gb Ethernet support"
-       depends on PCI
-       select CRC32
-       select MDIO
-       help
-         This driver supports Chelsio gigabit and 10-gigabit
-         Ethernet cards. More information about adapter features and
-         performance tuning is in <file:Documentation/networking/cxgb.txt>.
-
-         For general information about Chelsio and our products, visit
-         our website at <http://www.chelsio.com>.
-
-         For customer support, please visit our customer support page at
-         <http://www.chelsio.com/support.html>.
-
-         Please send feedback to <linux-bugs@chelsio.com>.
-
-         To compile this driver as a module, choose M here: the module
-         will be called cxgb.
-
-config CHELSIO_T1_1G
-       bool "Chelsio gigabit Ethernet support"
-       depends on CHELSIO_T1
-       help
-         Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
-         are using only 10G cards say 'N' here.
-
-config CHELSIO_T3
-       tristate "Chelsio Communications T3 10Gb Ethernet support"
-       depends on PCI && INET
-       select FW_LOADER
-       select MDIO
-       help
-         This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
-         adapters.
-
-         For general information about Chelsio and our products, visit
-         our website at <http://www.chelsio.com>.
-
-         For customer support, please visit our customer support page at
-         <http://www.chelsio.com/support.html>.
-
-         Please send feedback to <linux-bugs@chelsio.com>.
-
-         To compile this driver as a module, choose M here: the module
-         will be called cxgb3.
-
-config CHELSIO_T4
-       tristate "Chelsio Communications T4 Ethernet support"
-       depends on PCI
-       select FW_LOADER
-       select MDIO
-       help
-         This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
-         adapters.
-
-         For general information about Chelsio and our products, visit
-         our website at <http://www.chelsio.com>.
-
-         For customer support, please visit our customer support page at
-         <http://www.chelsio.com/support.html>.
-
-         Please send feedback to <linux-bugs@chelsio.com>.
-
-         To compile this driver as a module choose M here; the module
-         will be called cxgb4.
-
-config CHELSIO_T4VF
-       tristate "Chelsio Communications T4 Virtual Function Ethernet support"
-       depends on PCI
-       help
-         This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
-         adapters with PCI-E SR-IOV Virtual Functions.
-
-         For general information about Chelsio and our products, visit
-         our website at <http://www.chelsio.com>.
-
-         For customer support, please visit our customer support page at
-         <http://www.chelsio.com/support.html>.
-
-         Please send feedback to <linux-bugs@chelsio.com>.
-
-         To compile this driver as a module choose M here; the module
-         will be called cxgb4vf.
-
 config EHEA
        tristate "eHEA Ethernet support"
        depends on IBMEBUS && INET && SPARSEMEM
index 4cc2dcd..a987d46 100644 (file)
@@ -19,10 +19,6 @@ obj-$(CONFIG_IXGBE) += ixgbe/
 obj-$(CONFIG_IXGBEVF) += ixgbevf/
 obj-$(CONFIG_IXGB) += ixgb/
 obj-$(CONFIG_IP1000) += ipg.o
-obj-$(CONFIG_CHELSIO_T1) += chelsio/
-obj-$(CONFIG_CHELSIO_T3) += cxgb3/
-obj-$(CONFIG_CHELSIO_T4) += cxgb4/
-obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/
 obj-$(CONFIG_EHEA) += ehea/
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
index 772fb49..69d6403 100644 (file)
@@ -15,5 +15,6 @@ source "drivers/net/ethernet/3com/Kconfig"
 source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
+source "drivers/net/ethernet/chelsio/Kconfig"
 
 endif # ETHERNET
index 3ef49a2..470e5d8 100644 (file)
@@ -6,3 +6,4 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
 obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
+obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/chelsio/Kconfig
new file mode 100644 (file)
index 0000000..7b54574
--- /dev/null
@@ -0,0 +1,106 @@
+#
+# Chelsio device configuration
+#
+
+config NET_VENDOR_CHELSIO
+       bool "Chelsio 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 Chelsio devices. If you say Y, you will be asked for
+         your specific card in the following questions.
+
+if NET_VENDOR_CHELSIO
+
+config CHELSIO_T1
+       tristate "Chelsio 10Gb Ethernet support"
+       depends on PCI
+       select CRC32
+       select MDIO
+       ---help---
+         This driver supports Chelsio gigabit and 10-gigabit
+         Ethernet cards. More information about adapter features and
+         performance tuning is in <file:Documentation/networking/cxgb.txt>.
+
+         For general information about Chelsio and our products, visit
+         our website at <http://www.chelsio.com>.
+
+         For customer support, please visit our customer support page at
+         <http://www.chelsio.com/support.html>.
+
+         Please send feedback to <linux-bugs@chelsio.com>.
+
+         To compile this driver as a module, choose M here: the module
+         will be called cxgb.
+
+config CHELSIO_T1_1G
+       bool "Chelsio gigabit Ethernet support"
+       depends on CHELSIO_T1
+       ---help---
+         Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
+         are using only 10G cards say 'N' here.
+
+config CHELSIO_T3
+       tristate "Chelsio Communications T3 10Gb Ethernet support"
+       depends on PCI && INET
+       select FW_LOADER
+       select MDIO
+       ---help---
+         This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
+         adapters.
+
+         For general information about Chelsio and our products, visit
+         our website at <http://www.chelsio.com>.
+
+         For customer support, please visit our customer support page at
+         <http://www.chelsio.com/support.html>.
+
+         Please send feedback to <linux-bugs@chelsio.com>.
+
+         To compile this driver as a module, choose M here: the module
+         will be called cxgb3.
+
+config CHELSIO_T4
+       tristate "Chelsio Communications T4 Ethernet support"
+       depends on PCI
+       select FW_LOADER
+       select MDIO
+       ---help---
+         This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
+         adapters.
+
+         For general information about Chelsio and our products, visit
+         our website at <http://www.chelsio.com>.
+
+         For customer support, please visit our customer support page at
+         <http://www.chelsio.com/support.html>.
+
+         Please send feedback to <linux-bugs@chelsio.com>.
+
+         To compile this driver as a module choose M here; the module
+         will be called cxgb4.
+
+config CHELSIO_T4VF
+       tristate "Chelsio Communications T4 Virtual Function Ethernet support"
+       depends on PCI
+       ---help---
+         This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
+         adapters with PCI-E SR-IOV Virtual Functions.
+
+         For general information about Chelsio and our products, visit
+         our website at <http://www.chelsio.com>.
+
+         For customer support, please visit our customer support page at
+         <http://www.chelsio.com/support.html>.
+
+         Please send feedback to <linux-bugs@chelsio.com>.
+
+         To compile this driver as a module choose M here; the module
+         will be called cxgb4vf.
+
+endif # NET_VENDOR_CHELSIO
diff --git a/drivers/net/ethernet/chelsio/Makefile b/drivers/net/ethernet/chelsio/Makefile
new file mode 100644 (file)
index 0000000..390510b
--- /dev/null
@@ -0,0 +1,8 @@
+#
+# Makefile for the Chelsio network device drivers.
+#
+
+obj-$(CONFIG_CHELSIO_T1) += cxgb/
+obj-$(CONFIG_CHELSIO_T3) += cxgb3/
+obj-$(CONFIG_CHELSIO_T4) += cxgb4/
+obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/
index 09dbf9e..6f095e2 100644 (file)
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb3
 
 obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o
index b9f4af7..8290cda 100644 (file)
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb4
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb4
 
 obj-$(CONFIG_SCSI_CXGB4_ISCSI) += cxgb4i.o