diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-13 13:41:34 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-13 19:17:41 +0200 |
commit | 86fd8cb435daf05f52468daabd41a363917485b7 (patch) | |
tree | 9997cc8eb0b05a150b73f8bcbea8c7cf327ab07f /target/linux/generic/backport-4.19 | |
parent | 09050b6fe22848c6b8d59a437e357c7ad34bc523 (diff) | |
download | upstream-86fd8cb435daf05f52468daabd41a363917485b7.tar.gz upstream-86fd8cb435daf05f52468daabd41a363917485b7.tar.bz2 upstream-86fd8cb435daf05f52468daabd41a363917485b7.zip |
kernel: bump 4.19 to 4.19.42
Refreshed all patches.
Remove upstreamed:
- 060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch
- 400-v5.2-leds-trigger-netdev-fix-refcnt-leak-on-interface-ren.patch
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.19')
2 files changed, 0 insertions, 163 deletions
diff --git a/target/linux/generic/backport-4.19/060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch b/target/linux/generic/backport-4.19/060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch deleted file mode 100644 index b1843842e4..0000000000 --- a/target/linux/generic/backport-4.19/060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 72ff51d8dd262d1fef25baedc2ac35116435be47 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz> -Date: Wed, 6 Mar 2019 17:54:03 +0100 -Subject: [PATCH] serial: ar933x_uart: Fix build failure with disabled console -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Andrey has reported on OpenWrt's bug tracking system[1], that he -currently can't use ar93xx_uart as pure serial UART without console -(CONFIG_SERIAL_8250_CONSOLE and CONFIG_SERIAL_AR933X_CONSOLE undefined), -because compilation ends with following error: - - ar933x_uart.c: In function 'ar933x_uart_console_write': - ar933x_uart.c:550:14: error: 'struct uart_port' has no - member named 'sysrq' - -So this patch moves all the code related to console handling behind -series of CONFIG_SERIAL_AR933X_CONSOLE ifdefs. - -1. https://bugs.openwrt.org/index.php?do=details&task_id=2152 - -Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Cc: Jiri Slaby <jslaby@suse.com> -Cc: Andrey Batyiev <batyiev@gmail.com> -Reported-by: Andrey Batyiev <batyiev@gmail.com> -Tested-by: Andrey Batyiev <batyiev@gmail.com> -Signed-off-by: Petr Štetiar <ynezz@true.cz> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/tty/serial/ar933x_uart.c | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - ---- a/drivers/tty/serial/ar933x_uart.c -+++ b/drivers/tty/serial/ar933x_uart.c -@@ -49,11 +49,6 @@ struct ar933x_uart_port { - struct clk *clk; - }; - --static inline bool ar933x_uart_console_enabled(void) --{ -- return IS_ENABLED(CONFIG_SERIAL_AR933X_CONSOLE); --} -- - static inline unsigned int ar933x_uart_read(struct ar933x_uart_port *up, - int offset) - { -@@ -508,6 +503,7 @@ static const struct uart_ops ar933x_uart - .verify_port = ar933x_uart_verify_port, - }; - -+#ifdef CONFIG_SERIAL_AR933X_CONSOLE - static struct ar933x_uart_port * - ar933x_console_ports[CONFIG_SERIAL_AR933X_NR_UARTS]; - -@@ -604,14 +600,7 @@ static struct console ar933x_uart_consol - .index = -1, - .data = &ar933x_uart_driver, - }; -- --static void ar933x_uart_add_console_port(struct ar933x_uart_port *up) --{ -- if (!ar933x_uart_console_enabled()) -- return; -- -- ar933x_console_ports[up->port.line] = up; --} -+#endif /* CONFIG_SERIAL_AR933X_CONSOLE */ - - static struct uart_driver ar933x_uart_driver = { - .owner = THIS_MODULE, -@@ -700,7 +689,9 @@ static int ar933x_uart_probe(struct plat - baud = ar933x_uart_get_baud(port->uartclk, 0, AR933X_UART_MAX_STEP); - up->max_baud = min_t(unsigned int, baud, AR933X_UART_MAX_BAUD); - -- ar933x_uart_add_console_port(up); -+#ifdef CONFIG_SERIAL_AR933X_CONSOLE -+ ar933x_console_ports[up->port.line] = up; -+#endif - - ret = uart_add_one_port(&ar933x_uart_driver, &up->port); - if (ret) -@@ -749,8 +740,9 @@ static int __init ar933x_uart_init(void) - { - int ret; - -- if (ar933x_uart_console_enabled()) -- ar933x_uart_driver.cons = &ar933x_uart_console; -+#ifdef CONFIG_SERIAL_AR933X_CONSOLE -+ ar933x_uart_driver.cons = &ar933x_uart_console; -+#endif - - ret = uart_register_driver(&ar933x_uart_driver); - if (ret) diff --git a/target/linux/generic/backport-4.19/400-v5.2-leds-trigger-netdev-fix-refcnt-leak-on-interface-ren.patch b/target/linux/generic/backport-4.19/400-v5.2-leds-trigger-netdev-fix-refcnt-leak-on-interface-ren.patch deleted file mode 100644 index 851e13ba2e..0000000000 --- a/target/linux/generic/backport-4.19/400-v5.2-leds-trigger-netdev-fix-refcnt-leak-on-interface-ren.patch +++ /dev/null @@ -1,69 +0,0 @@ -From dd7590a3ab3f0804ed5e930295e2caa5979e3958 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> -Date: Thu, 28 Feb 2019 22:57:33 +0100 -Subject: [PATCH] leds: trigger: netdev: fix refcnt leak on interface rename -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Renaming a netdev-trigger-tracked interface was resulting in an -unbalanced dev_hold(). - -Example: -> iw phy phy0 interface add foo type __ap -> echo netdev > trigger -> echo foo > device_name -> ip link set foo name bar -> iw dev bar del -[ 237.355366] unregister_netdevice: waiting for bar to become free. Usage count = 1 -[ 247.435362] unregister_netdevice: waiting for bar to become free. Usage count = 1 -[ 257.545366] unregister_netdevice: waiting for bar to become free. Usage count = 1 - -Above problem was caused by trigger checking a dev->name which obviously -changes after renaming an interface. It meant missing all further events -including the NETDEV_UNREGISTER which is required for calling dev_put(). - -This change fixes that by: -1) Comparing device struct *address* for notification-filtering purposes -2) Dropping unneeded NETDEV_CHANGENAME code (no behavior change) - -Fixes: 06f502f57d0d ("leds: trigger: Introduce a NETDEV trigger") -Signed-off-by: Rafał Miłecki <rafal@milecki.pl> -Acked-by: Pavel Machek <pavel@ucw.cz> -Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com> ---- - drivers/leds/trigger/ledtrig-netdev.c | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) - ---- a/drivers/leds/trigger/ledtrig-netdev.c -+++ b/drivers/leds/trigger/ledtrig-netdev.c -@@ -301,11 +301,11 @@ static int netdev_trig_notify(struct not - container_of(nb, struct led_netdev_data, notifier); - - if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE -- && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER -- && evt != NETDEV_CHANGENAME) -+ && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER) - return NOTIFY_DONE; - -- if (strcmp(dev->name, trigger_data->device_name)) -+ if (!(dev == trigger_data->net_dev || -+ (evt == NETDEV_REGISTER && !strcmp(dev->name, trigger_data->device_name)))) - return NOTIFY_DONE; - - cancel_delayed_work_sync(&trigger_data->work); -@@ -320,12 +320,9 @@ static int netdev_trig_notify(struct not - dev_hold(dev); - trigger_data->net_dev = dev; - break; -- case NETDEV_CHANGENAME: - case NETDEV_UNREGISTER: -- if (trigger_data->net_dev) { -- dev_put(trigger_data->net_dev); -- trigger_data->net_dev = NULL; -- } -+ dev_put(trigger_data->net_dev); -+ trigger_data->net_dev = NULL; - break; - case NETDEV_UP: - case NETDEV_CHANGE: |