turbostat: fix Skylake server package
diff mbox

Message ID 20170804154223.16223-1-artem.bityutskiy@linux.intel.com
State Accepted
Headers show

Commit Message

Artem Bityutskiy Aug. 4, 2017, 3:42 p.m. UTC
This patch fixes the problem of turbostat not reporting any package C-states on
Skylake Xeon processor when the deepest package C-stated is configured as "no
limit" in the UEFI firmware configuration menu.

The lowest 3 bits of the MSR_PKG_CST_CONFIG_CONTROL (0x000000e2) register
contain 7 in this case, meaning "No Package C state limits" (see Intel SDM, vol
4, Table 2-41 - MSRs Supported by Intel® Xeon® Processor Scalable Family with
DisplayFamily_DisplayModel 06_55H).

The problem was that turbostat's internal array of supported package C-sates
(skx_pkg_cstate_limits) marked position #7 as "PCLRSV" (reserved), instead of
"PCLUNL" (not limited). Instead, position #8 was incorrectly marked as "PCLUNL"
(probably due to a typo).

This patch fixes the issue by marking position #7 as "not limited", and
position #8 as "reserved".

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
---
 turbostat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Len Brown Aug. 5, 2017, 7:07 a.m. UTC | #1
Applied!

thanks,
-Len

On Fri, Aug 4, 2017 at 11:42 AM, Artem Bityutskiy
<artem.bityutskiy@linux.intel.com> wrote:
> This patch fixes the problem of turbostat not reporting any package C-states on
> Skylake Xeon processor when the deepest package C-stated is configured as "no
> limit" in the UEFI firmware configuration menu.
>
> The lowest 3 bits of the MSR_PKG_CST_CONFIG_CONTROL (0x000000e2) register
> contain 7 in this case, meaning "No Package C state limits" (see Intel SDM, vol
> 4, Table 2-41 - MSRs Supported by Intel® Xeon® Processor Scalable Family with
> DisplayFamily_DisplayModel 06_55H).
>
> The problem was that turbostat's internal array of supported package C-sates
> (skx_pkg_cstate_limits) marked position #7 as "PCLRSV" (reserved), instead of
> "PCLUNL" (not limited). Instead, position #8 was incorrectly marked as "PCLUNL"
> (probably due to a typo).
>
> This patch fixes the issue by marking position #7 as "not limited", and
> position #8 as "reserved".
>
> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
> ---
>  turbostat.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/turbostat.c b/turbostat.c
> index 6c185a9..1c4d3e2 100644
> --- a/turbostat.c
> +++ b/turbostat.c
> @@ -1816,7 +1816,7 @@ int slv_pkg_cstate_limits[16] = {PCL__0, PCL__1, PCLRSV, PCLRSV, PCL__4, PCLRSV,
>  int amt_pkg_cstate_limits[16] = {PCLUNL, 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};
> +int skx_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCL_6N, PCL_6R, PCLRSV, PCLRSV, PCLRSV, PCLUNL, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
>
>
>  static void
> --
> 2.9.3

Patch
diff mbox

diff --git a/turbostat.c b/turbostat.c
index 6c185a9..1c4d3e2 100644
--- a/turbostat.c
+++ b/turbostat.c
@@ -1816,7 +1816,7 @@  int slv_pkg_cstate_limits[16] = {PCL__0, PCL__1, PCLRSV, PCLRSV, PCL__4, PCLRSV,
 int amt_pkg_cstate_limits[16] = {PCLUNL, 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};
+int skx_pkg_cstate_limits[16] = {PCL__0, PCL__2, PCL_6N, PCL_6R, PCLRSV, PCLRSV, PCLRSV, PCLUNL, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV, PCLRSV};
 
 
 static void