netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2.6] pci.ids for e1000
@ 2003-09-12  1:11 Feldman, Scott
  2003-09-12 16:08 ` Jeff Garzik
  0 siblings, 1 reply; 7+ messages in thread
From: Feldman, Scott @ 2003-09-12  1:11 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: netdev


* Add missing Device and Subdevice IDs for devices support by e1000.  I've 
updated pciids.sourceforge.net, but those changes don't seem to be getting 
approved/pushed out.

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

--- linux-2.6.0-test5/drivers/pci/pci.ids	2003-09-08 12:50:06.000000000 -0700
+++ linux-2.6.0-test5/drivers/pci/pci.ids.new	2003-09-11 17:45:32.000000000 -0700
@@ -6228,28 +6228,73 @@
 		8086 1004  PRO/1000 T Server Adapter
 		8086 2004  PRO/1000 T Server Adapter
 	1008  82544EI Gigabit Ethernet Controller (Copper)
+		1014 0269  iSeries 1000/100/10 Ethernet Adapter
+		1028 011c  PRO/1000 XT Network Connection
 		8086 1107  PRO/1000 XT Server Adapter
 		8086 2107  PRO/1000 XT Server Adapter
 		8086 2110  PRO/1000 XT Server Adapter
+		8086 3108  PRO/1000 XT Network Connection
 	1009  82544EI Gigabit Ethernet Controller (Fiber)
+		1014 0268  iSeries Gigabit Ethernet Adapter
 		8086 1109  PRO/1000 XF Server Adapter
 		8086 2109  PRO/1000 XF Server Adapter
 	100c  82544GC Gigabit Ethernet Controller (Copper)
 		8086 1112  PRO/1000 T Desktop Adapter
 		8086 2112  PRO/1000 T Desktop Adapter
 	100d  82544GC Gigabit Ethernet Controller (LOM)
+		1028 0123  PRO/1000 XT Network Connection
+		107b 891f  82544GC Based Network Connection
+		8086 110d  82544GC Based Network Connection
 	100e  82540EM Gigabit Ethernet Controller
+		1014 0265  PRO/1000 MT Network Connection
+		1014 0267  PRO/1000 MT Network Connection
+		1014 026a  PRO/1000 MT Network Connection
+		107b 8920  PRO/1000 MT Desktop Adapter 
 		8086 001e  PRO/1000 MT Desktop Adapter
 		8086 002e  PRO/1000 MT Desktop Adapter
 	100f  82545EM Gigabit Ethernet Controller (Copper)
+		1014 0269  iSeries 1000/100/10 Ethernet Adapter
+		1014 028e  PRO/1000 MT Network Connection
+		8086 1000  PRO/1000 MT Network Connection
 		8086 1001  PRO/1000 MT Server Adapter
 	1010  82546EB Gigabit Ethernet Controller (Copper)
+		1014 027c  PRO/1000 MT Dual Port Network Adapter
 		8086 1011  PRO/1000 MT Dual Port Server Adapter
+		8086 101a  PRO/1000 MT Dual Port Network Adapter
 	1011  82545EM Gigabit Ethernet Controller (Fiber)
+		1014 0268  iSeries Gigabit Ethernet Adapter
 		8086 1002  PRO/1000 MF Server Adapter
+		8086 1003  PRO/1000 MF Server Adapter (LX)
 	1012  82546EB Gigabit Ethernet Controller (Fiber)
 		8086 1012  PRO/1000 MF Dual Port Server Adapter
 	1015  82540EM Gigabit Ethernet Controller (LOM)
+	1016  82540EP Gigabit Ethernet Controller
+		1014 052C  PRO/1000 MT Mobile Connection
+		1179 0001  PRO/1000 MT Mobile Connection
+		8086 1016  PRO/1000 MT Mobile Connection
+	1017  82540EP Gigabit Ethernet Controller
+		8086 1017  PR0/1000 MT Desktop Connection
+	1018  82541EP Gigabit Ethernet Controller
+		8086 1018  PRO/1000 MT Desktop Adapter
+	1019  82547EI Gigabit Ethernet Controller
+		8086 1019  PRO/1000 CT Desktop Adapter
+	101d  82546EB Gigabit Ethernet Controller
+		8086 1000  PRO/1000 MT Quad Port Server Adapter
+	101e  82540EP Gigabit Ethernet Controller
+		1014 0549  PRO/1000 MT Mobile Connection
+		8086 101e  PRO/1000 MT Mobile Connection
+	1026  82545GM Gigabit Ethernet Controller
+		8086 1000  PRO/1000 MT Server Connection
+		8086 1001  PRO/1000 MT Server Adapter
+		8086 1002  PRO/1000 MT Server Adapter
+		8086 1026  PRO/1000 MT Server Connection
+	1027  82545GM Gigabit Ethernet Controller
+		8086 1001  PRO/1000 MF Server Adapter(LX)
+		8086 1002  PRO/1000 MF Server Adapter(LX)
+		8086 1003  PRO/1000 MF Server Adapter(LX)
+		8086 1027  PRO/1000 MF Server Adapter
+	1028  82545GM Gigabit Ethernet Controller
+		8086 1028  PRO/1000 MB Server Adapter
 	1029  82559 Ethernet Controller
 	1030  82559 InBusiness 10/100
 	1031  82801CAM (ICH3) PRO/100 VE (LOM) Ethernet Controller
@@ -6279,6 +6324,31 @@
 		8086 a01f  PRO/10GbE LR Server Adapter
 		8086 a11f  PRO/10GbE LR Server Adapter
 	1059  82551QM Ethernet Controller
+	1075  82547EI Gigabit Ethernet Controller
+		8086 0075  PRO/1000 CT Network Connection
+		8086 1075  PRO/1000 CT Network Connection
+	1076  82541EI Gigabit Ethernet Controller
+		8086 0076  PRO/1000 MT Network Connection
+		8086 1076  PRO/1000 MT Network Connection
+		8086 1176  PRO/1000 MT Desktop Adapter
+		8086 1276  PRO/1000 MT Network Adapter
+	1077  82541EI Gigabit Ethernet Controller
+		1179 0001  PRO/1000 MT Mobile Connection
+		8086 0077  PRO/1000 MT Mobile Connection
+		8086 1077  PRO/1000 MT Mobile Connection
+	1078  82541EI Gigabit Ethernet Controller
+		8086 1078  PRO/1000 MT Network Connection
+	1079  82546EB Gigabit Ethernet Controller
+		8086 0079  PRO/1000 MT Dual Port Network Connection
+		8086 1079  PRO/1000 MT Dual Port Network Connection
+		8086 1179  PRO/1000 MT Dual Port Server Adapter
+		8086 117a  PRO/1000 MT Dual Port Server Adapter
+	107a  82546EB Gigabit Ethernet Controller
+		8086 107a  PRO/1000 MF Dual Port Server Adapter
+		8086 127a  PRO/1000 MF Dual Port Server Adapter
+	107b  82546EB Gigabit Ethernet Controller
+		8086 007b  PRO/1000 MB Dual Port Server Connection
+		8086 107b  PRO/1000 MB Dual Port Server Connection
 	1130  82815 815 Chipset Host Bridge and Memory Controller Hub
 		1025 1016  Travelmate 612 TX
 		1043 8027  TUSL2-C Mainboard

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6] pci.ids for e1000
  2003-09-12  1:11 Feldman, Scott
@ 2003-09-12 16:08 ` Jeff Garzik
  0 siblings, 0 replies; 7+ messages in thread
