aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-05 12:18:03 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-06 11:54:50 +0200
commitbcbc7ba768638c88f2ccb2440b22a5b2eeda6e43 (patch)
tree3a7483d6cbea7bd69acabe03761df9709bc20c33 /target/linux/ipq40xx
parent0f3d54f5b70c42c2b0f7802970dac123ea0f8689 (diff)
downloadupstream-bcbc7ba768638c88f2ccb2440b22a5b2eeda6e43.tar.gz
upstream-bcbc7ba768638c88f2ccb2440b22a5b2eeda6e43.tar.bz2
upstream-bcbc7ba768638c88f2ccb2440b22a5b2eeda6e43.zip
kernel: bump 4.14 to 4.14.136
Refreshed all patches. Altered patches: - 306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch Remove upstreamed: - 100-powerpc-4xx-uic-clear-pending-interrupt-after-irq-ty.patch - 088-0002-i2c-qup-fixed-releasing-dma-without-flush-operation.patch - 500-arm64-dts-marvell-Fix-A37xx-UART0-register-size.patch Fixes: - CVE-2019-13648 - CVE-2019-10207 Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ipq40xx')
-rw-r--r--target/linux/ipq40xx/patches-4.14/088-0002-i2c-qup-fixed-releasing-dma-without-flush-operation.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/target/linux/ipq40xx/patches-4.14/088-0002-i2c-qup-fixed-releasing-dma-without-flush-operation.patch b/target/linux/ipq40xx/patches-4.14/088-0002-i2c-qup-fixed-releasing-dma-without-flush-operation.patch
deleted file mode 100644
index 25d0366ec6..0000000000
--- a/target/linux/ipq40xx/patches-4.14/088-0002-i2c-qup-fixed-releasing-dma-without-flush-operation.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7239872fb3400b21a8f5547257f9f86455867bd6 Mon Sep 17 00:00:00 2001
-From: Abhishek Sahu <absahu@codeaurora.org>
-Date: Mon, 12 Mar 2018 18:44:51 +0530
-Subject: [PATCH 02/13] i2c: qup: fixed releasing dma without flush operation
- completion
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-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 <absahu@codeaurora.org>
-Acked-by: Sricharan R <sricharan@codeaurora.org>
-Reviewed-by: Austin Christ <austinwc@codeaurora.org>
-Reviewed-by: Andy Gross <andy.gross@linaro.org>
-Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
----
- 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
-@@ -835,6 +835,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;