[PATCH] PCI: restore 2 missing pci ids

[PATCH] PCI: restore 2 missing pci ids

[Greg KH]

[PATCH] PCI: restore 2 missing pci ids

Somewhere between 2.6.14 and 2.6.15-rc3, some PCI ids were apparently
removed.  The ecc.c module, which is not a part of the kernel.org tree, but
included in some distributions, fails to compile.

Signed-off-by: Mark Rustad <mrustad@mac.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
commit 9b88de850747ab8ff39ce31ca6ff788210f9441a
tree a9ba9136f00c3434c6adf741b9b3f9308af42d73
parent d181278c96e0b59478bef909ec2476c40169e7ba
author Mark Rustad <MRustad@mac.com> Thu, 05 Jan 2006 22:47:29 -0800
committer Greg Kroah-Hartman <gregkh@suse.de> Fri, 20 Jan 2006 10:29:34 -0800

 include/linux/pci_ids.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 117e023..560b26a 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2065,6 +2065,7 @@
 #define PCI_DEVICE_ID_INTEL_82801EB_5	0x24d5
 #define PCI_DEVICE_ID_INTEL_82801EB_6	0x24d6
 #define PCI_DEVICE_ID_INTEL_82801EB_11	0x24db
+#define PCI_DEVICE_ID_INTEL_82801EB_13	0x24dd
 #define PCI_DEVICE_ID_INTEL_ESB_1	0x25a1
 #define PCI_DEVICE_ID_INTEL_ESB_2	0x25a2
 #define PCI_DEVICE_ID_INTEL_ESB_4	0x25a4
@@ -2154,6 +2155,7 @@
 #define PCI_DEVICE_ID_INTEL_82443GX_2	0x71a2
 #define PCI_DEVICE_ID_INTEL_82372FB_1	0x7601
 #define PCI_DEVICE_ID_INTEL_82454GX	0x84c4
+#define PCI_DEVICE_ID_INTEL_82450GX	0x84c5
 #define PCI_DEVICE_ID_INTEL_82451NX	0x84ca
 #define PCI_DEVICE_ID_INTEL_82454NX     0x84cb
 #define PCI_DEVICE_ID_INTEL_84460GX	0x84ea

Re: [PATCH] PCI: restore 2 missing pci ids

[Jeff Garzik]

Linux Kernel Mailing List wrote:
> tree e425ac74afc0b89f3a513290a2dd5e503d974906
> parent 654143ee3a73b2793350b039a135d9cd3101147b
> author Mark Rustad <MRustad@mac.com> Fri, 06 Jan 2006 14:47:29 -0800
> committer Greg Kroah-Hartman <gregkh@suse.de> Wed, 01 Feb 2006 10:00:11 -0800
> 
> [PATCH] PCI: restore 2 missing pci ids
> 
> Somewhere between 2.6.14 and 2.6.15-rc3, some PCI ids were apparently
> removed.  The ecc.c module, which is not a part of the kernel.org tree, but
> included in some distributions, fails to compile.
> 
> Signed-off-by: Mark Rustad <mrustad@mac.com>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
> 
>  include/linux/pci_ids.h |    2 ++
>  1 files changed, 2 insertions(+)

Why was this applied?  We could apply these patches all day, and get 
nothing else done.  If it's not in the kernel tree, we shouldn't be 
worrying about it.  Let the distros patch it in.

	Jeff

Re: [PATCH] PCI: restore 2 missing pci ids

[Mark Rustad]

Jeff,

On Feb 1, 2006, at 12:00 PM, Jeff Garzik wrote:

> Linux Kernel Mailing List wrote:
>> tree e425ac74afc0b89f3a513290a2dd5e503d974906
>> parent 654143ee3a73b2793350b039a135d9cd3101147b
>> author Mark Rustad <MRustad@mac.com> Fri, 06 Jan 2006 14:47:29 -0800
>> committer Greg Kroah-Hartman <gregkh@suse.de> Wed, 01 Feb 2006  
>> 10:00:11 -0800
>> [PATCH] PCI: restore 2 missing pci ids
>> Somewhere between 2.6.14 and 2.6.15-rc3, some PCI ids were apparently
>> removed.  The ecc.c module, which is not a part of the kernel.org  
>> tree, but
>> included in some distributions, fails to compile.
>> Signed-off-by: Mark Rustad <mrustad@mac.com>
>> Signed-off-by: Andrew Morton <akpm@osdl.org>
>> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
>>  include/linux/pci_ids.h |    2 ++
>>  1 files changed, 2 insertions(+)
>
> Why was this applied?  We could apply these patches all day, and  
> get nothing else done.  If it's not in the kernel tree, we  
> shouldn't be worrying about it.  Let the distros patch it in.

