Commit 4fd8974a authored by Liao Xuan's avatar Liao Xuan
Browse files

x86/amd_nb: Add support for Hygon family 18h model 10h 

hygon inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VW9Q


CVE: NA

---------------------------

Add root and DF F1/F3/F4 device IDs for Hygon family 18h model
10h processors.

Signed-off-by: default avatarLiao Xuan <liaoxuan@hygon.cn>
parent 47a3fc83

drivers/edac/amd64_edac.c

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

		}

	},

	[F18_M10H_CPUS] = {

		.ctl_name = "F18h_M10h",

		.f0_id = PCI_DEVICE_ID_HYGON_18H_M10H_DF_F0,

		.f6_id = PCI_DEVICE_ID_HYGON_18H_M10H_DF_F6,

		.max_mcs = 2,

		.ops = {

			.early_channel_count	= f17_early_channel_count,

			.dbam_to_cs		= f17_addr_mask_to_cs_size,

		}

	},

	[F19_CPUS] = {

		.ctl_name = "F19h",

		.f0_id = PCI_DEVICE_ID_AMD_19H_DF_F0,
@@ -3791,6 +3801,10 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) 
			pvt->ops = &family_types[F18_M06H_CPUS].ops;

			family_types[F18_M06H_CPUS].ctl_name = "F18h_M07h";

			break;

		} else if (pvt->model == 0x10) {

			fam_type = &family_types[F18_M10H_CPUS];

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

			break;

		}

		fam_type	= &family_types[F17_CPUS];

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

drivers/edac/amd64_edac.h

+3 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ 


#define PCI_DEVICE_ID_HYGON_18H_M06H_DF_F0 0x14b0

#define PCI_DEVICE_ID_HYGON_18H_M06H_DF_F6 0x14b6

#define PCI_DEVICE_ID_HYGON_18H_M10H_DF_F0 0x14d0

#define PCI_DEVICE_ID_HYGON_18H_M10H_DF_F6 0x14d6



/*

 * Function 1 - Address Map
@@ -306,6 +308,7 @@ enum amd_families { 
	F17_M60H_CPUS,

	F17_M70H_CPUS,

	F18_M06H_CPUS,

	F18_M10H_CPUS,

	F19_CPUS,

	F19_M10H_CPUS,

	NUM_FAMILIES,