Merge back power capping changes for v5.6.

diff --combined drivers/powercap/intel_rapl_common.c
index 2e5b6a6834da5d71ff768fef433a1067406e890a,85fb97fa655c14f52116baa55ef9462c615909d7..73257cf107d973b034b2e3e36076d558f44efe10
--- 1/drivers/powercap/intel_rapl_common.c
--- 2/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@@ -980,6 -980,7 +980,7 @@@ static const struct x86_cpu_id rapl_ids
        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 +990,7 @@@
        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),
@@@ -1295,9 -1297,6 +1297,9 @@@ struct rapl_package *rapl_add_package(i
        struct cpuinfo_x86 *c = &cpu_data(cpu);
        int ret;
  
 +      if (!rapl_defaults)
 +              return ERR_PTR(-ENODEV);
 +
        rp = kzalloc(sizeof(struct rapl_package), GFP_KERNEL);
        if (!rp)
                return ERR_PTR(-ENOMEM);