Home Home > GIT Browse > packaging
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-08-03 07:05:03 +0200
committerTakashi Iwai <tiwai@suse.de>2018-08-03 07:05:03 +0200
commit0bf23e932182c739c6817dcff7e970820cc1d975 (patch)
tree5b7c9f6f497410d8b1114e42c3c33e2b0dd59282
parente56f895e04266452c0629115b548d62104870ffe (diff)
parent9fb5cd33092b42220d2ee9a920965f056b8afa40 (diff)
Merge branch 'users/tonyj/SLE15/for-next' into SLE15
Pull perf fixes from Tony Jones
-rw-r--r--patches.fixes/perf-intel-pt-always-set-no-branch-for-dummy-event.patch56
-rw-r--r--patches.fixes/perf-intel-pt-set-no_aux_samples-for-the-tracking-event.patch37
-rw-r--r--patches.fixes/perf-x86-intel-uncore-add-event-constraint-for-bdx-pcu.patch50
-rw-r--r--patches.fixes/perf-x86-intel-uncore-fix-missing-marker-for-skx_uncore_cha_extra_regs.patch39
-rw-r--r--patches.fixes/perf-x86-intel-uncore-fix-skx-cha-event-extra-regs.patch62
-rw-r--r--patches.fixes/perf-x86-intel-uncore-fix-skylake-server-cha-llc_lookup-event-umask.patch41
-rw-r--r--patches.fixes/perf-x86-intel-uncore-fix-skylake-server-pcu-pmu-event-format.patch67
-rw-r--r--patches.fixes/perf-x86-intel-uncore-fix-skylake-upi-pmu-event-masks.patch61
-rw-r--r--patches.fixes/perf-x86-intel-uncore-remove-invalid-skylake-server-cha-filter-field.patch54
-rw-r--r--series.conf9
10 files changed, 476 insertions, 0 deletions
diff --git a/patches.fixes/perf-intel-pt-always-set-no-branch-for-dummy-event.patch b/patches.fixes/perf-intel-pt-always-set-no-branch-for-dummy-event.patch
new file mode 100644
index 0000000000..69f59dc33a
--- /dev/null
+++ b/patches.fixes/perf-intel-pt-always-set-no-branch-for-dummy-event.patch
@@ -0,0 +1,56 @@
+From: Kan Liang <kan.liang@intel.com>
+Date: Fri, 30 Jun 2017 10:16:56 -0400
+Subject: perf intel-pt: Always set no branch for dummy event
+Git-commit: 91a8c5b840f2da31280e14b6268761cf14033756
+Patch-mainline: v4.14-rc1
+References: bsc#1087217
+
+An earlier kernel patch allowed enabling PT and LBR at the same time on
+Goldmont.
+
+commit ccbebba4c6bf ("perf/x86/intel/pt: Bypass PT vs. LBR exclusivity
+if the core supports it")
+
+However, users still cannot use Intel PT and LBRs simultaneously. $
+sudo perf record -e cycles,intel_pt//u -b -- sleep 1 Error: PMU
+Hardware doesn't support sampling/overflow-interrupts.
+
+PT implicitly adds dummy event in perf tool. dummy event is software
+event which doesn't support LBR.
+
+Always setting no branch for dummy event in Intel PT.
+
+Signed-off-by: Kan Liang <kan.liang@intel.com>
+Acked-by: Jiri Olsa <jolsa@redhat.com>
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Andi Kleen <ak@linux.intel.com>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Link: http://lkml.kernel.org/r/20170630141656.1626-2-kan.liang@intel.com
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Tony Jones <tonyj@suse.de>
+---
+ tools/perf/arch/x86/util/intel-pt.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
+index 4a461e8ae326..db0ba8caf5a2 100644
+--- a/tools/perf/arch/x86/util/intel-pt.c
++++ b/tools/perf/arch/x86/util/intel-pt.c
+@@ -701,6 +701,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,
+ perf_evsel__set_sample_bit(switch_evsel, TID);
+ perf_evsel__set_sample_bit(switch_evsel, TIME);
+ perf_evsel__set_sample_bit(switch_evsel, CPU);
++ perf_evsel__reset_sample_bit(switch_evsel, BRANCH_STACK);
+
+ opts->record_switch_events = false;
+ ptr->have_sched_switch = 3;
+@@ -762,6 +763,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,
+ /* And the CPU for switch events */
+ perf_evsel__set_sample_bit(tracking_evsel, CPU);
+ }
++ perf_evsel__reset_sample_bit(tracking_evsel, BRANCH_STACK);
+ }
+
+ /*
+
diff --git a/patches.fixes/perf-intel-pt-set-no_aux_samples-for-the-tracking-event.patch b/patches.fixes/perf-intel-pt-set-no_aux_samples-for-the-tracking-event.patch
new file mode 100644
index 0000000000..1f08131df7
--- /dev/null
+++ b/patches.fixes/perf-intel-pt-set-no_aux_samples-for-the-tracking-event.patch
@@ -0,0 +1,37 @@
+From: Kan Liang <kan.liang@intel.com>
+Date: Fri, 30 Jun 2017 10:16:55 -0400
+Subject: perf intel-pt: Set no_aux_samples for the tracking event
+Git-commit: 69d8bd8aa7d8906a1e922ae884d97f0bd7f1b269
+Patch-mainline: v4.14-rc1
+References: bsc#1087217
+
+The reason of introducing the tracking event (a dummy software event) is
+to collect side-band information. Additional sampling is wasteful.
+no_aux_samples should be set for tracking event.
+
+Signed-off-by: Kan Liang <kan.liang@intel.com>
+Acked-by: Jiri Olsa <jolsa@redhat.com>
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Andi Kleen <ak@linux.intel.com>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Link: http://lkml.kernel.org/r/20170630141656.1626-1-kan.liang@intel.com
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Tony Jones <tonyj@suse.de>
+---
+ tools/perf/arch/x86/util/intel-pt.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
+index 9535be57033f..4a461e8ae326 100644
+--- a/tools/perf/arch/x86/util/intel-pt.c
++++ b/tools/perf/arch/x86/util/intel-pt.c
+@@ -752,6 +752,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,
+ tracking_evsel->attr.freq = 0;
+ tracking_evsel->attr.sample_period = 1;
+
++ tracking_evsel->no_aux_samples = true;
+ if (need_immediate)
+ tracking_evsel->immediate = true;
+
+
diff --git a/patches.fixes/perf-x86-intel-uncore-add-event-constraint-for-bdx-pcu.patch b/patches.fixes/perf-x86-intel-uncore-add-event-constraint-for-bdx-pcu.patch
new file mode 100644
index 0000000000..619670dbf5
--- /dev/null
+++ b/patches.fixes/perf-x86-intel-uncore-add-event-constraint-for-bdx-pcu.patch
@@ -0,0 +1,50 @@
+From: Kan Liang <kan.liang@intel.com>
+Date: Tue, 14 Nov 2017 06:06:40 -0800
+Subject: perf/x86/intel/uncore: Add event constraint for BDX PCU
+Git-commit: bb9fbe1b57503f790dbbf9f06e72cb0fb9e60740
+Patch-mainline: v4.15-rc1
+References: bsc#1087202
+
+Event select bit 7 'Use Occupancy' in PCU Box is not available for
+counter 0 on BDX
+
+Add a constraint to fix it.
+
+Reported-by: Stephane Eranian <eranian@google.com>
+Signed-off-by: Kan Liang <kan.liang@intel.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Tested-by: Stephane Eranian <eranian@google.com>
+Cc: peterz@infradead.org
+Cc: ak@linux.intel.com
+Link: https://lkml.kernel.org/r/1510668400-301000-1-git-send-email-kan.liang@intel.com
+
+Signed-off-by: Tony Jones <tonyj@suse.de>
+---
+ arch/x86/events/intel/uncore_snbep.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
+index 95cb19f4e06f..f4e4168455a8 100644
+--- a/arch/x86/events/intel/uncore_snbep.c
++++ b/arch/x86/events/intel/uncore_snbep.c
+@@ -3035,11 +3035,19 @@ static struct intel_uncore_type *bdx_msr_uncores[] = {
+ NULL,
+ };
+
++/* Bit 7 'Use Occupancy' is not available for counter 0 on BDX */
++static struct event_constraint bdx_uncore_pcu_constraints[] = {
++ EVENT_CONSTRAINT(0x80, 0xe, 0x80),
++ EVENT_CONSTRAINT_END
++};
++
+ void bdx_uncore_cpu_init(void)
+ {
+ if (bdx_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)
+ bdx_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;
+ uncore_msr_uncores = bdx_msr_uncores;
++
++ hswep_uncore_pcu.constraints = bdx_uncore_pcu_constraints;
+ }
+
+ static struct intel_uncore_type bdx_uncore_ha = {
+
diff --git a/patches.fixes/perf-x86-intel-uncore-fix-missing-marker-for-skx_uncore_cha_extra_regs.patch b/patches.fixes/perf-x86-intel-uncore-fix-missing-marker-for-skx_uncore_cha_extra_regs.patch
new file mode 100644
index 0000000000..2f875976ea
--- /dev/null
+++ b/patches.fixes/perf-x86-intel-uncore-fix-missing-marker-for-skx_uncore_cha_extra_regs.patch
@@ -0,0 +1,39 @@
+From: Stephane Eranian <eranian@google.com>
+Date: Thu, 13 Jul 2017 10:35:50 -0700
+Subject: perf/x86/intel/uncore: Fix missing marker for
+ skx_uncore_cha_extra_regs
+Git-commit: ba883b4abc9cd837441b01eb9cf8d9196181294d
+Patch-mainline: v4.13-rc3
+References: bsc#1087233
+
+This skx_uncore_cha_extra_regs array was missing an end-marker.
+
+Signed-off-by: Stephane Eranian <eranian@google.com>
+Signed-off-by: Kan Liang <kan.liang@intel.com>
+Acked-by: Peter Zijlstra <peterz@infradead.org>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Vince Weaver <vincent.weaver@maine.edu>
+Link: http://lkml.kernel.org/r/1499967350-10385-7-git-send-email-kan.liang@intel.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Tony Jones <tonyj@suse.de>
+---
+ arch/x86/events/intel/uncore_snbep.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
+index f9f825b6a46e..4f9127644b80 100644
+--- a/arch/x86/events/intel/uncore_snbep.c
++++ b/arch/x86/events/intel/uncore_snbep.c
+@@ -3334,6 +3334,7 @@ static struct extra_reg skx_uncore_cha_extra_regs[] = {
+ SNBEP_CBO_EVENT_EXTRA_REG(0x9134, 0xffff, 0x4),
+ SNBEP_CBO_EVENT_EXTRA_REG(0x35, 0xff, 0x8),
+ SNBEP_CBO_EVENT_EXTRA_REG(0x36, 0xff, 0x8),
++ EVENT_EXTRA_END
+ };
+
+ static u64 skx_cha_filter_mask(int fields)
+
diff --git a/patches.fixes/perf-x86-intel-uncore-fix-skx-cha-event-extra-regs.patch b/patches.fixes/perf-x86-intel-uncore-fix-skx-cha-event-extra-regs.patch
new file mode 100644
index 0000000000..db8b134543
--- /dev/null
+++ b/patches.fixes/perf-x86-intel-uncore-fix-skx-cha-event-extra-regs.patch
@@ -0,0 +1,62 @@
+From: Stephane Eranian <eranian@google.com>
+Date: Thu, 13 Jul 2017 10:35:49 -0700
+Subject: perf/x86/intel/uncore: Fix SKX CHA event extra regs
+Git-commit: 8aa7b7b4b4a601978672dce6604b9f5630b2eeb8
+Patch-mainline: v4.13-rc3
+References: bsc#1087233
+
+This patch adds two missing event extra regs for Skylake Server CHA PMU:
+
+ - TOR_INSERTS
+ - TOR_OCCUPANCY
+
+Were missing support for all the filters, including opcode matchers.
+
+Signed-off-by: Stephane Eranian <eranian@google.com>
+Signed-off-by: Kan Liang <kan.liang@intel.com>
+Acked-by: Peter Zijlstra <peterz@infradead.org>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Vince Weaver <vincent.weaver@maine.edu>
+Link: http://lkml.kernel.org/r/1499967350-10385-6-git-send-email-kan.liang@intel.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Tony Jones <tonyj@suse.de>
+---
+ arch/x86/events/intel/uncore_snbep.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
+index 2401d0600b47..f9f825b6a46e 100644
+--- a/arch/x86/events/intel/uncore_snbep.c
++++ b/arch/x86/events/intel/uncore_snbep.c
+@@ -3332,6 +3332,8 @@ static struct extra_reg skx_uncore_cha_extra_regs[] = {
+ SNBEP_CBO_EVENT_EXTRA_REG(0x1134, 0xffff, 0x4),
+ SNBEP_CBO_EVENT_EXTRA_REG(0x3134, 0xffff, 0x4),
+ SNBEP_CBO_EVENT_EXTRA_REG(0x9134, 0xffff, 0x4),
++ SNBEP_CBO_EVENT_EXTRA_REG(0x35, 0xff, 0x8),
++ SNBEP_CBO_EVENT_EXTRA_REG(0x36, 0xff, 0x8),
+ };
+
+ static u64 skx_cha_filter_mask(int fields)
+@@ -3344,6 +3346,17 @@ static u64 skx_cha_filter_mask(int fields)
+ mask |= SKX_CHA_MSR_PMON_BOX_FILTER_LINK;
+ if (fields & 0x4)
+ mask |= SKX_CHA_MSR_PMON_BOX_FILTER_STATE;
++ if (fields & 0x8) {
++ mask |= SKX_CHA_MSR_PMON_BOX_FILTER_REM;
++ mask |= SKX_CHA_MSR_PMON_BOX_FILTER_LOC;
++ mask |= SKX_CHA_MSR_PMON_BOX_FILTER_ALL_OPC;
++ mask |= SKX_CHA_MSR_PMON_BOX_FILTER_NM;
++ mask |= SKX_CHA_MSR_PMON_BOX_FILTER_NOT_NM;
++ mask |= SKX_CHA_MSR_PMON_BOX_FILTER_OPC0;
++ mask |= SKX_CHA_MSR_PMON_BOX_FILTER_OPC1;
++ mask |= SKX_CHA_MSR_PMON_BOX_FILTER_NC;
++ mask |= SKX_CHA_MSR_PMON_BOX_FILTER_ISOC;
++ }
+ return mask;
+ }
+
+
diff --git a/patches.fixes/perf-x86-intel-uncore-fix-skylake-server-cha-llc_lookup-event-umask.patch b/patches.fixes/perf-x86-intel-uncore-fix-skylake-server-cha-llc_lookup-event-umask.patch
new file mode 100644
index 0000000000..1d5de9859b
--- /dev/null
+++ b/patches.fixes/perf-x86-intel-uncore-fix-skylake-server-cha-llc_lookup-event-umask.patch
@@ -0,0 +1,41 @@
+From: Kan Liang <kan.liang@intel.com>
+Date: Thu, 13 Jul 2017 10:35:47 -0700
+Subject: perf/x86/intel/uncore: Fix Skylake server CHA LLC_LOOKUP event umask
+Git-commit: c3f02682a101b83424128915b14e60c156c03f02
+Patch-mainline: v4.13-rc3
+References: bsc#1087233
+
+Correct the umask for LLC_LOOKUP.LOCAL and LLC_LOOKUP.REMOTE events
+
+Signed-off-by: Kan Liang <kan.liang@intel.com>
+Acked-by: Peter Zijlstra <peterz@infradead.org>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Stephane Eranian <eranian@google.com>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Vince Weaver <vincent.weaver@maine.edu>
+Link: http://lkml.kernel.org/r/1499967350-10385-4-git-send-email-kan.liang@intel.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Tony Jones <tonyj@suse.de>
+---
+ arch/x86/events/intel/uncore_snbep.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
+index fbf8f6e462e7..a30bf973b5de 100644
+--- a/arch/x86/events/intel/uncore_snbep.c
++++ b/arch/x86/events/intel/uncore_snbep.c
+@@ -3333,8 +3333,8 @@ static struct extra_reg skx_uncore_cha_extra_regs[] = {
+ SNBEP_CBO_EVENT_EXTRA_REG(0x0534, 0xffff, 0x4),
+ SNBEP_CBO_EVENT_EXTRA_REG(0x0934, 0xffff, 0x4),
+ SNBEP_CBO_EVENT_EXTRA_REG(0x1134, 0xffff, 0x4),
+- SNBEP_CBO_EVENT_EXTRA_REG(0x2134, 0xffff, 0x4),
+- SNBEP_CBO_EVENT_EXTRA_REG(0x8134, 0xffff, 0x4),
++ SNBEP_CBO_EVENT_EXTRA_REG(0x3134, 0xffff, 0x4),
++ SNBEP_CBO_EVENT_EXTRA_REG(0x9134, 0xffff, 0x4),
+ };
+
+ static u64 skx_cha_filter_mask(int fields)
+
diff --git a/patches.fixes/perf-x86-intel-uncore-fix-skylake-server-pcu-pmu-event-format.patch b/patches.fixes/perf-x86-intel-uncore-fix-skylake-server-pcu-pmu-event-format.patch
new file mode 100644
index 0000000000..9df7673855
--- /dev/null
+++ b/patches.fixes/perf-x86-intel-uncore-fix-skylake-server-pcu-pmu-event-format.patch
@@ -0,0 +1,67 @@
+From: Kan Liang <kan.liang@intel.com>
+Date: Thu, 13 Jul 2017 10:35:46 -0700
+Subject: perf/x86/intel/uncore: Fix Skylake server PCU PMU event format
+Git-commit: bab4e569e80c07ba6fe5e4f2d815adeef26cee94
+Patch-mainline: v4.13-rc3
+References: bsc#1087233
+
+PCU event format for SKX are different from snbep. Introduce a new
+format group for SKX PCU.
+
+Signed-off-by: Kan Liang <kan.liang@intel.com>
+Acked-by: Peter Zijlstra <peterz@infradead.org>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Stephane Eranian <eranian@google.com>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Vince Weaver <vincent.weaver@maine.edu>
+Link: http://lkml.kernel.org/r/1499967350-10385-3-git-send-email-kan.liang@intel.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Tony Jones <tonyj@suse.de>
+---
+ arch/x86/events/intel/uncore_snbep.c | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
+index 19a00a7b4964..fbf8f6e462e7 100644
+--- a/arch/x86/events/intel/uncore_snbep.c
++++ b/arch/x86/events/intel/uncore_snbep.c
+@@ -3492,6 +3492,26 @@ static struct intel_uncore_type skx_uncore_irp = {
+ .format_group = &skx_uncore_format_group,
+ };
+
++static struct attribute *skx_uncore_pcu_formats_attr[] = {
++ &format_attr_event.attr,
++ &format_attr_umask.attr,
++ &format_attr_edge.attr,
++ &format_attr_inv.attr,
++ &format_attr_thresh8.attr,
++ &format_attr_occ_invert.attr,
++ &format_attr_occ_edge_det.attr,
++ &format_attr_filter_band0.attr,
++ &format_attr_filter_band1.attr,
++ &format_attr_filter_band2.attr,
++ &format_attr_filter_band3.attr,
++ NULL,
++};
++
++static struct attribute_group skx_uncore_pcu_format_group = {
++ .name = "format",
++ .attrs = skx_uncore_pcu_formats_attr,
++};
++
+ static struct intel_uncore_ops skx_uncore_pcu_ops = {
+ IVBEP_UNCORE_MSR_OPS_COMMON_INIT(),
+ .hw_config = hswep_pcu_hw_config,
+@@ -3510,7 +3530,7 @@ static struct intel_uncore_type skx_uncore_pcu = {
+ .box_ctl = HSWEP_PCU_MSR_PMON_BOX_CTL,
+ .num_shared_regs = 1,
+ .ops = &skx_uncore_pcu_ops,
+- .format_group = &snbep_uncore_pcu_format_group,
++ .format_group = &skx_uncore_pcu_format_group,
+ };
+
+ static struct intel_uncore_type *skx_msr_uncores[] = {
+
diff --git a/patches.fixes/perf-x86-intel-uncore-fix-skylake-upi-pmu-event-masks.patch b/patches.fixes/perf-x86-intel-uncore-fix-skylake-upi-pmu-event-masks.patch
new file mode 100644
index 0000000000..ff0d41782f
--- /dev/null
+++ b/patches.fixes/perf-x86-intel-uncore-fix-skylake-upi-pmu-event-masks.patch
@@ -0,0 +1,61 @@
+From: Stephane Eranian <eranian@google.com>
+Date: Thu, 13 Jul 2017 10:35:45 -0700
+Subject: perf/x86/intel/uncore: Fix Skylake UPI PMU event masks
+Git-commit: b3625980a65db6b6b6bbd5790a77ab95ce6397c5
+Patch-mainline: v4.13-rc3
+References: bsc#1087233
+
+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@google.com>
+Signed-off-by: Kan Liang <kan.liang@intel.com>
+Acked-by: Peter Zijlstra <peterz@infradead.org>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Vince Weaver <vincent.weaver@maine.edu>
+Link: http://lkml.kernel.org/r/1499967350-10385-2-git-send-email-kan.liang@intel.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Tony Jones <tonyj@suse.de>
+---
+ 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 dae2fedc1601..19a00a7b4964 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(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-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 struct intel_uncore_type skx_uncore_upi = {
+ .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,
+
diff --git a/patches.fixes/perf-x86-intel-uncore-remove-invalid-skylake-server-cha-filter-field.patch b/patches.fixes/perf-x86-intel-uncore-remove-invalid-skylake-server-cha-filter-field.patch
new file mode 100644
index 0000000000..c119514f43
--- /dev/null
+++ b/patches.fixes/perf-x86-intel-uncore-remove-invalid-skylake-server-cha-filter-field.patch
@@ -0,0 +1,54 @@
+From: Kan Liang <kan.liang@intel.com>
+Date: Thu, 13 Jul 2017 10:35:48 -0700
+Subject: perf/x86/intel/uncore: Remove invalid Skylake server CHA filter field
+Git-commit: 9ad0fbd8fcd9e6815908c772f8d792a9d764449e
+Patch-mainline: v4.13-rc3
+References: bsc#1087233
+
+There is no field c6 and link for CHA BOX FILTER.
+
+Signed-off-by: Kan Liang <kan.liang@intel.com>
+Acked-by: Peter Zijlstra <peterz@infradead.org>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Stephane Eranian <eranian@google.com>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Vince Weaver <vincent.weaver@maine.edu>
+Link: http://lkml.kernel.org/r/1499967350-10385-5-git-send-email-kan.liang@intel.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Tony Jones <tonyj@suse.de>
+---
+ arch/x86/events/intel/uncore_snbep.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
+index a30bf973b5de..2401d0600b47 100644
+--- a/arch/x86/events/intel/uncore_snbep.c
++++ b/arch/x86/events/intel/uncore_snbep.c
+@@ -351,7 +351,6 @@ 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");
+ DEFINE_UNCORE_FORMAT_ATTR(filter_link3, filter_link, "config1:12");
+-DEFINE_UNCORE_FORMAT_ATTR(filter_link4, filter_link, "config1:9-12");
+ DEFINE_UNCORE_FORMAT_ATTR(filter_nid, filter_nid, "config1:10-17");
+ DEFINE_UNCORE_FORMAT_ATTR(filter_nid2, filter_nid, "config1:32-47");
+ DEFINE_UNCORE_FORMAT_ATTR(filter_state, filter_state, "config1:18-22");
+@@ -3302,7 +3301,6 @@ static struct attribute *skx_uncore_cha_formats_attr[] = {
+ &format_attr_inv.attr,
+ &format_attr_thresh8.attr,
+ &format_attr_filter_tid4.attr,
+- &format_attr_filter_link4.attr,
+ &format_attr_filter_state5.attr,
+ &format_attr_filter_rem.attr,
+ &format_attr_filter_loc.attr,
+@@ -3312,7 +3310,6 @@ static struct attribute *skx_uncore_cha_formats_attr[] = {
+ &format_attr_filter_opc_0.attr,
+ &format_attr_filter_opc_1.attr,
+ &format_attr_filter_nc.attr,
+- &format_attr_filter_c6.attr,
+ &format_attr_filter_isoc.attr,
+ NULL,
+ };
+
diff --git a/series.conf b/series.conf
index cbe0b12c9a..088f9e8711 100644
--- a/series.conf
+++ b/series.conf
@@ -4037,6 +4037,12 @@
patches.suse/KVM-s390-take-srcu-lock-when-getting-setting-storage.patch
patches.suse/KVM-LAPIC-Fix-reentrancy-issues-with-preempt-notifie.patch
patches.fixes/0001-NFS-Optimize-fallocate-by-refreshing-mapping-when-ne.patch
+ patches.fixes/perf-x86-intel-uncore-fix-skylake-upi-pmu-event-masks.patch
+ patches.fixes/perf-x86-intel-uncore-fix-skylake-server-pcu-pmu-event-format.patch
+ patches.fixes/perf-x86-intel-uncore-fix-skylake-server-cha-llc_lookup-event-umask.patch
+ patches.fixes/perf-x86-intel-uncore-remove-invalid-skylake-server-cha-filter-field.patch
+ patches.fixes/perf-x86-intel-uncore-fix-skx-cha-event-extra-regs.patch
+ patches.fixes/perf-x86-intel-uncore-fix-missing-marker-for-skx_uncore_cha_extra_regs.patch
patches.suse/sched-wait-Clean-up-some-documentation-warnings.patch
patches.arch/workqueue-Work-around-edge-cases-for-calc-of-pool-s-.patch
patches.drivers/selftests-bpf-subtraction-bounds-test.patch
@@ -5025,6 +5031,8 @@
patches.arch/perf-pmu-events-support-additional-power8-pvr-in-mapfile.patch
patches.arch/perf-vendor-events-add-power9-pmu-events.patch
patches.arch/perf-vendor-events-add-power9-pvrs-to-mapfile.patch
+ patches.fixes/perf-intel-pt-set-no_aux_samples-for-the-tracking-event.patch
+ patches.fixes/perf-intel-pt-always-set-no-branch-for-dummy-event.patch
patches.arch/14.1-irq-make-the-irqentry-text-section-unconditional.patch
patches.arch/perf-vendor-events-powerpc-remove-suffix-in-mapfile.patch
patches.arch/perf-vendor-events-powerpc-update-power9-events.patch
@@ -9771,6 +9779,7 @@
patches.suse/0001-objtool-Move-synced-files-to-their-original-relative.patch
patches.suse/0002-objtool-Move-kernel-headers-code-sync-check-to-a-scr.patch
patches.suse/objtool-Fix-cross-build.patch
+ patches.fixes/perf-x86-intel-uncore-add-event-constraint-for-bdx-pcu.patch
patches.arch/x86-acpi-handle-sci-interrupts-above-legacy-space-gracefully.patch
patches.arch/x86-acpi-reduce-code-duplication-in-mp_override_legacy_irq.patch
patches.arch/x86-topology-avoid-wasting-128k-for-package-id-array.patch