Commit 2eb61c91 authored by Yazen Ghannam's avatar Yazen Ghannam Committed by Borislav Petkov
Browse files

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: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200110015651.14887-5-Yazen.Ghannam@amd.com
parent b3f79ae4

drivers/edac/amd64_edac.c

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

		}

	},

	[F19_CPUS] = {

		.ctl_name = "F19h",

		.f0_id = PCI_DEVICE_ID_AMD_19H_DF_F0,

		.f6_id = PCI_DEVICE_ID_AMD_19H_DF_F6,

		.max_mcs = 8,

		.ops = {

			.early_channel_count	= f17_early_channel_count,

			.dbam_to_cs		= f17_addr_mask_to_cs_size,

		}

	},

};



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

		break;



	case 0x19:

		fam_type	= &family_types[F19_CPUS];

		pvt->ops	= &family_types[F19_CPUS].ops;

		family_types[F19_CPUS].ctl_name = "F19h";

		break;



	default:

		amd64_err("Unsupported family!\n");

		return NULL;
@@ -3626,6 +3642,7 @@ static const struct x86_cpu_id amd64_cpuids[] = { 
	{ X86_VENDOR_AMD, 0x16, X86_MODEL_ANY,	X86_FEATURE_ANY, 0 },

	{ X86_VENDOR_AMD, 0x17, X86_MODEL_ANY,	X86_FEATURE_ANY, 0 },

	{ X86_VENDOR_HYGON, 0x18, X86_MODEL_ANY, X86_FEATURE_ANY, 0 },

	{ X86_VENDOR_AMD, 0x19, X86_MODEL_ANY,	X86_FEATURE_ANY, 0 },

	{ }

};

MODULE_DEVICE_TABLE(x86cpu, amd64_cpuids);

drivers/edac/amd64_edac.h

+3 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ 
#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

#define PCI_DEVICE_ID_AMD_19H_DF_F0	0x1650

#define PCI_DEVICE_ID_AMD_19H_DF_F6	0x1656



/*

 * Function 1 - Address Map
@@ -292,6 +294,7 @@ enum amd_families { 
	F17_M10H_CPUS,

	F17_M30H_CPUS,

	F17_M70H_CPUS,

	F19_CPUS,

	NUM_FAMILIES,

};