Commit ea36a570 authored by Avadhut Naik's avatar Avadhut Naik Committed by PvsNarasimha
Browse files

EDAC/amd64: Add support for AMD family 1Ah models 00h-1Fh and 40h-4Fh 

mainline inclusion
from mainline-v6.6-rc1
commit c4d07c37
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAU6ZD

Reference: https://github.com/torvalds/linux/commit/c4d07c371283cb0453c8ce187551e4d064cc407e



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

commit c4d07c37 upstream

Add support for family 1Ah-based models 00h-1Fh and 40h-4Fh.

  [ bp: Simplify. ]

Signed-off-by: default avatarAvadhut Naik <Avadhut.Naik@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230809035244.2722455-4-avadhut.naik@amd.com


Signed-off-by: default avatarHemanth Selam <Hemanth.Selam@amd.com>
Signed-off-by: default avatarPvsNarasimha <PVS.NarasimhaRao@amd.com>
parent 20fc2c6e

drivers/edac/amd64_edac.c

+15 −0
Original line number Diff line number Diff line
@@ -3611,6 +3611,20 @@ static int per_family_init(struct amd64_pvt *pvt) 
		}

		break;



	case 0x1A:

		switch (pvt->model) {

		case 0x00 ... 0x1f:

			pvt->ctl_name           = "F1Ah";

			pvt->max_mcs            = 12;

			pvt->flags.zn_regs_v2   = 1;

			break;

		case 0x40 ... 0x4f:

			pvt->ctl_name           = "F1Ah_M40h";

			pvt->flags.zn_regs_v2   = 1;

			break;

		}

		break;



	default:

		amd64_err("Unsupported family!\n");

		return -ENODEV;
@@ -3803,6 +3817,7 @@ static const struct x86_cpu_id amd64_cpuids[] = { 
	X86_MATCH_VENDOR_FAM(AMD,	0x17, NULL),

	X86_MATCH_VENDOR_FAM(HYGON,	0x18, NULL),

	X86_MATCH_VENDOR_FAM(AMD,	0x19, NULL),

	X86_MATCH_VENDOR_FAM(AMD,	0x1A, NULL),

	{ }

};

MODULE_DEVICE_TABLE(x86cpu, amd64_cpuids);