powercap: Add Hygon Fam18h RAPL support

Enable Hygon Fam18h RAPL support for the power capping framework.

Signed-off-by: Pu Wen <puwen@hygon.cn>
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 fdda2a73718614e67a6d623f8f0efbee3c53dc05..73cf68af97700796678896fa8928fddbe945305b 100644 (file)
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -1069,6 +1069,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(HYGON, 0x18, &rapl_defaults_amd),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, rapl_ids);

diff --git a/drivers/powercap/intel_rapl_msr.c b/drivers/powercap/intel_rapl_msr.c
index 78213d4b5b16a9ca35f6477d594a88233f2c93ec..cc3b22881bfe930e710b0200ebb7726a6a54dd79 100644 (file)
--- a/drivers/powercap/intel_rapl_msr.c
+++ b/drivers/powercap/intel_rapl_msr.c
@@ -150,6 +150,7 @@ static int rapl_msr_probe(struct platform_device *pdev)
        case X86_VENDOR_INTEL:
                rapl_msr_priv = &rapl_msr_priv_intel;
                break;
+       case X86_VENDOR_HYGON:
        case X86_VENDOR_AMD:
                rapl_msr_priv = &rapl_msr_priv_amd;
                break;