From 988ddf5d18f008cb9339eb406e652a2f510bcfbf Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Mon, 16 Aug 2021 16:58:42 +0800 Subject: [PATCH] kernel: bump 5.10 to 5.10.58 (#7649) * kernel: bump 5.10 to 5.10.57 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra * kernel: bump 5.10 to 5.10.58 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra Co-authored-by: Rui Salvaterra --- include/kernel-version.mk | 4 +- .../generic/hack-5.10/205-kconfig-exit.patch | 11 ++++++ .../hack-5.10/904-debloat_dma_buf.patch | 2 +- ...83-of_net-add-mac-address-to-of-tree.patch | 37 +++++++++++++++++++ .../0028-NET-lantiq-various-etop-fixes.patch | 11 ++---- .../patches-5.10/410-bt-mtk-serial-fix.patch | 2 +- .../700-allocate_interface_by_label.patch | 19 +++++----- 7 files changed, 65 insertions(+), 21 deletions(-) create mode 100644 target/linux/generic/hack-5.10/205-kconfig-exit.patch create mode 100644 target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 7e5798861..9afb6ea63 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-5.4 = .138 -LINUX_VERSION-5.10 = .57 +LINUX_VERSION-5.10 = .58 LINUX_KERNEL_HASH-5.4.138 = a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657 -LINUX_KERNEL_HASH-5.10.57 = 00bbaeaac17f82d9a6d93cbc42cafd39d3b2fa3a6087333503d2344fa5e3142d +LINUX_KERNEL_HASH-5.10.58 = 732cc56be539e65894621c3b6b2640597d8cf5da17319b82da6e7b4f7828f210 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/generic/hack-5.10/205-kconfig-exit.patch b/target/linux/generic/hack-5.10/205-kconfig-exit.patch new file mode 100644 index 000000000..c3fb7a1f9 --- /dev/null +++ b/target/linux/generic/hack-5.10/205-kconfig-exit.patch @@ -0,0 +1,11 @@ +--- a/scripts/kconfig/conf.c ++++ b/scripts/kconfig/conf.c +@@ -215,6 +215,8 @@ static int conf_sym(struct menu *menu) + break; + continue; + case 0: ++ if (!sym_has_value(sym) && !tty_stdio && getenv("FAIL_ON_UNCONFIGURED")) ++ exit(1); + newval = oldval; + break; + case '?': diff --git a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch index 2f5f68506..4ed40bb63 100644 --- a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch @@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -3051,6 +3051,7 @@ int wake_up_state(struct task_struct *p, +@@ -3049,6 +3049,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } diff --git a/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch b/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch new file mode 100644 index 000000000..02f7519f7 --- /dev/null +++ b/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch @@ -0,0 +1,37 @@ +--- a/drivers/of/of_net.c ++++ b/drivers/of/of_net.c +@@ -141,6 +141,26 @@ static int of_get_mac_address_mtd(struct + return -EINVAL; + } + ++static int of_add_mac_address(struct device_node *np, u8* addr) ++{ ++ struct property *prop; ++ ++ prop = kzalloc(sizeof(*prop), GFP_KERNEL); ++ if (!prop) ++ return -ENOMEM; ++ ++ prop->name = "mac-address"; ++ prop->length = ETH_ALEN; ++ prop->value = kmemdup(addr, ETH_ALEN, GFP_KERNEL); ++ if (!prop->value || of_update_property(np, prop)) ++ goto free; ++ ++ return 0; ++free: ++ kfree(prop->value); ++ kfree(prop); ++ return -ENOMEM; ++} + + /** + * Search the device tree for the best MAC address to use. 'mac-address' is +@@ -216,6 +236,7 @@ found: + if (!of_property_read_u32(np, "mac-address-increment", &mac_inc)) + addr[inc_idx] += mac_inc; + ++ of_add_mac_address(np, addr); + return ret; + } + EXPORT_SYMBOL(of_get_mac_address); diff --git a/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch b/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch index 441aaed05..eb47010fa 100644 --- a/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch +++ b/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch @@ -721,7 +721,7 @@ Signed-off-by: John Crispin netif_trans_update(dev); netif_wake_queue(dev); return; -@@ -618,14 +822,19 @@ static const struct net_device_ops ltq_e +@@ -618,14 +822,18 @@ static const struct net_device_ops ltq_e .ndo_tx_timeout = ltq_etop_tx_timeout, }; @@ -733,7 +733,6 @@ Signed-off-by: John Crispin struct ltq_etop_priv *priv; - struct resource *res; + struct resource *res, *gbit_res, irqres[2]; -+ const u8 *mac; int err; - int i; + @@ -745,7 +744,7 @@ Signed-off-by: John Crispin res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { -@@ -651,31 +860,64 @@ ltq_etop_probe(struct platform_device *p +@@ -651,31 +859,62 @@ ltq_etop_probe(struct platform_device *p goto err_out; } @@ -785,9 +784,7 @@ Signed-off-by: John Crispin + if (err) + pr_err("Can't find phy-mode for port\n"); + -+ mac = of_get_mac_address(pdev->dev.of_node); -+ if (mac) -+ memcpy(priv->mac, mac, ETH_ALEN); ++ of_get_mac_address(pdev->dev.of_node, priv->mac); + + priv->clk_ppe = clk_get(&pdev->dev, NULL); + if (IS_ERR(priv->clk_ppe)) @@ -825,7 +822,7 @@ Signed-off-by: John Crispin err = register_netdev(dev); if (err) -@@ -704,31 +946,22 @@ ltq_etop_remove(struct platform_device * +@@ -704,31 +943,22 @@ ltq_etop_remove(struct platform_device * return 0; } diff --git a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch index 381eaab5e..b82e174d2 100644 --- a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2712,6 +2712,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2718,6 +2718,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; diff --git a/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch b/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch index 3a9b2eb7c..e4dc3f96e 100644 --- a/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch +++ b/target/linux/octeon/patches-5.10/700-allocate_interface_by_label.patch @@ -12,21 +12,20 @@ Tested-by: Johannes Kimmel Signed-off-by: Roman Kuzmitskii --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -408,9 +408,12 @@ int cvm_oct_common_init(struct net_devic +@@ -407,8 +407,12 @@ static int cvm_oct_common_set_mac_addres + int cvm_oct_common_init(struct net_device *dev) { struct octeon_ethernet *priv = netdev_priv(dev); - const u8 *mac = NULL; + const u8 *label = NULL; + int ret; -- if (priv->of_node) -+ if (priv->of_node) { - mac = of_get_mac_address(priv->of_node); ++ if (priv->of_node) + label = of_get_property(priv->of_node, "label", NULL); -+ } - - if (!IS_ERR_OR_NULL(mac)) - ether_addr_copy(dev->dev_addr, mac); -@@ -445,6 +448,9 @@ int cvm_oct_common_init(struct net_devic ++ + ret = of_get_mac_address(priv->of_node, dev->dev_addr); + if (ret) + eth_hw_addr_random(dev); +@@ -441,6 +445,9 @@ int cvm_oct_common_init(struct net_devic if (dev->netdev_ops->ndo_stop) dev->netdev_ops->ndo_stop(dev);