aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Senozhatsky <sergey.senozhatsky@gmail.com>2013-10-17 23:37:51 +0300
committerKristen Carlson Accardi <kristen@linux.intel.com>2013-10-18 10:53:33 -0700
commitb283af0839fbcdd29023f17cd02ddad241a10cf4 (patch)
treea4114a063b19bbdbfc5dc59f6cc8ffefe072402d
parentc6b903c04d81520905d82fb8da962edf29d68ab4 (diff)
intel cpus: add proper C-states initv2.5-rc1upstream
add missing has_c2c7_res init to nhm_core() .ctor and has_c8c9c10_res/has_c2c7_res init to nhm_package() .ctor. uninitialised has_c2c7_res/has_c8c9c10_res/has_c2c7_res may be used in core/package measurement_start()/measurement_end(). Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
-rw-r--r--src/cpu/intel_cpus.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp
index 194dc75..ad80337 100644
--- a/src/cpu/intel_cpus.cpp
+++ b/src/cpu/intel_cpus.cpp
@@ -87,6 +87,8 @@ static uint64_t get_msr(int cpu, uint64_t offset)
nhm_core::nhm_core(int model)
{
+ has_c2c7_res = 0;
+
switch(model) {
case 0x2A: /* SNB */
case 0x2D: /* SNB Xeon */
@@ -252,6 +254,9 @@ char * nhm_core::fill_pstate_line(int line_nr, char *buffer)
nhm_package::nhm_package(int model)
{
+ has_c8c9c10_res = 0;
+ has_c2c7_res = 0;
+
switch(model) {
case 0x2A: /* SNB */
case 0x2D: /* SNB Xeon */
@@ -269,7 +274,6 @@ nhm_package::nhm_package(int model)
else
has_c3_res = 1;
-
/* Haswell-ULT has C8/9/10*/
if (model == 0x45)
has_c8c9c10_res = 1;