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

Commit 6e846239 authored by Yazen Ghannam's avatar Yazen Ghannam Committed by Borislav Petkov
Browse files

EDAC/amd64: Add Family 17h Model 30h PCI IDs 



Add the new Family 17h Model 30h PCI IDs to the AMD64 EDAC module.

This also fixes a probe failure that appeared when some other PCI IDs
for Family 17h Model 30h were added to the AMD NB code.

Fixes: be3518a1 (x86/amd_nb: Add PCI device IDs for family 17h, model 30h)
Signed-off-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Tested-by: default avatarKim Phillips <kim.phillips@amd.com>
Cc: James Morse <james.morse@arm.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: https://lkml.kernel.org/r/20190228153558.127292-1-Yazen.Ghannam@amd.com
parent bcc5c1bb

drivers/edac/amd64_edac.c

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

		}

	},

	[F17_M30H_CPUS] = {

		.ctl_name = "F17h_M30h",

		.f0_id = PCI_DEVICE_ID_AMD_17H_M30H_DF_F0,

		.f6_id = PCI_DEVICE_ID_AMD_17H_M30H_DF_F6,

		.ops = {

			.early_channel_count	= f17_early_channel_count,

			.dbam_to_cs		= f17_base_addr_to_cs_size,

		}

	},

};



/*
@@ -3203,6 +3212,10 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) 
			fam_type = &family_types[F17_M10H_CPUS];

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

			break;

		} else if (pvt->model >= 0x30 && pvt->model <= 0x3f) {

			fam_type = &family_types[F17_M30H_CPUS];

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

			break;

		}

		/* fall through */

	case 0x18:

drivers/edac/amd64_edac.h

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

#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F0 0x1490

#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F6 0x1496



/*

 * Function 1 - Address Map
@@ -284,6 +286,7 @@ enum amd_families { 
	F16_M30H_CPUS,

	F17_CPUS,

	F17_M10H_CPUS,

	F17_M30H_CPUS,

	NUM_FAMILIES,

};