From: Jeff Garzik @ 2003-09-12 16:08 UTC (permalink / raw)
  To: Feldman, Scott; +Cc: netdev

Feldman, Scott wrote:
> * Add missing Device and Subdevice IDs for devices support by e1000.  I've 
> updated pciids.sourceforge.net, but those changes don't seem to be getting 
> approved/pushed out.

How motivated are you?  ;-)

The general idea is to keep 2.4, 2.6, and pciids.sf.net in sync.

Could you be talked into comparing 2.4, 2.6, and pciids.sf.net, and 
creating patches for 2.4 and 2.6 that add missing ids?  ;-)  Martin 
Mares (pciids.sf.net maintainer) did a big sync-up less than 12 months 
ago, so the job shouldn't be as big as it sounds.

If not, no big deal.  Just say "no" and I'll apply the patch below, 
instead of waiting for the larger patches...

	Jeff




> ----------------
> 
> --- linux-2.6.0-test5/drivers/pci/pci.ids	2003-09-08 12:50:06.000000000 -0700
> +++ linux-2.6.0-test5/drivers/pci/pci.ids.new	2003-09-11 17:45:32.000000000 -0700
> @@ -6228,28 +6228,73 @@
>  		8086 1004  PRO/1000 T Server Adapter
>  		8086 2004  PRO/1000 T Server Adapter
>  	1008  82544EI Gigabit Ethernet Controller (Copper)
> +		1014 0269  iSeries 1000/100/10 Ethernet Adapter
> +		1028 011c  PRO/1000 XT Network Connection
>  		8086 1107  PRO/1000 XT Server Adapter
>  		8086 2107  PRO/1000 XT Server Adapter
>  		8086 2110  PRO/1000 XT Server Adapter
> +		8086 3108  PRO/1000 XT Network Connection
>  	1009  82544EI Gigabit Ethernet Controller (Fiber)
> +		1014 0268  iSeries Gigabit Ethernet Adapter
>  		8086 1109  PRO/1000 XF Server Adapter
>  		8086 2109  PRO/1000 XF Server Adapter
>  	100c  82544GC Gigabit Ethernet Controller (Copper)
>  		8086 1112  PRO/1000 T Desktop Adapter
>  		8086 2112  PRO/1000 T Desktop Adapter
>  	100d  82544GC Gigabit Ethernet Controller (LOM)
> +		1028 0123  PRO/1000 XT Network Connection
> +		107b 891f  82544GC Based Network Connection
> +		8086 110d  82544GC Based Network Connection
>  	100e  82540EM Gigabit Ethernet Controller
> +		1014 0265  PRO/1000 MT Network Connection
> +		1014 0267  PRO/1000 MT Network Connection
> +		1014 026a  PRO/1000 MT Network Connection
> +		107b 8920  PRO/1000 MT Desktop Adapter 
>  		8086 001e  PRO/1000 MT Desktop Adapter
>  		8086 002e  PRO/1000 MT Desktop Adapter
>  	100f  82545EM Gigabit Ethernet Controller (Copper)
> +		1014 0269  iSeries 1000/100/10 Ethernet Adapter
> +		1014 028e  PRO/1000 MT Network Connection
> +		8086 1000  PRO/1000 MT Network Connection
>  		8086 1001  PRO/1000 MT Server Adapter
>  	1010  82546EB Gigabit Ethernet Controller (Copper)
> +		1014 027c  PRO/1000 MT Dual Port Network Adapter
>  		8086 1011  PRO/1000 MT Dual Port Server Adapter
> +		8086 101a  PRO/1000 MT Dual Port Network Adapter
>  	1011  82545EM Gigabit Ethernet Controller (Fiber)
> +		1014 0268  iSeries Gigabit Ethernet Adapter
>  		8086 1002  PRO/1000 MF Server Adapter
> +		8086 1003  PRO/1000 MF Server Adapter (LX)
>  	1012  82546EB Gigabit Ethernet Controller (Fiber)
>  		8086 1012  PRO/1000 MF Dual Port Server Adapter
>  	1015  82540EM Gigabit Ethernet Controller (LOM)
> +	1016  82540EP Gigabit Ethernet Controller
> +		1014 052C  PRO/1000 MT Mobile Connection
> +		1179 0001  PRO/1000 MT Mobile Connection
> +		8086 1016  PRO/1000 MT Mobile Connection
> +	1017  82540EP Gigabit Ethernet Controller
> +		8086 1017  PR0/1000 MT Desktop Connection
> +	1018  82541EP Gigabit Ethernet Controller
> +		8086 1018  PRO/1000 MT Desktop Adapter
> +	1019  82547EI Gigabit Ethernet Controller
> +		8086 1019  PRO/1000 CT Desktop Adapter
> +	101d  82546EB Gigabit Ethernet Controller
> +		8086 1000  PRO/1000 MT Quad Port Server Adapter
> +	101e  82540EP Gigabit Ethernet Controller
> +		1014 0549  PRO/1000 MT Mobile Connection
> +		8086 101e  PRO/1000 MT Mobile Connection
> +	1026  82545GM Gigabit Ethernet Controller
> +		8086 1000  PRO/1000 MT Server Connection
> +		8086 1001  PRO/1000 MT Server Adapter
> +		8086 1002  PRO/1000 MT Server Adapter
> +		8086 1026  PRO/1000 MT Server Connection
> +	1027  82545GM Gigabit Ethernet Controller
> +		8086 1001  PRO/1000 MF Server Adapter(LX)
> +		8086 1002  PRO/1000 MF Server Adapter(LX)
> +		8086 1003  PRO/1000 MF Server Adapter(LX)
> +		8086 1027  PRO/1000 MF Server Adapter
> +	1028  82545GM Gigabit Ethernet Controller
> +		8086 1028  PRO/1000 MB Server Adapter
>  	1029  82559 Ethernet Controller
>  	1030  82559 InBusiness 10/100
>  	1031  82801CAM (ICH3) PRO/100 VE (LOM) Ethernet Controller
> @@ -6279,6 +6324,31 @@
>  		8086 a01f  PRO/10GbE LR Server Adapter
>  		8086 a11f  PRO/10GbE LR Server Adapter
>  	1059  82551QM Ethernet Controller
> +	1075  82547EI Gigabit Ethernet Controller
> +		8086 0075  PRO/1000 CT Network Connection
> +		8086 1075  PRO/1000 CT Network Connection
> +	1076  82541EI Gigabit Ethernet Controller
> +		8086 0076  PRO/1000 MT Network Connection
> +		8086 1076  PRO/1000 MT Network Connection
> +		8086 1176  PRO/1000 MT Desktop Adapter
> +		8086 1276  PRO/1000 MT Network Adapter
> +	1077  82541EI Gigabit Ethernet Controller
> +		1179 0001  PRO/1000 MT Mobile Connection
> +		8086 0077  PRO/1000 MT Mobile Connection
> +		8086 1077  PRO/1000 MT Mobile Connection
> +	1078  82541EI Gigabit Ethernet Controller
> +		8086 1078  PRO/1000 MT Network Connection
> +	1079  82546EB Gigabit Ethernet Controller
> +		8086 0079  PRO/1000 MT Dual Port Network Connection
> +		8086 1079  PRO/1000 MT Dual Port Network Connection
> +		8086 1179  PRO/1000 MT Dual Port Server Adapter
> +		8086 117a  PRO/1000 MT Dual Port Server Adapter
> +	107a  82546EB Gigabit Ethernet Controller
> +		8086 107a  PRO/1000 MF Dual Port Server Adapter
> +		8086 127a  PRO/1000 MF Dual Port Server Adapter
> +	107b  82546EB Gigabit Ethernet Controller
> +		8086 007b  PRO/1000 MB Dual Port Server Connection
> +		8086 107b  PRO/1000 MB Dual Port Server Connection
>  	1130  82815 815 Chipset Host Bridge and Memory Controller Hub
>  		1025 1016  Travelmate 612 TX
>  		1043 8027  TUSL2-C Mainboard
> 
> 
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* RE: [PATCH 2.6] pci.ids for e1000
@ 2003-09-12 18:40 Feldman, Scott
  0 siblings, 0 replies; 7+ messages in thread
