4.4-stable patches

added patches:
	drm-dp-mst-save-vcpi-with-payloads.patch
	mips-fix-minimum-alignment-requirement-of-irq-stack.patch

diff --git a/queue-4.4/drm-dp-mst-save-vcpi-with-payloads.patch b/queue-4.4/drm-dp-mst-save-vcpi-with-payloads.patch
new file mode 100644 (file)
index 0000000..d0d8cca
--- /dev/null
+++ b/queue-4.4/drm-dp-mst-save-vcpi-with-payloads.patch
@@ -0,0 +1,41 @@
+From 6cecdf7a161d2b909dc7c8979176bbc4f0669968 Mon Sep 17 00:00:00 2001
+From: Harry Wentland <harry.wentland@amd.com>
+Date: Mon, 7 Dec 2015 13:55:52 -0500
+Subject: drm/dp/mst: save vcpi with payloads
+
+From: Harry Wentland <harry.wentland@amd.com>
+
+commit 6cecdf7a161d2b909dc7c8979176bbc4f0669968 upstream.
+
+This makes it possibly for drivers to find the associated
+mst_port by looking at the payload allocation table.
+
+Signed-off-by: Harry Wentland <harry.wentland@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Link: http://patchwork.freedesktop.org/patch/msgid/1449514552-10236-3-git-send-email-harry.wentland@amd.com
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Cc: Kai Heng Feng <kai.heng.feng@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/drm_dp_mst_topology.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/gpu/drm/drm_dp_mst_topology.c
++++ b/drivers/gpu/drm/drm_dp_mst_topology.c
+@@ -1802,6 +1802,7 @@ int drm_dp_update_payload_part1(struct d
+                               return -EINVAL;
+                       }
+                       req_payload.num_slots = mgr->proposed_vcpis[i]->num_slots;
++                      req_payload.vcpi = mgr->proposed_vcpis[i]->vcpi;
+               } else {
+                       port = NULL;
+                       req_payload.num_slots = 0;
+@@ -1817,6 +1818,7 @@ int drm_dp_update_payload_part1(struct d
+                       if (req_payload.num_slots) {
+                               drm_dp_create_payload_step1(mgr, mgr->proposed_vcpis[i]->vcpi, &req_payload);
+                               mgr->payloads[i].num_slots = req_payload.num_slots;
++                              mgr->payloads[i].vcpi = req_payload.vcpi;
+                       } else if (mgr->payloads[i].num_slots) {
+                               mgr->payloads[i].num_slots = 0;
+                               drm_dp_destroy_payload_step1(mgr, port, mgr->payloads[i].vcpi, &mgr->payloads[i]);

diff --git a/queue-4.4/mips-fix-minimum-alignment-requirement-of-irq-stack.patch b/queue-4.4/mips-fix-minimum-alignment-requirement-of-irq-stack.patch
new file mode 100644 (file)
index 0000000..010539b
--- /dev/null
+++ b/queue-4.4/mips-fix-minimum-alignment-requirement-of-irq-stack.patch
@@ -0,0 +1,45 @@
+From 5fdc66e046206306bf61ff2d626bfa52ca087f7b Mon Sep 17 00:00:00 2001
+From: Matt Redfearn <matt.redfearn@imgtec.com>
+Date: Mon, 10 Jul 2017 09:43:31 +0100
+Subject: MIPS: Fix minimum alignment requirement of IRQ stack
+
+From: Matt Redfearn <matt.redfearn@imgtec.com>
+
+commit 5fdc66e046206306bf61ff2d626bfa52ca087f7b upstream.
+
+Commit db8466c581cc ("MIPS: IRQ Stack: Unwind IRQ stack onto task
+stack") erroneously set the initial stack pointer of the IRQ stack to a
+value with a 4 byte alignment. The MIPS32 ABI requires that the minimum
+stack alignment is 8 byte, and the MIPS64 ABIs(n32/n64) require 16 byte
+minimum alignment. Fix IRQ_STACK_START such that it leaves space for the
+dummy stack frame (containing interrupted task kernel stack pointer)
+while also meeting minimum alignment requirements.
+
+Fixes: db8466c581cc ("MIPS: IRQ Stack: Unwind IRQ stack onto task stack")
+Reported-by: Darius Ivanauskas <dasilt@yahoo.com>
+Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
+Cc: Chris Metcalf <cmetcalf@mellanox.com>
+Cc: Petr Mladek <pmladek@suse.com>
+Cc: Aaron Tomlin <atomlin@redhat.com>
+Cc: Jason A. Donenfeld <jason@zx2c4.com>
+Cc: linux-mips@linux-mips.org
+Cc: linux-kernel@vger.kernel.org
+Patchwork: https://patchwork.linux-mips.org/patch/16760/
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/include/asm/irq.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/include/asm/irq.h
++++ b/arch/mips/include/asm/irq.h
+@@ -18,7 +18,7 @@
+ #include <irq.h>
+ 
+ #define IRQ_STACK_SIZE                        THREAD_SIZE
+-#define IRQ_STACK_START                       (IRQ_STACK_SIZE - sizeof(unsigned long))
++#define IRQ_STACK_START                       (IRQ_STACK_SIZE - 16)
+ 
+ extern void *irq_stack[NR_CPUS];
+ 

diff --git a/queue-4.4/series b/queue-4.4/series
index a490ef2541d2acc5eb489eaced44d9532f819b04..7958056c94174c79171af207808d864e93904c9c 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1 +1,3 @@
 percpu-make-this_cpu_generic_read-atomic-w.r.t.-interrupts.patch
+drm-dp-mst-save-vcpi-with-payloads.patch
+mips-fix-minimum-alignment-requirement-of-irq-stack.patch