perf/x86: Add new Alder Lake and Raptor Lake support
Subsystems (2)
PATCH 1/5 perf/x86: Add new Alder Lake and Raptor Lake support
From: Kan Liang <[email protected]>
From PMU's perspective, there is no difference for the new Alder Lake N and Raptor Lake P.
--- arch/x86/events/intel/core.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/events/intel/core.c +2 -0
@@ -6216,7 +6216,9 @@ __init int intel_pmu_init(void)case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : +case INTEL_FAM6_ALDERLAKE_N :case INTEL_FAM6_RAPTORLAKE : +case INTEL_FAM6_RAPTORLAKE_P :/* * Alder Lake has 2 types of CPU, core and atom. *
Signature · 1 line
2.35.1
PATCH 2/5 perf/x86/msr: Add new Alder Lake and Raptor Lake support
From: Kan Liang <[email protected]>
The new Alder Lake N and Raptor Lake P also support PPERF and SMI_COUNT MSRs.
--- arch/x86/events/msr.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/events/msr.c +2 -0
@@ -103,7 +103,9 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_ROCKETLAKE :case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : +case INTEL_FAM6_ALDERLAKE_N :case INTEL_FAM6_RAPTORLAKE : +case INTEL_FAM6_RAPTORLAKE_P :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
Signature · 1 line
2.35.1
PATCH 3/5 perf/x86/cstate: Add new Alder Lake and Raptor Lake support
In reply to [email protected]From: Kan Liang <[email protected]>
From the perspective of Intel cstate residency counters, there is nothing changed for the new Alder Lake N and Raptor Lake P.
--- arch/x86/events/intel/cstate.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/events/intel/cstate.c +2 -0
@@ -681,7 +681,9 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_cstates), + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &adl_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
Signature · 1 line
2.35.1
PATCH 4/5 perf/x86/uncore: Clean up uncore_pci_ids[]
In reply to [email protected]From: Kan Liang <[email protected]>
The initialization code to assign PCI IDs for different platforms is similar. Add the new macros to reduce the redundant code.
--- arch/x86/events/intel/uncore_snb.c | 402 ++++++----------------------- 1 file changed, 86 insertions(+), 316 deletions(-)
arch/x86/events/intel/uncore_snb.c +86 -316
@@ -84,6 +84,13 @@#define PCI_DEVICE_ID_INTEL_RPL_3_IMC 0xA706#define PCI_DEVICE_ID_INTEL_RPL_4_IMC 0xA709 + +#define IMC_UNCORE_DEV (a) \ +{ \ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_##a##_IMC), \ + .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), \ +} +/* SNB event control */ #define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff#define SNB_UNC_CTL_UMASK_MASK 0x0000ff00
@@ -849,242 +856,80 @@ static struct intel_uncore_type *snb_pci_uncores[] = { };static const struct pci_device_id snb_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SNB_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, +IMC_UNCORE_DEV (SNB ), {/* end: all zeroes */ }, };static const struct pci_device_id ivb_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_IVB_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_IVB_E3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, +IMC_UNCORE_DEV (IVB ), +IMC_UNCORE_DEV (IVB_E3 ), {/* end: all zeroes */ }, };static const struct pci_device_id hsw_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_HSW_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_HSW_U_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, +IMC_UNCORE_DEV (HSW ), +IMC_UNCORE_DEV (HSW_U ), {/* end: all zeroes */ }, };static const struct pci_device_id bdw_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_BDW_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, +IMC_UNCORE_DEV (BDW ), {/* end: all zeroes */ }, };static const struct pci_device_id skl_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_Y_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_U_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_HD_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_HQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_SD_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_SQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_E3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_Y_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_U_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_UQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_SD_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_SQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_HQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_WQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_2U_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_4U_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_4H_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_6H_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_2S_D_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_4S_D_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_6S_D_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_8S_D_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_4S_W_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_6S_W_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_8S_W_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_4S_S_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_6S_S_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_8S_S_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_AML_YD_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_AML_YQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_WHL_UQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_WHL_4_UQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_WHL_UD_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_H1_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_H2_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_H3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_U1_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_U2_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_U3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_S1_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_S2_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_S3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_S4_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_S5_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, +IMC_UNCORE_DEV (SKL_Y ), +IMC_UNCORE_DEV (SKL_U ), +IMC_UNCORE_DEV (SKL_HD ), +IMC_UNCORE_DEV (SKL_HQ ), +IMC_UNCORE_DEV (SKL_SD ), +IMC_UNCORE_DEV (SKL_SQ ), +IMC_UNCORE_DEV (SKL_E3 ), +IMC_UNCORE_DEV (KBL_Y ), +IMC_UNCORE_DEV (KBL_U ), +IMC_UNCORE_DEV (KBL_UQ ), +IMC_UNCORE_DEV (KBL_SD ), +IMC_UNCORE_DEV (KBL_SQ ), +IMC_UNCORE_DEV (KBL_HQ ), +IMC_UNCORE_DEV (KBL_WQ ), +IMC_UNCORE_DEV (CFL_2U ), +IMC_UNCORE_DEV (CFL_4U ), +IMC_UNCORE_DEV (CFL_4H ), +IMC_UNCORE_DEV (CFL_6H ), +IMC_UNCORE_DEV (CFL_2S_D ), +IMC_UNCORE_DEV (CFL_4S_D ), +IMC_UNCORE_DEV (CFL_6S_D ), +IMC_UNCORE_DEV (CFL_8S_D ), +IMC_UNCORE_DEV (CFL_4S_W ), +IMC_UNCORE_DEV (CFL_6S_W ), +IMC_UNCORE_DEV (CFL_8S_W ), +IMC_UNCORE_DEV (CFL_4S_S ), +IMC_UNCORE_DEV (CFL_6S_S ), +IMC_UNCORE_DEV (CFL_8S_S ), +IMC_UNCORE_DEV (AML_YD ), +IMC_UNCORE_DEV (AML_YQ ), +IMC_UNCORE_DEV (WHL_UQ ), +IMC_UNCORE_DEV (WHL_4_UQ ), +IMC_UNCORE_DEV (WHL_UD ), +IMC_UNCORE_DEV (CML_H1 ), +IMC_UNCORE_DEV (CML_H2 ), +IMC_UNCORE_DEV (CML_H3 ), +IMC_UNCORE_DEV (CML_U1 ), +IMC_UNCORE_DEV (CML_U2 ), +IMC_UNCORE_DEV (CML_U3 ), +IMC_UNCORE_DEV (CML_S1 ), +IMC_UNCORE_DEV (CML_S2 ), +IMC_UNCORE_DEV (CML_S3 ), +IMC_UNCORE_DEV (CML_S4 ), +IMC_UNCORE_DEV (CML_S5 ), {/* end: all zeroes */ }, };static const struct pci_device_id icl_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICL_U_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -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 ), - }, +IMC_UNCORE_DEV (ICL_U ), +IMC_UNCORE_DEV (ICL_U2 ), +IMC_UNCORE_DEV (RKL_1 ), +IMC_UNCORE_DEV (RKL_2 ), {/* end: all zeroes */ }, };
@@ -1326,106 +1171,31 @@ void nhm_uncore_cpu_init(void)/* Tiger Lake MMIO uncore support */ static const struct pci_device_id tgl_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TGL_U1_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TGL_U2_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TGL_U3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TGL_U4_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TGL_H_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_1_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_2_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_4_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_5_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_6_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_7_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_8_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_9_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_10_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_11_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_12_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_13_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_14_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_15_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_16_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_1_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_2_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_4_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, +IMC_UNCORE_DEV (TGL_U1 ), +IMC_UNCORE_DEV (TGL_U2 ), +IMC_UNCORE_DEV (TGL_U3 ), +IMC_UNCORE_DEV (TGL_U4 ), +IMC_UNCORE_DEV (TGL_H ), +IMC_UNCORE_DEV (ADL_1 ), +IMC_UNCORE_DEV (ADL_2 ), +IMC_UNCORE_DEV (ADL_3 ), +IMC_UNCORE_DEV (ADL_4 ), +IMC_UNCORE_DEV (ADL_5 ), +IMC_UNCORE_DEV (ADL_6 ), +IMC_UNCORE_DEV (ADL_7 ), +IMC_UNCORE_DEV (ADL_8 ), +IMC_UNCORE_DEV (ADL_9 ), +IMC_UNCORE_DEV (ADL_10 ), +IMC_UNCORE_DEV (ADL_11 ), +IMC_UNCORE_DEV (ADL_12 ), +IMC_UNCORE_DEV (ADL_13 ), +IMC_UNCORE_DEV (ADL_14 ), +IMC_UNCORE_DEV (ADL_15 ), +IMC_UNCORE_DEV (ADL_16 ), +IMC_UNCORE_DEV (RPL_1 ), +IMC_UNCORE_DEV (RPL_2 ), +IMC_UNCORE_DEV (RPL_3 ), +IMC_UNCORE_DEV (RPL_4 ), {/* end: all zeroes */ } };
Signature · 1 line
2.35.1
PATCH 5/5 perf/x86/uncore: Add new Alder Lake and Raptor Lake support
In reply to [email protected]From: Kan Liang <[email protected]>
From the perspective of the uncore PMU, there is nothing changed for the new Alder Lake N and Raptor Lake P.
Add new PCIIDs of IMC.
--- arch/x86/events/intel/uncore.c | 2 ++ arch/x86/events/intel/uncore_snb.c | 52 ++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+)
arch/x86/events/intel/uncore.c +2 -0
@@ -1828,7 +1828,9 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &rkl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &spr_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init), {},
arch/x86/events/intel/uncore_snb.c +52 -0
72 lines not on this page · raw message
Signature · 1 line
2.35.1
[tip: perf/core] perf/x86/uncore: Add new Alder Lake and Raptor 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: f758bc5a91233bb5b5b6994a8e72ba4eba0e9ab2 Gitweb: https://git.kernel.org/tip/f758bc5a91233bb5b5b6994a8e72ba4eba0e9ab2 Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 May 2022 12:44:13 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 11 May 2022 16:27:09 +02:00
perf/x86/uncore: Add new Alder Lake and Raptor Lake support
Quoted 1 line
From the perspective of the uncore PMU, there is nothing changed for the
new Alder Lake N and Raptor Lake P.
Add new PCIIDs of IMC.
--- arch/x86/events/intel/uncore.c | 2 +- arch/x86/events/intel/uncore_snb.c | 52 +++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+)
arch/x86/events/intel/uncore.c +2 -0
@@ -1828,7 +1828,9 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &rkl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &spr_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init), {},
arch/x86/events/intel/uncore_snb.c +52 -0
72 lines not on this page · raw message
[tip: perf/core] perf/x86/uncore: Clean up uncore_pci_ids[]
In reply to [email protected]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: e5ae168e8394dc3c6dce580690c87ff2cf16cdbb Gitweb: https://git.kernel.org/tip/e5ae168e8394dc3c6dce580690c87ff2cf16cdbb Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 May 2022 12:44:12 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 11 May 2022 16:27:08 +02:00
perf/x86/uncore: Clean up uncore_pci_ids[]
The initialization code to assign PCI IDs for different platforms is similar. Add the new macros to reduce the redundant code.
--- arch/x86/events/intel/uncore_snb.c | 402 +++++----------------------- 1 file changed, 86 insertions(+), 316 deletions(-)
arch/x86/events/intel/uncore_snb.c +86 -316
@@ -84,6 +84,13 @@#define PCI_DEVICE_ID_INTEL_RPL_3_IMC 0xA706#define PCI_DEVICE_ID_INTEL_RPL_4_IMC 0xA709 + +#define IMC_UNCORE_DEV (a) \ +{ \ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_##a##_IMC), \ + .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), \ +} +/* SNB event control */ #define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff#define SNB_UNC_CTL_UMASK_MASK 0x0000ff00
@@ -849,242 +856,80 @@ static struct intel_uncore_type *snb_pci_uncores[] = { };static const struct pci_device_id snb_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SNB_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, +IMC_UNCORE_DEV (SNB ), {/* end: all zeroes */ }, };static const struct pci_device_id ivb_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_IVB_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_IVB_E3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, +IMC_UNCORE_DEV (IVB ), +IMC_UNCORE_DEV (IVB_E3 ), {/* end: all zeroes */ }, };static const struct pci_device_id hsw_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_HSW_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_HSW_U_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, +IMC_UNCORE_DEV (HSW ), +IMC_UNCORE_DEV (HSW_U ), {/* end: all zeroes */ }, };static const struct pci_device_id bdw_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_BDW_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, +IMC_UNCORE_DEV (BDW ), {/* end: all zeroes */ }, };static const struct pci_device_id skl_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_Y_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_U_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_HD_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_HQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_SD_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_SQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_E3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_Y_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_U_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_UQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_SD_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_SQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_HQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_KBL_WQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_2U_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_4U_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_4H_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_6H_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_2S_D_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_4S_D_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_6S_D_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_8S_D_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_4S_W_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_6S_W_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_8S_W_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_4S_S_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_6S_S_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CFL_8S_S_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_AML_YD_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_AML_YQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_WHL_UQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_WHL_4_UQ_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_WHL_UD_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_H1_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_H2_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_H3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_U1_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_U2_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_U3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_S1_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_S2_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_S3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_S4_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_CML_S5_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, +IMC_UNCORE_DEV (SKL_Y ), +IMC_UNCORE_DEV (SKL_U ), +IMC_UNCORE_DEV (SKL_HD ), +IMC_UNCORE_DEV (SKL_HQ ), +IMC_UNCORE_DEV (SKL_SD ), +IMC_UNCORE_DEV (SKL_SQ ), +IMC_UNCORE_DEV (SKL_E3 ), +IMC_UNCORE_DEV (KBL_Y ), +IMC_UNCORE_DEV (KBL_U ), +IMC_UNCORE_DEV (KBL_UQ ), +IMC_UNCORE_DEV (KBL_SD ), +IMC_UNCORE_DEV (KBL_SQ ), +IMC_UNCORE_DEV (KBL_HQ ), +IMC_UNCORE_DEV (KBL_WQ ), +IMC_UNCORE_DEV (CFL_2U ), +IMC_UNCORE_DEV (CFL_4U ), +IMC_UNCORE_DEV (CFL_4H ), +IMC_UNCORE_DEV (CFL_6H ), +IMC_UNCORE_DEV (CFL_2S_D ), +IMC_UNCORE_DEV (CFL_4S_D ), +IMC_UNCORE_DEV (CFL_6S_D ), +IMC_UNCORE_DEV (CFL_8S_D ), +IMC_UNCORE_DEV (CFL_4S_W ), +IMC_UNCORE_DEV (CFL_6S_W ), +IMC_UNCORE_DEV (CFL_8S_W ), +IMC_UNCORE_DEV (CFL_4S_S ), +IMC_UNCORE_DEV (CFL_6S_S ), +IMC_UNCORE_DEV (CFL_8S_S ), +IMC_UNCORE_DEV (AML_YD ), +IMC_UNCORE_DEV (AML_YQ ), +IMC_UNCORE_DEV (WHL_UQ ), +IMC_UNCORE_DEV (WHL_4_UQ ), +IMC_UNCORE_DEV (WHL_UD ), +IMC_UNCORE_DEV (CML_H1 ), +IMC_UNCORE_DEV (CML_H2 ), +IMC_UNCORE_DEV (CML_H3 ), +IMC_UNCORE_DEV (CML_U1 ), +IMC_UNCORE_DEV (CML_U2 ), +IMC_UNCORE_DEV (CML_U3 ), +IMC_UNCORE_DEV (CML_S1 ), +IMC_UNCORE_DEV (CML_S2 ), +IMC_UNCORE_DEV (CML_S3 ), +IMC_UNCORE_DEV (CML_S4 ), +IMC_UNCORE_DEV (CML_S5 ), {/* end: all zeroes */ }, };static const struct pci_device_id icl_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICL_U_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -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 ), - }, +IMC_UNCORE_DEV (ICL_U ), +IMC_UNCORE_DEV (ICL_U2 ), +IMC_UNCORE_DEV (RKL_1 ), +IMC_UNCORE_DEV (RKL_2 ), {/* end: all zeroes */ }, };
@@ -1326,106 +1171,31 @@ void nhm_uncore_cpu_init(void)/* Tiger Lake MMIO uncore support */ static const struct pci_device_id tgl_uncore_pci_ids[] = { - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TGL_U1_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TGL_U2_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TGL_U3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TGL_U4_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TGL_H_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_1_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_2_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_4_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_5_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_6_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_7_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_8_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_9_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_10_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_11_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_12_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_13_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_14_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_15_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ADL_16_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_1_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_2_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_3_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, - {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_4_IMC ), - .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), - }, +IMC_UNCORE_DEV (TGL_U1 ), +IMC_UNCORE_DEV (TGL_U2 ), +IMC_UNCORE_DEV (TGL_U3 ), +IMC_UNCORE_DEV (TGL_U4 ), +IMC_UNCORE_DEV (TGL_H ), +IMC_UNCORE_DEV (ADL_1 ), +IMC_UNCORE_DEV (ADL_2 ), +IMC_UNCORE_DEV (ADL_3 ), +IMC_UNCORE_DEV (ADL_4 ), +IMC_UNCORE_DEV (ADL_5 ), +IMC_UNCORE_DEV (ADL_6 ), +IMC_UNCORE_DEV (ADL_7 ), +IMC_UNCORE_DEV (ADL_8 ), +IMC_UNCORE_DEV (ADL_9 ), +IMC_UNCORE_DEV (ADL_10 ), +IMC_UNCORE_DEV (ADL_11 ), +IMC_UNCORE_DEV (ADL_12 ), +IMC_UNCORE_DEV (ADL_13 ), +IMC_UNCORE_DEV (ADL_14 ), +IMC_UNCORE_DEV (ADL_15 ), +IMC_UNCORE_DEV (ADL_16 ), +IMC_UNCORE_DEV (RPL_1 ), +IMC_UNCORE_DEV (RPL_2 ), +IMC_UNCORE_DEV (RPL_3 ), +IMC_UNCORE_DEV (RPL_4 ), {/* end: all zeroes */ } };
[tip: perf/core] perf/x86/msr: Add new Alder Lake and Raptor Lake support
In reply to [email protected]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: d773a73366bd54d0c75c533269fe2f0765ce42ee Gitweb: https://git.kernel.org/tip/d773a73366bd54d0c75c533269fe2f0765ce42ee Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 May 2022 12:44:10 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 11 May 2022 16:27:08 +02:00
perf/x86/msr: Add new Alder Lake and Raptor Lake support
The new Alder Lake N and Raptor Lake P also support PPERF and SMI_COUNT MSRs.
--- arch/x86/events/msr.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/events/msr.c +2 -0
@@ -103,7 +103,9 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_ROCKETLAKE :case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : +case INTEL_FAM6_ALDERLAKE_N :case INTEL_FAM6_RAPTORLAKE : +case INTEL_FAM6_RAPTORLAKE_P :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
[tip: perf/core] perf/x86/cstate: Add new Alder Lake and Raptor Lake support
In reply to [email protected]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: cd971104ac7e41ff66082b9b584d319bb0688a1a Gitweb: https://git.kernel.org/tip/cd971104ac7e41ff66082b9b584d319bb0688a1a Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 May 2022 12:44:11 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 11 May 2022 16:27:08 +02:00
perf/x86/cstate: Add new Alder Lake and Raptor Lake support
Quoted 1 line
From the perspective of Intel cstate residency counters, there is nothing
changed for the new Alder Lake N and Raptor Lake P.
--- arch/x86/events/intel/cstate.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/events/intel/cstate.c +2 -0
@@ -682,7 +682,9 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_N , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_cstates), + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &adl_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
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: c2a960f7c5741cc4f03b4e587afeb89ad53c32c5 Gitweb: https://git.kernel.org/tip/c2a960f7c5741cc4f03b4e587afeb89ad53c32c5 Author: Kan Liang <[email protected]> AuthorDate: Wed, 04 May 2022 12:44:09 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 11 May 2022 16:27:08 +02:00
perf/x86: Add new Alder Lake and Raptor Lake support
Quoted 1 line
From PMU's perspective, there is no difference for the new Alder Lake N
and Raptor Lake P.
--- arch/x86/events/intel/core.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/events/intel/core.c +2 -0
@@ -6216,7 +6216,9 @@ __init int intel_pmu_init(void)case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : +case INTEL_FAM6_ALDERLAKE_N :case INTEL_FAM6_RAPTORLAKE : +case INTEL_FAM6_RAPTORLAKE_P :/* * Alder Lake has 2 types of CPU, core and atom. *