From: Kim Phillips <kim.phillips@amd.com>
Date: Tue, 27 Oct 2020 07:23:57 +0000 (+0000)
Subject: powercap: RAPL: Add AMD Fam19h RAPL support
X-Git-Tag: v5.15.73~13035^2~1^5~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a9d881f22d7a0e06a46a326d0880fb45a06d3b5;p=platform%2Fkernel%2Flinux-rpi.git

powercap: RAPL: Add AMD Fam19h RAPL support

AMD Family 19h's RAPL MSRs are identical to Family 17h's.  Extend
Family 17h's support to Family 19h.

Signed-off-by: Kim Phillips <kim.phillips@amd.com>
Signed-off-by: Victor Ding <victording@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index 1ecd09424445..c9e57237d778 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -1067,6 +1067,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM,	&rapl_defaults_hsw_server),
 
 	X86_MATCH_VENDOR_FAM(AMD, 0x17, &rapl_defaults_amd),
+	X86_MATCH_VENDOR_FAM(AMD, 0x19, &rapl_defaults_amd),
 	{}
 };
 MODULE_DEVICE_TABLE(x86cpu, rapl_ids);