diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-01-13 10:32:19 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-01-13 10:32:19 +0100 |
| commit | ead067beb56f3b4f74a39b50e6568d0cf4cce60a (patch) | |
| tree | 12fc89f5d90ed0782ecc3f33d3d890206b547c32 /drivers/powercap | |
| parent | powercap: intel_rapl: add NULL pointer check to rapl_mmio_cpu_online() (diff) | |
| parent | powercap/intel_rapl: add support for JasperLake (diff) | |
| download | linux-dev-ead067beb56f3b4f74a39b50e6568d0cf4cce60a.tar.xz linux-dev-ead067beb56f3b4f74a39b50e6568d0cf4cce60a.zip | |
Merge back power capping changes for v5.6.
Diffstat (limited to 'drivers/powercap')
| -rw-r--r-- | drivers/powercap/intel_rapl_common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index 2e5b6a6834da..73257cf107d9 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -980,6 +980,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { INTEL_CPU_FAM6(ICELAKE_D, rapl_defaults_hsw_server), INTEL_CPU_FAM6(COMETLAKE_L, rapl_defaults_core), INTEL_CPU_FAM6(COMETLAKE, rapl_defaults_core), + INTEL_CPU_FAM6(TIGERLAKE_L, rapl_defaults_core), INTEL_CPU_FAM6(ATOM_SILVERMONT, rapl_defaults_byt), INTEL_CPU_FAM6(ATOM_AIRMONT, rapl_defaults_cht), @@ -989,6 +990,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS, rapl_defaults_core), INTEL_CPU_FAM6(ATOM_GOLDMONT_D, rapl_defaults_core), INTEL_CPU_FAM6(ATOM_TREMONT_D, rapl_defaults_core), + INTEL_CPU_FAM6(ATOM_TREMONT_L, rapl_defaults_core), INTEL_CPU_FAM6(XEON_PHI_KNL, rapl_defaults_hsw_server), INTEL_CPU_FAM6(XEON_PHI_KNM, rapl_defaults_hsw_server), |