[RFC][PATCH 1/3] enic: add Makefile, patch Kconfg, MAINTAINERS, etc

[RFC][PATCH 1/3] enic: add Makefile, patch Kconfg, MAINTAINERS, etc

[Scott Feldman]

enic: add Makefile, patch Kconfg, MAINTAINERS, etc

Adds drivers/net/enic/Makefile, adds the enic (10G Ethernet) option
to the net Kconfig.  Add PCI vendor and device ID for Cisco and enic.
Updates MAINTAINERS to add an entry for the enic driver.

Signed-off-by: Scott Feldman <scofeldm@cisco.com>
---
diff -Naurp -X linux-2.6.26.3/Documentation/dontdiff linux-2.6.26.3/drivers/net/enic/Makefile linux-2.6.26.3-enic/drivers/net/enic/Makefile
--- linux-2.6.26.3/drivers/net/enic/Makefile	1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.26.3-enic/drivers/net/enic/Makefile	2008-08-22 13:41:41.000000000 -0700
@@ -0,0 +1,5 @@
+obj-$(CONFIG_ENIC) := enic.o
+
+enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \
+	enic_res.o vnic_dev.o vnic_rq.o
+
diff -Naurp -X linux-2.6.26.3/Documentation/dontdiff linux-2.6.26.3/drivers/net/Kconfig linux-2.6.26.3-enic/drivers/net/Kconfig
--- linux-2.6.26.3/drivers/net/Kconfig	2008-08-20 11:11:37.000000000 -0700
+++ linux-2.6.26.3-enic/drivers/net/Kconfig	2008-08-22 13:46:50.000000000 -0700
@@ -2527,6 +2527,13 @@ config MYRI10GE
  	  To compile this driver as a module, choose M here. The module
  	  will be called myri10ge.

+config ENIC
+	tristate "Cisco 10Gigabit Ethernet NIC"
+	depends on PCI
+	select INET_LRO
+	help
+	  This enables the support for Cisco 10Gigabit Ethernet card.
+
  config NETXEN_NIC
  	tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
  	depends on PCI
diff -Naurp -X linux-2.6.26.3/Documentation/dontdiff linux-2.6.26.3/drivers/net/Makefile linux-2.6.26.3-enic/drivers/net/Makefile
--- linux-2.6.26.3/drivers/net/Makefile	2008-08-20 11:11:37.000000000 -0700
+++ linux-2.6.26.3-enic/drivers/net/Makefile	2008-08-22 13:59:05.000000000 -0700
@@ -18,6 +18,7 @@ obj-$(CONFIG_BONDING) += bonding/
  obj-$(CONFIG_ATL1) += atlx/
  obj-$(CONFIG_GIANFAR) += gianfar_driver.o
  obj-$(CONFIG_TEHUTI) += tehuti.o
+obj-$(CONFIG_ENIC) += enic/

  gianfar_driver-objs := gianfar.o \
  		gianfar_ethtool.o \
diff -Naurp -X linux-2.6.26.3/Documentation/dontdiff linux-2.6.26.3/include/linux/pci_ids.h linux-2.6.26.3-enic/include/linux/pci_ids.h
--- linux-2.6.26.3/include/linux/pci_ids.h	2008-08-20 11:11:37.000000000 -0700
+++ linux-2.6.26.3-enic/include/linux/pci_ids.h	2008-08-25 10:52:25.000000000 -0700
@@ -1410,6 +1410,9 @@
  #define PCI_DEVICE_ID_EICON_MAESTRAQ_U	0xe013
  #define PCI_DEVICE_ID_EICON_MAESTRAP	0xe014

+#define PCI_VENDOR_ID_CISCO		0x1137
+#define PCI_DEVICE_ID_CISCO_ENIC	0x0043
+
  #define PCI_VENDOR_ID_ZIATECH		0x1138
  #define PCI_DEVICE_ID_ZIATECH_5550_HC	0x5550

diff -Naurp -X linux-2.6.26.3/Documentation/dontdiff linux-2.6.26.3/MAINTAINERS linux-2.6.26.3-enic/MAINTAINERS
--- linux-2.6.26.3/MAINTAINERS	2008-08-20 11:11:37.000000000 -0700
+++ linux-2.6.26.3-enic/MAINTAINERS	2008-08-22 14:08:29.000000000 -0700
@@ -1054,6 +1054,13 @@ L:	cbe-oss-dev@ozlabs.org
  W:	http://www.ibm.com/developerworks/power/cell/
  S:	Supported

+CISCO 10G ETHERNET DRIVER
+P:	Scott Feldman
+M:	scofeldm@cisco.com
+P:	Joe Eykholt
+M:	jeykholt@cisco.com
+S:	Supported
+
  CFAG12864B LCD DRIVER
  P:	Miguel Ojeda Sandonis
  M:	miguel.ojeda.sandonis@gmail.com

Re: [RFC][PATCH 1/3] enic: add Makefile, patch Kconfg, MAINTAINERS, etc

[Roland Dreier]

Overall, looks quite good.  Very clean, just a few comments here and there:

 > +#define PCI_VENDOR_ID_CISCO		0x1137
 > +#define PCI_DEVICE_ID_CISCO_ENIC	0x0043

the current convention is that we don't put IDs that are only used in
one place into pci_ids.h.  I guess the vendor ID can stay but the device
ID is probably not needed here (just put it in the driver file where
it's used, if anywhere).

 - R.

Re: [RFC][PATCH 1/3] enic: add Makefile, patch Kconfg, MAINTAINERS, etc

[Scott Feldman]

On Mon, 25 Aug 2008, Roland Dreier wrote:

> Overall, looks quite good.  Very clean, just a few comments here and there:

Thanks for the review Roland.  I'll give a day or two for more review and 
repost the patches.

> > +#define PCI_VENDOR_ID_CISCO		0x1137
> > +#define PCI_DEVICE_ID_CISCO_ENIC	0x0043
>
> the current convention is that we don't put IDs that are only used in
> one place into pci_ids.h.  I guess the vendor ID can stay but the device
> ID is probably not needed here (just put it in the driver file where
> it's used, if anywhere).

Ok

-scott

Re: [RFC][PATCH 1/3] enic: add Makefile, patch Kconfg, MAINTAINERS, etc

[Roland Dreier]

Oh yeah, by the way, this patch got whitespace mangled somehow so it
won't apply (and also it seems to be against an old tree that doesn't
have the atl1e driver merged).

And:

 > +config ENIC
 > +	tristate "Cisco 10Gigabit Ethernet NIC"

The Kconfig file seems to use "10 Gigabit Ethernet" (with a space) or
variations on "10Gb Ethernet".  Probably worth it not to add yet another
variation.

 > +	depends on PCI
 > +	select INET_LRO

I believe if you select INET_LRO, you'd better depend on INET or else it
is possible to create unbuildable configs.

Re: [RFC][PATCH 1/3] enic: add Makefile, patch Kconfg, MAINTAINERS, etc

[Scott Feldman]

On Mon, 25 Aug 2008, Roland Dreier wrote:

> > +config ENIC
> > +	tristate "Cisco 10Gigabit Ethernet NIC"
>
> The Kconfig file seems to use "10 Gigabit Ethernet" (with a space) or
> variations on "10Gb Ethernet".  Probably worth it not to add yet another
> variation.

done

> > +	depends on PCI
> > +	select INET_LRO
>
> I believe if you select INET_LRO, you'd better depend on INET or else it
> is possible to create unbuildable configs.
>

done