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>master
Koen Vandeputte
6 years ago
parent
0f3d54f5b7
commit
bcbc7ba768
@ -1,30 +0,0 @@ |
||||
From 9b84ad676e248a3e3c81db7f5d39e1739b3780aa Mon Sep 17 00:00:00 2001
|
||||
From: Christian Lamparter <chunkeey@gmail.com>
|
||||
Date: Sat, 15 Jun 2019 16:35:26 +0200
|
||||
Subject: [PATCH] powerpc/4xx/uic: clear pending interrupt after irq type/pol
|
||||
change
|
||||
|
||||
When testing out gpio-keys with a button, a spurious
|
||||
interrupt (and therefore a key press or release event)
|
||||
gets triggered as soon as the driver enables the irq
|
||||
line for the first time.
|
||||
|
||||
This patch clears any potential bogus generated interrupt
|
||||
that was caused by the switching of the associated irq's
|
||||
type and polarity.
|
||||
|
||||
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
||||
---
|
||||
arch/powerpc/platforms/4xx/uic.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
--- a/arch/powerpc/platforms/4xx/uic.c
|
||||
+++ b/arch/powerpc/platforms/4xx/uic.c
|
||||
@@ -158,6 +158,7 @@ static int uic_set_irq_type(struct irq_d
|
||||
|
||||
mtdcr(uic->dcrbase + UIC_PR, pr);
|
||||
mtdcr(uic->dcrbase + UIC_TR, tr);
|
||||
+ mtdcr(uic->dcrbase + UIC_SR, ~mask);
|
||||
|
||||
raw_spin_unlock_irqrestore(&uic->lock, flags);
|
||||
|
||||
@ -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;
|
||||
@ -1,39 +0,0 @@ |
||||
From c737abc193d16e62e23e2fb585b8b7398ab380d8 Mon Sep 17 00:00:00 2001
|
||||
From: allen yan <yanwei@marvell.com>
|
||||
Date: Thu, 7 Sep 2017 15:04:53 +0200
|
||||
Subject: arm64: dts: marvell: Fix A37xx UART0 register size
|
||||
|
||||
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 <yanwei@marvell.com>
|
||||
Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
|
||||
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
|
||||
---
|
||||
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
|
||||
@@ -134,7 +134,7 @@
|
||||
|
||||
uart0: serial@12000 {
|
||||
compatible = "marvell,armada-3700-uart";
|
||||
- reg = <0x12000 0x400>;
|
||||
+ reg = <0x12000 0x200>;
|
||||
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
|
||||
status = "disabled";
|
||||
};
|
||||
Loading…
Reference in new issue