Skip to content

Commit ad4878d

Browse files
kliang2Peter Zijlstra
authored andcommitted
perf/x86/uncore: Add Raptor Lake uncore support
The uncore PMU of the Raptor Lake is the same as Alder Lake. Add new PCIIDs of IMC for Raptor Lake. Signed-off-by: Kan Liang <kan.liang@intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/1647366360-82824-4-git-send-email-kan.liang@linux.intel.com
1 parent 82cd830 commit ad4878d

2 files changed

Lines changed: 21 additions & 0 deletions

File tree

arch/x86/events/intel/uncore.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,6 +1828,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {
18281828
X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &rkl_uncore_init),
18291829
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &adl_uncore_init),
18301830
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &adl_uncore_init),
1831+
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &adl_uncore_init),
18311832
X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &spr_uncore_init),
18321833
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init),
18331834
{},

arch/x86/events/intel/uncore_snb.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@
7979
#define PCI_DEVICE_ID_INTEL_ADL_14_IMC 0x4650
8080
#define PCI_DEVICE_ID_INTEL_ADL_15_IMC 0x4668
8181
#define PCI_DEVICE_ID_INTEL_ADL_16_IMC 0x4670
82+
#define PCI_DEVICE_ID_INTEL_RPL_1_IMC 0xA700
83+
#define PCI_DEVICE_ID_INTEL_RPL_2_IMC 0xA702
84+
#define PCI_DEVICE_ID_INTEL_RPL_3_IMC 0xA706
85+
#define PCI_DEVICE_ID_INTEL_RPL_4_IMC 0xA709
8286

8387
/* SNB event control */
8488
#define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff
@@ -1406,6 +1410,22 @@ static const struct pci_device_id tgl_uncore_pci_ids[] = {
14061410
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ADL_16_IMC),
14071411
.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
14081412
},
1413+
{ /* IMC */
1414+
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_RPL_1_IMC),
1415+
.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
1416+
},
1417+
{ /* IMC */
1418+
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_RPL_2_IMC),
1419+
.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
1420+
},
1421+
{ /* IMC */
1422+
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_RPL_3_IMC),
1423+
.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
1424+
},
1425+
{ /* IMC */
1426+
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_RPL_4_IMC),
1427+
.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
1428+
},
14091429
{ /* end: all zeroes */ }
14101430
};
14111431

0 commit comments

Comments
 (0)