perf/x86/intel/uncore: Add Meteor Lake support
Subsystems (2)
PATCH 1/1 perf/x86/intel/uncore: Add Meteor Lake support
From: Kan Liang <[email protected]>
The uncore subsystem for Meteor Lake is similar to the previous Alder Lake. The main difference is that MTL provides PMU support for different tiles, while ADL only provides PMU support for the whole package. On ADL, there are CBOX, ARB, and clockbox uncore PMON units. On MTL, they are split into CBOX/HAC_CBOX, ARB/HAC_ARB, and cncu/sncu which provides a fixed counter for clockticks. Also, new MSR addresses are introduced on MTL.
The IMC uncore PMON is the same as Alder Lake. Add new PCIIDs of IMC for Meteor Lake.
--- arch/x86/events/intel/uncore.c | 7 ++ arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snb.c | 161 +++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+)
arch/x86/events/intel/uncore.c +7 -0
@@ -1789,6 +1789,11 @@ static const struct intel_uncore_init_fun adl_uncore_init __initconst = { .mmio_init = adl_uncore_mmio_init, }; +static const struct intel_uncore_init_fun mtl_uncore_init__initconst = { + .cpu_init = mtl_uncore_cpu_init, + .mmio_init = adl_uncore_mmio_init, +}; +static const struct intel_uncore_init_fun icx_uncore_init__initconst = { .cpu_init = icx_uncore_cpu_init, .pci_init = icx_uncore_pci_init,
@@ -1857,6 +1862,8 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_S , &adl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (METEORLAKE , &mtl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (METEORLAKE_L , &mtl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &spr_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (EMERALDRAPIDS_X , &spr_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init),
arch/x86/events/intel/uncore.h +1 -0
@@ -606,6 +606,7 @@ void skl_uncore_cpu_init(void);void icl_uncore_cpu_init (void );void tgl_uncore_cpu_init (void );void adl_uncore_cpu_init (void ); +void mtl_uncore_cpu_init (void );void tgl_uncore_mmio_init (void );void tgl_l_uncore_mmio_init (void );void adl_uncore_mmio_init (void );
arch/x86/events/intel/uncore_snb.c +161 -0
185 lines not on this page · raw message
Signature · 1 line
2.35.1
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: c828441f21ddc819a28b5723a72e3c840e9de1c6 Gitweb: https://git.kernel.org/tip/c828441f21ddc819a28b5723a72e3c840e9de1c6 Author: Kan Liang <[email protected]> AuthorDate: Fri, 10 Feb 2023 11:02:38 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sat, 11 Feb 2023 12:39:03 +01:00
perf/x86/intel/uncore: Add Meteor Lake support
The uncore subsystem for Meteor Lake is similar to the previous Alder Lake. The main difference is that MTL provides PMU support for different tiles, while ADL only provides PMU support for the whole package. On ADL, there are CBOX, ARB, and clockbox uncore PMON units. On MTL, they are split into CBOX/HAC_CBOX, ARB/HAC_ARB, and cncu/sncu which provides a fixed counter for clockticks. Also, new MSR addresses are introduced on MTL.
The IMC uncore PMON is the same as Alder Lake. Add new PCIIDs of IMC for Meteor Lake.
--- arch/x86/events/intel/uncore.c | 7 +- arch/x86/events/intel/uncore.h | 1 +- arch/x86/events/intel/uncore_snb.c | 161 ++++++++++++++++++++++++++++- 3 files changed, 169 insertions(+)
arch/x86/events/intel/uncore.c +7 -0
@@ -1789,6 +1789,11 @@ static const struct intel_uncore_init_fun adl_uncore_init __initconst = { .mmio_init = adl_uncore_mmio_init, }; +static const struct intel_uncore_init_fun mtl_uncore_init__initconst = { + .cpu_init = mtl_uncore_cpu_init, + .mmio_init = adl_uncore_mmio_init, +}; +static const struct intel_uncore_init_fun icx_uncore_init__initconst = { .cpu_init = icx_uncore_cpu_init, .pci_init = icx_uncore_pci_init,
@@ -1857,6 +1862,8 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_S , &adl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (METEORLAKE , &mtl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (METEORLAKE_L , &mtl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &spr_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (EMERALDRAPIDS_X , &spr_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init),
arch/x86/events/intel/uncore.h +1 -0
@@ -606,6 +606,7 @@ void skl_uncore_cpu_init(void);void icl_uncore_cpu_init (void );void tgl_uncore_cpu_init (void );void adl_uncore_cpu_init (void ); +void mtl_uncore_cpu_init (void );void tgl_uncore_mmio_init (void );void tgl_l_uncore_mmio_init (void );void adl_uncore_mmio_init (void );
arch/x86/events/intel/uncore_snb.c +161 -0
185 lines not on this page · raw message