Add the new Family 17h Model 70h PCI IDs (device 18h functions 0 and 6) to the AMD64 EDAC module. [ bp: s/f17_base_addr_to_cs_size/f17_addr_mask_to_cs_size/g ]
Unified · Split
| @@ -2317,6 +2317,15 @@ static struct amd64_family_type family_types[] = { · 2316 unmodified lines | |||
| 2317 | .dbam_to_cs = f17_addr_mask_to_cs_size, | 2317 | .dbam_to_cs = f17_addr_mask_to_cs_size, |
| 2318 | } | 2318 | } |
| 2319 | }, | 2319 | }, |
| 2320 | [F17_M70H_CPUS] = { | ||
| 2321 | .ctl_name = "F17h_M70h", | ||
| 2322 | .f0_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F0, | ||
| 2323 | .f6_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F6, | ||
| 2324 | .ops = { | ||
| 2325 | .early_channel_count = f17_early_channel_count, | ||
| 2326 | .dbam_to_cs = f17_addr_mask_to_cs_size, | ||
| 2327 | } | ||
| 2328 | }, | ||
| 2320 | }; | 2329 | }; |
| 2321 | 2330 | ||
| 2322 | /* | 2331 | /* |
| @@ -3355,6 +3364,10 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) · 1032 unmodified lines | |||
| 3355 | fam_type = &family_types[F17_M30H_CPUS]; | 3364 | fam_type = &family_types[F17_M30H_CPUS]; |
| 3356 | pvt->ops = &family_types[F17_M30H_CPUS].ops; | 3365 | pvt->ops = &family_types[F17_M30H_CPUS].ops; |
| 3357 | break; | 3366 | break; |
| 3367 | } else if (pvt->model >= 0x70 && pvt->model <= 0x7f) { | ||
| 3368 | fam_type = &family_types[F17_M70H_CPUS]; | ||
| 3369 | pvt->ops = &family_types[F17_M70H_CPUS].ops; | ||
| 3370 | break; | ||
| 3358 | } | 3371 | } |
| 3359 | /* fall through */ | 3372 | /* fall through */ |
| 3360 | case 0x18: | 3373 | case 0x18: |
| @@ -120,6 +120,8 @@ · 119 unmodified lines | |||
| 120 | #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F6 0x15ee | 120 | #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F6 0x15ee |
| 121 | #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F0 0x1490 | 121 | #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F0 0x1490 |
| 122 | #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F6 0x1496 | 122 | #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F6 0x1496 |
| 123 | #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F0 0x1440 | ||
| 124 | #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F6 0x1446 | ||
| 123 | 125 | ||
| 124 | /* | 126 | /* |
| 125 | * Function 1 - Address Map | 127 | * Function 1 - Address Map |
| @@ -289,6 +291,7 @@ enum amd_families { · 163 unmodified lines | |||
| 289 | F17_CPUS, | 291 | F17_CPUS, |
| 290 | F17_M10H_CPUS, | 292 | F17_M10H_CPUS, |
| 291 | F17_M30H_CPUS, | 293 | F17_M30H_CPUS, |
| 294 | F17_M70H_CPUS, | ||
| 292 | NUM_FAMILIES, | 295 | NUM_FAMILIES, |
| 293 | }; | 296 | }; |
| 294 | 297 | ||