tools/power turbostat: Support Ice Lake server

OpenAnolis Bug Tracker: 0000546

fix #36078218

commit 23274faf96 upstream

From a turbostat point of view, Ice Lake server looks like Sky Lake server.

[
 Guanjun: fix conflicts in
  tools/power/x86/turbostat/turbostat.c
]

Signed-off-by: Chen Yu <yu.c.chen@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Guanjun <guanjun@linux.alibaba.com>
Acked-by: Zelin Deng <zelin.deng@linux.alibaba.com>
This commit is contained in:
Chen Yu 2020-01-14 12:06:49 +08:00 committed by Xunlei Pang
parent 9eaab7ae87
commit 96a955027c
1 changed files with 2 additions and 0 deletions

View File

@ -4577,6 +4577,8 @@ unsigned int intel_model_duplicates(unsigned int model)
case INTEL_FAM6_KABYLAKE_L:
case INTEL_FAM6_KABYLAKE_DESKTOP:
return INTEL_FAM6_SKYLAKE_L;
case INTEL_FAM6_ICELAKE_X:
return INTEL_FAM6_SKYLAKE_X;
}
return model;
}