Commit ead067be authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back power capping changes for v5.6.

parents 3aa3c588 2298cf8d

arch/x86/include/asm/intel-family.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ 


#define INTEL_FAM6_ATOM_TREMONT_D	0x86 /* Jacobsville */

#define INTEL_FAM6_ATOM_TREMONT		0x96 /* Elkhart Lake */

#define INTEL_FAM6_ATOM_TREMONT_L	0x9C /* Jasper Lake */



/* Xeon Phi */

drivers/powercap/intel_rapl_common.c

+2 −0
Original line number Diff line number Diff line
@@ -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),