perf/x86/intel/uncore: Add support for Intel SKL client uncore
Subsystems (2)
PATCH v2 1/2 perf/x86/intel/uncore: Add support for Intel SKL client uncore
From: Kan Liang <[email protected]>
This patch addes full support for Intel SKL client uncore.
- Add support for SKL client cpu uncore, which is similar to BDW client. There are some differences in CBOX number and uncore control MSR.
- Add new CPU model 78 for SkyLake Mobile, include both cpu and pci uncore.
---
Changes since V1:
- Move enable_box to another patch.
- Remove disable_box
arch/x86/events/intel/uncore.c | 4 ++- arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snb.c | 67 +++++++++++++++++++++++++++++++++++++- 3 files changed, 70 insertions(+), 2 deletions(-)
arch/x86/events/intel/uncore.c +3 -1
@@ -1361,6 +1361,7 @@ static const struct intel_uncore_init_fun knl_uncore_init __initconst = { };static const struct intel_uncore_init_fun skl_uncore_init__initconst = { + .cpu_init = skl_uncore_cpu_init, .pci_init = skl_uncore_pci_init, };
@@ -1384,7 +1385,8 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (79 , bdx_uncore_init),/* BDX-EP */ X86_UNCORE_MODEL_MATCH (86 , bdx_uncore_init),/* BDX-DE */ X86_UNCORE_MODEL_MATCH (87 , knl_uncore_init),/* Knights Landing */ - X86_UNCORE_MODEL_MATCH(94, skl_uncore_init), /* SkyLake */ +X86_UNCORE_MODEL_MATCH (78 , skl_uncore_init),/* SkyLake Mobile */ + X86_UNCORE_MODEL_MATCH(94, skl_uncore_init), /* SkyLake Desktop */ {}, };
arch/x86/events/intel/uncore.h +1 -0
@@ -360,6 +360,7 @@ int bdw_uncore_pci_init(void);int skl_uncore_pci_init (void );void snb_uncore_cpu_init (void );void nhm_uncore_cpu_init (void ); +void skl_uncore_cpu_init (void );int snb_pci2phy_map_init (int devid);/* perf_event_intel_uncore_snbep.c */
arch/x86/events/intel/uncore_snb.c +66 -1
100 lines not on this page · raw message
Signature · 1 line
2.4.0
PATCH v2 2/2 perf/x86/intel/uncore: add enable_box for client msr uncore
From: Kan Liang <[email protected]>
PERF_GLOBAL_CTL could be cleared after Package C7. This patch tries to workaround this issue by re-enable PERF_GLOBAL_CTL in enable_box. The workaround does not cover all cases. It helps for new events after returning from C7.
There is no drawback in letting the thing enabled, so it does not need disable_box here.
---
Changes since V1:
- New patch for enable_box
- Similar support for SNB
arch/x86/events/intel/uncore_snb.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/x86/events/intel/uncore_snb.c +14 -0
@@ -100,6 +100,12 @@ static void snb_uncore_msr_init_box(struct intel_uncore_box *box) } } +static void snb_uncore_msr_enable_box (struct intel_uncore_box *box) +{ +wrmsrl (SNB_UNC_PERF_GLOBAL_CTL , +SNB_UNC_GLOBAL_CTL_EN |SNB_UNC_GLOBAL_CTL_CORE_ALL ); +} +static void snb_uncore_msr_exit_box (struct intel_uncore_box *box) {if (box->pmu->pmu_idx ==0 )
@@ -127,6 +133,7 @@ static struct attribute_group snb_uncore_format_group = {static struct intel_uncore_ops snb_uncore_msr_ops = { .init_box = snb_uncore_msr_init_box, + .enable_box = snb_uncore_msr_enable_box, .exit_box = snb_uncore_msr_exit_box, .disable_event = snb_uncore_msr_disable_event, .enable_event = snb_uncore_msr_enable_event,
@@ -192,6 +199,12 @@ static void skl_uncore_msr_init_box(struct intel_uncore_box *box) } } +static void skl_uncore_msr_enable_box (struct intel_uncore_box *box) +{ +wrmsrl (SKL_UNC_PERF_GLOBAL_CTL , +SNB_UNC_GLOBAL_CTL_EN |SKL_UNC_GLOBAL_CTL_CORE_ALL ); +} +static void skl_uncore_msr_exit_box (struct intel_uncore_box *box) {if (box->pmu->pmu_idx ==0 )
@@ -200,6 +213,7 @@ static void skl_uncore_msr_exit_box(struct intel_uncore_box *box)static struct intel_uncore_ops skl_uncore_msr_ops = { .init_box = skl_uncore_msr_init_box, + .enable_box = skl_uncore_msr_enable_box, .exit_box = skl_uncore_msr_exit_box, .disable_event = snb_uncore_msr_disable_event, .enable_event = snb_uncore_msr_enable_event,
Signature · 1 line
2.4.0
Hi Thomas and Peter,
Any comments for the patch series?
Thanks,
Kan
Quoted 181 lines
From: Kan Liang <[email protected]>
This patch addes full support for Intel SKL client uncore.
- Add support for SKL client cpu uncore, which is similar to BDW client. There are some differences in CBOX number and uncore control MSR.
- Add new CPU model 78 for SkyLake Mobile, include both cpu and pci uncore.Signed-off-by Kan Liang <[email protected]>---
Changes since V1:
- Moveenable_boxto another patch.
- Removedisable_boxarch/x86/events/intel/uncore.c | 4 ++- arch/x86/events/intel/uncore.h | 1 + arch/x86/events/intel/uncore_snb.c | 67 +++++++++++++++++++++++++++++++++++++- 3 files changed, 70 insertions(+), 2 deletions(-)arch/x86/events/intel/uncore.c +1
-0@@ -1361,6 +1361,7 @@ static const struct intel_uncore_init_fun knl_uncore_init __initconst = { };static const struct intel_uncore_init_fun skl_uncore_init__initconst = { + .cpu_init = skl_uncore_cpu_init, .pci_init = skl_uncore_pci_init, };@@ -1384,7 +1385,8 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (79 , bdx_uncore_init),/* BDX-EP */ X86_UNCORE_MODEL_MATCH (86 , bdx_uncore_init),/* BDX-DE */ X86_UNCORE_MODEL_MATCH(87, knl_uncore_init), /* KnightsLanding */
arch/x86/events/intel/uncore.c +1
-1- X86_UNCORE_MODEL_MATCH(94, skl_uncore_init), /* SkyLake */ + X86_UNCORE_MODEL_MATCH(78, skl_uncore_init), /* SkyLakeMobile */
arch/x86/events/intel/uncore.c +1
-0+ X86_UNCORE_MODEL_MATCH(94, skl_uncore_init), /* SkyLakeDesktop */
arch/x86/events/intel/uncore.c +0
-0{}, };arch/x86/events/intel/uncore.h +0
-0@@ -360,6 +360,7 @@ int bdw_uncore_pci_init(void); int
skl_uncore_pci_init(void); voidsnb_uncore_cpu_init(void); voidnhm_uncore_cpu_init(void);arch/x86/events/intel/uncore.h +1
-0+void skl_uncore_cpu_init (void );int snb_pci2phy_map_init (int devid);/* perf_event_intel_uncore_snbep.c */ arch/x86/events/intel/uncore_snb.c +6
-1@@ -1,4 +1,4 @@ -/* Nehalem/SandBridge/Haswell uncore support */ +/* Nehalem/SandBridge/Haswell/Broadwell/Skylake uncore support */ #include "uncore.h" /* Uncore IMC PCI IDs */ @@ -9,6 +9,7 @@#define PCI_DEVICE_ID_INTEL_HSW_U_IMC 0x0a04#define PCI_DEVICE_ID_INTEL_BDW_IMC 0x1604#define PCI_DEVICE_ID_INTEL_SKL_IMC 0x191f +#define PCI_DEVICE_ID_INTEL_SKL_U_IMC 0x190c/* SNB event control */ #define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff@@ -64,6 +65,10 @@#define NHM_UNC_PERFEVTSEL0 0x3c0#define NHM_UNC_UNCORE_PMC0 0x3b0 +/* SKL uncore global control */ +#define SKL_UNC_PERF_GLOBAL_CTL 0xe01 +#define SKL_UNC_GLOBAL_CTL_CORE_ALL ((1 << 5) - 1) +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"); @@ -179,6 +184,60 @@ voidsnb_uncore_cpu_init(void)
snb_uncore_cbox.num_boxes =
boot_cpu_data.x86_max_cores; }arch/x86/events/intel/uncore_snb.c +4
-0+static void skl_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 |
SKL_UNC_GLOBAL_CTL_CORE_ALL);arch/x86/events/intel/uncore_snb.c +45
-0+ } +} + +static void skl_uncore_msr_exit_box (struct intel_uncore_box *box) { +if (box->pmu->pmu_idx ==0 ) +wrmsrl (SKL_UNC_PERF_GLOBAL_CTL ,0 ); +} + +static struct intel_uncore_ops skl_uncore_msr_ops = { + .init_box = skl_uncore_msr_init_box, + .exit_box = skl_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 intel_uncore_type skl_uncore_cbox = { + .name ="cbox" , + .num_counters =4 , + .num_boxes =5 , + .perf_ctr_bits =44 , + .fixed_ctr_bits =48 , + .perf_ctr =SNB_UNC_CBO_0_PER_CTR0 , + .event_ctl =SNB_UNC_CBO_0_PERFEVTSEL0 , + .fixed_ctr =SNB_UNC_FIXED_CTR , + .fixed_ctl =SNB_UNC_FIXED_CTR_CTRL , + .single_fixed =1 , + .event_mask =SNB_UNC_RAW_EVENT_MASK , + .msr_offset =SNB_UNC_CBO_MSR_OFFSET , + .ops = &skl_uncore_msr_ops, + .format_group = &snb_uncore_format_group, + .event_descs = snb_uncore_events, +}; + +static struct intel_uncore_type *skl_msr_uncores[] = { + &skl_uncore_cbox, + &snb_uncore_arb, +NULL , +}; + +void skl_uncore_cpu_init (void ) +{ + uncore_msr_uncores = skl_msr_uncores; +if (skl_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores) + skl_uncore_cbox.num_boxes =boot_cpu_data.x86_max_cores;
arch/x86/events/intel/uncore_snb.c +4
-0+ snb_uncore_arb.ops = &skl_uncore_msr_ops; } +enum {SNB_PCI_UNCORE_IMC , };@@ -544,6 +603,11 @@ static const struct pci_device_id skl_uncore_pci_ids[] = {PCI_DEVICE (PCI_VENDOR_ID_INTEL , PCI_DEVICE_ID_INTEL_SKL_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),arch/x86/events/intel/uncore_snb.c +1
-0+ .driver_data =
UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),arch/x86/events/intel/uncore_snb.c +2
-0+ }, + { /* end: all zeroes */ }, };@@ -587,6 +651,7 @@ static const struct imc_uncore_pci_dev desktop_imc_pci_ids[] = { IMC_DEV(HSW_U_IMC, &hsw_uncore_pci_driver), /* 4th Gen CoreULT Mobile Processor */
IMC_DEV(BDW_IMC, &bdw_uncore_pci_driver), /* 5th Gen Core U
*/arch/x86/events/intel/uncore_snb.c +1
-0IMC_DEV (SKL_IMC , &skl_uncore_pci_driver),/* 6th Gen Core */ + IMC_DEV(SKL_U_IMC, &skl_uncore_pci_driver), /* 6th Gen Core U*/
{ /* end marker */ }
};--
2.4.0