perf/x86/intel/uncore: Add uncore support for Snow Ridge server
Subsystems (2)
PATCH 1/5 perf/x86/intel/uncore: Add uncore support for Snow Ridge server
From: Kan Liang <[email protected]>
The uncore subsystem on Snow Ridge is similar as previous SKX server. The uncore units on Snow Ridge include Ubox, Chabox, IIO, IRP, M2PCIE, PCU, M2M, PCIE3 and IMC.
- The config register encoding and pci device IDs are changed.
- For CHA, the umask_ext and filter_tid fields are changed.
- For IIO, the ch_mask and fc_mask fields are changed.
- For M2M, the mask_ext field is changed.
- Add new PCIe3 unit for PCIe3 root port which provides the interface between PCIe devices, plugged into the PCIe port, and the components (in M2IOSF).
- IMC can only be accessed via MMIO on Snow Ridge now. Current common code doesn't support it yet. IMC will be supported in following patches.
- There are 9 free running counters for IIO CLOCKS and bandwidth In.
- Full uncore event list is not published yet. Event constrain is not included in this patch. It will be added later separately.
--- arch/x86/events/intel/uncore.c | 6 + arch/x86/events/intel/uncore.h | 2 + arch/x86/events/intel/uncore_snbep.c | 403 +++++++++++++++++++++++++++++++++++ 3 files changed, 411 insertions(+)
arch/x86/events/intel/uncore.c +6 -0
@@ -1372,6 +1372,11 @@ static const struct intel_uncore_init_fun icl_uncore_init __initconst = { .pci_init = skl_uncore_pci_init, }; +static const struct intel_uncore_init_fun snr_uncore_init__initconst = { + .cpu_init = snr_uncore_cpu_init, + .pci_init = snr_uncore_pci_init, +}; +static const struct x86_cpu_id intel_uncore_match[]__initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_NEHALEM_EP , nhm_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_NEHALEM , nhm_uncore_init),
@@ -1399,6 +1404,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_DESKTOP , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , icl_uncore_init), + X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_X, snr_uncore_init), {}, };
arch/x86/events/intel/uncore.h +2 -0
@@ -538,6 +538,8 @@ int knl_uncore_pci_init(void);void knl_uncore_cpu_init (void );int skx_uncore_pci_init (void );void skx_uncore_cpu_init (void ); +int snr_uncore_pci_init (void ); +void snr_uncore_cpu_init (void );/* uncore_nhmex.c */ void nhmex_uncore_cpu_init (void );
arch/x86/events/intel/uncore_snbep.c +403 -0
429 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 2/5 perf/x86/intel/uncore: Extract codes of box ref/unref
From: Kan Liang <[email protected]>
For uncore box which can only be accessed by MSR, its reference box->refcnt is updated in CPU hot plug. The uncore boxes needs to be init/exit accordingly for the first/last CPU of a socket. Starts from Snow Ridge server, a new type of uncore box is introduced, which can only be accessed by MMIO. The driver needs to map/unmap MMIO space for the first/last CPU of a socket.
Extract the codes of box ref/unref and init/exit for reuse later.
There is no functional change.
--- arch/x86/events/intel/uncore.c | 55 +++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 19 deletions(-)
arch/x86/events/intel/uncore.c +36 -19
@@ -1140,12 +1140,27 @@ static void uncore_change_context(struct intel_uncore_type **uncores,uncore_change_type_ctx (*uncores, old_cpu, new_cpu); } -static int uncore_event_cpu_offline (unsigned int cpu) +static void uncore_box_unref (struct intel_uncore_type **types,int id) { -struct intel_uncore_type *type, **types = uncore_msr_uncores; +struct intel_uncore_type *type;struct intel_uncore_pmu *pmu;struct intel_uncore_box *box; -int i, pkg, target; +int i; + +for (; *types; types++) { + type = *types; + pmu = type->pmus; +for (i =0 ; i < type->num_boxes; i++, pmu++) { + box = pmu->boxes[id]; +if (box &&atomic_dec_return (&box->refcnt) ==0 ) +uncore_box_exit (box); + } + } +} + +static int uncore_event_cpu_offline (unsigned int cpu) +{ +int pkg, target;/* Check if exiting cpu is used for collecting uncore events */ if (!cpumask_test_and_clear_cpu (cpu, &uncore_cpu_mask))
@@ -1165,15 +1180,7 @@ static int uncore_event_cpu_offline(unsigned int cpu) unref:/* Clear the references */ pkg =topology_logical_package_id (cpu); -for (; *types; types++) { - type = *types; - pmu = type->pmus; -for (i =0 ; i < type->num_boxes; i++, pmu++) { - box = pmu->boxes[pkg]; -if (box &&atomic_dec_return (&box->refcnt) ==0 ) -uncore_box_exit (box); - } - } +uncore_box_unref (uncore_msr_uncores, pkg);return 0 ; }
@@ -1215,16 +1222,15 @@ static int allocate_boxes(struct intel_uncore_type **types, }return -ENOMEM ; } - -static int uncore_event_cpu_online (unsigned int cpu) +static int uncore_box_ref (struct intel_uncore_type **types, +int id,unsigned int cpu) { -struct intel_uncore_type *type, **types = uncore_msr_uncores; +struct intel_uncore_type *type;struct intel_uncore_pmu *pmu;struct intel_uncore_box *box; -int i, ret, pkg, target; +int i, ret; - pkg =topology_logical_package_id (cpu); - ret =allocate_boxes (types, pkg, cpu); + ret =allocate_boxes (types, id, cpu);if (ret)return ret;
@@ -1232,11 +1238,22 @@ static int uncore_event_cpu_online(unsigned int cpu) type = *types; pmu = type->pmus;for (i =0 ; i < type->num_boxes; i++, pmu++) { - box = pmu->boxes[pkg]; + box = pmu->boxes[id];if (box &&atomic_inc_return (&box->refcnt) ==1 )uncore_box_init (box); } } +return 0 ; +} + +static int uncore_event_cpu_online (unsigned int cpu) +{ +int ret, pkg, target; + + pkg =topology_logical_package_id (cpu); + ret =uncore_box_ref (uncore_msr_uncores, pkg, cpu); +if (ret) +return ret;/* * Check if there is an online cpu in the package
Signature · 1 line
2.7.4
PATCH 3/5 perf/x86/intel/uncore: Support MMIO type uncore blocks
In reply to [email protected]From: Kan Liang <[email protected]>
A new MMIO type uncore box is introduced on Snow Ridge server. The counters of MMIO type uncore box can only be accessed by MMIO.
Add a new uncore type, uncore_mmio_uncores, for MMIO type uncore blocks.
Support MMIO type uncore blocks in CPU hot plug. The MMIO space has to be map/unmap for the first/last CPU. The context also need to be migrated if the bind CPU changes.
Add mmio_init() to init and register PMUs for MMIO type uncore blocks.
Add a helper to calculate the box_ctl address.
The helpers which calculate ctl/ctr can be shared with PCI type uncore blocks.
--- arch/x86/events/intel/uncore.c | 51 ++++++++++++++++++++++++++++++++++++------ arch/x86/events/intel/uncore.h | 21 ++++++++++++----- 2 files changed, 60 insertions(+), 12 deletions(-)
arch/x86/events/intel/uncore.c +44 -7
@@ -7,6 +7,7 @@static struct intel_uncore_type *empty_uncore[] = {NULL , };struct intel_uncore_type **uncore_msr_uncores = empty_uncore;struct intel_uncore_type **uncore_pci_uncores = empty_uncore; +struct intel_uncore_type **uncore_mmio_uncores = empty_uncore;static bool pcidrv_registered;struct pci_driver *uncore_pci_driver;
@@ -1175,12 +1176,14 @@ static int uncore_event_cpu_offline(unsigned int cpu) target =-1 ;uncore_change_context (uncore_msr_uncores, cpu, target); +uncore_change_context (uncore_mmio_uncores, cpu, target);uncore_change_context (uncore_pci_uncores, cpu, target); unref:/* Clear the references */ pkg =topology_logical_package_id (cpu);uncore_box_unref (uncore_msr_uncores, pkg); +uncore_box_unref (uncore_mmio_uncores, pkg);return 0 ; }
@@ -1248,12 +1251,13 @@ static int uncore_box_ref(struct intel_uncore_type **types,static int uncore_event_cpu_online (unsigned int cpu) { -int ret, pkg, target; +int pkg, target, msr_ret, mmio_ret; pkg =topology_logical_package_id (cpu); - ret =uncore_box_ref (uncore_msr_uncores, pkg, cpu); -if (ret) -return ret; + msr_ret =uncore_box_ref (uncore_msr_uncores, pkg, cpu); + mmio_ret =uncore_box_ref (uncore_mmio_uncores, pkg, cpu); +if (msr_ret && mmio_ret) +return -ENOMEM ;/* * Check if there is an online cpu in the package
@@ -1265,7 +1269,10 @@ static int uncore_event_cpu_online(unsigned int cpu)cpumask_set_cpu (cpu, &uncore_cpu_mask); -uncore_change_context (uncore_msr_uncores,-1 , cpu); +if (!msr_ret) +uncore_change_context (uncore_msr_uncores,-1 , cpu); +if (!mmio_ret) +uncore_change_context (uncore_mmio_uncores,-1 , cpu);uncore_change_context (uncore_pci_uncores,-1 , cpu);return 0 ; }
@@ -1313,12 +1320,35 @@ static int __init uncore_cpu_init(void)return ret; } +static int __init uncore_mmio_init (void ) +{ +struct intel_uncore_type **types = uncore_mmio_uncores; +int ret; + + ret =uncore_types_init (types, true); +if (ret) + goto err; + +for (; *types; types++) { + ret =type_pmu_register (*types); +if (ret) + goto err; + } +return 0 ; +err: +uncore_types_exit (uncore_mmio_uncores); + uncore_mmio_uncores = empty_uncore; +return ret; +} + +#define X86_UNCORE_MODEL_MATCH (model, init) \ { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&init }struct intel_uncore_init_fun {void (*cpu_init)(void );int (*pci_init)(void ); +void (*mmio_init)(void ); };static const struct intel_uncore_init_fun nhm_uncore_init__initconst = {
@@ -1431,7 +1461,7 @@ static int __init intel_uncore_init(void) {const struct x86_cpu_id *id;struct intel_uncore_init_fun *uncore_init; -int pret =0 , cret =0 , ret; +int pret =0 , cret =0 , mret =0 , ret; id =x86_match_cpu (intel_uncore_match);if (!id)
@@ -1454,7 +1484,12 @@ static int __init intel_uncore_init(void) cret =uncore_cpu_init (); } -if (cret && pret) +if (uncore_init->mmio_init) { + uncore_init->mmio_init (); + mret =uncore_mmio_init (); + } + +if (cret && pret && mret)return -ENODEV ;/* Install hotplug callbacks to setup the targets for each package */
@@ -1468,6 +1503,7 @@ static int __init intel_uncore_init(void) err:uncore_types_exit (uncore_msr_uncores); +uncore_types_exit (uncore_mmio_uncores);uncore_pci_exit ();return ret; }
@@ -1477,6 +1513,7 @@ static void __exit intel_uncore_exit(void) {cpuhp_remove_state (CPUHP_AP_PERF_X86_UNCORE_ONLINE );uncore_types_exit (uncore_msr_uncores); +uncore_types_exit (uncore_mmio_uncores);uncore_pci_exit (); }module_exit (intel_uncore_exit);
arch/x86/events/intel/uncore.h +16 -5
@@ -56,7 +56,10 @@ struct intel_uncore_type {unsigned fixed_ctr;unsigned fixed_ctl;unsigned box_ctl; -unsigned msr_offset; +union { +unsigned msr_offset; +unsigned mmio_offset; + }; unsigned num_shared_regs:8; unsigned single_fixed:1; unsigned pair_ctr_ctl:1;
@@ -190,6 +193,13 @@ static inline bool uncore_pmc_freerunning(int idx)return idx ==UNCORE_PMC_IDX_FREERUNNING ; } +static inline +unsigned int uncore_mmio_box_ctl (struct intel_uncore_box *box) +{ +return box->pmu->type->box_ctl + + box->pmu->type->mmio_offset * box->pmu->pmu_idx; +} +static inline unsigned uncore_pci_box_ctl (struct intel_uncore_box *box) {return box->pmu->type->box_ctl;
@@ -330,7 +340,7 @@ unsigned uncore_msr_perf_ctr(struct intel_uncore_box *box, int idx)static inline unsigned uncore_fixed_ctl (struct intel_uncore_box *box) { -if (box->pci_dev) +if (box->pci_dev || box->io_addr)return uncore_pci_fixed_ctl (box);else return uncore_msr_fixed_ctl (box);
@@ -339,7 +349,7 @@ unsigned uncore_fixed_ctl(struct intel_uncore_box *box)static inline unsigned uncore_fixed_ctr (struct intel_uncore_box *box) { -if (box->pci_dev) +if (box->pci_dev || box->io_addr)return uncore_pci_fixed_ctr (box);else return uncore_msr_fixed_ctr (box);
@@ -348,7 +358,7 @@ unsigned uncore_fixed_ctr(struct intel_uncore_box *box)static inline unsigned uncore_event_ctl (struct intel_uncore_box *box,int idx) { -if (box->pci_dev) +if (box->pci_dev || box->io_addr)return uncore_pci_event_ctl (box, idx);else return uncore_msr_event_ctl (box, idx);
@@ -357,7 +367,7 @@ unsigned uncore_event_ctl(struct intel_uncore_box *box, int idx)static inline unsigned uncore_perf_ctr (struct intel_uncore_box *box,int idx) { -if (box->pci_dev) +if (box->pci_dev || box->io_addr)return uncore_pci_perf_ctr (box, idx);else return uncore_msr_perf_ctr (box, idx);
@@ -507,6 +517,7 @@ u64 uncore_shared_reg_config(struct intel_uncore_box *box, int idx);extern struct intel_uncore_type **uncore_msr_uncores;extern struct intel_uncore_type **uncore_pci_uncores; +extern struct intel_uncore_type **uncore_mmio_uncores;extern struct pci_driver *uncore_pci_driver;extern raw_spinlock_t pci2phy_map_lock;extern struct list_head pci2phy_map_head;
Signature · 1 line
2.7.4
PATCH 4/5 perf/x86/intel/uncore: Clean up client IMC
In reply to [email protected]From: Kan Liang <[email protected]>
The client IMC block is accessed by MMIO. Current code uses an informal way to access the block, which is not recommended.
Cleaning up the code by using __iomem annotation and the accessor functions (read[lq]()).
Move exit_box() and read_counter() to generic code, which can be shared with server later.
--- arch/x86/events/intel/uncore.c | 15 +++++++++++++++ arch/x86/events/intel/uncore.h | 6 +++++- arch/x86/events/intel/uncore_snb.c | 16 ++-------------- 3 files changed, 22 insertions(+), 15 deletions(-)
arch/x86/events/intel/uncore.c +15 -0
@@ -119,6 +119,21 @@ u64 uncore_msr_read_counter(struct intel_uncore_box *box, struct perf_event *evereturn count; } +void uncore_mmio_exit_box (struct intel_uncore_box *box) +{ +if (box->io_addr) +iounmap (box->io_addr); +} + +u64 uncore_mmio_read_counter (struct intel_uncore_box *box, +struct perf_event *event) +{ +if (!box->io_addr) +return 0 ; + +return readq (box->io_addr + event->hw.event_base); +} +/* * generic get constraint function for shared match/mask registers. */
arch/x86/events/intel/uncore.h +5 -1
@@ -2,6 +2,7 @@#include <linux/slab.h> #include <linux/pci.h> #include <asm/apicdef.h> +#include <linux/io-64-nonatomic-lo-hi.h> #include <linux/perf_event.h> #include "../perf_event.h"
@@ -128,7 +129,7 @@ struct intel_uncore_box {struct hrtimer hrtimer;struct list_head list;struct list_head active_list; -void *io_addr; +void __iomem *io_addr;struct intel_uncore_extra_reg shared_regs[0 ]; };
@@ -502,6 +503,9 @@ static inline struct intel_uncore_box *uncore_event_to_box(struct perf_event *evstruct intel_uncore_box *uncore_pmu_to_box (struct intel_uncore_pmu *pmu,int cpu);u64 uncore_msr_read_counter (struct intel_uncore_box *box,struct perf_event *event); +void uncore_mmio_exit_box (struct intel_uncore_box *box); +u64 uncore_mmio_read_counter (struct intel_uncore_box *box, +struct perf_event *event);void uncore_pmu_start_hrtimer (struct intel_uncore_box *box);void uncore_pmu_cancel_hrtimer (struct intel_uncore_box *box);void uncore_pmu_event_start (struct perf_event *event,int flags);
arch/x86/events/intel/uncore_snb.c +2 -14
@@ -420,11 +420,6 @@ static void snb_uncore_imc_init_box(struct intel_uncore_box *box) box->hrtimer_duration =UNCORE_SNB_IMC_HRTIMER_INTERVAL ; } -static void snb_uncore_imc_exit_box (struct intel_uncore_box *box) -{ -iounmap (box->io_addr); -} -static void snb_uncore_imc_enable_box (struct intel_uncore_box *box) {}
@@ -437,13 +432,6 @@ static void snb_uncore_imc_enable_event(struct intel_uncore_box *box, struct perstatic void snb_uncore_imc_disable_event (struct intel_uncore_box *box,struct perf_event *event) {} -static u64 snb_uncore_imc_read_counter (struct intel_uncore_box *box,struct perf_event *event) -{ -struct hw_perf_event *hwc = &event->hw; - -return (u64)*(unsigned int *)(box->io_addr + hwc->event_base); -} -/* * Keep the custom event_init() function compatible with old event * encoding for free running counters.
@@ -570,13 +558,13 @@ static struct pmu snb_uncore_imc_pmu = {static struct intel_uncore_ops snb_uncore_imc_ops = { .init_box = snb_uncore_imc_init_box, - .exit_box = snb_uncore_imc_exit_box, + .exit_box = uncore_mmio_exit_box, .enable_box = snb_uncore_imc_enable_box, .disable_box = snb_uncore_imc_disable_box, .disable_event = snb_uncore_imc_disable_event, .enable_event = snb_uncore_imc_enable_event, .hw_config = snb_uncore_imc_hw_config, - .read_counter = snb_uncore_imc_read_counter, + .read_counter = uncore_mmio_read_counter, };static struct intel_uncore_type snb_uncore_imc = {
Signature · 1 line
2.7.4
PATCH 5/5 perf/x86/intel/uncore: Add IMC uncore support for Snow Ridge
In reply to [email protected]From: Kan Liang <[email protected]>
IMC uncore unit can only be accessed via MMIO on Snow Ridge. The MMIO space of IMC uncore is at the specified offsets from the MEM0_BAR. Add snr_uncore_get_mc_dev() to locate the PCI device with MMIO_BASE and MEM0_BAR register.
Add new ops to access the IMC registers via MMIO.
Add 3 new free running counters for clocks, read and write bandwidth.
--- arch/x86/events/intel/uncore.c | 3 +- arch/x86/events/intel/uncore.h | 2 + arch/x86/events/intel/uncore_snbep.c | 197 +++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+), 1 deletion(-)
arch/x86/events/intel/uncore.c +2 -1
@@ -28,7 +28,7 @@ struct event_constraint uncore_constraint_empty =MODULE_LICENSE ("GPL" ); -static int uncore_pcibus_to_physid (struct pci_bus *bus) +int uncore_pcibus_to_physid (struct pci_bus *bus) {struct pci2phy_map *map;int phys_id =-1 ;
@@ -1437,6 +1437,7 @@ static const struct intel_uncore_init_fun icl_uncore_init __initconst = {static const struct intel_uncore_init_fun snr_uncore_init__initconst = { .cpu_init = snr_uncore_cpu_init, .pci_init = snr_uncore_pci_init, + .mmio_init = snr_uncore_mmio_init, };static const struct x86_cpu_id intel_uncore_match[]__initconst = {
arch/x86/events/intel/uncore.h +2 -0
@@ -163,6 +163,7 @@ struct pci2phy_map { };struct pci2phy_map *__find_pci2phy_map (int segment); +int uncore_pcibus_to_physid (struct pci_bus *bus);ssize_t uncore_event_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf);
@@ -555,6 +556,7 @@ int skx_uncore_pci_init(void);void skx_uncore_cpu_init (void );int snr_uncore_pci_init (void );void snr_uncore_cpu_init (void ); +void snr_uncore_mmio_init (void );/* uncore_nhmex.c */ void nhmex_uncore_cpu_init (void );
arch/x86/events/intel/uncore_snbep.c +197 -0
207 lines not on this page · raw message
Signature · 1 line
2.7.4
Hi Peter,
Have you got a chance to take a look at the series for Snow Ridge server?
Here is the link for the document.
https://cdrdv2.intel.com/v1/dl/getContent/611319
Thanks,
Kan
Quoted 500 lines · On 4/15/2019 2:41 PM, [email protected] wrote:
From: Kan Liang <[email protected]>
The uncore subsystem on Snow Ridge is similar as previous SKX server. The uncore units on Snow Ridge include Ubox, Chabox, IIO, IRP, M2PCIE, PCU, M2M, PCIE3 and IMC.
- The config register encoding and pci device IDs are changed.
- For CHA, theumask_extandfilter_tidfields are changed.
- For IIO, thech_maskandfc_maskfields are changed.
- For M2M, themask_extfield is changed.
- Add new PCIe3 unit for PCIe3 root port which provides the interface between PCIe devices, plugged into the PCIe port, and the components (in M2IOSF).
- IMC can only be accessed via MMIO on Snow Ridge now. Current common code doesn't support it yet. IMC will be supported in following patches.
- There are 9 free running counters for IIO CLOCKS and bandwidth In.
- Full uncore event list is not published yet. Event constrain is not included in this patch. It will be added later separately.Signed-off-by Kan Liang <[email protected]>--- arch/x86/events/intel/uncore.c | 6 + arch/x86/events/intel/uncore.h | 2 + arch/x86/events/intel/uncore_snbep.c | 403 +++++++++++++++++++++++++++++++++++ 3 files changed, 411 insertions(+)arch/x86/events/intel/uncore.c +6
-0@@ -1372,6 +1372,11 @@ static const struct intel_uncore_init_fun icl_uncore_init __initconst = { .pci_init = skl_uncore_pci_init, }; +static const struct intel_uncore_init_fun snr_uncore_init__initconst = { + .cpu_init = snr_uncore_cpu_init, + .pci_init = snr_uncore_pci_init, +}; +static const struct x86_cpu_id intel_uncore_match[]__initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_NEHALEM_EP , nhm_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_NEHALEM , nhm_uncore_init),@@ -1399,6 +1404,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_DESKTOP , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , icl_uncore_init), + X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_X, snr_uncore_init), {}, };arch/x86/events/intel/uncore.h +2
-0@@ -538,6 +538,8 @@ int knl_uncore_pci_init(void);void knl_uncore_cpu_init (void );int skx_uncore_pci_init (void );void skx_uncore_cpu_init (void ); +int snr_uncore_pci_init (void ); +void snr_uncore_cpu_init (void );/* uncore_nhmex.c */ void nhmex_uncore_cpu_init (void );arch/x86/events/intel/uncore_snbep.c +403
-0@@ -324,12 +324,64 @@#define SKX_M2M_PCI_PMON_CTR0 0x200#define SKX_M2M_PCI_PMON_BOX_CTL 0x258 +/* SNR Ubox */ +#define SNR_U_MSR_PMON_CTR0 0x1f98 +#define SNR_U_MSR_PMON_CTL0 0x1f91 +#define SNR_U_MSR_PMON_UCLK_FIXED_CTL 0x1f93 +#define SNR_U_MSR_PMON_UCLK_FIXED_CTR 0x1f94 + +/* SNR CHA */ +#define SNR_CHA_RAW_EVENT_MASK_EXT 0x3ffffff +#define SNR_CHA_MSR_PMON_CTL0 0x1c01 +#define SNR_CHA_MSR_PMON_CTR0 0x1c08 +#define SNR_CHA_MSR_PMON_BOX_CTL 0x1c00 +#define SNR_C0_MSR_PMON_BOX_FILTER0 0x1c05 + + +/* SNR IIO */ +#define SNR_IIO_MSR_PMON_CTL0 0x1e08 +#define SNR_IIO_MSR_PMON_CTR0 0x1e01 +#define SNR_IIO_MSR_PMON_BOX_CTL 0x1e00 +#define SNR_IIO_MSR_OFFSET 0x10 +#define SNR_IIO_PMON_RAW_EVENT_MASK_EXT 0x7ffff + +/* SNR IRP */ +#define SNR_IRP0_MSR_PMON_CTL0 0x1ea8 +#define SNR_IRP0_MSR_PMON_CTR0 0x1ea1 +#define SNR_IRP0_MSR_PMON_BOX_CTL 0x1ea0 +#define SNR_IRP_MSR_OFFSET 0x10 + +/* SNR M2PCIE */ +#define SNR_M2PCIE_MSR_PMON_CTL0 0x1e58 +#define SNR_M2PCIE_MSR_PMON_CTR0 0x1e51 +#define SNR_M2PCIE_MSR_PMON_BOX_CTL 0x1e50 +#define SNR_M2PCIE_MSR_OFFSET 0x10 + +/* SNR PCU */ +#define SNR_PCU_MSR_PMON_CTL0 0x1ef1 +#define SNR_PCU_MSR_PMON_CTR0 0x1ef8 +#define SNR_PCU_MSR_PMON_BOX_CTL 0x1ef0 +#define SNR_PCU_MSR_PMON_BOX_FILTER 0x1efc + +/* SNR M2M */ +#define SNR_M2M_PCI_PMON_CTL0 0x468 +#define SNR_M2M_PCI_PMON_CTR0 0x440 +#define SNR_M2M_PCI_PMON_BOX_CTL 0x438 +#define SNR_M2M_PCI_PMON_UMASK_EXT 0xff + +/* SNR PCIE3 */ +#define SNR_PCIE3_PCI_PMON_CTL0 0x508 +#define SNR_PCIE3_PCI_PMON_CTR0 0x4e8 +#define SNR_PCIE3_PCI_PMON_BOX_CTL 0x4e4 +DEFINE_UNCORE_FORMAT_ATTR (event, event,"config:0-7" );DEFINE_UNCORE_FORMAT_ATTR (event2, event,"config:0-6" );DEFINE_UNCORE_FORMAT_ATTR (event_ext, event,"config:0-7,21" );DEFINE_UNCORE_FORMAT_ATTR (use_occ_ctr, use_occ_ctr,"config:7" );DEFINE_UNCORE_FORMAT_ATTR (umask, umask,"config:8-15" );DEFINE_UNCORE_FORMAT_ATTR (umask_ext, umask,"config:8-15,32-43,45-55" ); +DEFINE_UNCORE_FORMAT_ATTR (umask_ext2, umask,"config:8-15,32-57" ); +DEFINE_UNCORE_FORMAT_ATTR (umask_ext3, umask,"config:8-15,32-39" );DEFINE_UNCORE_FORMAT_ATTR (qor, qor,"config:16" );DEFINE_UNCORE_FORMAT_ATTR (edge, edge,"config:18" );DEFINE_UNCORE_FORMAT_ATTR (tid_en, tid_en,"config:19" );@@ -343,11 +395,14 @@ DEFINE_UNCORE_FORMAT_ATTR(occ_invert, occ_invert, "config:30");DEFINE_UNCORE_FORMAT_ATTR (occ_edge, occ_edge,"config:14-51" );DEFINE_UNCORE_FORMAT_ATTR (occ_edge_det, occ_edge_det,"config:31" );DEFINE_UNCORE_FORMAT_ATTR (ch_mask, ch_mask,"config:36-43" ); +DEFINE_UNCORE_FORMAT_ATTR (ch_mask2, ch_mask,"config:36-47" );DEFINE_UNCORE_FORMAT_ATTR (fc_mask, fc_mask,"config:44-46" ); +DEFINE_UNCORE_FORMAT_ATTR (fc_mask2, fc_mask,"config:48-50" );DEFINE_UNCORE_FORMAT_ATTR (filter_tid, filter_tid,"config1:0-4" );DEFINE_UNCORE_FORMAT_ATTR (filter_tid2, filter_tid,"config1:0" );DEFINE_UNCORE_FORMAT_ATTR (filter_tid3, filter_tid,"config1:0-5" );DEFINE_UNCORE_FORMAT_ATTR (filter_tid4, filter_tid,"config1:0-8" ); +DEFINE_UNCORE_FORMAT_ATTR (filter_tid5, filter_tid,"config1:0-9" );DEFINE_UNCORE_FORMAT_ATTR (filter_cid, filter_cid,"config1:5" );DEFINE_UNCORE_FORMAT_ATTR (filter_link, filter_link,"config1:5-8" );DEFINE_UNCORE_FORMAT_ATTR (filter_link2, filter_link,"config1:6-8" );@@ -3968,3 +4023,351 @@ int skx_uncore_pci_init(void) }/* end of SKX uncore support */ + +/* SNR uncore support */ + +static struct intel_uncore_type snr_uncore_ubox = { + .name ="ubox" , + .num_counters =2 , + .num_boxes =1 , + .perf_ctr_bits =48 , + .fixed_ctr_bits =48 , + .perf_ctr =SNR_U_MSR_PMON_CTR0 , + .event_ctl =SNR_U_MSR_PMON_CTL0 , + .event_mask =SNBEP_PMON_RAW_EVENT_MASK , + .fixed_ctr =SNR_U_MSR_PMON_UCLK_FIXED_CTR , + .fixed_ctl =SNR_U_MSR_PMON_UCLK_FIXED_CTL , + .ops = &ivbep_uncore_msr_ops, + .format_group = &ivbep_uncore_format_group, +}; + +static struct attribute *snr_uncore_cha_formats_attr[] = { + &format_attr_event.attr, + &format_attr_umask_ext2.attr, + &format_attr_edge.attr, + &format_attr_tid_en.attr, + &format_attr_inv.attr, + &format_attr_thresh8.attr, + &format_attr_filter_tid5.attr, +NULL , +}; +static const struct attribute_group snr_uncore_chabox_format_group = { + .name ="format" , + .attrs = snr_uncore_cha_formats_attr, +}; + +static int snr_cha_hw_config (struct intel_uncore_box *box,struct perf_event *event) +{ +struct hw_perf_event_extra *reg1 = &event->hw.extra_reg; + + reg1->reg =SNR_C0_MSR_PMON_BOX_FILTER0 + + box->pmu->type->msr_offset * box->pmu->pmu_idx; + reg1->config = event->attr.config1 &SKX_CHA_MSR_PMON_BOX_FILTER_TID ; + reg1->idx =0 ; + +return 0 ; +} + +static void snr_cha_enable_event (struct intel_uncore_box *box, +struct perf_event *event) +{ +struct hw_perf_event *hwc = &event->hw; +struct hw_perf_event_extra *reg1 = &hwc->extra_reg; + +if (reg1->idx !=EXTRA_REG_NONE ) +wrmsrl (reg1->reg, reg1->config); + +wrmsrl (hwc->config_base, hwc->config |SNBEP_PMON_CTL_EN ); +} + +static struct intel_uncore_ops snr_uncore_chabox_ops = { + .init_box = ivbep_uncore_msr_init_box, + .disable_box = snbep_uncore_msr_disable_box, + .enable_box = snbep_uncore_msr_enable_box, + .disable_event = snbep_uncore_msr_disable_event, + .enable_event = snr_cha_enable_event, + .read_counter = uncore_msr_read_counter, + .hw_config = snr_cha_hw_config, +}; + +static struct intel_uncore_type snr_uncore_chabox = { + .name ="cha" , + .num_counters =4 , + .num_boxes =6 , + .perf_ctr_bits =48 , + .event_ctl =SNR_CHA_MSR_PMON_CTL0 , + .perf_ctr =SNR_CHA_MSR_PMON_CTR0 , + .box_ctl =SNR_CHA_MSR_PMON_BOX_CTL , + .msr_offset =HSWEP_CBO_MSR_OFFSET , + .event_mask =HSWEP_S_MSR_PMON_RAW_EVENT_MASK , + .event_mask_ext =SNR_CHA_RAW_EVENT_MASK_EXT , + .ops = &snr_uncore_chabox_ops, + .format_group = &snr_uncore_chabox_format_group, +}; + +static struct attribute *snr_uncore_iio_formats_attr[] = { + &format_attr_event.attr, + &format_attr_umask.attr, + &format_attr_edge.attr, + &format_attr_inv.attr, + &format_attr_thresh9.attr, + &format_attr_ch_mask2.attr, + &format_attr_fc_mask2.attr, +NULL , +}; + +static const struct attribute_group snr_uncore_iio_format_group = { + .name ="format" , + .attrs = snr_uncore_iio_formats_attr, +}; + +static struct intel_uncore_type snr_uncore_iio = { + .name ="iio" , + .num_counters =4 , + .num_boxes =5 , + .perf_ctr_bits =48 , + .event_ctl =SNR_IIO_MSR_PMON_CTL0 , + .perf_ctr =SNR_IIO_MSR_PMON_CTR0 , + .event_mask =SNBEP_PMON_RAW_EVENT_MASK , + .event_mask_ext =SNR_IIO_PMON_RAW_EVENT_MASK_EXT , + .box_ctl =SNR_IIO_MSR_PMON_BOX_CTL , + .msr_offset =SNR_IIO_MSR_OFFSET , + .ops = &ivbep_uncore_msr_ops, + .format_group = &snr_uncore_iio_format_group, +}; + +static struct intel_uncore_type snr_uncore_irp = { + .name ="irp" , + .num_counters =2 , + .num_boxes =5 , + .perf_ctr_bits =48 , + .event_ctl =SNR_IRP0_MSR_PMON_CTL0 , + .perf_ctr =SNR_IRP0_MSR_PMON_CTR0 , + .event_mask =SNBEP_PMON_RAW_EVENT_MASK , + .box_ctl =SNR_IRP0_MSR_PMON_BOX_CTL , + .msr_offset =SNR_IRP_MSR_OFFSET , + .ops = &ivbep_uncore_msr_ops, + .format_group = &ivbep_uncore_format_group, +}; + +static struct intel_uncore_type snr_uncore_m2pcie = { + .name ="m2pcie" , + .num_counters =4 , + .num_boxes =5 , + .perf_ctr_bits =48 , + .event_ctl =SNR_M2PCIE_MSR_PMON_CTL0 , + .perf_ctr =SNR_M2PCIE_MSR_PMON_CTR0 , + .box_ctl =SNR_M2PCIE_MSR_PMON_BOX_CTL , + .msr_offset =SNR_M2PCIE_MSR_OFFSET , + .event_mask =SNBEP_PMON_RAW_EVENT_MASK , + .ops = &ivbep_uncore_msr_ops, + .format_group = &ivbep_uncore_format_group, +}; + +static int snr_pcu_hw_config (struct intel_uncore_box *box,struct perf_event *event) +{ +struct hw_perf_event *hwc = &event->hw; +struct hw_perf_event_extra *reg1 = &hwc->extra_reg; +int ev_sel = hwc->config &SNBEP_PMON_CTL_EV_SEL_MASK ; + +if (ev_sel >=0xb && ev_sel <=0xe ) { + reg1->reg =SNR_PCU_MSR_PMON_BOX_FILTER ; + reg1->idx = ev_sel -0xb ; + reg1->config = event->attr.config1 & (0xff << reg1->idx); + } +return 0 ; +} + +static struct intel_uncore_ops snr_uncore_pcu_ops = { +IVBEP_UNCORE_MSR_OPS_COMMON_INIT (), + .hw_config = snr_pcu_hw_config, + .get_constraint = snbep_pcu_get_constraint, + .put_constraint = snbep_pcu_put_constraint, +}; + +static struct intel_uncore_type snr_uncore_pcu = { + .name ="pcu" , + .num_counters =4 , + .num_boxes =1 , + .perf_ctr_bits =48 , + .perf_ctr =SNR_PCU_MSR_PMON_CTR0 , + .event_ctl =SNR_PCU_MSR_PMON_CTL0 , + .event_mask =SNBEP_PMON_RAW_EVENT_MASK , + .box_ctl =SNR_PCU_MSR_PMON_BOX_CTL , + .num_shared_regs =1 , + .ops = &snr_uncore_pcu_ops, + .format_group = &skx_uncore_pcu_format_group, +}; + +enum perf_uncore_snr_iio_freerunning_type_id { +SNR_IIO_MSR_IOCLK , +SNR_IIO_MSR_BW_IN , + +SNR_IIO_FREERUNNING_TYPE_MAX , +}; + +static struct freerunning_counters snr_iio_freerunning[] = { + [SNR_IIO_MSR_IOCLK ] = {0x1eac ,0x1 ,0x10 ,1 ,48 }, + [SNR_IIO_MSR_BW_IN ] = {0x1f00 ,0x1 ,0x10 ,8 ,48 }, +}; + +static struct uncore_event_desc snr_uncore_iio_freerunning_events[] = { +/* Free-Running IIO CLOCKS Counter */ +INTEL_UNCORE_EVENT_DESC (ioclk,"event=0xff,umask=0x10" ), +/* Free-Running IIO BANDWIDTH IN Counters */ +INTEL_UNCORE_EVENT_DESC (bw_in_port0,"event=0xff,umask=0x20" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port0.scale,"3.814697266e-6" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port0.unit,"MiB" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port1,"event=0xff,umask=0x21" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port1.scale,"3.814697266e-6" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port1.unit,"MiB" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port2,"event=0xff,umask=0x22" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port2.scale,"3.814697266e-6" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port2.unit,"MiB" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port3,"event=0xff,umask=0x23" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port3.scale,"3.814697266e-6" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port3.unit,"MiB" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port4,"event=0xff,umask=0x24" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port4.scale,"3.814697266e-6" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port4.unit,"MiB" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port5,"event=0xff,umask=0x25" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port5.scale,"3.814697266e-6" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port5.unit,"MiB" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port6,"event=0xff,umask=0x26" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port6.scale,"3.814697266e-6" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port6.unit,"MiB" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port7,"event=0xff,umask=0x27" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port7.scale,"3.814697266e-6" ), +INTEL_UNCORE_EVENT_DESC (bw_in_port7.unit,"MiB" ), + {/* end: all zeroes */ }, +}; + +static struct intel_uncore_type snr_uncore_iio_free_running = { + .name ="iio_free_running" , + .num_counters =9 , + .num_boxes =5 , + .num_freerunning_types =SNR_IIO_FREERUNNING_TYPE_MAX , + .freerunning = snr_iio_freerunning, + .ops = &skx_uncore_iio_freerunning_ops, + .event_descs = snr_uncore_iio_freerunning_events, + .format_group = &skx_uncore_iio_freerunning_format_group, +}; + +static struct intel_uncore_type *snr_msr_uncores[] = { + &snr_uncore_ubox, + &snr_uncore_chabox, + &snr_uncore_iio, + &snr_uncore_irp, + &snr_uncore_m2pcie, + &snr_uncore_pcu, + &snr_uncore_iio_free_running, +NULL , +}; + +void snr_uncore_cpu_init (void ) +{ + uncore_msr_uncores = snr_msr_uncores; +} + +static void snr_m2m_uncore_pci_init_box (struct intel_uncore_box *box) +{ +struct pci_dev *pdev = box->pci_dev; +int box_ctl =uncore_pci_box_ctl (box); + +__set_bit (UNCORE_BOX_FLAG_CTL_OFFS8 , &box->flags); +pci_write_config_dword (pdev, box_ctl,IVBEP_PMON_BOX_CTL_INT ); +} + +static struct intel_uncore_ops snr_m2m_uncore_pci_ops = { + .init_box = snr_m2m_uncore_pci_init_box, + .disable_box = snbep_uncore_pci_disable_box, + .enable_box = snbep_uncore_pci_enable_box, + .disable_event = snbep_uncore_pci_disable_event, + .enable_event = snbep_uncore_pci_enable_event, + .read_counter = snbep_uncore_pci_read_counter, +}; + +static struct attribute *snr_m2m_uncore_formats_attr[] = { + &format_attr_event.attr, + &format_attr_umask_ext3.attr, + &format_attr_edge.attr, + &format_attr_inv.attr, + &format_attr_thresh8.attr, +NULL , +}; + +static const struct attribute_group snr_m2m_uncore_format_group = { + .name ="format" , + .attrs = snr_m2m_uncore_formats_attr, +}; + +static struct intel_uncore_type snr_uncore_m2m = { + .name ="m2m" , + .num_counters =4 , + .num_boxes =1 , + .perf_ctr_bits =48 , + .perf_ctr =SNR_M2M_PCI_PMON_CTR0 , + .event_ctl =SNR_M2M_PCI_PMON_CTL0 , + .event_mask =SNBEP_PMON_RAW_EVENT_MASK , + .event_mask_ext =SNR_M2M_PCI_PMON_UMASK_EXT , + .box_ctl =SNR_M2M_PCI_PMON_BOX_CTL , + .ops = &snr_m2m_uncore_pci_ops, + .format_group = &snr_m2m_uncore_format_group, +}; + +static struct intel_uncore_type snr_uncore_pcie3 = { + .name ="pcie3" , + .num_counters =4 , + .num_boxes =1 , + .perf_ctr_bits =48 , + .perf_ctr =SNR_PCIE3_PCI_PMON_CTR0 , + .event_ctl =SNR_PCIE3_PCI_PMON_CTL0 , + .event_mask =SNBEP_PMON_RAW_EVENT_MASK , + .box_ctl =SNR_PCIE3_PCI_PMON_BOX_CTL , + .ops = &ivbep_uncore_pci_ops, + .format_group = &ivbep_uncore_format_group, +}; + +enum { +SNR_PCI_UNCORE_M2M , +SNR_PCI_UNCORE_PCIE3 , +}; + +static struct intel_uncore_type *snr_pci_uncores[] = { + [SNR_PCI_UNCORE_M2M ] = &snr_uncore_m2m, + [SNR_PCI_UNCORE_PCIE3 ] = &snr_uncore_pcie3, +NULL , +}; + +static const struct pci_device_id snr_uncore_pci_ids[] = { + {/* M2M */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x344a ), + .driver_data =UNCORE_PCI_DEV_FULL_DATA (12 ,0 ,SNR_PCI_UNCORE_M2M ,0 ), + }, + {/* PCIe3 */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x334a ), + .driver_data =UNCORE_PCI_DEV_FULL_DATA (4 ,0 ,SNR_PCI_UNCORE_PCIE3 ,0 ), + }, + {/* end: all zeroes */ } +}; + +static struct pci_driver snr_uncore_pci_driver = { + .name ="snr_uncore" , + .id_table = snr_uncore_pci_ids, +}; + +int snr_uncore_pci_init (void ) +{ +/* SNR UBOX DID */ +int ret =snbep_pci2phy_map_init (0x3460 ,SKX_CPUNODEID , +SKX_GIDNIDMAP , true); + +if (ret) +return ret; + + uncore_pci_uncores = snr_pci_uncores; + uncore_pci_driver = &snr_uncore_pci_driver; +return 0 ; +} + +/* end of SNR uncore support */