From: Rui Salvaterra Date: Wed, 19 May 2021 11:14:40 +0000 (+0100) Subject: kernel: bump 5.10 to 5.10.38 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8615573ac1d9bcb95cf30ff0ff7704ea6a4d20a8;p=openwrt%2Fstaging%2Fstintel.git kernel: bump 5.10 to 5.10.38 Automatically refreshed: apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch generic/backport-5.10/610-v5.13-31-net-ethernet-mtk_eth_soc-fix-parsing-packets-in-GDM.patch generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch generic/hack-5.10/204-module_strip.patch generic/hack-5.10/911-kobject_add_broadcast_uevent.patch ipq806x/patches-5.10/104-1-drivers-thermal-tsens-Add-VER_0-tsens-version.patch ipq806x/patches-5.10/104-8-drivers-thermal-tsens-Add-support-for-ipq8064-tsens.patch Deleted (reverse-appliable): generic/backport-5.10/610-v5.13-37-net-ethernet-mtk_eth_soc-fix-RX-VLAN-offload.patch ipq806x/patches-5.10/106-5.13-net-stmmac-Set-FIFO-sizes-for-ipq806x.patch Signed-off-by: Rui Salvaterra --- diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 494d76d4b8..c254acf62d 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-5.4 = .117 -LINUX_VERSION-5.10 = .37 +LINUX_VERSION-5.10 = .38 LINUX_KERNEL_HASH-5.4.117 = 4e989b5775830092e5c76b5cca65ebff862ad0c87d0b58c3a20d415c3d4ec770 -LINUX_KERNEL_HASH-5.10.37 = a8d5e3309dafc484eb70f94747a6efffa29a79bae651ae126333e913c00be077 +LINUX_KERNEL_HASH-5.10.38 = 32f25ab128f9e819fd5de28ac4a7c6c2dac96340cff4b03338bcb4edecbbf12f 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/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch index 6d217e160f..038213bd00 100644 --- a/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch @@ -13,7 +13,7 @@ produce a noisy warning. --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -261,6 +261,7 @@ static void xhci_pci_quirks(struct devic +@@ -265,6 +265,7 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x0015) { xhci->quirks |= XHCI_RESET_ON_RESUME; xhci->quirks |= XHCI_ZERO_64B_REGS; diff --git a/target/linux/generic/backport-5.10/610-v5.13-31-net-ethernet-mtk_eth_soc-fix-parsing-packets-in-GDM.patch b/target/linux/generic/backport-5.10/610-v5.13-31-net-ethernet-mtk_eth_soc-fix-parsing-packets-in-GDM.patch index 75a4128b7f..8361c992ae 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-31-net-ethernet-mtk_eth_soc-fix-parsing-packets-in-GDM.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-31-net-ethernet-mtk_eth_soc-fix-parsing-packets-in-GDM.patch @@ -58,7 +58,7 @@ Signed-off-by: Pablo Neira Ayuso #define MTK_GDMA_ICS_EN BIT(22) #define MTK_GDMA_TCS_EN BIT(21) #define MTK_GDMA_UCS_EN BIT(20) -@@ -304,6 +305,7 @@ +@@ -305,6 +306,7 @@ #define RX_DMA_L4_VALID_PDMA BIT(30) /* when PDMA is used */ #define RX_DMA_FPORT_SHIFT 19 #define RX_DMA_FPORT_MASK 0x7 diff --git a/target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch b/target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch index e52e96ade7..73697615c3 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch @@ -105,7 +105,7 @@ Signed-off-by: Pablo Neira Ayuso #define MTK_GDMA_DROP_ALL 0x7777 /* Unicast Filter MAC Address Register - Low */ -@@ -301,6 +303,12 @@ +@@ -302,6 +304,12 @@ #define RX_DMA_VID(_x) ((_x) & 0xfff) /* QDMA descriptor rxd4 */ @@ -118,7 +118,7 @@ Signed-off-by: Pablo Neira Ayuso #define RX_DMA_L4_VALID BIT(24) #define RX_DMA_L4_VALID_PDMA BIT(30) /* when PDMA is used */ #define RX_DMA_FPORT_SHIFT 19 -@@ -798,6 +806,7 @@ struct mtk_soc_data { +@@ -799,6 +807,7 @@ struct mtk_soc_data { u32 caps; u32 required_clks; bool required_pctl; @@ -126,7 +126,7 @@ Signed-off-by: Pablo Neira Ayuso netdev_features_t hw_features; }; -@@ -897,6 +906,8 @@ struct mtk_eth { +@@ -898,6 +907,8 @@ struct mtk_eth { u32 tx_int_status_reg; u32 rx_dma_l4_valid; int ip_align; diff --git a/target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch b/target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch index 82e3ddec3f..030c3fda9c 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch @@ -60,7 +60,7 @@ Signed-off-by: Pablo Neira Ayuso #define MTK_HW_FEATURES_MT7628 (NETIF_F_SG | NETIF_F_RXCSUM) #define NEXT_DESP_IDX(X, Y) (((X) + 1) & ((Y) - 1)) -@@ -908,6 +910,7 @@ struct mtk_eth { +@@ -909,6 +911,7 @@ struct mtk_eth { int ip_align; struct mtk_ppe ppe; @@ -68,7 +68,7 @@ Signed-off-by: Pablo Neira Ayuso }; /* struct mtk_mac - the structure that holds the info about the MACs of the -@@ -952,4 +955,9 @@ int mtk_gmac_sgmii_path_setup(struct mtk +@@ -953,4 +956,9 @@ int mtk_gmac_sgmii_path_setup(struct mtk int mtk_gmac_gephy_path_setup(struct mtk_eth *eth, int mac_id); int mtk_gmac_rgmii_path_setup(struct mtk_eth *eth, int mac_id); diff --git a/target/linux/generic/backport-5.10/610-v5.13-37-net-ethernet-mtk_eth_soc-fix-RX-VLAN-offload.patch b/target/linux/generic/backport-5.10/610-v5.13-37-net-ethernet-mtk_eth_soc-fix-RX-VLAN-offload.patch deleted file mode 100644 index 7020fd7143..0000000000 --- a/target/linux/generic/backport-5.10/610-v5.13-37-net-ethernet-mtk_eth_soc-fix-RX-VLAN-offload.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3f57d8c40fea9b20543cab4da12f4680d2ef182c Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Thu, 22 Apr 2021 22:20:54 -0700 -Subject: [PATCH] net: ethernet: mtk_eth_soc: fix RX VLAN offload - -The VLAN ID in the rx descriptor is only valid if the RX_DMA_VTAG bit is -set. Fixes frames wrongly marked with VLAN tags. - -Signed-off-by: Felix Fietkau -[Ilya: fix commit message] -Signed-off-by: Ilya Lipnitskiy -Signed-off-by: David S. Miller ---- - drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- - drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c -+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -1319,7 +1319,7 @@ static int mtk_poll_rx(struct napi_struc - skb->protocol = eth_type_trans(skb, netdev); - - if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX && -- RX_DMA_VID(trxd.rxd3)) -+ (trxd.rxd2 & RX_DMA_VTAG)) - __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), - RX_DMA_VID(trxd.rxd3)); - skb_record_rx_queue(skb, 0); ---- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h -+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h -@@ -300,6 +300,7 @@ - #define RX_DMA_LSO BIT(30) - #define RX_DMA_PLEN0(_x) (((_x) & 0x3fff) << 16) - #define RX_DMA_GET_PLEN0(_x) (((_x) >> 16) & 0x3fff) -+#define RX_DMA_VTAG BIT(15) - - /* QDMA descriptor rxd3 */ - #define RX_DMA_VID(_x) ((_x) & 0xfff) diff --git a/target/linux/generic/hack-5.10/204-module_strip.patch b/target/linux/generic/hack-5.10/204-module_strip.patch index 491c21d5e0..3379c5f3d6 100644 --- a/target/linux/generic/hack-5.10/204-module_strip.patch +++ b/target/linux/generic/hack-5.10/204-module_strip.patch @@ -184,7 +184,7 @@ Signed-off-by: Felix Fietkau } static void write_buf(struct buffer *b, const char *fname) -@@ -2643,7 +2653,9 @@ int main(int argc, char **argv) +@@ -2630,7 +2640,9 @@ int main(int argc, char **argv) add_staging_flag(&buf, mod->name); err |= add_versions(&buf, mod); add_depends(&buf, mod); diff --git a/target/linux/generic/hack-5.10/911-kobject_add_broadcast_uevent.patch b/target/linux/generic/hack-5.10/911-kobject_add_broadcast_uevent.patch index 1f3002da4c..a487d55193 100644 --- a/target/linux/generic/hack-5.10/911-kobject_add_broadcast_uevent.patch +++ b/target/linux/generic/hack-5.10/911-kobject_add_broadcast_uevent.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau #endif /* _KOBJECT_H_ */ --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c -@@ -690,6 +690,43 @@ int add_uevent_var(struct kobj_uevent_en +@@ -691,6 +691,43 @@ int add_uevent_var(struct kobj_uevent_en EXPORT_SYMBOL_GPL(add_uevent_var); #if defined(CONFIG_NET) diff --git a/target/linux/ipq806x/patches-5.10/104-1-drivers-thermal-tsens-Add-VER_0-tsens-version.patch b/target/linux/ipq806x/patches-5.10/104-1-drivers-thermal-tsens-Add-VER_0-tsens-version.patch index cf8fd7cf61..8627244c59 100644 --- a/target/linux/ipq806x/patches-5.10/104-1-drivers-thermal-tsens-Add-VER_0-tsens-version.patch +++ b/target/linux/ipq806x/patches-5.10/104-1-drivers-thermal-tsens-Add-VER_0-tsens-version.patch @@ -166,7 +166,7 @@ Reported-by: Dan Carpenter if (tsens_version(priv) > VER_0_1) { for (i = VER_MAJOR; i <= VER_STEP; i++) { priv->rf[i] = devm_regmap_field_alloc(dev, priv->srot_map, -@@ -769,6 +818,10 @@ int __init init_common(struct tsens_priv +@@ -771,6 +820,10 @@ int __init init_common(struct tsens_priv ret = PTR_ERR(priv->rf[TSENS_EN]); goto err_put_device; } @@ -177,7 +177,7 @@ Reported-by: Dan Carpenter ret = regmap_field_read(priv->rf[TSENS_EN], &enabled); if (ret) goto err_put_device; -@@ -791,6 +844,19 @@ int __init init_common(struct tsens_priv +@@ -793,6 +846,19 @@ int __init init_common(struct tsens_priv goto err_put_device; } @@ -197,7 +197,7 @@ Reported-by: Dan Carpenter /* This loop might need changes if enum regfield_ids is reordered */ for (j = LAST_TEMP_0; j <= UP_THRESH_15; j += 16) { for (i = 0; i < priv->feat->max_sensors; i++) { -@@ -806,7 +872,7 @@ int __init init_common(struct tsens_priv +@@ -808,7 +874,7 @@ int __init init_common(struct tsens_priv } } @@ -206,7 +206,7 @@ Reported-by: Dan Carpenter /* Loop might need changes if enum regfield_ids is reordered */ for (j = CRITICAL_STATUS_0; j <= CRIT_THRESH_15; j += 16) { for (i = 0; i < priv->feat->max_sensors; i++) { -@@ -844,7 +910,11 @@ int __init init_common(struct tsens_priv +@@ -846,7 +912,11 @@ int __init init_common(struct tsens_priv } spin_lock_init(&priv->ul_lock); @@ -219,7 +219,7 @@ Reported-by: Dan Carpenter tsens_debug_init(op); err_put_device: -@@ -943,10 +1013,19 @@ static int tsens_register_irq(struct tse +@@ -945,10 +1015,19 @@ static int tsens_register_irq(struct tse if (irq == -ENXIO) ret = 0; } else { @@ -243,7 +243,7 @@ Reported-by: Dan Carpenter if (ret) dev_err(&pdev->dev, "%s: failed to get irq\n", __func__); -@@ -975,6 +1054,19 @@ static int tsens_register(struct tsens_p +@@ -977,6 +1056,19 @@ static int tsens_register(struct tsens_p priv->ops->enable(priv, i); } diff --git a/target/linux/ipq806x/patches-5.10/104-8-drivers-thermal-tsens-Add-support-for-ipq8064-tsens.patch b/target/linux/ipq806x/patches-5.10/104-8-drivers-thermal-tsens-Add-support-for-ipq8064-tsens.patch index a6ecac1cae..127abaefc3 100644 --- a/target/linux/ipq806x/patches-5.10/104-8-drivers-thermal-tsens-Add-support-for-ipq8064-tsens.patch +++ b/target/linux/ipq806x/patches-5.10/104-8-drivers-thermal-tsens-Add-support-for-ipq8064-tsens.patch @@ -14,7 +14,7 @@ Reviewed-by: Thara Gopinath --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c -@@ -966,6 +966,9 @@ static SIMPLE_DEV_PM_OPS(tsens_pm_ops, t +@@ -968,6 +968,9 @@ static SIMPLE_DEV_PM_OPS(tsens_pm_ops, t static const struct of_device_id tsens_table[] = { { diff --git a/target/linux/ipq806x/patches-5.10/106-5.13-net-stmmac-Set-FIFO-sizes-for-ipq806x.patch b/target/linux/ipq806x/patches-5.10/106-5.13-net-stmmac-Set-FIFO-sizes-for-ipq806x.patch deleted file mode 100644 index 894edaccf9..0000000000 --- a/target/linux/ipq806x/patches-5.10/106-5.13-net-stmmac-Set-FIFO-sizes-for-ipq806x.patch +++ /dev/null @@ -1,99 +0,0 @@ -From patchwork Sat Mar 13 13:18:26 2021 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Jonathan McDowell -X-Patchwork-Id: 12136795 -X-Patchwork-Delegate: kuba@kernel.org -Return-Path: -X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on - aws-us-west-2-korg-lkml-1.web.codeaurora.org -X-Spam-Level: -X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, - DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, - MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 - autolearn=unavailable autolearn_force=no version=3.4.0 -Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) - by smtp.lore.kernel.org (Postfix) with ESMTP id 90AB7C433DB - for ; Sat, 13 Mar 2021 14:03:56 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) - by mail.kernel.org (Postfix) with ESMTP id 58E0464F18 - for ; Sat, 13 Mar 2021 14:03:56 +0000 (UTC) -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S233791AbhCMODW (ORCPT ); - Sat, 13 Mar 2021 09:03:22 -0500 -Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52042 "EHLO - lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S233478AbhCMOCx (ORCPT - ); Sat, 13 Mar 2021 09:02:53 -0500 -X-Greylist: delayed 2658 seconds by postgrey-1.37 at - lindbergh.monkeyblade.net; Sat, 13 Mar 2021 06:02:53 PST -Received: from the.earth.li (the.earth.li - [IPv6:2a00:1098:86:4d:c0ff:ee:15:900d]) - by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FE3FC061574; - Sat, 13 Mar 2021 06:02:53 -0800 (PST) -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=earth.li; - s=the; - h=Content-Type:MIME-Version:Message-ID:Subject:To:From:Date:Sender: - Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: - Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: - In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: - List-Post:List-Owner:List-Archive; - bh=QOTdjy1PdYeDQ1fUENDrh0RtMG0coACWNQ4YsZbgl5w=; - b=DeTr+9knNkPOvtIi2OlW73HS3t - slxWRqQmC/Qd+tyDE8Lnj4oD+NFf5isDoaYYYhiPQ8iT/IOWEUz6DODzLTEBHd1WG9KYfSqzwFT70 - 7pdoIUdBZOPtb0r/1WZqZHRog4L3uDDlSBHRkO6SaLFE0zu6nunAVePrw4XLLmC9bJGsxaEmVvJ4N - zAgW5ejJ2lWOVgTIKSiBHTnLvkLbkSUT3inboIq/iEhEMGyBD8Zio1md1EU+8pQugFxwTmI5hqZ8M - RBYRHIUBaaivkhOJptSZm3vns90mjlM/uDY69gA+jRAsvt2mhWRHSwLv8PJUZ5sB0SenvC1WcPH1S - zAB6oEag==; -Received: from noodles by the.earth.li with local (Exim 4.92) - (envelope-from ) - id 1lL49y-0004kB-SB; Sat, 13 Mar 2021 13:18:26 +0000 -Date: Sat, 13 Mar 2021 13:18:26 +0000 -From: Jonathan McDowell -To: Giuseppe Cavallaro , - Alexandre Torgue , - Jose Abreu , - David Miller , - Jakub Kicinski , - Maxime Coquelin , - netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, - linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org -Subject: [PATCH net-next] net: stmmac: Set FIFO sizes for ipq806x -Message-ID: <20210313131826.GA17553@earth.li> -MIME-Version: 1.0 -Content-Disposition: inline -User-Agent: Mutt/1.10.1 (2018-07-13) -Precedence: bulk -List-ID: -X-Mailing-List: netdev@vger.kernel.org -X-Patchwork-Delegate: kuba@kernel.org - -Commit eaf4fac47807 ("net: stmmac: Do not accept invalid MTU values") -started using the TX FIFO size to verify what counts as a valid MTU -request for the stmmac driver. This is unset for the ipq806x variant. -Looking at older patches for this it seems the RX + TXs buffers can be -up to 8k, so set appropriately. - -(I sent this as an RFC patch in June last year, but received no replies. -I've been running with this on my hardware (a MikroTik RB3011) since -then with larger MTUs to support both the internal qca8k switch and -VLANs with no problems. Without the patch it's impossible to set the -larger MTU required to support this.) - -Signed-off-by: Jonathan McDowell ---- - drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c -+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c -@@ -405,6 +405,8 @@ static int ipq806x_gmac_probe(struct pla - plat_dat->bsp_priv = gmac; - plat_dat->fix_mac_speed = ipq806x_gmac_fix_mac_speed; - plat_dat->multicast_filter_bins = 0; -+ plat_dat->tx_fifo_size = 8192; -+ plat_dat->rx_fifo_size = 8192; - - err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); - if (err)