Commit f376de41 authored by Dhananjay Ugwekar's avatar Dhananjay Ugwekar Committed by Wen Zhiwei
Browse files

powercap/intel_rapl: Add support for AMD family 1Ah 

stable inclusion
from stable-v6.6.53
commit ea71c39d4638f45a30a8d80ad6cab0d93b3ca990
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAZ0GM

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ea71c39d4638f45a30a8d80ad6cab0d93b3ca990



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

[ Upstream commit 166df51097a258a14fe9e946e2157f3b75eeb3c2 ]

AMD Family 1Ah's RAPL MSRs are identical to Family 19h's,
extend Family 19h's support to Family 1Ah.

Signed-off-by: default avatarDhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
Reviewed-by: default avatarGautham R. Shenoy <gautham.shenoy@amd.com>
Link: https://patch.msgid.link/20240719101234.50827-1-Dhananjay.Ugwekar@amd.com


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent a3651bce

drivers/powercap/intel_rapl_common.c

+1 −0
Original line number Diff line number Diff line
@@ -1282,6 +1282,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { 


	X86_MATCH_VENDOR_FAM(AMD, 0x17, &rapl_defaults_amd),

	X86_MATCH_VENDOR_FAM(AMD, 0x19, &rapl_defaults_amd),

	X86_MATCH_VENDOR_FAM(AMD, 0x1A, &rapl_defaults_amd),

	X86_MATCH_VENDOR_FAM(HYGON, 0x18, &rapl_defaults_amd),

	{}

};