From: Greg Kroah-Hartman Date: Wed, 31 Jul 2019 09:49:20 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.2.6~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=034c65a2cb261b731b07ee76ca1321baf722f0c9;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: arm64-compat-provide-definition-for-compat_sigminstksz.patch arm64-dts-marvell-fix-a37xx-uart0-register-size.patch i2c-qup-fixed-releasing-dma-without-flush-operation-completion.patch --- diff --git a/queue-4.9/arm64-compat-provide-definition-for-compat_sigminstksz.patch b/queue-4.9/arm64-compat-provide-definition-for-compat_sigminstksz.patch new file mode 100644 index 00000000000..a5c17d92fc8 --- /dev/null +++ b/queue-4.9/arm64-compat-provide-definition-for-compat_sigminstksz.patch @@ -0,0 +1,39 @@ +From 24951465cbd279f60b1fdc2421b3694405bcff42 Mon Sep 17 00:00:00 2001 +From: Will Deacon +Date: Wed, 5 Sep 2018 15:34:43 +0100 +Subject: arm64: compat: Provide definition for COMPAT_SIGMINSTKSZ + +From: Will Deacon + +commit 24951465cbd279f60b1fdc2421b3694405bcff42 upstream. + +arch/arm/ defines a SIGMINSTKSZ of 2k, so we should use the same value +for compat tasks. + +Cc: Arnd Bergmann +Cc: Dominik Brodowski +Cc: "Eric W. Biederman" +Cc: Andrew Morton +Cc: Al Viro +Cc: Oleg Nesterov +Reviewed-by: Dave Martin +Reported-by: Steve McIntyre +Tested-by: Steve McIntyre <93sam@debian.org> +Signed-off-by: Will Deacon +Signed-off-by: Catalin Marinas +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/include/asm/compat.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/include/asm/compat.h ++++ b/arch/arm64/include/asm/compat.h +@@ -234,6 +234,7 @@ static inline compat_uptr_t ptr_to_compa + } + + #define compat_user_stack_pointer() (user_stack_pointer(task_pt_regs(current))) ++#define COMPAT_MINSIGSTKSZ 2048 + + static inline void __user *arch_compat_alloc_user_space(long len) + { diff --git a/queue-4.9/arm64-dts-marvell-fix-a37xx-uart0-register-size.patch b/queue-4.9/arm64-dts-marvell-fix-a37xx-uart0-register-size.patch new file mode 100644 index 00000000000..85e24194f90 --- /dev/null +++ b/queue-4.9/arm64-dts-marvell-fix-a37xx-uart0-register-size.patch @@ -0,0 +1,46 @@ +From c737abc193d16e62e23e2fb585b8b7398ab380d8 Mon Sep 17 00:00:00 2001 +From: allen yan +Date: Thu, 7 Sep 2017 15:04:53 +0200 +Subject: arm64: dts: marvell: Fix A37xx UART0 register size + +From: allen yan + +commit c737abc193d16e62e23e2fb585b8b7398ab380d8 upstream. + +Armada-37xx UART0 registers are 0x200 bytes wide. Right next to them are +the UART1 registers that should not be declared in this node. + +Update the example in DT bindings document accordingly. + +Signed-off-by: allen yan +Signed-off-by: Miquel Raynal +Signed-off-by: Gregory CLEMENT +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/devicetree/bindings/serial/mvebu-uart.txt | 2 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/Documentation/devicetree/bindings/serial/mvebu-uart.txt ++++ b/Documentation/devicetree/bindings/serial/mvebu-uart.txt +@@ -8,6 +8,6 @@ Required properties: + Example: + serial@12000 { + compatible = "marvell,armada-3700-uart"; +- reg = <0x12000 0x400>; ++ reg = <0x12000 0x200>; + interrupts = <43>; + }; +--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi ++++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +@@ -96,7 +96,7 @@ + + uart0: serial@12000 { + compatible = "marvell,armada-3700-uart"; +- reg = <0x12000 0x400>; ++ reg = <0x12000 0x200>; + interrupts = ; + status = "disabled"; + }; diff --git a/queue-4.9/i2c-qup-fixed-releasing-dma-without-flush-operation-completion.patch b/queue-4.9/i2c-qup-fixed-releasing-dma-without-flush-operation-completion.patch new file mode 100644 index 00000000000..c2a5e7c6cbc --- /dev/null +++ b/queue-4.9/i2c-qup-fixed-releasing-dma-without-flush-operation-completion.patch @@ -0,0 +1,50 @@ +From 7239872fb3400b21a8f5547257f9f86455867bd6 Mon Sep 17 00:00:00 2001 +From: Abhishek Sahu +Date: Mon, 12 Mar 2018 18:44:51 +0530 +Subject: i2c: qup: fixed releasing dma without flush operation completion +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Abhishek Sahu + +commit 7239872fb3400b21a8f5547257f9f86455867bd6 upstream. + +The QUP BSLP BAM generates the following error sometimes if the +current I2C DMA transfer fails and the flush operation has been +scheduled + + “bam-dma-engine 7884000.dma: Cannot free busy channel” + +If any I2C error comes during BAM DMA transfer, then the QUP I2C +interrupt will be generated and the flush operation will be +carried out to make I2C consume all scheduled DMA transfer. +Currently, the same completion structure is being used for BAM +transfer which has already completed without reinit. It will make +flush operation wait_for_completion_timeout completed immediately +and will proceed for freeing the DMA resources where the +descriptors are still in process. + +Signed-off-by: Abhishek Sahu +Acked-by: Sricharan R +Reviewed-by: Austin Christ +Reviewed-by: Andy Gross +Signed-off-by: Wolfram Sang +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/i2c/busses/i2c-qup.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/i2c/busses/i2c-qup.c ++++ b/drivers/i2c/busses/i2c-qup.c +@@ -808,6 +808,8 @@ static int qup_i2c_bam_do_xfer(struct qu + } + + if (ret || qup->bus_err || qup->qup_err) { ++ reinit_completion(&qup->xfer); ++ + if (qup_i2c_change_state(qup, QUP_RUN_STATE)) { + dev_err(qup->dev, "change to run state timed out"); + goto desc_err; diff --git a/queue-4.9/series b/queue-4.9/series index 594820aac38..c328ccfa03f 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -210,3 +210,6 @@ powerpc-tm-fix-oops-on-sigreturn-on-systems-without-tm.patch access-avoid-the-rcu-grace-period-for-the-temporary-subjective-credentials.patch ipv6-check-sk-sk_type-and-protocol-early-in-ip_mrout.patch tcp-reset-sk_send_head-in-tcp_write_queue_purge.patch +arm64-dts-marvell-fix-a37xx-uart0-register-size.patch +i2c-qup-fixed-releasing-dma-without-flush-operation-completion.patch +arm64-compat-provide-definition-for-compat_sigminstksz.patch