diff options
| author | John Audia <graysky@archlinux.us> | 2020-11-01 11:37:10 -0500 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-11-02 16:33:25 +0100 |
| commit | 71b2b32f98d5f359818458334fc4109c16a926ee (patch) | |
| tree | d6c280290e29eb2921f14e10970a87e20841cd8b /target/linux/bcm27xx/patches-5.4/950-0266-tty-amba-pl011-Make-TX-optimisation-conditional.patch | |
| parent | bd0b8200687c69df543a7e3ef043baa39d7784be (diff) | |
| download | upstream-71b2b32f98d5f359818458334fc4109c16a926ee.tar.gz upstream-71b2b32f98d5f359818458334fc4109c16a926ee.tar.bz2 upstream-71b2b32f98d5f359818458334fc4109c16a926ee.zip | |
kernel: bump 5.4 to 5.4.74
Removed upstreamed patches:
mvebu/patches-5.4
409-phy-marvell-comphy-Convert-internal-SMCC-firmware-re.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711, x86_64
Run-tested: ipq806x/R7800, x86_64, lantiq/Easybox 904 xDSL
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-by: Curtis Deptuck <curtdept@me.com> [x86_64 build/run]
[added lantiq test report]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0266-tty-amba-pl011-Make-TX-optimisation-conditional.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0266-tty-amba-pl011-Make-TX-optimisation-conditional.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0266-tty-amba-pl011-Make-TX-optimisation-conditional.patch b/target/linux/bcm27xx/patches-5.4/950-0266-tty-amba-pl011-Make-TX-optimisation-conditional.patch index 9214bda206..58829c9e92 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0266-tty-amba-pl011-Make-TX-optimisation-conditional.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0266-tty-amba-pl011-Make-TX-optimisation-conditional.patch @@ -42,7 +42,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> #ifdef CONFIG_DMA_ENGINE /* DMA stuff */ bool using_tx_dma; -@@ -813,6 +814,7 @@ __acquires(&uap->port.lock) +@@ -816,6 +817,7 @@ __acquires(&uap->port.lock) if (!uap->using_tx_dma) return; @@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> dmaengine_terminate_async(uap->dmatx.chan); if (uap->dmatx.queued) { -@@ -939,6 +941,7 @@ static void pl011_dma_rx_chars(struct ua +@@ -942,6 +944,7 @@ static void pl011_dma_rx_chars(struct ua fifotaken = pl011_fifo_to_tty(uap); } @@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> spin_unlock(&uap->port.lock); dev_vdbg(uap->port.dev, "Took %d chars from DMA buffer and %d chars from the FIFO\n", -@@ -1347,6 +1350,7 @@ __acquires(&uap->port.lock) +@@ -1350,6 +1353,7 @@ __acquires(&uap->port.lock) { pl011_fifo_to_tty(uap); @@ -66,7 +66,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> spin_unlock(&uap->port.lock); tty_flip_buffer_push(&uap->port.state->port); /* -@@ -1482,6 +1486,7 @@ static irqreturn_t pl011_int(int irq, vo +@@ -1485,6 +1489,7 @@ static irqreturn_t pl011_int(int irq, vo int handled = 0; spin_lock_irqsave(&uap->port.lock, flags); @@ -74,7 +74,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> status = pl011_read(uap, REG_RIS) & uap->im; if (status) { do { -@@ -1501,7 +1506,7 @@ static irqreturn_t pl011_int(int irq, vo +@@ -1504,7 +1509,7 @@ static irqreturn_t pl011_int(int irq, vo UART011_CTSMIS|UART011_RIMIS)) pl011_modem_status(uap); if (status & UART011_TXIS) |