From: Greg Kroah-Hartman Date: Thu, 19 Oct 2017 09:42:44 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v3.18.77~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12aa6f7f80c17ea47d0e186bade52272d0a77514;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..d0d8cca7dbc --- /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 +Date: Mon, 7 Dec 2015 13:55:52 -0500 +Subject: drm/dp/mst: save vcpi with payloads + +From: Harry Wentland + +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 +Reviewed-by: Alex Deucher +Link: http://patchwork.freedesktop.org/patch/msgid/1449514552-10236-3-git-send-email-harry.wentland@amd.com +Signed-off-by: Daniel Vetter +Cc: Kai Heng Feng +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..010539b9c05 --- /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 +Date: Mon, 10 Jul 2017 09:43:31 +0100 +Subject: MIPS: Fix minimum alignment requirement of IRQ stack + +From: Matt Redfearn + +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 +Signed-off-by: Matt Redfearn +Cc: Chris Metcalf +Cc: Petr Mladek +Cc: Aaron Tomlin +Cc: Jason A. Donenfeld +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 +Signed-off-by: Greg Kroah-Hartman + +--- + 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 + + #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 a490ef2541d..7958056c941 100644 --- 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