On 04/15/2013 11:11 AM, Borislav Petkov wrote:On Mon, Apr 15, 2013 at 09:56:08AM -0600, Bjorn Helgaas wrote:On Mon, Apr 15, 2013 at 9:17 AM, Aravind GopalakrishnanYeah, they should be in pci_ids.h since they're used in amd_nb.c and@@ -172,7 +176,12 @@What is the point of adding identical #defines both here and in
*/
#define PCI_DEVICE_ID_AMD_15H_NB_F1 0x1601
#define PCI_DEVICE_ID_AMD_15H_NB_F2 0x1602
-
+#define PCI_DEVICE_ID_AMD_16H_NB_F0 0x1530
+#define PCI_DEVICE_ID_AMD_16H_NB_F1 0x1531
+#define PCI_DEVICE_ID_AMD_16H_NB_F2 0x1532
+#define PCI_DEVICE_ID_AMD_16H_NB_F3 0x1533
+#define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534
+#define PCI_DEVICE_ID_AMD_16H_NB_F5 0x1535
/*
* Function 1 - Address Map
@@ -300,6 +309,7 @@ enum amd_families {
K8_CPUS = 0,
F10_CPUS,
F15_CPUS,
+ F16_CPUS,
NUM_FAMILIES,
};
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 1679ff6..59f732f 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -519,6 +519,8 @@
#define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304
#define PCI_DEVICE_ID_AMD_15H_NB_F3 0x1603
#define PCI_DEVICE_ID_AMD_15H_NB_F4 0x1604
+#define PCI_DEVICE_ID_AMD_16H_NB_F3 0x1533
+#define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534
amd64_edac.h? Also, read the note at the top of
include/linux/pci_ids.h.
amd64_edac.c.
But, what shouldn't be is adding unused defines (*_F0 and *_F5).
Aravind, please drop them.
Yes, I have made the changes and sent it out as version 2 of the PATCH.
Do have a look and let me know if I need to make any changes.
I'll review the rest of the patch when I get around to it this week.