diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-05 12:15:19 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-06 11:52:47 +0200 |
commit | 96f1d4b02b29fa6153dfa96a8672af97b139cbbc (patch) | |
tree | 39f7356cf65f345187ac60cfbb78a919d2689ab6 /target/linux/ipq40xx | |
parent | a4d366005d1fd7680e9f03db63a453938c19c263 (diff) | |
download | upstream-96f1d4b02b29fa6153dfa96a8672af97b139cbbc.tar.gz upstream-96f1d4b02b29fa6153dfa96a8672af97b139cbbc.tar.bz2 upstream-96f1d4b02b29fa6153dfa96a8672af97b139cbbc.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: cns3xxx
Runtime-tested on: 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.patch | 44 |
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; |