Commit b2d433ae authored Sep 24, 2022 by Zhang Rui Committed by Len Brown Oct 04, 2022

tools/power turbostat: Use standard Energy Unit for SPR Dram RAPL domain



Intel Xeon servers used to use a fixed energy resolution (15.3uj) for
Dram RAPL domain. But on SPR, Dram RAPL domain follows the standard
energy resolution as described in MSR_RAPL_POWER_UNIT.

Remove the SPR rapl_dram_energy_units quirk.

Fixes: e7af1ed3 ("tools/power turbostat: Support additional CPU model numbers")
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Tested-by: Wang Wendy <wendy.wang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 3ea8e52e

tools/power/x86/turbostat/turbostat.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4567,7 +4567,6 @@ static double rapl_dram_energy_units_probe(int model, double rapl_energy_units)
	case INTEL_FAM6_SKYLAKE_X: /* SKX */		case INTEL_FAM6_SKYLAKE_X: /* SKX */
	case INTEL_FAM6_XEON_PHI_KNL: /* KNL */		case INTEL_FAM6_XEON_PHI_KNL: /* KNL */
	case INTEL_FAM6_ICELAKE_X: /* ICX */		case INTEL_FAM6_ICELAKE_X: /* ICX */
	case INTEL_FAM6_SAPPHIRERAPIDS_X: /* SPR */
	return (rapl_dram_energy_units = 15.3 / 1000000);		return (rapl_dram_energy_units = 15.3 / 1000000);
	default:		default:
	return (rapl_energy_units);		return (rapl_energy_units);