Skip to content

Commit 570992f

Browse files
committed
tools/power turbostat: rename has_hsw_msrs()
Perhaps if this more descriptive name had been used, then we wouldn't have had the HSW ULT vs HSW CORE bug, fixed by the previous commit. Signed-off-by: Len Brown <[email protected]>
1 parent cd188af commit 570992f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tools/power/x86/turbostat/turbostat.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4280,7 +4280,7 @@ int has_snb_msrs(unsigned int family, unsigned int model)
42804280
}
42814281

42824282
/*
4283-
* HSW adds support for additional MSRs:
4283+
* HSW ULT added support for C8/C9/C10 MSRs:
42844284
*
42854285
* MSR_PKG_C8_RESIDENCY 0x00000630
42864286
* MSR_PKG_C9_RESIDENCY 0x00000631
@@ -4291,7 +4291,7 @@ int has_snb_msrs(unsigned int family, unsigned int model)
42914291
* MSR_PKGC10_IRTL 0x00000635
42924292
*
42934293
*/
4294-
int has_hsw_msrs(unsigned int family, unsigned int model)
4294+
int has_c8910_msrs(unsigned int family, unsigned int model)
42954295
{
42964296
if (!genuine_intel)
42974297
return 0;
@@ -4833,12 +4833,12 @@ void process_cpuid()
48334833
BIC_NOT_PRESENT(BIC_CPU_c7);
48344834
BIC_NOT_PRESENT(BIC_Pkgpc7);
48354835
}
4836-
if (has_hsw_msrs(family, model)) {
4836+
if (has_c8910_msrs(family, model)) {
48374837
BIC_PRESENT(BIC_Pkgpc8);
48384838
BIC_PRESENT(BIC_Pkgpc9);
48394839
BIC_PRESENT(BIC_Pkgpc10);
48404840
}
4841-
do_irtl_hsw = has_hsw_msrs(family, model);
4841+
do_irtl_hsw = has_c8910_msrs(family, model);
48424842
if (has_skl_msrs(family, model)) {
48434843
BIC_PRESENT(BIC_Totl_c0);
48444844
BIC_PRESENT(BIC_Any_c0);

0 commit comments

Comments
 (0)