| Message ID | 20210302020108.1777-1-puwen@hygon.cn |
|---|---|
| State | Accepted |
| Commit | a740561201ebf75326188e4e899fe9c2526046be |
| Headers | show |
| Series | powercap: Add Hygon Fam18h RAPL support | expand |
On Tue, Mar 2, 2021 at 3:05 AM Pu Wen <puwen@hygon.cn> wrote: > > Enable Hygon Fam18h RAPL support for the power capping framework. > > Signed-off-by: Pu Wen <puwen@hygon.cn> > --- > drivers/powercap/intel_rapl_common.c | 1 + > drivers/powercap/intel_rapl_msr.c | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c > index fdda2a737186..73cf68af9770 100644 > --- 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 78213d4b5b16..cc3b22881bfe 100644 > --- 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; > -- Applied as 5.13 material, thanks!
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index fdda2a737186..73cf68af9770 100644 --- 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 78213d4b5b16..cc3b22881bfe 100644 --- 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;
Enable Hygon Fam18h RAPL support for the power capping framework. Signed-off-by: Pu Wen <puwen@hygon.cn> --- drivers/powercap/intel_rapl_common.c | 1 + drivers/powercap/intel_rapl_msr.c | 1 + 2 files changed, 2 insertions(+)