Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8960de4a authored by Michael Jin's avatar Michael Jin Committed by Borislav Petkov
Browse files

EDAC, amd64: Add Family 17h, models 10h-2fh support 



Add new device IDs for family 17h, models 10h-2fh.

This is required by amd64_edac_mod in order to properly detect PCI
device functions 0 and 6.

Signed-off-by: default avatarMichael Jin <mikhail.jin@gmail.com>
Reviewed-by: default avatarYazen Ghannam <Yazen.Ghannam@amd.com>
Cc: <stable@vger.kernel.org>
Link: http://lkml.kernel.org/r/20180816192840.31166-1-mikhail.jin@gmail.com


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 5b394b2d

drivers/edac/amd64_edac.c

+14 −0
Original line number Diff line number Diff line
@@ -2200,6 +2200,15 @@ static struct amd64_family_type family_types[] = { 
			.dbam_to_cs		= f17_base_addr_to_cs_size,

		}

	},

	[F17_M10H_CPUS] = {

		.ctl_name = "F17h_M10h",

		.f0_id = PCI_DEVICE_ID_AMD_17H_M10H_DF_F0,

		.f6_id = PCI_DEVICE_ID_AMD_17H_M10H_DF_F6,

		.ops = {

			.early_channel_count	= f17_early_channel_count,

			.dbam_to_cs		= f17_base_addr_to_cs_size,

		}

	},

};



/*
@@ -3188,6 +3197,11 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) 
		break;



	case 0x17:

		if (pvt->model >= 0x10 && pvt->model <= 0x2f) {

			fam_type = &family_types[F17_M10H_CPUS];

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

			break;

		}

		fam_type	= &family_types[F17_CPUS];

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

		break;

drivers/edac/amd64_edac.h

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ 
#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F2 0x1582

#define PCI_DEVICE_ID_AMD_17H_DF_F0	0x1460

#define PCI_DEVICE_ID_AMD_17H_DF_F6	0x1466

#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F0 0x15e8

#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F6 0x15ee



/*

 * Function 1 - Address Map
@@ -281,6 +283,7 @@ enum amd_families { 
	F16_CPUS,

	F16_M30H_CPUS,

	F17_CPUS,

	F17_M10H_CPUS,

	NUM_FAMILIES,

};