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

Commit 31e07522 authored by Len Brown's avatar Len Brown
Browse files

tools/power turbostat: fix decoding for GLM, DNV, SKX turbo-ratio limits 



Newer processors do not hard-code the the number of cpus in each bin
to {1, 2, 3, 4, 5, 6, 7, 8}  Rather, they can specify any number
of CPUS in each of the 8 bins:

eg.

...
37 * 100.0 = 3600.0 MHz max turbo 4 active cores
38 * 100.0 = 3700.0 MHz max turbo 3 active cores
39 * 100.0 = 3800.0 MHz max turbo 2 active cores
39 * 100.0 = 3900.0 MHz max turbo 1 active cores

could now look something like this:

...
37 * 100.0 = 3600.0 MHz max turbo 16 active cores
38 * 100.0 = 3700.0 MHz max turbo 8 active cores
39 * 100.0 = 3800.0 MHz max turbo 4 active cores
39 * 100.0 = 3900.0 MHz max turbo 2 active cores

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 34c76197

tools/power/x86/turbostat/turbostat.c

+67 −23
Original line number Original line Diff line number Diff line
@@ -1671,56 +1671,84 @@ dump_ivt_turbo_ratio_limits(void) 
			ratio, bclk, ratio * bclk);

			ratio, bclk, ratio * bclk);

	return;

	return;

}

}

int has_turbo_ratio_group_limits(int family, int model)

{



	if (!genuine_intel)

		return 0;



	switch (model) {

	case INTEL_FAM6_ATOM_GOLDMONT:

	case INTEL_FAM6_SKYLAKE_X:

	case INTEL_FAM6_ATOM_DENVERTON:

		return 1;

	}

	return 0;

}





static void

static void

dump_nhm_turbo_ratio_limits(void)

dump_turbo_ratio_limits(int family, int model)

{

{

	unsigned long long msr;

	unsigned long long msr, core_counts;

	unsigned int ratio;

	unsigned int ratio, group_size;





	get_msr(base_cpu, MSR_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);

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





	if (has_turbo_ratio_group_limits(family, model)) {

		get_msr(base_cpu, MSR_TURBO_RATIO_LIMIT1, &core_counts);

		fprintf(outf, "cpu%d: MSR_TURBO_RATIO_LIMIT1: 0x%08llx\n", base_cpu, core_counts);

	} else {

		core_counts = 0x0807060504030201;

	}



	ratio = (msr >> 56) & 0xFF;

	ratio = (msr >> 56) & 0xFF;

	group_size = (core_counts >> 56) & 0xFF;

	if (ratio)

	if (ratio)

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo 8 active cores\n",

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",

			ratio, bclk, ratio * bclk);

			ratio, bclk, ratio * bclk, group_size);





	ratio = (msr >> 48) & 0xFF;

	ratio = (msr >> 48) & 0xFF;

	group_size = (core_counts >> 48) & 0xFF;

	if (ratio)

	if (ratio)

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo 7 active cores\n",

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",

			ratio, bclk, ratio * bclk);

			ratio, bclk, ratio * bclk, group_size);





	ratio = (msr >> 40) & 0xFF;

	ratio = (msr >> 40) & 0xFF;

	group_size = (core_counts >> 40) & 0xFF;

	if (ratio)

	if (ratio)

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo 6 active cores\n",

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",

			ratio, bclk, ratio * bclk);

			ratio, bclk, ratio * bclk, group_size);





	ratio = (msr >> 32) & 0xFF;

	ratio = (msr >> 32) & 0xFF;

	group_size = (core_counts >> 32) & 0xFF;

	if (ratio)

	if (ratio)

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo 5 active cores\n",

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",

			ratio, bclk, ratio * bclk);

			ratio, bclk, ratio * bclk, group_size);





	ratio = (msr >> 24) & 0xFF;

	ratio = (msr >> 24) & 0xFF;

	group_size = (core_counts >> 24) & 0xFF;

	if (ratio)

	if (ratio)

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo 4 active cores\n",

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",

			ratio, bclk, ratio * bclk);

			ratio, bclk, ratio * bclk, group_size);





	ratio = (msr >> 16) & 0xFF;

	ratio = (msr >> 16) & 0xFF;

	group_size = (core_counts >> 16) & 0xFF;

	if (ratio)

	if (ratio)

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo 3 active cores\n",

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",

			ratio, bclk, ratio * bclk);

			ratio, bclk, ratio * bclk, group_size);





	ratio = (msr >> 8) & 0xFF;

	ratio = (msr >> 8) & 0xFF;

	group_size = (core_counts >> 8) & 0xFF;

	if (ratio)

	if (ratio)

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo 2 active cores\n",

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",

			ratio, bclk, ratio * bclk);

			ratio, bclk, ratio * bclk, group_size);





	ratio = (msr >> 0) & 0xFF;

	ratio = (msr >> 0) & 0xFF;

	group_size = (core_counts >> 0) & 0xFF;

	if (ratio)

	if (ratio)

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo 1 active cores\n",

		fprintf(outf, "%d * %.1f = %.1f MHz max turbo %d active cores\n",

			ratio, bclk, ratio * bclk);

			ratio, bclk, ratio * bclk, group_size);

	return;

	return;

}

}
@@ -2597,7 +2625,7 @@ int is_skx(unsigned int family, unsigned int model) 
	return 0;

	return 0;

}

}





int has_nhm_turbo_ratio_limit(unsigned int family, unsigned int model)

int has_turbo_ratio_limit(unsigned int family, unsigned int model)

{

{

	if (has_slv_msrs(family, model))

	if (has_slv_msrs(family, model))

		return 0;

		return 0;
@@ -2668,6 +2696,22 @@ int has_knl_turbo_ratio_limit(unsigned int family, unsigned int model) 
		return 0;

		return 0;

	}

	}

}

}

int has_glm_turbo_ratio_limit(unsigned int family, unsigned int model)

{

	if (!genuine_intel)

		return 0;



	if (family != 6)

		return 0;



	switch (model) {

	case INTEL_FAM6_ATOM_GOLDMONT:

	case INTEL_FAM6_SKYLAKE_X:

		return 1;

	default:

		return 0;

	}

}

int has_config_tdp(unsigned int family, unsigned int model)

int has_config_tdp(unsigned int family, unsigned int model)

{

{

	if (!genuine_intel)

	if (!genuine_intel)
@@ -2714,8 +2758,8 @@ dump_cstate_pstate_config_info(unsigned int family, unsigned int model) 
	if (has_ivt_turbo_ratio_limit(family, model))

	if (has_ivt_turbo_ratio_limit(family, model))

		dump_ivt_turbo_ratio_limits();

		dump_ivt_turbo_ratio_limits();





	if (has_nhm_turbo_ratio_limit(family, model))

	if (has_turbo_ratio_limit(family, model))

		dump_nhm_turbo_ratio_limits();

		dump_turbo_ratio_limits(family, model);





	if (has_atom_turbo_ratio_limit(family, model))

	if (has_atom_turbo_ratio_limit(family, model))

		dump_atom_turbo_ratio_limits();

		dump_atom_turbo_ratio_limits();