| Message ID | 20200817224109.11040-1-kim.phillips@amd.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powercap: Add AMD Fam19h RAPL support | expand |
On Tue, Aug 18, 2020 at 12:41 AM Kim Phillips <kim.phillips@amd.com> wrote: > > 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> > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Cc: Victor Ding <victording@google.com> > Cc: LKML <linux-kernel@vger.kernel.org> > Cc: linux-pm@vger.kernel.org > Cc: x86@kernel.org > --- > Depends on Victor Ding's "powercap: Enable RAPL for AMD Fam17h" > series, submitted here: > > https://lore.kernel.org/lkml/20200729105206.2991064-1-victording@google.com/ So I'm deferring this one, because the submitter of the above was requested to resend the series. > drivers/powercap/intel_rapl_common.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c > index 2e311f9c0d85..1bc0e67cd7a4 100644 > --- a/drivers/powercap/intel_rapl_common.c > +++ b/drivers/powercap/intel_rapl_common.c > @@ -1052,6 +1052,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_core), > + X86_MATCH_VENDOR_FAM(AMD, 0x19, &rapl_defaults_core), > {} > }; > MODULE_DEVICE_TABLE(x86cpu, rapl_ids); > -- > 2.27.0 >
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index 2e311f9c0d85..1bc0e67cd7a4 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1052,6 +1052,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_core), + X86_MATCH_VENDOR_FAM(AMD, 0x19, &rapl_defaults_core), {} }; MODULE_DEVICE_TABLE(x86cpu, rapl_ids);
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> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Victor Ding <victording@google.com> Cc: LKML <linux-kernel@vger.kernel.org> Cc: linux-pm@vger.kernel.org Cc: x86@kernel.org --- Depends on Victor Ding's "powercap: Enable RAPL for AMD Fam17h" series, submitted here: https://lore.kernel.org/lkml/20200729105206.2991064-1-victording@google.com/ drivers/powercap/intel_rapl_common.c | 1 + 1 file changed, 1 insertion(+)