diff options
-rw-r--r-- | arch/x86/kernel/amd_nb.c | 2 | ||||
-rw-r--r-- | drivers/edac/amd64_edac.c | 24 | ||||
-rw-r--r-- | drivers/edac/amd64_edac.h | 3 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 2 |
4 files changed, 31 insertions, 0 deletions
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index 59554dca96ec..6523534671b6 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c | |||
@@ -22,6 +22,7 @@ const struct pci_device_id amd_nb_misc_ids[] = { | |||
22 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, | 22 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, |
23 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) }, | 23 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) }, |
24 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) }, | 24 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) }, |
25 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) }, | ||
25 | {} | 26 | {} |
26 | }; | 27 | }; |
27 | EXPORT_SYMBOL(amd_nb_misc_ids); | 28 | EXPORT_SYMBOL(amd_nb_misc_ids); |
@@ -30,6 +31,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { | |||
30 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) }, | 31 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) }, |
31 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F4) }, | 32 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F4) }, |
32 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) }, | 33 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) }, |
34 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F4) }, | ||
33 | {} | 35 | {} |
34 | }; | 36 | }; |
35 | 37 | ||
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 34380ccc3dd9..f8bf00010d45 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c | |||
@@ -1807,6 +1807,17 @@ static struct amd64_family_type family_types[] = { | |||
1807 | .read_dct_pci_cfg = f10_read_dct_pci_cfg, | 1807 | .read_dct_pci_cfg = f10_read_dct_pci_cfg, |
1808 | } | 1808 | } |
1809 | }, | 1809 | }, |
1810 | [F16_M30H_CPUS] = { | ||
1811 | .ctl_name = "F16h_M30h", | ||
1812 | .f1_id = PCI_DEVICE_ID_AMD_16H_M30H_NB_F1, | ||
1813 | .f3_id = PCI_DEVICE_ID_AMD_16H_M30H_NB_F3, | ||
1814 | .ops = { | ||
1815 | .early_channel_count = f1x_early_channel_count, | ||
1816 | .map_sysaddr_to_csrow = f1x_map_sysaddr_to_csrow, | ||
1817 | .dbam_to_cs = f16_dbam_to_chip_select, | ||
1818 | .read_dct_pci_cfg = f10_read_dct_pci_cfg, | ||
1819 | } | ||
1820 | }, | ||
1810 | }; | 1821 | }; |
1811 | 1822 | ||
1812 | /* | 1823 | /* |
@@ -2586,6 +2597,11 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) | |||
2586 | break; | 2597 | break; |
2587 | 2598 | ||
2588 | case 0x16: | 2599 | case 0x16: |
2600 | if (pvt->model == 0x30) { | ||
2601 | fam_type = &family_types[F16_M30H_CPUS]; | ||
2602 | pvt->ops = &family_types[F16_M30H_CPUS].ops; | ||
2603 | break; | ||
2604 | } | ||
2589 | fam_type = &family_types[F16_CPUS]; | 2605 | fam_type = &family_types[F16_CPUS]; |
2590 | pvt->ops = &family_types[F16_CPUS].ops; | 2606 | pvt->ops = &family_types[F16_CPUS].ops; |
2591 | break; | 2607 | break; |
@@ -2838,6 +2854,14 @@ static const struct pci_device_id amd64_pci_table[] = { | |||
2838 | .class = 0, | 2854 | .class = 0, |
2839 | .class_mask = 0, | 2855 | .class_mask = 0, |
2840 | }, | 2856 | }, |
2857 | { | ||
2858 | .vendor = PCI_VENDOR_ID_AMD, | ||
2859 | .device = PCI_DEVICE_ID_AMD_16H_M30H_NB_F2, | ||
2860 | .subvendor = PCI_ANY_ID, | ||
2861 | .subdevice = PCI_ANY_ID, | ||
2862 | .class = 0, | ||
2863 | .class_mask = 0, | ||
2864 | }, | ||
2841 | 2865 | ||
2842 | {0, } | 2866 | {0, } |
2843 | }; | 2867 | }; |
diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h index 6dc1fcc25afb..d903e0c21144 100644 --- a/drivers/edac/amd64_edac.h +++ b/drivers/edac/amd64_edac.h | |||
@@ -168,6 +168,8 @@ | |||
168 | #define PCI_DEVICE_ID_AMD_15H_NB_F2 0x1602 | 168 | #define PCI_DEVICE_ID_AMD_15H_NB_F2 0x1602 |
169 | #define PCI_DEVICE_ID_AMD_16H_NB_F1 0x1531 | 169 | #define PCI_DEVICE_ID_AMD_16H_NB_F1 0x1531 |
170 | #define PCI_DEVICE_ID_AMD_16H_NB_F2 0x1532 | 170 | #define PCI_DEVICE_ID_AMD_16H_NB_F2 0x1532 |
171 | #define PCI_DEVICE_ID_AMD_16H_M30H_NB_F1 0x1581 | ||
172 | #define PCI_DEVICE_ID_AMD_16H_M30H_NB_F2 0x1582 | ||
171 | 173 | ||
172 | /* | 174 | /* |
173 | * Function 1 - Address Map | 175 | * Function 1 - Address Map |
@@ -300,6 +302,7 @@ enum amd_families { | |||
300 | F15_CPUS, | 302 | F15_CPUS, |
301 | F15_M30H_CPUS, | 303 | F15_M30H_CPUS, |
302 | F16_CPUS, | 304 | F16_CPUS, |
305 | F16_M30H_CPUS, | ||
303 | NUM_FAMILIES, | 306 | NUM_FAMILIES, |
304 | }; | 307 | }; |
305 | 308 | ||
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 97fbecdd7a40..e91ad27b1a56 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -528,6 +528,8 @@ | |||
528 | #define PCI_DEVICE_ID_AMD_15H_NB_F5 0x1605 | 528 | #define PCI_DEVICE_ID_AMD_15H_NB_F5 0x1605 |
529 | #define PCI_DEVICE_ID_AMD_16H_NB_F3 0x1533 | 529 | #define PCI_DEVICE_ID_AMD_16H_NB_F3 0x1533 |
530 | #define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534 | 530 | #define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534 |
531 | #define PCI_DEVICE_ID_AMD_16H_M30H_NB_F3 0x1583 | ||
532 | #define PCI_DEVICE_ID_AMD_16H_M30H_NB_F4 0x1584 | ||
531 | #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 | 533 | #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 |
532 | #define PCI_DEVICE_ID_AMD_LANCE 0x2000 | 534 | #define PCI_DEVICE_ID_AMD_LANCE 0x2000 |
533 | #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 | 535 | #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 |