Add DMR/NVL and missing PTL uncore support
Status from this message: The following commit has been merged into the perf/core branch of tip:
Get series with b4
b4 am [email protected]Versions newest first
Changes in v2 from the cover letter
- Introduce struct uncore_discovery_domain[] to allow multiple discovery base, and each could be either an MSR or a PCI device.
- Add global_init() callback.
- Add missing format_attr_umask in dmr_imc_uncore_formats_attr[].
- Address Dapeng’s comments.
- Add new patches for PTL and NVL uncore support.
Patches in v2 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/13 | perf/x86/intel/uncore: Move uncore discovery init struct to headerarch/ arch/ arch/ +1 more | +49 | 1 reply | |
| 2/13 | perf/x86/intel/uncore: Support per-platform discovery base devicesarch/ arch/ arch/ | +69 | 2 replies | |
| 3/13 | perf/x86/intel/uncore: Remove has_generic_discovery_table()arch/ arch/ | +12 | 1 reply | |
| 4/13 | perf/x86/intel/uncore: Add IMH PMON support for Diamond Rapidsarch/ arch/ arch/ +1 more | +243 | 0 replies | |
| 5/13 | perf/x86/intel/uncore: Add CBB PMON support for Diamond Rapidsarch/ arch/ arch/ +1 more | +54 | 0 replies | |
| 6/13 | perf/x86/intel/uncore: Add domain global init callbackarch/ arch/ arch/ | +21 | 1 reply | |
| 7/13 | perf/x86/intel/uncore: Add freerunning event descriptor helper macroarch/ | +28 | 0 replies | |
| 8/13 | perf/x86/intel/uncore: Support IIO free-running counters on DMRarch/ | +113 | 3 replies | |
| 9/13 | perf/x86/intel/uncore: Support uncore constraint rangesarch/ arch/ arch/ | +44 | 1 reply | |
| 10/13 | perf/x86/intel/uncore: Update DMR uncore constraints preliminarilyarch/ | +27 | 1 reply | |
| 11/13 | perf pmu: Relax uncore wildcard matching to allow numeric suffixtools/ | +8 | 9 replies | |
| 12/13 | perf/x86/intel/uncore: Add missing PMON units for Panther Lakearch/ arch/ | +46 | 2 replies | |
| 13/13 | perf/x86/intel/uncore: Add Nova Lake supportarch/ arch/ arch/ +1 more | +52 | 1 reply |
Reviews trailers per patch
12 of 13 patches have a Reviewed-by or Acked-by.
| Patch | Dapeng Mi |
|---|---|
| 1/13 | R-b |
| 2/13 | R-b |
| 3/13 | R-b |
| 4/13 | |
| 5/13 | R-b |
| 6/13 | R-b |
| 7/13 | R-b |
| 8/13 | R-b |
| 9/13 | R-b |
| 10/13 | R-b |
| 11/13 | R-b |
| 12/13 | R-b R-b |
| 13/13 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH V2 00/13] Add DMR/NVL and missing PTL uncore support
Similar to Sapphire Rapids, Diamond Rapids (DMR) relies on discovery tables for uncore enumeration. Key differences and additions include:
- DMR may have two Integrated I/O and Memory Hub (IMH) dies, separate from the compute tile (CBB) dies. Each CBB and each IMH die has its own discovery domain.
- Unlike prior CPUs that retrieve the global discovery table portal exclusively via PCI or MSR, DMR uses PCI for IMH PMON discovery and MSR for CBB PMON discovery.
- DMR introduces several new PMON types: SCA, HAMVF, D2D_ULA, UBR, PCIE4, CRS, CPC, ITC, OTC, CMS, and PCIE6.
- IIO free-running counters in DMR are MMIO-based, unlike SPR.
The uncore driver currently does not clear the freeze_all bit in the Global Control Register. On platforms where it is set at power-on, some units may not be enabled if they lack a per-unit enable bit.
Patch series overview:
- Patch 1–3, 7, 9: Cleanup or preparatory patches
- Patch 4–6, 8, 10–11: DMR uncore support
- Patch 12: Add missing PTL PMON units
- Patch 13: NVL uncore support
V2:
- Introduce struct uncore_discovery_domain[] to allow multiple discovery base, and each could be either an MSR or a PCI device.
- Add global_init() callback.
- Add missing format_attr_umask in dmr_imc_uncore_formats_attr[].
- Address Dapeng’s comments.
- Add new patches for PTL and NVL uncore support.
V1: https://lore.kernel.org/linux-perf-users/[email protected]/
Zide Chen (13):
perf/x86/intel/uncore: Move uncore discovery init struct to header perf/x86/intel/uncore: Support per-platform discovery base devices perf/x86/intel/uncore: Remove has_generic_discovery_table() perf/x86/intel/uncore: Add IMH PMON support for Diamond Rapids perf/x86/intel/uncore: Add CBB PMON support for Diamond Rapids perf/x86/intel/uncore: Add domain global init callback perf/x86/intel/uncore: Add freerunning event descriptor helper macro perf/x86/intel/uncore: Support IIO free-running counters on DMR perf/x86/intel/uncore: Support uncore constraint ranges perf/x86/intel/uncore: Update DMR uncore constraints preliminarily perf pmu: Relax uncore wildcard matching to allow numeric suffix perf/x86/intel/uncore: Add missing PMON units for Panther Lake perf/x86/intel/uncore: Add Nova Lake support
arch/x86/events/intel/uncore.c | 142 +++-- arch/x86/events/intel/uncore.h | 26 + arch/x86/events/intel/uncore_discovery.c | 78 ++- arch/x86/events/intel/uncore_discovery.h | 8 +- arch/x86/events/intel/uncore_snb.c | 85 +++ arch/x86/events/intel/uncore_snbep.c | 690 ++++++++++++++++------- tools/perf/util/pmu.c | 14 +- 7 files changed, 735 insertions(+), 308 deletions(-)
Signature · 1 line
2.52.0