From ce2f31254ad6af35c8cba7e71b708e11d8af5249 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Mon, 9 Aug 2021 22:05:05 +0100 Subject: [PATCH] kernel: bump 5.10 to 5.10.57 No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra --- include/kernel-version.mk | 4 ++-- .../0028-NET-lantiq-various-etop-fixes.patch | 4 ++-- .../patches-5.10/110-er200-ethernet_probe_order.patch | 4 ++-- .../700-allocate_interface_by_label.patch | 11 ++++++----- .../701-honor_sgmii_node_device_tree_status.patch | 2 +- ...700-net-ethernet-mediatek-support-net-labels.patch | 8 ++++---- ...-net-usb-r8152-add-LED-configuration-from-OF.patch | 8 ++++---- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 3ef1aba6c3..7e5798861b 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 = .56 +LINUX_VERSION-5.10 = .57 LINUX_KERNEL_HASH-5.4.138 = a43957727a54e5e1035d7372a1e64203ae8e3060c52a3816916157967f9a8657 -LINUX_KERNEL_HASH-5.10.56 = 4d6a0d5f9c50fa44890e0b61e1fb63f6efe6be448ceddfe1ad7c0cbd2890ec6b +LINUX_KERNEL_HASH-5.10.57 = 00bbaeaac17f82d9a6d93cbc42cafd39d3b2fa3a6087333503d2344fa5e3142d 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/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 0a42fd59e4..eb47010fa0 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 @@ -744,7 +744,7 @@ Signed-off-by: John Crispin res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { -@@ -651,31 +860,62 @@ ltq_etop_probe(struct platform_device *p +@@ -651,31 +859,62 @@ ltq_etop_probe(struct platform_device *p goto err_out; } @@ -822,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/octeon/patches-5.10/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-5.10/110-er200-ethernet_probe_order.patch index 58312f0c45..b816e9c430 100644 --- a/target/linux/octeon/patches-5.10/110-er200-ethernet_probe_order.patch +++ b/target/linux/octeon/patches-5.10/110-er200-ethernet_probe_order.patch @@ -1,6 +1,6 @@ --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -683,6 +683,7 @@ static int cvm_oct_probe(struct platform +@@ -679,6 +679,7 @@ static int cvm_oct_probe(struct platform int interface; int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE; int qos; @@ -8,7 +8,7 @@ struct device_node *pip; int mtu_overhead = ETH_HLEN + ETH_FCS_LEN; -@@ -804,13 +805,19 @@ static int cvm_oct_probe(struct platform +@@ -800,13 +801,19 @@ static int cvm_oct_probe(struct platform } num_interfaces = cvmx_helper_get_number_of_interfaces(); 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 4ee6f84660..e4dc3f96e5 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,19 +12,20 @@ Tested-by: Johannes Kimmel Signed-off-by: Roman Kuzmitskii --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -408,7 +408,11 @@ 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 *label = NULL; - int ret; -+ + int ret; + + if (priv->of_node) + label = of_get_property(priv->of_node, "label", NULL); - ++ ret = of_get_mac_address(priv->of_node, dev->dev_addr); if (ret) -@@ -445,6 +448,9 @@ int cvm_oct_common_init(struct net_devic + 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); diff --git a/target/linux/octeon/patches-5.10/701-honor_sgmii_node_device_tree_status.patch b/target/linux/octeon/patches-5.10/701-honor_sgmii_node_device_tree_status.patch index d11503c2c1..4185fcba70 100644 --- a/target/linux/octeon/patches-5.10/701-honor_sgmii_node_device_tree_status.patch +++ b/target/linux/octeon/patches-5.10/701-honor_sgmii_node_device_tree_status.patch @@ -12,7 +12,7 @@ Tested-by: Johannes Kimmel Signed-off-by: Roman Kuzmitskii --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -883,8 +883,10 @@ static int cvm_oct_probe(struct platform +@@ -880,8 +880,10 @@ static int cvm_oct_probe(struct platform case CVMX_HELPER_INTERFACE_MODE_SGMII: priv->phy_mode = PHY_INTERFACE_MODE_SGMII; diff --git a/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch index 8f4a2d9848..531a23ef4a 100644 --- a/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch +++ b/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch @@ -14,7 +14,7 @@ Signed-off-by: René van Dorst --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -2914,6 +2914,7 @@ static const struct net_device_ops mtk_n +@@ -2911,6 +2911,7 @@ static const struct net_device_ops mtk_n static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) { @@ -22,9 +22,9 @@ Signed-off-by: René van Dorst const __be32 *_id = of_get_property(np, "reg", NULL); phy_interface_t phy_mode; struct phylink *phylink; -@@ -3008,6 +3009,9 @@ static int mtk_add_mac(struct mtk_eth *e - - of_platform_device_create(np, NULL, NULL); +@@ -3003,6 +3004,9 @@ static int mtk_add_mac(struct mtk_eth *e + + eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN; + if (name) + strlcpy(eth->netdev[id]->name, name, IFNAMSIZ); diff --git a/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch index c1e2a67272..f94d16c0ff 100644 --- a/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer #include #include #include -@@ -5300,6 +5301,22 @@ static void rtl_tally_reset(struct r8152 +@@ -5301,6 +5302,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -5341,6 +5358,8 @@ static void r8152b_init(struct r8152 *tp +@@ -5342,6 +5359,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer } static void r8153_init(struct r8152 *tp) -@@ -5486,6 +5505,8 @@ static void r8153_init(struct r8152 *tp) +@@ -5487,6 +5506,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer } static void r8153b_init(struct r8152 *tp) -@@ -5572,6 +5593,8 @@ static void r8153b_init(struct r8152 *tp +@@ -5573,6 +5594,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */