| Message ID | 20190906192131.8ced0ca112146f32d82b6cae@knights.ucf.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add PCI device IDs for family 17h, model 70h | expand |
On Fri, Sep 06, 2019 at 11:21:38PM +0000, Isaac Vaughn wrote: > Add the new Family 17h Model 70h PCI IDs (device 18h functions 0 and 6) > to the AMD64 EDAC module. > > Cc: Borislav Petkov <bp@alien8.de> (maintainer:EDAC-AMD64) > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> (supporter:EDAC-CORE) > Cc: James Morse <james.morse@arm.com> (reviewer:EDAC-CORE) > Cc: linux-edac@vger.kernel.org (open list:EDAC-AMD64) > Cc: linux-kernel@vger.kernel.org (open list) > Signed-off-by: Isaac Vaughn <isaac.vaughn@knights.ucf.edu> > --- > drivers/edac/amd64_edac.c | 13 +++++++++++++ > drivers/edac/amd64_edac.h | 3 +++ > 2 files changed, 16 insertions(+) > > diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c > index 873437be86d9..a35c97f9100a 100644 > --- a/drivers/edac/amd64_edac.c > +++ b/drivers/edac/amd64_edac.c > @@ -2253,6 +2253,15 @@ static struct amd64_family_type family_types[] = { > .dbam_to_cs = f17_base_addr_to_cs_size, > } > }, > + [F17_M70H_CPUS] = { > + .ctl_name = "F17h_M70h", > + .f0_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F0, > + .f6_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F6, > + .ops = { > + .early_channel_count = f17_early_channel_count, > + .dbam_to_cs = f17_base_addr_to_cs_size, You still have f17_base_addr_to_cs_size here. If you'd built it against the branch I pointed you at: https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git/log/?h=edac-for-next it would have failed. Anyway, I fixed it up and applied it. Thx.
> > Add the new Family 17h Model 70h PCI IDs (device 18h functions 0 and 6) > > to the AMD64 EDAC module. > > > > Cc: Borislav Petkov <bp@alien8.de> (maintainer:EDAC-AMD64) > > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> (supporter:EDAC-CORE) > > Cc: James Morse <james.morse@arm.com> (reviewer:EDAC-CORE) > > Cc: linux-edac@vger.kernel.org (open list:EDAC-AMD64) > > Cc: linux-kernel@vger.kernel.org (open list) > > Signed-off-by: Isaac Vaughn <isaac.vaughn@knights.ucf.edu> > > --- > > drivers/edac/amd64_edac.c | 13 +++++++++++++ > > drivers/edac/amd64_edac.h | 3 +++ > > 2 files changed, 16 insertions(+) > > > > diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c > > index 873437be86d9..a35c97f9100a 100644 > > --- a/drivers/edac/amd64_edac.c > > +++ b/drivers/edac/amd64_edac.c > > @@ -2253,6 +2253,15 @@ static struct amd64_family_type family_types[] = { > > .dbam_to_cs = f17_base_addr_to_cs_size, > > } > > }, > > + [F17_M70H_CPUS] = { > > + .ctl_name = "F17h_M70h", > > + .f0_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F0, > > + .f6_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F6, > > + .ops = { > > + .early_channel_count = f17_early_channel_count, > > + .dbam_to_cs = f17_base_addr_to_cs_size, > > You still have f17_base_addr_to_cs_size here. If you'd built it against > the branch I pointed you at: > > https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.kernel.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Fras%2Fras.git%2Flog%2F%3Fh%3Dedac-for-next&data=02%7C01%7Cisaac.vaughn%40Knights.ucf.edu%7Ca142cff36aab414087c608d733588d1f%7C5b16e18278b3412c919668342689eeb7%7C0%7C0%7C637034327751460625&sdata=Ky1T%2F9tWeNYEDcLftxU%2FQyVeN0zbrmRIrH5fHF2Mz8s%3D&reserved=0 > > it would have failed. > > Anyway, I fixed it up and applied it. > > Thx. > > -- > Regards/Gruss, > Boris. > > https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpeople.kernel.org%2Ftglx%2Fnotes-about-netiquette&data=02%7C01%7Cisaac.vaughn%40Knights.ucf.edu%7Ca142cff36aab414087c608d733588d1f%7C5b16e18278b3412c919668342689eeb7%7C0%7C0%7C637034327751460625&sdata=mOi8dnvpzomUvfX4FAabgA5G0A8tr3bMcbUx%2BKB91r8%3D&reserved=0 Sorry about that, I didn't follow that edac-for-next was a branch and built against ras master. Thanks again for all the help. Sincerely, Isaac Vaughn
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 873437be86d9..a35c97f9100a 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -2253,6 +2253,15 @@ static struct amd64_family_type family_types[] = { .dbam_to_cs = f17_base_addr_to_cs_size, } }, + [F17_M70H_CPUS] = { + .ctl_name = "F17h_M70h", + .f0_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F0, + .f6_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F6, + .ops = { + .early_channel_count = f17_early_channel_count, + .dbam_to_cs = f17_base_addr_to_cs_size, + } + }, }; /* @@ -3241,6 +3250,10 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) fam_type = &family_types[F17_M30H_CPUS]; pvt->ops = &family_types[F17_M30H_CPUS].ops; break; + } else if (pvt->model >= 0x70 && pvt->model <= 0x7f) { + fam_type = &family_types[F17_M70H_CPUS]; + pvt->ops = &family_types[F17_M70H_CPUS].ops; + break; } /* fall through */ case 0x18: diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h index 8f66472f7adc..1adf7ddbf744 100644 --- a/drivers/edac/amd64_edac.h +++ b/drivers/edac/amd64_edac.h @@ -119,6 +119,8 @@ #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F6 0x15ee #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F0 0x1490 #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F6 0x1496 +#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F0 0x1440 +#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F6 0x1446 /* * Function 1 - Address Map @@ -285,6 +287,7 @@ enum amd_families { F17_CPUS, F17_M10H_CPUS, F17_M30H_CPUS, + F17_M70H_CPUS, NUM_FAMILIES, };
Add the new Family 17h Model 70h PCI IDs (device 18h functions 0 and 6) to the AMD64 EDAC module. Cc: Borislav Petkov <bp@alien8.de> (maintainer:EDAC-AMD64) Cc: Mauro Carvalho Chehab <mchehab@kernel.org> (supporter:EDAC-CORE) Cc: James Morse <james.morse@arm.com> (reviewer:EDAC-CORE) Cc: linux-edac@vger.kernel.org (open list:EDAC-AMD64) Cc: linux-kernel@vger.kernel.org (open list) Signed-off-by: Isaac Vaughn <isaac.vaughn@knights.ucf.edu> --- drivers/edac/amd64_edac.c | 13 +++++++++++++ drivers/edac/amd64_edac.h | 3 +++ 2 files changed, 16 insertions(+)