--- /dev/null
+From 76a563675485849f6f9ad5b30df220438b3628c1 Mon Sep 17 00:00:00 2001
+From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
+Date: Tue, 8 Dec 2015 12:15:54 -0200
+Subject: [media] exynos4-is: fix a format string bug
+
+From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
+
+commit 76a563675485849f6f9ad5b30df220438b3628c1 upstream.
+
+Ironically, 7d4020c3c400 ("[media] exynos4-is: fix some warnings when
+compiling on arm64") fixed some format string bugs but introduced a
+new one. buf_index is a simple int, so it should be printed with %d,
+not %pad (which is correctly used for dma_addr_t).
+
+Fixes: 7d4020c3c400 ("[media] exynos4-is: fix some warnings when compiling on arm64")
+
+Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/platform/exynos4-is/fimc-isp-video.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
++++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
+@@ -221,8 +221,8 @@ static void isp_video_capture_buffer_que
+ ivb->dma_addr[i];
+
+ isp_dbg(2, &video->ve.vdev,
+- "dma_buf %pad (%d/%d/%d) addr: %pad\n",
+- &buf_index, ivb->index, i, vb->index,
++ "dma_buf %d (%d/%d/%d) addr: %pad\n",
++ buf_index, ivb->index, i, vb->index,
+ &ivb->dma_addr[i]);
+ }
+
--- /dev/null
+From 08c6e8cc66282a082484480c1a5641bc27d26c55 Mon Sep 17 00:00:00 2001
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Date: Fri, 15 Jan 2016 22:02:12 +0200
+Subject: i2c: designware-pci: use IRQF_COND_SUSPEND flag
+
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+
+commit 08c6e8cc66282a082484480c1a5641bc27d26c55 upstream.
+
+This is effectively reapplies the commit b0898fdaffb2 ("i2c: designware-pci: use
+IRQF_COND_SUSPEND flag") after the commit d80d134182ba ("i2c: designware: Move
+common probe code into i2c_dw_probe()"). Original message as follows.
+
+The mentioned flag fixes a warning on Intel Edison board since one of the I2C
+controller shares IRQ line with watchdog timer.
+
+Fixes: d80d134182ba (i2c: designware: Move common probe code into i2c_dw_probe())
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
+Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/i2c/busses/i2c-designware-core.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/i2c/busses/i2c-designware-core.c
++++ b/drivers/i2c/busses/i2c-designware-core.c
+@@ -865,7 +865,8 @@ int i2c_dw_probe(struct dw_i2c_dev *dev)
+ i2c_set_adapdata(adap, dev);
+
+ i2c_dw_disable_int(dev);
+- r = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr, IRQF_SHARED,
++ r = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr,
++ IRQF_SHARED | IRQF_COND_SUSPEND,
+ dev_name(dev->dev), dev);
+ if (r) {
+ dev_err(dev->dev, "failure requesting irq %i: %d\n",
--- /dev/null
+From 0805909f59e02036a4e2660159f27dbf8b6084ac Mon Sep 17 00:00:00 2001
+From: Jiri Olsa <jolsa@kernel.org>
+Date: Wed, 20 Jan 2016 12:56:33 +0100
+Subject: perf hists: Fix HISTC_MEM_DCACHELINE width setting
+
+From: Jiri Olsa <jolsa@kernel.org>
+
+commit 0805909f59e02036a4e2660159f27dbf8b6084ac upstream.
+
+Set correct width for unresolved mem_dcacheline addr.
+
+Signed-off-by: Jiri Olsa <jolsa@kernel.org>
+Cc: David Ahern <dsahern@gmail.com>
+Cc: Don Zickus <dzickus@redhat.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
+Fixes: 9b32ba71ba90 ("perf tools: Add dcacheline sort")
+Link: http://lkml.kernel.org/r/1453290995-18485-3-git-send-email-jolsa@kernel.org
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/perf/util/hist.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/tools/perf/util/hist.c
++++ b/tools/perf/util/hist.c
+@@ -131,6 +131,8 @@ void hists__calc_col_len(struct hists *h
+ symlen = unresolved_col_width + 4 + 2;
+ hists__new_col_len(hists, HISTC_MEM_DADDR_SYMBOL,
+ symlen);
++ hists__new_col_len(hists, HISTC_MEM_DCACHELINE,
++ symlen);
+ }
+
+ if (h->mem_info->iaddr.sym) {
--- /dev/null
+From e01d8718de4170373cd7fbf5cf6f9cb61cebb1e9 Mon Sep 17 00:00:00 2001
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Wed, 27 Jan 2016 23:24:29 +0100
+Subject: perf/x86: Fix uninitialized value usage
+
+From: Peter Zijlstra <peterz@infradead.org>
+
+commit e01d8718de4170373cd7fbf5cf6f9cb61cebb1e9 upstream.
+
+When calling intel_alt_er() with .idx != EXTRA_REG_RSP_* we will not
+initialize alt_idx and then use this uninitialized value to index an
+array.
+
+When that is not fatal, it can result in an infinite loop in its
+caller __intel_shared_reg_get_constraints(), with IRQs disabled.
+
+Alternative error modes are random memory corruption due to the
+cpuc->shared_regs->regs[] array overrun, which manifest in either
+get_constraints or put_constraints doing weird stuff.
+
+Only took 6 hours of painful debugging to find this. Neither GCC nor
+Smatch warnings flagged this bug.
+
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: David Ahern <dsahern@gmail.com>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Kan Liang <kan.liang@intel.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Stephane Eranian <eranian@google.com>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Vince Weaver <vincent.weaver@maine.edu>
+Fixes: ae3f011fc251 ("perf/x86/intel: Fix SLM MSR_OFFCORE_RSP1 valid_mask")
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kernel/cpu/perf_event_intel.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/kernel/cpu/perf_event_intel.c
++++ b/arch/x86/kernel/cpu/perf_event_intel.c
+@@ -1937,7 +1937,8 @@ intel_bts_constraints(struct perf_event
+
+ static int intel_alt_er(int idx, u64 config)
+ {
+- int alt_idx;
++ int alt_idx = idx;
++
+ if (!(x86_pmu.flags & PMU_FL_HAS_RSP_1))
+ return idx;
+
--- /dev/null
+From 370f06c88528b3988fe24a372c10e1303bb94cf6 Mon Sep 17 00:00:00 2001
+From: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
+Date: Mon, 25 Jan 2016 14:03:46 +0530
+Subject: powerpc/perf: Remove PPMU_HAS_SSLOT flag for Power8
+
+From: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
+
+commit 370f06c88528b3988fe24a372c10e1303bb94cf6 upstream.
+
+Commit 7a7868326d77 ("powerpc/perf: Add an explict flag indicating
+presence of SLOT field") introduced the PPMU_HAS_SSLOT flag to remove
+the assumption that MMCRA[SLOT] was present when PPMU_ALT_SIPR was not
+set.
+
+That commit's changelog also mentions that Power8 does not support
+MMCRA[SLOT]. However when the Power8 PMU support was merged, it
+errnoeously included the PPMU_HAS_SSLOT flag.
+
+So remove PPMU_HAS_SSLOT from the Power8 flags.
+
+mpe: On systems where MMCRA[SLOT] exists, the field occupies bits 37:39
+(IBM numbering). On Power8 bit 37 is reserved, and 38:39 overlap with
+the high bits of the Threshold Event Counter Mantissa. I am not aware of
+any published events which use the threshold counting mechanism, which
+would cause the mantissa bits to be set. So in practice this bug is
+unlikely to trigger.
+
+Fixes: e05b9b9e5c10 ("powerpc/perf: Power8 PMU support")
+Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/perf/power8-pmu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/powerpc/perf/power8-pmu.c
++++ b/arch/powerpc/perf/power8-pmu.c
+@@ -816,7 +816,7 @@ static struct power_pmu power8_pmu = {
+ .get_constraint = power8_get_constraint,
+ .get_alternatives = power8_get_alternatives,
+ .disable_pmc = power8_disable_pmc,
+- .flags = PPMU_HAS_SSLOT | PPMU_HAS_SIER | PPMU_ARCH_207S,
++ .flags = PPMU_HAS_SIER | PPMU_ARCH_207S,
+ .n_generic = ARRAY_SIZE(power8_generic_events),
+ .generic_events = power8_generic_events,
+ .cache_events = &power8_cache_events,
alsa-opti9xx-shut-up-gcc-10-range-warning.patch
nfs-fix-potential-posix_acl-refcnt-leak-in-nfs3_set_acl.patch
dmaengine-dmatest-fix-iteration-non-stop-logic.patch
+i2c-designware-pci-use-irqf_cond_suspend-flag.patch
+perf-hists-fix-histc_mem_dcacheline-width-setting.patch
+powerpc-perf-remove-ppmu_has_sslot-flag-for-power8.patch
+perf-x86-fix-uninitialized-value-usage.patch
+exynos4-is-fix-a-format-string-bug.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
