[RFC] pci_ids.h: correct naming of 1022:7450 (AMD 8131 Bridge)

[RFC] pci_ids.h: correct naming of 1022:7450 (AMD 8131 Bridge)

[John W. Linville]

The naming of the constant defined for PCI ID 1022:7450 does not seem
to match the information at http://pciids.sourceforge.net/:

	http://pci-ids.ucw.cz/iii/?i=1022

There 1022:7450 is listed as "AMD-8131 PCI-X Bridge" while 1022:7451
is listed as "AMD-8131 PCI-X IOAPIC".  Yet, the current definition for
0x7450 is PCI_DEVICE_ID_AMD_8131_APIC.	It seems to me like that name
should map to 0x7451, while a name like PCI_DEVICE_ID_AMD_8131_BRIDGE
should map to 0x7450.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
There is a PCI quirk that matches 1022:7450.  Even though that is
specifically related to the IOAPIC, I have to believe that it needs to
continue pointing at that ID.  Does anyone have any better information?

The reason I'm interested is because I have a tg3 patch that needs to
reference 1022:7450.  I could use the existing pci_ids.h definition,
but it just seems wrong.  So, it seems like it makes sense to fix
it now?

 drivers/pci/quirks.c    |    2 +-
 include/linux/pci_ids.h |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index dda6099..eb4c95b 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -589,7 +589,7 @@ static void __init quirk_amd_8131_ioapic
                 pci_write_config_byte( dev, AMD8131_MISC, tmp);
         }
 } 
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_APIC,         quirk_amd_8131_ioapic ); 
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic); 
 
 static void __init quirk_svw_msi(struct pci_dev *dev)
 {
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 751eea5..d2bdc25 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -496,7 +496,8 @@
 #define PCI_DEVICE_ID_AMD_8111_SMBUS	0x746b
 #define PCI_DEVICE_ID_AMD_8111_AUDIO	0x746d
 #define PCI_DEVICE_ID_AMD_8151_0	0x7454
-#define PCI_DEVICE_ID_AMD_8131_APIC     0x7450
+#define PCI_DEVICE_ID_AMD_8131_BRIDGE	0x7450
+#define PCI_DEVICE_ID_AMD_8131_APIC	0x7451
 #define PCI_DEVICE_ID_AMD_CS5536_ISA    0x2090
 #define PCI_DEVICE_ID_AMD_CS5536_FLASH  0x2091
 #define PCI_DEVICE_ID_AMD_CS5536_AUDIO  0x2093
-- 
John W. Linville
linville@tuxdriver.com

Re: [RFC] pci_ids.h: correct naming of 1022:7450 (AMD 8131 Bridge)

[Greg KH]

On Mon, Mar 20, 2006 at 02:33:56PM -0500, John W. Linville wrote:
> The naming of the constant defined for PCI ID 1022:7450 does not seem
> to match the information at http://pciids.sourceforge.net/:
> 
> 	http://pci-ids.ucw.cz/iii/?i=1022
> 
> There 1022:7450 is listed as "AMD-8131 PCI-X Bridge" while 1022:7451
> is listed as "AMD-8131 PCI-X IOAPIC".  Yet, the current definition for
> 0x7450 is PCI_DEVICE_ID_AMD_8131_APIC.	It seems to me like that name
> should map to 0x7451, while a name like PCI_DEVICE_ID_AMD_8131_BRIDGE
> should map to 0x7450.

Yes, that's what the latest pci ids file shows, so this patch looks
correct, I'll add it to my queue.

thanks,

greg k-h