Commit 570992fc authored by Len Brown's avatar Len Brown

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: default avatarLen Brown <len.brown@intel.com>
parent cd188af5
...@@ -4280,7 +4280,7 @@ int has_snb_msrs(unsigned int family, unsigned int model) ...@@ -4280,7 +4280,7 @@ int has_snb_msrs(unsigned int family, unsigned int model)
} }
/* /*
* HSW adds support for additional MSRs: * HSW ULT added support for C8/C9/C10 MSRs:
* *
* MSR_PKG_C8_RESIDENCY 0x00000630 * MSR_PKG_C8_RESIDENCY 0x00000630
* MSR_PKG_C9_RESIDENCY 0x00000631 * MSR_PKG_C9_RESIDENCY 0x00000631
...@@ -4291,7 +4291,7 @@ int has_snb_msrs(unsigned int family, unsigned int model) ...@@ -4291,7 +4291,7 @@ int has_snb_msrs(unsigned int family, unsigned int model)
* MSR_PKGC10_IRTL 0x00000635 * MSR_PKGC10_IRTL 0x00000635
* *
*/ */
int has_hsw_msrs(unsigned int family, unsigned int model) int has_c8910_msrs(unsigned int family, unsigned int model)
{ {
if (!genuine_intel) if (!genuine_intel)
return 0; return 0;
...@@ -4833,12 +4833,12 @@ void process_cpuid() ...@@ -4833,12 +4833,12 @@ void process_cpuid()
BIC_NOT_PRESENT(BIC_CPU_c7); BIC_NOT_PRESENT(BIC_CPU_c7);
BIC_NOT_PRESENT(BIC_Pkgpc7); BIC_NOT_PRESENT(BIC_Pkgpc7);
} }
if (has_hsw_msrs(family, model)) { if (has_c8910_msrs(family, model)) {
BIC_PRESENT(BIC_Pkgpc8); BIC_PRESENT(BIC_Pkgpc8);
BIC_PRESENT(BIC_Pkgpc9); BIC_PRESENT(BIC_Pkgpc9);
BIC_PRESENT(BIC_Pkgpc10); BIC_PRESENT(BIC_Pkgpc10);
} }
do_irtl_hsw = has_hsw_msrs(family, model); do_irtl_hsw = has_c8910_msrs(family, model);
if (has_skl_msrs(family, model)) { if (has_skl_msrs(family, model)) {
BIC_PRESENT(BIC_Totl_c0); BIC_PRESENT(BIC_Totl_c0);
BIC_PRESENT(BIC_Any_c0); BIC_PRESENT(BIC_Any_c0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment