Skip to content

Commit 2eb61c9

Browse files
yghannamsuryasaimadhu
authored andcommitted
EDAC/amd64: Add family ops for Family 19h Models 00h-0Fh
Add family ops to support AMD Family 19h systems. Existing Family 17h functions can be used. Also, add Family 19h to the list of families to automatically load the module. Signed-off-by: Yazen Ghannam <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent b3f79ae commit 2eb61c9

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

drivers/edac/amd64_edac.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2336,6 +2336,16 @@ static struct amd64_family_type family_types[] = {
23362336
.dbam_to_cs = f17_addr_mask_to_cs_size,
23372337
}
23382338
},
2339+
[F19_CPUS] = {
2340+
.ctl_name = "F19h",
2341+
.f0_id = PCI_DEVICE_ID_AMD_19H_DF_F0,
2342+
.f6_id = PCI_DEVICE_ID_AMD_19H_DF_F6,
2343+
.max_mcs = 8,
2344+
.ops = {
2345+
.early_channel_count = f17_early_channel_count,
2346+
.dbam_to_cs = f17_addr_mask_to_cs_size,
2347+
}
2348+
},
23392349
};
23402350

23412351
/*
@@ -3368,6 +3378,12 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt)
33683378
family_types[F17_CPUS].ctl_name = "F18h";
33693379
break;
33703380

3381+
case 0x19:
3382+
fam_type = &family_types[F19_CPUS];
3383+
pvt->ops = &family_types[F19_CPUS].ops;
3384+
family_types[F19_CPUS].ctl_name = "F19h";
3385+
break;
3386+
33713387
default:
33723388
amd64_err("Unsupported family!\n");
33733389
return NULL;
@@ -3626,6 +3642,7 @@ static const struct x86_cpu_id amd64_cpuids[] = {
36263642
{ X86_VENDOR_AMD, 0x16, X86_MODEL_ANY, X86_FEATURE_ANY, 0 },
36273643
{ X86_VENDOR_AMD, 0x17, X86_MODEL_ANY, X86_FEATURE_ANY, 0 },
36283644
{ X86_VENDOR_HYGON, 0x18, X86_MODEL_ANY, X86_FEATURE_ANY, 0 },
3645+
{ X86_VENDOR_AMD, 0x19, X86_MODEL_ANY, X86_FEATURE_ANY, 0 },
36293646
{ }
36303647
};
36313648
MODULE_DEVICE_TABLE(x86cpu, amd64_cpuids);

drivers/edac/amd64_edac.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@
122122
#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F6 0x1496
123123
#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F0 0x1440
124124
#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F6 0x1446
125+
#define PCI_DEVICE_ID_AMD_19H_DF_F0 0x1650
126+
#define PCI_DEVICE_ID_AMD_19H_DF_F6 0x1656
125127

126128
/*
127129
* Function 1 - Address Map
@@ -292,6 +294,7 @@ enum amd_families {
292294
F17_M10H_CPUS,
293295
F17_M30H_CPUS,
294296
F17_M70H_CPUS,
297+
F19_CPUS,
295298
NUM_FAMILIES,
296299
};
297300

0 commit comments

Comments
 (0)