[linux-yocto] [yocto-4.12] [PATCH 1/6] perf/x86/intel/uncore: Fix Skylake UPI PMU event masks

[Bruce Ashfield]

merged.

Bruce

On 2017-12-18 8:58 PM, quanyang.wang at windriver.com wrote:
> From: Stephane Eranian <eranian at google.com>
> 
> Commit b3625980a65db6b6b6bbd5790a77ab95ce6397c5 upstream
> 
> This patch fixes the event_mask and event_ext_mask for the Intel Skylake
> Server UPI PMU. Bit 21 is not used as a filter. The extended umask is
> from bit 32 to bit 55. Correct both umasks.
> 
> Signed-off-by: Stephane Eranian <eranian at google.com>
> Signed-off-by: Kan Liang <kan.liang at intel.com>
> Acked-by: Peter Zijlstra <peterz at infradead.org>
> Cc: Alexander Shishkin <alexander.shishkin at linux.intel.com>
> Cc: Arnaldo Carvalho de Melo <acme at redhat.com>
> Cc: Jiri Olsa <jolsa at redhat.com>
> Cc: Linus Torvalds <torvalds at linux-foundation.org>
> Cc: Thomas Gleixner <tglx at linutronix.de>
> Cc: Vince Weaver <vincent.weaver at maine.edu>
> Link: http://lkml.kernel.org/r/1499967350-10385-2-git-send-email-kan.liang@intel.com
> Signed-off-by: Ingo Molnar <mingo at kernel.org>
> ---
>   arch/x86/events/intel/uncore_snbep.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
> index dae2fed..19a00a7 100644
> --- a/arch/x86/events/intel/uncore_snbep.c
> +++ b/arch/x86/events/intel/uncore_snbep.c
> @@ -316,7 +316,7 @@
>   #define SKX_UPI_PCI_PMON_CTL0		0x350
>   #define SKX_UPI_PCI_PMON_CTR0		0x318
>   #define SKX_UPI_PCI_PMON_BOX_CTL	0x378
> -#define SKX_PMON_CTL_UMASK_EXT		0xff
> +#define SKX_UPI_CTL_UMASK_EXT		0xffefff
>   
>   /* SKX M2M */
>   #define SKX_M2M_PCI_PMON_CTL0		0x228
> @@ -328,7 +328,7 @@
>   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-39");
> +DEFINE_UNCORE_FORMAT_ATTR(umask_ext, umask, "config:8-15,32-43,45-55");
>   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");
> @@ -3603,8 +3603,8 @@ static void skx_upi_uncore_pci_init_box(struct intel_uncore_box *box)
>   	.perf_ctr_bits	= 48,
>   	.perf_ctr	= SKX_UPI_PCI_PMON_CTR0,
>   	.event_ctl	= SKX_UPI_PCI_PMON_CTL0,
> -	.event_mask	= SNBEP_QPI_PCI_PMON_RAW_EVENT_MASK,
> -	.event_mask_ext = SKX_PMON_CTL_UMASK_EXT,
> +	.event_mask	= SNBEP_PMON_RAW_EVENT_MASK,
> +	.event_mask_ext = SKX_UPI_CTL_UMASK_EXT,
>   	.box_ctl	= SKX_UPI_PCI_PMON_BOX_CTL,
>   	.ops		= &skx_upi_uncore_pci_ops,
>   	.format_group	= &skx_upi_uncore_format_group,
>