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

Commit d8ebb442 authored by Len Brown's avatar Len Brown
Browse files

tools/power turbostat: fix SKX PKG_CSTATE_LIMIT decoding 



SKX has fewer package C-states than previous generations,
and so the decoding of PKG_CSTATE_LIMIT has changed.

This changes the line ending with pkg-cstate-limit=XXX: pcYYY

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

tools/power/x86/turbostat/turbostat.c

+4 −1
Original line number Diff line number Diff line
@@ -1294,6 +1294,7 @@ int slv_pkg_cstate_limits[16] = {PCL__0, PCL__1, PCLRSV, PCLRSV, PCL__4, PCLRSV, 
int amt_pkg_cstate_limits[16] = {PCL__0, PCL__1, PCL__2, PCLRSV, PCLRSV, PCLRSV, PCL__6, PCL__7, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};

int phi_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCL_6N, PCL_6R, PCLRSV, PCLRSV, PCLRSV, PCLUNL, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};

int bxt_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCLUNL, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};

int skx_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCL_6N, PCL_6R, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLUNL, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};





static void
@@ -2191,9 +2192,11 @@ int probe_nhm_msrs(unsigned int family, unsigned int model) 
	case INTEL_FAM6_SKYLAKE_DESKTOP:	/* SKL */

	case INTEL_FAM6_KABYLAKE_MOBILE:	/* KBL */

	case INTEL_FAM6_KABYLAKE_DESKTOP:	/* KBL */

	case INTEL_FAM6_SKYLAKE_X:	/* SKX */

		pkg_cstate_limits = hsw_pkg_cstate_limits;

		break;

	case INTEL_FAM6_SKYLAKE_X:	/* SKX */

		pkg_cstate_limits = skx_pkg_cstate_limits;

		break;

	case INTEL_FAM6_ATOM_SILVERMONT1:	/* BYT */

	case INTEL_FAM6_ATOM_SILVERMONT2:	/* AVN */

		pkg_cstate_limits = slv_pkg_cstate_limits;