Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'pm-cpu' 

* pm-cpu:
  x86: remove duplicate turbo ratio limit MSRs
  tools/power turbostat: Replace MSR_NHM_TURBO_RATIO_LIMIT
  cpufreq: intel_pstate: Replace MSR_NHM_TURBO_RATIO_LIMIT
parents e717a62d a0c9b8cc

arch/x86/include/asm/msr-index.h

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ 


#define MSR_OFFCORE_RSP_0		0x000001a6

#define MSR_OFFCORE_RSP_1		0x000001a7

#define MSR_NHM_TURBO_RATIO_LIMIT	0x000001ad

#define MSR_IVT_TURBO_RATIO_LIMIT	0x000001ae

#define MSR_TURBO_RATIO_LIMIT		0x000001ad

#define MSR_TURBO_RATIO_LIMIT1		0x000001ae

#define MSR_TURBO_RATIO_LIMIT2		0x000001af

drivers/cpufreq/intel_pstate.c

+2 −2
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ static int core_get_turbo_pstate(void) 
	u64 value;

	int nont, ret;



	rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value);

	rdmsrl(MSR_TURBO_RATIO_LIMIT, value);

	nont = core_get_max_pstate();

	ret = (value) & 255;

	if (ret <= nont)
@@ -1001,7 +1001,7 @@ static int knl_get_turbo_pstate(void) 
	u64 value;

	int nont, ret;



	rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value);

	rdmsrl(MSR_TURBO_RATIO_LIMIT, value);

	nont = core_get_max_pstate();

	ret = (((value) >> 8) & 0xFF);

	if (ret <= nont)

tools/power/x86/turbostat/turbostat.8

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ cpu0: MSR_NHM_PLATFORM_INFO: 0x80838f3012300 
35 * 100 = 3500 MHz TSC frequency

cpu0: MSR_IA32_POWER_CTL: 0x0004005d (C1E auto-promotion: DISabled)

cpu0: MSR_NHM_SNB_PKG_CST_CFG_CTL: 0x1e000400 (UNdemote-C3, UNdemote-C1, demote-C3, demote-C1, UNlocked: pkg-cstate-limit=0: pc0)

cpu0: MSR_NHM_TURBO_RATIO_LIMIT: 0x25262727

cpu0: MSR_TURBO_RATIO_LIMIT: 0x25262727

37 * 100 = 3700 MHz max turbo 4 active cores

38 * 100 = 3800 MHz max turbo 3 active cores

39 * 100 = 3900 MHz max turbo 2 active cores

tools/power/x86/turbostat/turbostat.c

+1 −1
Original line number Diff line number Diff line
@@ -1480,7 +1480,7 @@ dump_knl_turbo_ratio_limits(void) 
	unsigned int cores[buckets_no];

	unsigned int ratio[buckets_no];



	get_msr(base_cpu, MSR_NHM_TURBO_RATIO_LIMIT, &msr);

	get_msr(base_cpu, MSR_TURBO_RATIO_LIMIT, &msr);



	fprintf(outf, "cpu%d: MSR_TURBO_RATIO_LIMIT: 0x%08llx\n",

		base_cpu, msr);