perf/x86/intel/uncore: Add Alder Lake support
The uncore subsystem for Alder Lake is similar to the previous Tiger Lake. The difference includes: - New MSR addresses for global control, fixed counters, CBOX and ARB. Add a new adl_uncore_msr_ops for uncore operations. - Add a new threshold field for CBOX. - New PCIIDs for IMC devices. Signed-off-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Andi Kleen <ak@linux.intel.com> Link: https://lkml.kernel.org/r/1618237865-33448-23-git-send-email-kan.liang@linux.intel.com
This commit is contained in:
Родитель
55bcf6ef31
Коммит
772ed05f3c
|
@ -1752,6 +1752,11 @@ static const struct intel_uncore_init_fun rkl_uncore_init __initconst = {
|
|||
.pci_init = skl_uncore_pci_init,
|
||||
};
|
||||
|
||||
static const struct intel_uncore_init_fun adl_uncore_init __initconst = {
|
||||
.cpu_init = adl_uncore_cpu_init,
|
||||
.mmio_init = tgl_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,
|
||||
|
@ -1806,6 +1811,8 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {
|
|||
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(ALDERLAKE, &adl_uncore_init),
|
||||
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &adl_uncore_init),
|
||||
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init),
|
||||
{},
|
||||
};
|
||||
|
|
|
@ -582,6 +582,7 @@ void snb_uncore_cpu_init(void);
|
|||
void nhm_uncore_cpu_init(void);
|
||||
void skl_uncore_cpu_init(void);
|
||||
void icl_uncore_cpu_init(void);
|
||||
void adl_uncore_cpu_init(void);
|
||||
void tgl_uncore_cpu_init(void);
|
||||
void tgl_uncore_mmio_init(void);
|
||||
void tgl_l_uncore_mmio_init(void);
|
||||
|
|
|
@ -62,6 +62,8 @@
|
|||
#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
|
||||
#define PCI_DEVICE_ID_INTEL_ADL_1_IMC 0x4660
|
||||
#define PCI_DEVICE_ID_INTEL_ADL_2_IMC 0x4641
|
||||
|
||||
/* SNB event control */
|
||||
#define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff
|
||||
|
@ -131,12 +133,33 @@
|
|||
#define ICL_UNC_ARB_PER_CTR 0x3b1
|
||||
#define ICL_UNC_ARB_PERFEVTSEL 0x3b3
|
||||
|
||||
/* ADL uncore global control */
|
||||
#define ADL_UNC_PERF_GLOBAL_CTL 0x2ff0
|
||||
#define ADL_UNC_FIXED_CTR_CTRL 0x2fde
|
||||
#define ADL_UNC_FIXED_CTR 0x2fdf
|
||||
|
||||
/* ADL Cbo register */
|
||||
#define ADL_UNC_CBO_0_PER_CTR0 0x2002
|
||||
#define ADL_UNC_CBO_0_PERFEVTSEL0 0x2000
|
||||
#define ADL_UNC_CTL_THRESHOLD 0x3f000000
|
||||
#define ADL_UNC_RAW_EVENT_MASK (SNB_UNC_CTL_EV_SEL_MASK | \
|
||||
SNB_UNC_CTL_UMASK_MASK | \
|
||||
SNB_UNC_CTL_EDGE_DET | \
|
||||
SNB_UNC_CTL_INVERT | \
|
||||
ADL_UNC_CTL_THRESHOLD)
|
||||
|
||||
/* ADL ARB register */
|
||||
#define ADL_UNC_ARB_PER_CTR0 0x2FD2
|
||||
#define ADL_UNC_ARB_PERFEVTSEL0 0x2FD0
|
||||
#define ADL_UNC_ARB_MSR_OFFSET 0x8
|
||||
|
||||
DEFINE_UNCORE_FORMAT_ATTR(event, event, "config:0-7");
|
||||
DEFINE_UNCORE_FORMAT_ATTR(umask, umask, "config:8-15");
|
||||
DEFINE_UNCORE_FORMAT_ATTR(edge, edge, "config:18");
|
||||
DEFINE_UNCORE_FORMAT_ATTR(inv, inv, "config:23");
|
||||
DEFINE_UNCORE_FORMAT_ATTR(cmask5, cmask, "config:24-28");
|
||||
DEFINE_UNCORE_FORMAT_ATTR(cmask8, cmask, "config:24-31");
|
||||
DEFINE_UNCORE_FORMAT_ATTR(threshold, threshold, "config:24-29");
|
||||
|
||||
/* Sandy Bridge uncore support */
|
||||
static void snb_uncore_msr_enable_event(struct intel_uncore_box *box, struct perf_event *event)
|
||||
|
@ -422,6 +445,106 @@ void tgl_uncore_cpu_init(void)
|
|||
skl_uncore_msr_ops.init_box = rkl_uncore_msr_init_box;
|
||||
}
|
||||
|
||||
static void adl_uncore_msr_init_box(struct intel_uncore_box *box)
|
||||
{
|
||||
if (box->pmu->pmu_idx == 0)
|
||||
wrmsrl(ADL_UNC_PERF_GLOBAL_CTL, SNB_UNC_GLOBAL_CTL_EN);
|
||||
}
|
||||
|
||||
static void adl_uncore_msr_enable_box(struct intel_uncore_box *box)
|
||||
{
|
||||
wrmsrl(ADL_UNC_PERF_GLOBAL_CTL, SNB_UNC_GLOBAL_CTL_EN);
|
||||
}
|
||||
|
||||
static void adl_uncore_msr_disable_box(struct intel_uncore_box *box)
|
||||
{
|
||||
if (box->pmu->pmu_idx == 0)
|
||||
wrmsrl(ADL_UNC_PERF_GLOBAL_CTL, 0);
|
||||
}
|
||||
|
||||
static void adl_uncore_msr_exit_box(struct intel_uncore_box *box)
|
||||
{
|
||||
if (box->pmu->pmu_idx == 0)
|
||||
wrmsrl(ADL_UNC_PERF_GLOBAL_CTL, 0);
|
||||
}
|
||||
|
||||
static struct intel_uncore_ops adl_uncore_msr_ops = {
|
||||
.init_box = adl_uncore_msr_init_box,
|
||||
.enable_box = adl_uncore_msr_enable_box,
|
||||
.disable_box = adl_uncore_msr_disable_box,
|
||||
.exit_box = adl_uncore_msr_exit_box,
|
||||
.disable_event = snb_uncore_msr_disable_event,
|
||||
.enable_event = snb_uncore_msr_enable_event,
|
||||
.read_counter = uncore_msr_read_counter,
|
||||
};
|
||||
|
||||
static struct attribute *adl_uncore_formats_attr[] = {
|
||||
&format_attr_event.attr,
|
||||
&format_attr_umask.attr,
|
||||
&format_attr_edge.attr,
|
||||
&format_attr_inv.attr,
|
||||
&format_attr_threshold.attr,
|
||||
NULL,
|
||||
};
|
||||
|
||||
static const struct attribute_group adl_uncore_format_group = {
|
||||
.name = "format",
|
||||
.attrs = adl_uncore_formats_attr,
|
||||
};
|
||||
|
||||
static struct intel_uncore_type adl_uncore_cbox = {
|
||||
.name = "cbox",
|
||||
.num_counters = 2,
|
||||
.perf_ctr_bits = 44,
|
||||
.perf_ctr = ADL_UNC_CBO_0_PER_CTR0,
|
||||
.event_ctl = ADL_UNC_CBO_0_PERFEVTSEL0,
|
||||
.event_mask = ADL_UNC_RAW_EVENT_MASK,
|
||||
.msr_offset = ICL_UNC_CBO_MSR_OFFSET,
|
||||
.ops = &adl_uncore_msr_ops,
|
||||
.format_group = &adl_uncore_format_group,
|
||||
};
|
||||
|
||||
static struct intel_uncore_type adl_uncore_arb = {
|
||||
.name = "arb",
|
||||
.num_counters = 2,
|
||||
.num_boxes = 2,
|
||||
.perf_ctr_bits = 44,
|
||||
.perf_ctr = ADL_UNC_ARB_PER_CTR0,
|
||||
.event_ctl = ADL_UNC_ARB_PERFEVTSEL0,
|
||||
.event_mask = SNB_UNC_RAW_EVENT_MASK,
|
||||
.msr_offset = ADL_UNC_ARB_MSR_OFFSET,
|
||||
.constraints = snb_uncore_arb_constraints,
|
||||
.ops = &adl_uncore_msr_ops,
|
||||
.format_group = &snb_uncore_format_group,
|
||||
};
|
||||
|
||||
static struct intel_uncore_type adl_uncore_clockbox = {
|
||||
.name = "clock",
|
||||
.num_counters = 1,
|
||||
.num_boxes = 1,
|
||||
.fixed_ctr_bits = 48,
|
||||
.fixed_ctr = ADL_UNC_FIXED_CTR,
|
||||
.fixed_ctl = ADL_UNC_FIXED_CTR_CTRL,
|
||||
.single_fixed = 1,
|
||||
.event_mask = SNB_UNC_CTL_EV_SEL_MASK,
|
||||
.format_group = &icl_uncore_clock_format_group,
|
||||
.ops = &adl_uncore_msr_ops,
|
||||
.event_descs = icl_uncore_events,
|
||||
};
|
||||
|
||||
static struct intel_uncore_type *adl_msr_uncores[] = {
|
||||
&adl_uncore_cbox,
|
||||
&adl_uncore_arb,
|
||||
&adl_uncore_clockbox,
|
||||
NULL,
|
||||
};
|
||||
|
||||
void adl_uncore_cpu_init(void)
|
||||
{
|
||||
adl_uncore_cbox.num_boxes = icl_get_cbox_num();
|
||||
uncore_msr_uncores = adl_msr_uncores;
|
||||
}
|
||||
|
||||
enum {
|
||||
SNB_PCI_UNCORE_IMC,
|
||||
};
|
||||
|
@ -1203,6 +1326,14 @@ static const struct pci_device_id tgl_uncore_pci_ids[] = {
|
|||
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),
|
||||
},
|
||||
{ /* end: all zeroes */ }
|
||||
};
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче