Commit b6bea24d authored by Alexander Monakov's avatar Alexander Monakov Committed by Borislav Petkov
Browse files

EDAC/amd64: Add AMD family 17h model 60h PCI IDs 



Add support for AMD Renoir (4000-series Ryzen CPUs).

Signed-off-by: default avatarAlexander Monakov <amonakov@ispras.ru>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Link: https://lkml.kernel.org/r/20200510204842.2603-4-amonakov@ispras.ru
parent 279f0b3a

drivers/edac/amd64_edac.c

+14 −0
Original line number Diff line number Diff line
@@ -2316,6 +2316,16 @@ static struct amd64_family_type family_types[] = { 
			.dbam_to_cs		= f17_addr_mask_to_cs_size,

		}

	},

	[F17_M60H_CPUS] = {

		.ctl_name = "F17h_M60h",

		.f0_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F0,

		.f6_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F6,

		.max_mcs = 2,

		.ops = {

			.early_channel_count	= f17_early_channel_count,

			.dbam_to_cs		= f17_addr_mask_to_cs_size,

		}

	},

	[F17_M70H_CPUS] = {

		.ctl_name = "F17h_M70h",

		.f0_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F0,
@@ -3354,6 +3364,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 >= 0x60 && pvt->model <= 0x6f) {

			fam_type = &family_types[F17_M60H_CPUS];

			pvt->ops = &family_types[F17_M60H_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;

drivers/edac/amd64_edac.h

+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,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_M60H_DF_F0 0x1448

#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F6 0x144e

#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F0 0x1440

#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F6 0x1446

#define PCI_DEVICE_ID_AMD_19H_DF_F0	0x1650
@@ -293,6 +295,7 @@ enum amd_families { 
	F17_CPUS,

	F17_M10H_CPUS,

	F17_M30H_CPUS,

	F17_M60H_CPUS,

	F17_M70H_CPUS,

	F19_CPUS,

	NUM_FAMILIES,