Merge tag 'perf-urgent-2023-01-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull perf events hw enablement from Ingo Molnar:

- More hardware-enablement for Intel Meteor Lake & Emerald Rapid
systems: pure model ID enumeration additions that do not affect other
systems.

* tag 'perf-urgent-2023-01-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/intel/uncore: Add Emerald Rapids
perf/x86/msr: Add Emerald Rapids
perf/x86/msr: Add Meteor Lake support
perf/x86/cstate: Add Meteor Lake support

Linus Torvalds 3 years ago a7b19c60 ea66bf86

+16 -9

3 changed files

expand all

arch

x86

events

intel

cstate.c

uncore.c

msr.c

+12 -9

arch/x86/events/intel/cstate.c

··· 41 41 * MSR_CORE_C1_RES: CORE C1 Residency Counter 42 42 * perf code: 0x00 43 43 * Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL,RPL 44 + * MTL 44 45 * Scope: Core (each processor core has a MSR) 45 46 * MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter 46 47 * perf code: 0x01 ··· 52 51 * perf code: 0x02 53 52 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, 54 53 * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, 55 - * TGL,TNT,RKL,ADL,RPL,SPR 54 + * TGL,TNT,RKL,ADL,RPL,SPR,MTL 56 55 * Scope: Core 57 56 * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter 58 57 * perf code: 0x03 59 58 * Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML, 60 - * ICL,TGL,RKL,ADL,RPL 59 + * ICL,TGL,RKL,ADL,RPL,MTL 61 60 * Scope: Core 62 61 * MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. 63 62 * perf code: 0x00 64 63 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, 65 64 * KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL, 66 - * RPL,SPR 65 + * RPL,SPR,MTL 67 66 * Scope: Package (physical package) 68 67 * MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter. 69 68 * perf code: 0x01 70 69 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL, 71 70 * GLM,CNL,KBL,CML,ICL,TGL,TNT,RKL, 72 - * ADL,RPL 71 + * ADL,RPL,MTL 73 72 * Scope: Package (physical package) 74 73 * MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter. 75 74 * perf code: 0x02 76 75 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, 77 76 * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, 78 - * TGL,TNT,RKL,ADL,RPL,SPR 77 + * TGL,TNT,RKL,ADL,RPL,SPR,MTL 79 78 * Scope: Package (physical package) 80 79 * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter. 81 80 * perf code: 0x03 82 81 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL, 83 - * KBL,CML,ICL,TGL,RKL,ADL,RPL 82 + * KBL,CML,ICL,TGL,RKL,ADL,RPL,MTL 84 83 * Scope: Package (physical package) 85 84 * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. 86 85 * perf code: 0x04 87 86 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, 88 - * ADL,RPL 87 + * ADL,RPL,MTL 89 88 * Scope: Package (physical package) 90 89 * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. 91 90 * perf code: 0x05 92 91 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, 93 - * ADL,RPL 92 + * ADL,RPL,MTL 94 93 * Scope: Package (physical package) 95 94 * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. 96 95 * perf code: 0x06 97 96 * Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL, 98 - * TNT,RKL,ADL,RPL 97 + * TNT,RKL,ADL,RPL,MTL 99 98 * Scope: Package (physical package) 100 99 * 101 100 */ ··· 687 686 X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &adl_cstates), 688 687 X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &adl_cstates), 689 688 X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_cstates), 689 + X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, &adl_cstates), 690 + X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &adl_cstates), 690 691 { }, 691 692 }; 692 693 MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);

arch/x86/events/intel/uncore.c

··· 1833 1833 X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &adl_uncore_init), 1834 1834 X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_uncore_init), 1835 1835 X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &spr_uncore_init), 1836 + X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X, &spr_uncore_init), 1836 1837 X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init), 1837 1838 {}, 1838 1839 };

arch/x86/events/msr.c

··· 69 69 case INTEL_FAM6_BROADWELL_G: 70 70 case INTEL_FAM6_BROADWELL_X: 71 71 case INTEL_FAM6_SAPPHIRERAPIDS_X: 72 + case INTEL_FAM6_EMERALDRAPIDS_X: 72 73 73 74 case INTEL_FAM6_ATOM_SILVERMONT: 74 75 case INTEL_FAM6_ATOM_SILVERMONT_D: ··· 108 107 case INTEL_FAM6_RAPTORLAKE: 109 108 case INTEL_FAM6_RAPTORLAKE_P: 110 109 case INTEL_FAM6_RAPTORLAKE_S: 110 + case INTEL_FAM6_METEORLAKE: 111 + case INTEL_FAM6_METEORLAKE_L: 111 112 if (idx == PERF_MSR_SMI || idx == PERF_MSR_PPERF) 112 113 return true; 113 114 break;