Well, I offered the patch because I found that I suddenly needed it.  
I did not know why the ids had been removed, but it looks to me like  
edac is coming right along and will need the ids itself, so I sent  
the patch off.

Frankly, I was surprised that the patch was so quickly accepted. I  
perceive some difference of opinion on how PCI ids should be handled.  
Is there a consensus on a better way to handle ids? Why were the ids  
removed in the first place? THAT was worse than wasted effort.

-- 
Mark Rustad, MRustad@mac.com

Re: [PATCH] PCI: restore 2 missing pci ids

[Lee Revell]

On Wed, 2006-02-01 at 23:11 -0600, Mark Rustad wrote:
> Why were the ids  
> removed in the first place? 

Because they weren't used by anything in the tree.

Lee

Re: [PATCH] PCI: restore 2 missing pci ids

[Kyle Moffett]

On Feb 02, 2006, at 00:19, Lee Revell wrote:
> On Wed, 2006-02-01 at 23:11 -0600, Mark Rustad wrote:
>> Why were the ids removed in the first place?
>
> Because they weren't used by anything in the tree.

Also, the new PCI-ID policy is to put the defines in the driver  
itself, near where it is used, instead of collecting them in a single  
file.  The goal is to minimize the number of unused PCI IDs in the  
tree by keeping the definition near the usage.

Cheers,
Kyle Moffett

--
Somone asked me why I work on this free (http://www.fsf.org/ 
philosophy/) software stuff and not get a real job. Charles Schulz  
had the best answer:

"Why do musicians compose symphonies and poets write poems? They do  
it because life wouldn't have any meaning for them if they didn't.  
That's why I draw cartoons. It's my life."
   -- Charles Schulz

Re: [PATCH] PCI: restore 2 missing pci ids

[Jeff Garzik]

Kyle Moffett wrote:
> On Feb 02, 2006, at 00:19, Lee Revell wrote:
> 
>> On Wed, 2006-02-01 at 23:11 -0600, Mark Rustad wrote:
>>
>>> Why were the ids removed in the first place?
>>
>>
>> Because they weren't used by anything in the tree.
> 
> 
> Also, the new PCI-ID policy is to put the defines in the driver  itself, 
> near where it is used, instead of collecting them in a single  file.  
> The goal is to minimize the number of unused PCI IDs in the  tree by 
> keeping the definition near the usage.

No, if you do create a constant for a PCI ID, it still should go into 
include/linux/pci_ids.h.

Putting them in the driver will result in highly variable naming 
policies, which in turn means the constants are less grep-able than today.

Device IDs simply do not need an associated constant, if they are used 
only in a PCI ID table.  Device IDs are arbitrary numbers that are 
normally only used once in a source file.

Vendor IDs are used repeatedly, and definitely belong in pci_ids.h. 
Device IDs make sense in pci_ids.h if they are used more than once.

	Jeff

Re: [PATCH] PCI: restore 2 missing pci ids

[Mark Rustad]

On Feb 2, 2006, at 1:28 AM, Jeff Garzik wrote:

> Kyle Moffett wrote:
>> On Feb 02, 2006, at 00:19, Lee Revell wrote:
>>> On Wed, 2006-02-01 at 23:11 -0600, Mark Rustad wrote:
>>>
>>>> Why were the ids removed in the first place?
>>>
>>> Because they weren't used by anything in the tree.
>> Also, the new PCI-ID policy is to put the defines in the driver   
>> itself, near where it is used, instead of collecting them in a  
>> single  file.  The goal is to minimize the number of unused PCI  
>> IDs in the  tree by keeping the definition near the usage.
>
> No, if you do create a constant for a PCI ID, it still should go  
> into include/linux/pci_ids.h.
>
> Putting them in the driver will result in highly variable naming  
> policies, which in turn means the constants are less grep-able than  
> today.
>
> Device IDs simply do not need an associated constant, if they are  
> used only in a PCI ID table.  Device IDs are arbitrary numbers that  
> are normally only used once in a source file.
>
> Vendor IDs are used repeatedly, and definitely belong in pci_ids.h.  
> Device IDs make sense in pci_ids.h if they are used more than once.

Thank you for explaining the policy. In this particular case, there  
was only one use of the ID in the file in question, so it could have  
simply been a hex constant, I guess. Of course my instinct is to  
avoid weird constants like this in source code, but I can learn to  
make an exception for this kind of thing.

-- 
Mark Rustad, MRustad@mac.com