diff options
-rw-r--r-- | arch/x86/kernel/amd_nb.c | 3 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index d63e63b7d1d9..251c795b4eb3 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 | 21 | #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 |
22 | #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec | 22 | #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec |
23 | #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494 | 23 | #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494 |
24 | #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444 | ||
24 | 25 | ||
25 | /* Protect the PCI config register pairs used for SMN and DF indirect access. */ | 26 | /* Protect the PCI config register pairs used for SMN and DF indirect access. */ |
26 | static DEFINE_MUTEX(smn_mutex); | 27 | static DEFINE_MUTEX(smn_mutex); |
@@ -50,6 +51,7 @@ const struct pci_device_id amd_nb_misc_ids[] = { | |||
50 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, | 51 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, |
51 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, | 52 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, |
52 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, | 53 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, |
54 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) }, | ||
53 | {} | 55 | {} |
54 | }; | 56 | }; |
55 | EXPORT_SYMBOL_GPL(amd_nb_misc_ids); | 57 | EXPORT_SYMBOL_GPL(amd_nb_misc_ids); |
@@ -63,6 +65,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { | |||
63 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) }, | 65 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) }, |
64 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F4) }, | 66 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F4) }, |
65 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) }, | 67 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) }, |
68 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) }, | ||
66 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, | 69 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, |
67 | {} | 70 | {} |
68 | }; | 71 | }; |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index c842735a4f45..4b97f427cc92 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -548,6 +548,7 @@ | |||
548 | #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 | 548 | #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 |
549 | #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb | 549 | #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb |
550 | #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493 | 550 | #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493 |
551 | #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443 | ||
551 | #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 | 552 | #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 |
552 | #define PCI_DEVICE_ID_AMD_LANCE 0x2000 | 553 | #define PCI_DEVICE_ID_AMD_LANCE 0x2000 |
553 | #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 | 554 | #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 |