Pull perf fix from Ingo Molnar: "A cstate event enumeration fix for Kaby/Coffee Lake CPUs" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/intel: Update KBL Package C-state events to also include PC8/PC9/PC10 counters
Unified · Split
| @@ -76,15 +76,15 @@ · 75 unmodified lines | |||
| 76 | * Scope: Package (physical package) | 76 | * Scope: Package (physical package) |
| 77 | * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. | 77 | * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. |
| 78 | * perf code: 0x04 | 78 | * perf code: 0x04 |
| 79 | * Available model: HSW ULT,CNL | 79 | * Available model: HSW ULT,KBL,CNL |
| 80 | * Scope: Package (physical package) | 80 | * Scope: Package (physical package) |
| 81 | * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. | 81 | * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. |
| 82 | * perf code: 0x05 | 82 | * perf code: 0x05 |
| 83 | * Available model: HSW ULT,CNL | 83 | * Available model: HSW ULT,KBL,CNL |
| 84 | * Scope: Package (physical package) | 84 | * Scope: Package (physical package) |
| 85 | * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. | 85 | * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. |
| 86 | * perf code: 0x06 | 86 | * perf code: 0x06 |
| 87 | * Available model: HSW ULT,GLM,CNL | 87 | * Available model: HSW ULT,KBL,GLM,CNL |
| 88 | * Scope: Package (physical package) | 88 | * Scope: Package (physical package) |
| 89 | * | 89 | * |
| 90 | */ | 90 | */ |
| @@ -566,8 +566,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = { · 475 unmodified lines | |||
| 566 | X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_DESKTOP, snb_cstates), | 566 | X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_DESKTOP, snb_cstates), |
| 567 | X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_X, snb_cstates), | 567 | X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_X, snb_cstates), |
| 568 | 568 | ||
| 569 | X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_MOBILE, snb_cstates), | 569 | X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_MOBILE, hswult_cstates), |
| 570 | X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_DESKTOP, snb_cstates), | 570 | X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_DESKTOP, hswult_cstates), |
| 571 | 571 | ||
| 572 | X86_CSTATES_MODEL(INTEL_FAM6_CANNONLAKE_MOBILE, cnl_cstates), | 572 | X86_CSTATES_MODEL(INTEL_FAM6_CANNONLAKE_MOBILE, cnl_cstates), |
| 573 | 573 | ||