perf/x86/intel: Add Rocket Lake CPU support
Subsystems (2)
PATCH 1/4 perf/x86/intel: Add Rocket Lake CPU support
From: Kan Liang <[email protected]>
From the perspective of Intel PMU, Rocket Lake is the same as Ice Lake and Tiger Lake. Share the perf code with them.
--- arch/x86/events/intel/core.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/intel/core.c +1 -0
@@ -5425,6 +5425,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_ICELAKE :case INTEL_FAM6_TIGERLAKE_L :case INTEL_FAM6_TIGERLAKE : +case INTEL_FAM6_ROCKETLAKE : x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, skl_hw_cache_event_ids,sizeof (hw_cache_event_ids));memcpy (hw_cache_extra_regs, skl_hw_cache_extra_regs,sizeof (hw_cache_extra_regs));
Signature · 1 line
2.25.1
PATCH 2/4 perf/x86/cstate: Add Rocket Lake CPU support
From: Kan Liang <[email protected]>
From the perspective of Intel cstate residency counters, Rocket Lake is the same as Ice Lake and Tiger Lake. Share the code with them. Update the comments for Rocket Lake.
--- arch/x86/events/intel/cstate.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
arch/x86/events/intel/cstate.c +10 -9
@@ -51,46 +51,46 @@* perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,TGL, -* TNT +* TNT,RKL * Scope: Core * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter * perf code: 0x03 * Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML, -* ICL,TGL +* ICL,TGL,RKL * Scope: Core * MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. * perf code: 0x00 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, -* KBL,CML,ICL,TGL,TNT +* KBL,CML,ICL,TGL,TNT,RKL * Scope: Package (physical package) * MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter. * perf code: 0x01 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL, -* GLM,CNL,KBL,CML,ICL,TGL,TNT +* GLM,CNL,KBL,CML,ICL,TGL,TNT,RKL * Scope: Package (physical package) * MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter. * perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,TGL, -* TNT +* TNT,RKL * Scope: Package (physical package) * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter. * perf code: 0x03 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL, -* KBL,CML,ICL,TGL +* KBL,CML,ICL,TGL,RKL * Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04 -* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL +* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL * Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 -* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL +* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06 * Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL, -* TNT +* TNT,RKL * Scope: Package (physical package) * */
@@ -649,6 +649,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ICELAKE , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE_L , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE , &icl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &icl_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
Signature · 1 line
2.25.1
[tip: perf/core] perf/x86/cstate: Add Rocket Lake CPU support
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: cbea56395cba13173fffb9251cb23f146b51c792 Gitweb: https://git.kernel.org/tip/cbea56395cba13173fffb9251cb23f146b51c792 Author: Kan Liang <[email protected]> AuthorDate: Mon, 19 Oct 2020 08:35:26 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 29 Oct 2020 11:00:40 +01:00
perf/x86/cstate: Add Rocket Lake CPU support
Quoted 1 line
From the perspective of Intel cstate residency counters, Rocket Lake is
the same as Ice Lake and Tiger Lake. Share the code with them. Update the comments for Rocket Lake.
--- arch/x86/events/intel/cstate.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
arch/x86/events/intel/cstate.c +10 -9
@@ -51,46 +51,46 @@* perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,TGL, -* TNT +* TNT,RKL * Scope: Core * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter * perf code: 0x03 * Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML, -* ICL,TGL +* ICL,TGL,RKL * Scope: Core * MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. * perf code: 0x00 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, -* KBL,CML,ICL,TGL,TNT +* KBL,CML,ICL,TGL,TNT,RKL * Scope: Package (physical package) * MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter. * perf code: 0x01 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL, -* GLM,CNL,KBL,CML,ICL,TGL,TNT +* GLM,CNL,KBL,CML,ICL,TGL,TNT,RKL * Scope: Package (physical package) * MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter. * perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,TGL, -* TNT +* TNT,RKL * Scope: Package (physical package) * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter. * perf code: 0x03 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL, -* KBL,CML,ICL,TGL +* KBL,CML,ICL,TGL,RKL * Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04 -* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL +* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL * Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 -* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL +* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06 * Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL, -* TNT +* TNT,RKL * Scope: Package (physical package) * */
@@ -649,6 +649,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ICELAKE , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE_L , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE , &icl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &icl_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
PATCH 3/4 perf/x86/msr: Add Rocket Lake CPU support
In reply to [email protected]From: Kan Liang <[email protected]>
Like Ice Lake and Tiger Lake, PPERF and SMI_COUNT MSRs are also supported by Rocket Lake.
--- arch/x86/events/msr.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/msr.c +1 -0
@@ -99,6 +99,7 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_ICELAKE_D :case INTEL_FAM6_TIGERLAKE_L :case INTEL_FAM6_TIGERLAKE : +case INTEL_FAM6_ROCKETLAKE :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
Signature · 1 line
2.25.1
[tip: perf/core] perf/x86/msr: Add Rocket Lake CPU support
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: 907a196fbc70a48338ee8512da32f70fd33c97eb Gitweb: https://git.kernel.org/tip/907a196fbc70a48338ee8512da32f70fd33c97eb Author: Kan Liang <[email protected]> AuthorDate: Mon, 19 Oct 2020 08:35:27 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 29 Oct 2020 11:00:40 +01:00
perf/x86/msr: Add Rocket Lake CPU support
Like Ice Lake and Tiger Lake, PPERF and SMI_COUNT MSRs are also supported by Rocket Lake.
--- arch/x86/events/msr.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/msr.c +1 -0
@@ -99,6 +99,7 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_ICELAKE_D :case INTEL_FAM6_TIGERLAKE_L :case INTEL_FAM6_TIGERLAKE : +case INTEL_FAM6_ROCKETLAKE :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
PATCH 4/4 perf/x86/intel/uncore: Add Rocket Lake support
In reply to [email protected]From: Kan Liang <[email protected]>
For Rocket Lake, the MSR uncore, e.g., CBOX, ARB and CLOCKBOX, are the same as Tiger Lake. Share the perf code with it.
For Rocket Lake and Tiger Lake, the 8th CBOX is not mapped into a different MSR space anymore. Add rkl_uncore_msr_init_box() to replace skl_uncore_msr_init_box().
The IMC uncore is the similar to Ice Lake. Add new PCIIDs of IMC for Rocket Lake.
--- arch/x86/events/intel/uncore.c | 6 ++++++ arch/x86/events/intel/uncore_snb.c | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore.c +6 -0
@@ -1636,6 +1636,11 @@ static const struct intel_uncore_init_fun tgl_l_uncore_init __initconst = { .mmio_init = tgl_l_uncore_mmio_init, }; +static const struct intel_uncore_init_fun rkl_uncore_init__initconst = { + .cpu_init = tgl_uncore_cpu_init, + .pci_init = skl_uncore_pci_init, +}; +static const struct intel_uncore_init_fun icx_uncore_init__initconst = { .cpu_init = icx_uncore_cpu_init, .pci_init = icx_uncore_pci_init,
@@ -1683,6 +1688,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_X , &icx_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE_L , &tgl_l_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE , &tgl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &rkl_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init), {}, };
arch/x86/events/intel/uncore_snb.c +19 -1
@@ -60,7 +60,8 @@#define PCI_DEVICE_ID_INTEL_TGL_U3_IMC 0x9a12#define PCI_DEVICE_ID_INTEL_TGL_U4_IMC 0x9a14#define PCI_DEVICE_ID_INTEL_TGL_H_IMC 0x9a36 - +#define PCI_DEVICE_ID_INTEL_RKL_1_IMC 0x4c43 +#define PCI_DEVICE_ID_INTEL_RKL_2_IMC 0x4c53/* SNB event control */ #define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff
@@ -405,6 +406,12 @@ static struct intel_uncore_type *tgl_msr_uncores[] = { NULL, }; +static void rkl_uncore_msr_init_box (struct intel_uncore_box *box) +{ +if (box->pmu->pmu_idx ==0 ) +wrmsrl (SKL_UNC_PERF_GLOBAL_CTL ,SNB_UNC_GLOBAL_CTL_EN ); +} +void tgl_uncore_cpu_init (void ) { uncore_msr_uncores = tgl_msr_uncores;
@@ -412,6 +419,7 @@ void tgl_uncore_cpu_init(void) icl_uncore_cbox.ops = &skl_uncore_msr_ops; icl_uncore_clockbox.ops = &skl_uncore_msr_ops; snb_uncore_arb.ops = &skl_uncore_msr_ops; + skl_uncore_msr_ops.init_box = rkl_uncore_msr_init_box; }enum {
@@ -880,6 +888,14 @@ static const struct pci_device_id icl_uncore_pci_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICL_U2_IMC), .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), }, + {/* IMC */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_RKL_1_IMC), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + { /* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RKL_2_IMC ), + .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), + }, { /* end: all zeroes */ }, };
@@ -973,6 +989,8 @@ static const struct imc_uncore_pci_dev desktop_imc_pci_ids[] = {IMC_DEV (CML_S5_IMC , &skl_uncore_pci_driver),IMC_DEV (ICL_U_IMC , &icl_uncore_pci_driver),/* 10th Gen Core Mobile */ IMC_DEV (ICL_U2_IMC , &icl_uncore_pci_driver),/* 10th Gen Core Mobile */ +IMC_DEV (RKL_1_IMC , &icl_uncore_pci_driver), + IMC_DEV(RKL_2_IMC, &icl_uncore_pci_driver), { /* end marker */ } };
Signature · 1 line
2.25.1
[tip: perf/core] perf/x86/intel/uncore: Add Rocket Lake support
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: 43bc103a8044b9f7963aa1684efbdc9bd60939de Gitweb: https://git.kernel.org/tip/43bc103a8044b9f7963aa1684efbdc9bd60939de Author: Kan Liang <[email protected]> AuthorDate: Mon, 19 Oct 2020 08:35:28 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 29 Oct 2020 11:00:40 +01:00
perf/x86/intel/uncore: Add Rocket Lake support
For Rocket Lake, the MSR uncore, e.g., CBOX, ARB and CLOCKBOX, are the same as Tiger Lake. Share the perf code with it.
For Rocket Lake and Tiger Lake, the 8th CBOX is not mapped into a different MSR space anymore. Add rkl_uncore_msr_init_box() to replace skl_uncore_msr_init_box().
The IMC uncore is the similar to Ice Lake. Add new PCIIDs of IMC for Rocket Lake.
--- arch/x86/events/intel/uncore.c | 6 ++++++ arch/x86/events/intel/uncore_snb.c | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore.c +6 -0
@@ -1636,6 +1636,11 @@ static const struct intel_uncore_init_fun tgl_l_uncore_init __initconst = { .mmio_init = tgl_l_uncore_mmio_init, }; +static const struct intel_uncore_init_fun rkl_uncore_init__initconst = { + .cpu_init = tgl_uncore_cpu_init, + .pci_init = skl_uncore_pci_init, +}; +static const struct intel_uncore_init_fun icx_uncore_init__initconst = { .cpu_init = icx_uncore_cpu_init, .pci_init = icx_uncore_pci_init,
@@ -1683,6 +1688,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_X , &icx_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE_L , &tgl_l_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE , &tgl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &rkl_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init), {}, };
arch/x86/events/intel/uncore_snb.c +19 -1
@@ -60,7 +60,8 @@#define PCI_DEVICE_ID_INTEL_TGL_U3_IMC 0x9a12#define PCI_DEVICE_ID_INTEL_TGL_U4_IMC 0x9a14#define PCI_DEVICE_ID_INTEL_TGL_H_IMC 0x9a36 - +#define PCI_DEVICE_ID_INTEL_RKL_1_IMC 0x4c43 +#define PCI_DEVICE_ID_INTEL_RKL_2_IMC 0x4c53/* SNB event control */ #define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff
@@ -405,6 +406,12 @@ static struct intel_uncore_type *tgl_msr_uncores[] = { NULL, }; +static void rkl_uncore_msr_init_box (struct intel_uncore_box *box) +{ +if (box->pmu->pmu_idx ==0 ) +wrmsrl (SKL_UNC_PERF_GLOBAL_CTL ,SNB_UNC_GLOBAL_CTL_EN ); +} +void tgl_uncore_cpu_init (void ) { uncore_msr_uncores = tgl_msr_uncores;
@@ -412,6 +419,7 @@ void tgl_uncore_cpu_init(void) icl_uncore_cbox.ops = &skl_uncore_msr_ops; icl_uncore_clockbox.ops = &skl_uncore_msr_ops; snb_uncore_arb.ops = &skl_uncore_msr_ops; + skl_uncore_msr_ops.init_box = rkl_uncore_msr_init_box; }enum {
@@ -880,6 +888,14 @@ static const struct pci_device_id icl_uncore_pci_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICL_U2_IMC), .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), }, + {/* IMC */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_RKL_1_IMC), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + { /* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RKL_2_IMC ), + .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), + }, { /* end: all zeroes */ }, };
@@ -973,6 +989,8 @@ static const struct imc_uncore_pci_dev desktop_imc_pci_ids[] = {IMC_DEV (CML_S5_IMC , &skl_uncore_pci_driver),IMC_DEV (ICL_U_IMC , &icl_uncore_pci_driver),/* 10th Gen Core Mobile */ IMC_DEV (ICL_U2_IMC , &icl_uncore_pci_driver),/* 10th Gen Core Mobile */ +IMC_DEV (RKL_1_IMC , &icl_uncore_pci_driver), + IMC_DEV(RKL_2_IMC, &icl_uncore_pci_driver), { /* end marker */ } };
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: b14d0db5b8c86507c9810c1c8162c7d4a3c656bd Gitweb: https://git.kernel.org/tip/b14d0db5b8c86507c9810c1c8162c7d4a3c656bd Author: Kan Liang <[email protected]> AuthorDate: Mon, 19 Oct 2020 08:35:25 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 29 Oct 2020 11:00:39 +01:00
perf/x86/intel: Add Rocket Lake CPU support
Quoted 1 line
From the perspective of Intel PMU, Rocket Lake is the same as Ice Lake
and Tiger Lake. Share the perf code with them.
--- arch/x86/events/intel/core.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/intel/core.c +1 -0
@@ -5436,6 +5436,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_ICELAKE :case INTEL_FAM6_TIGERLAKE_L :case INTEL_FAM6_TIGERLAKE : +case INTEL_FAM6_ROCKETLAKE : x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, skl_hw_cache_event_ids,sizeof (hw_cache_event_ids));memcpy (hw_cache_extra_regs, skl_hw_cache_extra_regs,sizeof (hw_cache_extra_regs));