diff options
| author | Yu, Ong Hock <ong.hock.yu@intel.com> | 2016-06-23 02:59:58 -0400 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2016-06-29 01:21:15 -0400 |
| commit | 08a245160bce8b3d044fa0fdac9ca099bd720706 (patch) | |
| tree | 3167553874b58a648c068475a04bce56c9fc5fc7 /drivers/platform | |
| parent | 1d6de071cb0c321279373634d81eb8e176d887c4 (diff) | |
intel_telemetry: Remove Monitor MWAIT feature dependency
Telemetry capability does not depend on Monitor MWAIT feature.
Signed-off-by: "Yu, Ong Hock" <ong.hock.yu@intel.com>
Acked-by: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/intel_telemetry_debugfs.c | 2 | ||||
| -rw-r--r-- | drivers/platform/x86/intel_telemetry_pltdrv.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c index f5134acd6ff0..d76ee59f5090 100644 --- a/drivers/platform/x86/intel_telemetry_debugfs.c +++ b/drivers/platform/x86/intel_telemetry_debugfs.c | |||
| @@ -78,7 +78,7 @@ | |||
| 78 | #define TELEM_EVT_LEN(x) (sizeof(x)/sizeof((x)[0])) | 78 | #define TELEM_EVT_LEN(x) (sizeof(x)/sizeof((x)[0])) |
| 79 | 79 | ||
| 80 | #define TELEM_DEBUGFS_CPU(model, data) \ | 80 | #define TELEM_DEBUGFS_CPU(model, data) \ |
| 81 | { X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT, (unsigned long)&data} | 81 | { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&data} |
| 82 | 82 | ||
| 83 | #define TELEM_CHECK_AND_PARSE_EVTS(EVTID, EVTNUM, BUF, EVTLOG, EVTDAT, MASK) { \ | 83 | #define TELEM_CHECK_AND_PARSE_EVTS(EVTID, EVTNUM, BUF, EVTLOG, EVTDAT, MASK) { \ |
| 84 | if (evtlog[index].telem_evtid == (EVTID)) { \ | 84 | if (evtlog[index].telem_evtid == (EVTID)) { \ |
diff --git a/drivers/platform/x86/intel_telemetry_pltdrv.c b/drivers/platform/x86/intel_telemetry_pltdrv.c index 09c84a2b1c2c..e62cee97d65a 100644 --- a/drivers/platform/x86/intel_telemetry_pltdrv.c +++ b/drivers/platform/x86/intel_telemetry_pltdrv.c | |||
| @@ -82,7 +82,7 @@ | |||
| 82 | #define TELEM_SET_VERBOSITY_BITS(x, y) ((x) |= ((y) << 27)) | 82 | #define TELEM_SET_VERBOSITY_BITS(x, y) ((x) |= ((y) << 27)) |
| 83 | 83 | ||
| 84 | #define TELEM_CPU(model, data) \ | 84 | #define TELEM_CPU(model, data) \ |
| 85 | { X86_VENDOR_INTEL, 6, model, X86_FEATURE_MWAIT, (unsigned long)&data } | 85 | { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&data } |
| 86 | 86 | ||
| 87 | enum telemetry_action { | 87 | enum telemetry_action { |
| 88 | TELEM_UPDATE = 0, | 88 | TELEM_UPDATE = 0, |