From: Feldman, Scott @ 2003-09-12 18:40 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: netdev

> How motivated are you?  ;-)
> 
> The general idea is to keep 2.4, 2.6, and pciids.sf.net in sync.
> 
> Could you be talked into comparing 2.4, 2.6, and pciids.sf.net, and 
> creating patches for 2.4 and 2.6 that add missing ids?  ;-)  Martin 
> Mares (pciids.sf.net maintainer) did a big sync-up less than 
> 12 months 
> ago, so the job shouldn't be as big as it sounds.
> 
> If not, no big deal.  Just say "no" and I'll apply the patch below, 
> instead of waiting for the larger patches...

Now that I've dug into this a little more, go ahead and drop my patch
for e1000 IDs.  Bypassing the flow from pciids.sf.net is just going to
cause more problems.  Pciids.sf.net has been updated with these IDs, so
it's just a matter of getting them approved and having Martin push out a
sync for 2.4 and 2.6.  I'll add my request to Martin...

-scott

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6] pci.ids for e1000
@ 2003-09-12 19:07 Xose Vazquez Perez
  2003-09-30  6:25 ` David S. Miller
  2003-09-30 23:32 ` Greg KH
  0 siblings, 2 replies; 7+ messages in thread
From: Xose Vazquez Perez @ 2003-09-12 19:07 UTC (permalink / raw)
  To: netdev, linux-kernel

Jeff Garzik wrote:

> The general idea is to keep 2.4, 2.6, and pciids.sf.net in sync.

is there sync between 2.4, 2.6, and pciids.sf.net ?  ;-)

Linus and Marcelo should not accept patches against pci.ids,
all updates should go to pciids.sf.net. And every X time
to do a sync with 2.4 and 2.6.

It's the easiest, because otherwise is a chaos and it
takes too much work to do several merges:

2.4 <-> 2.6
2.4 <-> pciids
2.4 <-> 2.6

-- 
Que trabajen los romanos, que tienen el pecho de lata.


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6] pci.ids for e1000
@ 2003-09-12 20:15 Xose Vazquez Perez
  0 siblings, 0 replies; 7+ messages in thread
From: Xose Vazquez Perez @ 2003-09-12 20:15 UTC (permalink / raw)
  To: netdev, linux-kernel

Jeff Garzik wrote:

> The general idea is to keep 2.4, 2.6, and pciids.sf.net in sync.

is there sync between 2.4, 2.6, and pciids.sf.net ?  ;-)

Linus and Marcelo should not accept patches against pci.ids,
all updates should go to pciids.sf.net. And every X time
to do a sync with 2.4 and 2.6.

It's the easiest, because otherwise is a chaos and it
takes too much work to do several merges:

