diff options
author | John Audia <graysky@archlinux.us> | 2021-11-27 14:56:33 -0500 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-28 16:32:45 +0100 |
commit | bbdc13b15b383b8b8d5492575e0a83cbe2af139b (patch) | |
tree | e874ca367d12c68d8cdb5392f829bd53c37563a0 /target/linux/ath79 | |
parent | 26a7a385bbe2c8a258b9b845122e48935c8738c9 (diff) | |
download | upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.tar.gz upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.tar.bz2 upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.zip |
kernel: bump 5.4 to 5.4.161
Removed upstreamed:
ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch[1]
Manually rebased:
layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
All other patches automatically rebased.
1. Private email exchange with patch author, Hauke Mehrtens
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/ath79')
-rw-r--r-- | target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch | 2 | ||||
-rw-r--r-- | target/linux/ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch | 54 |
2 files changed, 1 insertions, 55 deletions
diff --git a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch index d2200c8976..26c4a7b213 100644 --- a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch @@ -754,7 +754,7 @@ ptr = ip6hoff + sizeof(struct ipv6hdr); --- a/include/net/neighbour.h +++ b/include/net/neighbour.h -@@ -274,8 +274,10 @@ static inline bool neigh_key_eq128(const +@@ -275,8 +275,10 @@ static inline bool neigh_key_eq128(const const u32 *n32 = (const u32 *)n->primary_key; const u32 *p32 = pkey; diff --git a/target/linux/ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch b/target/linux/ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch deleted file mode 100644 index 2a2aafa568..0000000000 --- a/target/linux/ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 4d3c17975c7814884a721fe693b3adf5c426d759 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens <hauke@hauke-m.de> -Date: Tue, 10 Nov 2015 22:18:39 +0100 -Subject: [RFC] serial: core: add support for boot console with arbitrary - baud rates - -The Arduino Yun uses a baud rate of 250000 by default. The serial is -going over the Atmel ATmega and is used to connect to this chip. -Without this patch Linux wants to switch the console to 9600 Baud. - -With this patch Linux will use the configured baud rate and not a -default one specified in uart_register_driver(). - -Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> -[rebased to 4.14, slightly reworded commit message] -Signed-off-by: Sungbo Eo <mans0n@gorani.run> ---- - drivers/tty/serial/serial_core.c | 6 +++++- - include/linux/console.h | 1 + - 2 files changed, 6 insertions(+), 1 deletions(-) - ---- a/drivers/tty/serial/serial_core.c -+++ b/drivers/tty/serial/serial_core.c -@@ -220,6 +220,8 @@ static int uart_port_startup(struct tty_ - if (retval == 0) { - if (uart_console(uport) && uport->cons->cflag) { - tty->termios.c_cflag = uport->cons->cflag; -+ tty->termios.c_ospeed = uport->cons->baud; -+ tty->termios.c_ispeed = uport->cons->baud; - uport->cons->cflag = 0; - } - /* -@@ -2110,8 +2112,10 @@ uart_set_options(struct uart_port *port, - * Allow the setting of the UART parameters with a NULL console - * too: - */ -- if (co) -+ if (co) { - co->cflag = termios.c_cflag; -+ co->baud = baud; -+ } - - return 0; - } ---- a/include/linux/console.h -+++ b/include/linux/console.h -@@ -153,6 +153,7 @@ struct console { - short flags; - short index; - int cflag; -+ int baud; - void *data; - struct console *next; - }; |