2.4 <-> 2.6
2.4 <-> pciids
2.4 <-> 2.6

-- 
Que trabajen los romanos, que tienen el pecho de lata.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6] pci.ids for e1000
  2003-09-12 19:07 [PATCH 2.6] pci.ids for e1000 Xose Vazquez Perez
@ 2003-09-30  6:25 ` David S. Miller
  2003-09-30 23:32 ` Greg KH
  1 sibling, 0 replies; 7+ messages in thread
From: David S. Miller @ 2003-09-30  6:25 UTC (permalink / raw)
  To: Xose Vazquez Perez; +Cc: netdev, linux-kernel

On Fri, 12 Sep 2003 21:07:17 +0200
Xose Vazquez Perez <xose@wanadoo.es> wrote:

> Linus and Marcelo should not accept patches against pci.ids,
> all updates should go to pciids.sf.net. And every X time
> to do a sync with 2.4 and 2.6.

I don't know if this is the best idea.

When merging in a driver, it makes perfect sense to add the
appropriate device IDs to all PCI ID files.

On the other hand this could make life difficult for the
pciids.sf.net person.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2.6] pci.ids for e1000
  2003-09-12 19:07 [PATCH 2.6] pci.ids for e1000 Xose Vazquez Perez
  2003-09-30  6:25 ` David S. Miller
@ 2003-09-30 23:32 ` Greg KH
  1 sibling, 0 replies; 7+ messages in thread
From: Greg KH @ 2003-09-30 23:32 UTC (permalink / raw)
  To: Xose Vazquez Perez; +Cc: netdev, linux-kernel

On Fri, Sep 12, 2003 at 09:07:17PM +0200, Xose Vazquez Perez wrote:
> Jeff Garzik wrote:
> 
> > The general idea is to keep 2.4, 2.6, and pciids.sf.net in sync.
> 
> is there sync between 2.4, 2.6, and pciids.sf.net ?  ;-)
> 
> Linus and Marcelo should not accept patches against pci.ids,
> all updates should go to pciids.sf.net. And every X time
> to do a sync with 2.4 and 2.6.

I'd love to see a volunteer to try to sync these files up and routinely
send updates to the pci maintainers of the different kernel trees.

Anyone?

I also agree with David, it's completly acceptable for drivers to add
their ids to this file when they are added to the kernel tree.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2003-09-30 23:32 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-09-12 19:07 [PATCH 2.6] pci.ids for e1000 Xose Vazquez Perez
2003-09-30  6:25 ` David S. Miller
2003-09-30 23:32 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2003-09-12 20:15 Xose Vazquez Perez
2003-09-12 18:40 Feldman, Scott
2003-09-12  1:11 Feldman, Scott
2003-09-12 16:08 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).