From 4170e91d1e380566e30f3593758fb5c046a051b4 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 2 May 2020 16:27:09 +0800 Subject: [PATCH] kernel: bump 5.4 to 5.4.37 Refreshed all patches. Signed-off-by: CN_SZTL --- include/kernel-version.mk | 4 +-- ...irst-codec-is-master-in-multicodec-s.patch | 2 +- ...-Remove-simple-bus-from-fixed-clocks.patch | 2 +- ...Move-pixelvalve-to-bcm2835-common.dt.patch | 2 +- ...rt-all-changes-to-upstream-dts-files.patch | 8 ++--- ...CM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch | 4 +-- ...CM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch | 1 - .../hack-5.4/904-debloat_dma_buf.patch | 2 +- ...rong-write-in-update_dual_edge.patch.patch | 7 +--- ...T-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++--- .../705-net-add-qualcomm-ar40xx-phy.patch | 1 - ...706-ar40xx-abort-probe-on-missig-phy.patch | 4 +-- ...xq-to-be-adaptive-of-cpus-and-netdev.patch | 32 ++++++++----------- .../716-essedma-reduce-write-reg.patch | 8 ++--- ...essedma-disable-default-vlan-tagging.patch | 15 +++------ .../patches-5.4/998-4g-add-u9300-driver.patch | 8 ++--- ...r-Gateworks-PLX-PEX860x-switch-with-.patch | 9 ++++-- .../ramips/patches-5.4/998-thermal-bool.patch | 2 +- 18 files changed, 51 insertions(+), 70 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index c1e2488ac9..8a5e9e663b 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -9,12 +9,12 @@ endif LINUX_VERSION-4.9 = .220 LINUX_VERSION-4.14 = .176 LINUX_VERSION-4.19 = .119 -LINUX_VERSION-5.4 = .36 +LINUX_VERSION-5.4 = .37 LINUX_KERNEL_HASH-4.9.220 = dad9c760787f9694173308c29f8e357b2c447b87a7965565ae4bb7f5979f0b2e LINUX_KERNEL_HASH-4.14.176 = bcae0956baaeb55dab5bad0401873fbc5baaa7fbe957ea6d27a5ab241cec5ca2 LINUX_KERNEL_HASH-4.19.119 = 2ba4b94a71bed9957d4d44b08de5552a30576ef2ceaa90f517af598dfe6f9bce -LINUX_KERNEL_HASH-5.4.36 = b9faea98122e8316af8fb428c942e81797b5d28a8fc59a24a4e47959e3765b8d +LINUX_KERNEL_HASH-5.4.37 = dc063a8064e60ebafb0b3d771ae9520d5987f7307d45d52b96b5761cb722b64e 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/bcm27xx/patches-5.4/950-0366-sound-soc-only-first-codec-is-master-in-multicodec-s.patch b/target/linux/bcm27xx/patches-5.4/950-0366-sound-soc-only-first-codec-is-master-in-multicodec-s.patch index c4f70ea11f..263f3532f3 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0366-sound-soc-only-first-codec-is-master-in-multicodec-s.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0366-sound-soc-only-first-codec-is-master-in-multicodec-s.patch @@ -15,7 +15,7 @@ Signed-off-by: Johannes Krude --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c -@@ -1646,7 +1646,15 @@ int snd_soc_runtime_set_dai_fmt(struct s +@@ -1656,7 +1656,15 @@ int snd_soc_runtime_set_dai_fmt(struct s int ret; for_each_rtd_codec_dai(rtd, i, codec_dai) { diff --git a/target/linux/bcm27xx/patches-5.4/950-0373-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch b/target/linux/bcm27xx/patches-5.4/950-0373-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch index 04b85fd6c5..db90055343 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0373-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0373-ARM-dts-bcm283x-Remove-simple-bus-from-fixed-clocks.patch @@ -24,7 +24,7 @@ Signed-off-by: Stefan Wahren --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi -@@ -634,22 +634,16 @@ +@@ -635,22 +635,16 @@ }; clocks { diff --git a/target/linux/bcm27xx/patches-5.4/950-0375-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch b/target/linux/bcm27xx/patches-5.4/950-0375-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch index 5303e937bd..218a846fa3 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0375-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0375-ARM-dts-bcm283x-Move-pixelvalve-to-bcm2835-common.dt.patch @@ -97,7 +97,7 @@ Signed-off-by: Stefan Wahren dpi: dpi@7e208000 { compatible = "brcm,bcm2835-dpi"; reg = <0x7e208000 0x8c>; -@@ -607,12 +595,6 @@ +@@ -608,12 +596,6 @@ status = "disabled"; }; diff --git a/target/linux/bcm27xx/patches-5.4/950-0420-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch b/target/linux/bcm27xx/patches-5.4/950-0420-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch index df922eaf4b..403f534baf 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0420-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0420-ARM-dts-Revert-all-changes-to-upstream-dts-files.patch @@ -1845,7 +1845,7 @@ Signed-off-by: Phil Elwell #address-cells = <1>; #size-cells = <0>; status = "disabled"; -@@ -540,32 +446,6 @@ +@@ -541,32 +447,6 @@ status = "disabled"; }; @@ -1878,7 +1878,7 @@ Signed-off-by: Phil Elwell i2c1: i2c@7e804000 { compatible = "brcm,bcm2835-i2c"; reg = <0x7e804000 0x1000>; -@@ -576,16 +456,6 @@ +@@ -577,16 +457,6 @@ status = "disabled"; }; @@ -1895,7 +1895,7 @@ Signed-off-by: Phil Elwell vec: vec@7e806000 { compatible = "brcm,bcm2835-vec"; reg = <0x7e806000 0x1000>; -@@ -594,20 +464,6 @@ +@@ -595,20 +465,6 @@ status = "disabled"; }; @@ -1916,7 +1916,7 @@ Signed-off-by: Phil Elwell usb: usb@7e980000 { compatible = "brcm,bcm2835-usb"; reg = <0x7e980000 0x10000>; -@@ -619,10 +475,6 @@ +@@ -620,10 +476,6 @@ phys = <&usbphy>; phy-names = "usb2-phy"; }; diff --git a/target/linux/bcm53xx/patches-5.4/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch b/target/linux/bcm53xx/patches-5.4/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch index 258407352c..e9698f2375 100644 --- a/target/linux/bcm53xx/patches-5.4/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch +++ b/target/linux/bcm53xx/patches-5.4/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch @@ -8,8 +8,8 @@ see 700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -105,6 +105,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ - bcm4709-netgear-r7000.dtb \ +@@ -109,6 +109,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4709-netgear-r7900.dtb \ bcm4709-netgear-r8000.dtb \ bcm4709-tplink-archer-c9-v1.dtb \ + bcm4709-arris-sbr-ac1900p.dtb \ diff --git a/target/linux/bcm53xx/patches-5.4/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch b/target/linux/bcm53xx/patches-5.4/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch index 606b22c3e2..f0b08deb4a 100644 --- a/target/linux/bcm53xx/patches-5.4/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch +++ b/target/linux/bcm53xx/patches-5.4/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch @@ -93,4 +93,3 @@ + }; + }; +}; -+ \ No newline at end of file diff --git a/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch index 24971487a4..1b103d5e00 100644 --- a/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch @@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -2673,6 +2673,7 @@ int wake_up_state(struct task_struct *p, +@@ -2668,6 +2668,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.4/001-v5.4-pinctrl-qcom-fix-wrong-write-in-update_dual_edge.patch.patch b/target/linux/generic/pending-5.4/001-v5.4-pinctrl-qcom-fix-wrong-write-in-update_dual_edge.patch.patch index e295311116..b9015236f4 100644 --- a/target/linux/generic/pending-5.4/001-v5.4-pinctrl-qcom-fix-wrong-write-in-update_dual_edge.patch.patch +++ b/target/linux/generic/pending-5.4/001-v5.4-pinctrl-qcom-fix-wrong-write-in-update_dual_edge.patch.patch @@ -13,11 +13,9 @@ Signed-off-by: Ansuel Smith drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c -index 1a948c3f54b7..9f1c9951949e 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c -@@ -692,7 +692,7 @@ static void msm_gpio_update_dual_edge_pos(struct msm_pinctrl *pctrl, +@@ -688,7 +688,7 @@ static void msm_gpio_update_dual_edge_po pol = msm_readl_intr_cfg(pctrl, g); pol ^= BIT(g->intr_polarity_bit); @@ -26,6 +24,3 @@ index 1a948c3f54b7..9f1c9951949e 100644 val2 = msm_readl_io(pctrl, g) & BIT(g->in_bit); intstat = msm_readl_intr_status(pctrl, g); --- -2.25.1 - diff --git a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 9fa34f0c6e..449b2c89cc 100644 --- a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5472,6 +5472,9 @@ static enum gro_result dev_gro_receive(s +@@ -5473,6 +5473,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau if (netif_elide_gro(skb->dev)) goto normal; -@@ -7265,6 +7268,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7266,6 +7269,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -7315,6 +7360,7 @@ static int __netdev_upper_dev_link(struc +@@ -7316,6 +7361,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7408,6 +7454,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -7409,6 +7455,7 @@ void netdev_upper_dev_unlink(struct net_ __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); -@@ -8138,6 +8185,7 @@ int dev_set_mac_address(struct net_devic +@@ -8139,6 +8186,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch b/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch index 0855deedc2..797aa33817 100644 --- a/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch +++ b/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch @@ -2149,7 +2149,6 @@ +module_platform_driver(ar40xx_drv); + +MODULE_DESCRIPTION("IPQ40XX ESS driver"); -+MODULE_LICENSE("Dual BSD/GPL"); --- /dev/null +++ b/drivers/net/phy/ar40xx.h @@ -0,0 +1,337 @@ diff --git a/target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch b/target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch index 19474bff0d..97927b1e5e 100644 --- a/target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch +++ b/target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/ar40xx.c +++ b/drivers/net/phy/ar40xx.c -@@ -2021,6 +2021,12 @@ static int ar40xx_probe(struct platform_ +@@ -2054,6 +2054,12 @@ static int ar40xx_probe(struct platform_ /* register switch */ swdev = &priv->dev; @@ -13,7 +13,7 @@ swdev->alias = dev_name(&priv->mii_bus->dev); swdev->cpu_port = AR40XX_PORT_CPU; -@@ -2052,6 +2058,7 @@ err_unregister_switch: +@@ -2085,6 +2091,7 @@ err_unregister_switch: unregister_switch(&priv->dev); err_unregister_phy: phy_driver_unregister(&ar40xx_phy_driver); diff --git a/target/linux/ipq40xx/patches-5.4/715-essedma-refine-txq-to-be-adaptive-of-cpus-and-netdev.patch b/target/linux/ipq40xx/patches-5.4/715-essedma-refine-txq-to-be-adaptive-of-cpus-and-netdev.patch index d8d09c1425..8aa1de0aa3 100644 --- a/target/linux/ipq40xx/patches-5.4/715-essedma-refine-txq-to-be-adaptive-of-cpus-and-netdev.patch +++ b/target/linux/ipq40xx/patches-5.4/715-essedma-refine-txq-to-be-adaptive-of-cpus-and-netdev.patch @@ -1,8 +1,6 @@ -diff --git a/drivers/net/ethernet/qualcomm/essedma/edma.c b/drivers/net/ethernet/qualcomm/essedma/edma.c -index 724f355..7a16236 100644 --- a/drivers/net/ethernet/qualcomm/essedma/edma.c +++ b/drivers/net/ethernet/qualcomm/essedma/edma.c -@@ -22,14 +22,6 @@ extern struct net_device *edma_netdev[EDMA_MAX_PORTID_SUPPORTED]; +@@ -22,14 +22,6 @@ extern struct net_device *edma_netdev[ED bool edma_stp_rstp; u16 edma_ath_eth_type; @@ -17,7 +15,7 @@ index 724f355..7a16236 100644 /* edma_alloc_tx_ring() * Allocate Tx descriptors ring */ -@@ -1014,13 +1006,14 @@ static inline u16 edma_tpd_available(struct edma_common_info *edma_cinfo, +@@ -1016,13 +1008,14 @@ static inline u16 edma_tpd_available(str /* edma_tx_queue_get() * Get the starting number of the queue */ @@ -34,7 +32,7 @@ index 724f355..7a16236 100644 } /* edma_tx_update_hw_idx() -@@ -1389,8 +1382,9 @@ netdev_tx_t edma_xmit(struct sk_buff *skb, +@@ -1391,8 +1384,9 @@ netdev_tx_t edma_xmit(struct sk_buff *sk } /* this will be one of the 4 TX queues exposed to linux kernel */ @@ -46,7 +44,7 @@ index 724f355..7a16236 100644 etdr = edma_cinfo->tpd_ring[queue_id]; nq = netdev_get_tx_queue(net_dev, txq_id); -@@ -1871,8 +1865,8 @@ void edma_free_irqs(struct edma_adapter *adapter) +@@ -1875,8 +1869,8 @@ void edma_free_irqs(struct edma_adapter int i, j; int k = ((edma_cinfo->num_rx_queues == 4) ? 1 : 2); @@ -57,8 +55,6 @@ index 724f355..7a16236 100644 free_irq(edma_cinfo->tx_irq[j], &edma_cinfo->edma_percpu_info[i]); for (j = edma_cinfo->edma_percpu_info[i].rx_start; j < (edma_cinfo->edma_percpu_info[i].rx_start + k); j++) -diff --git a/drivers/net/ethernet/qualcomm/essedma/edma.h b/drivers/net/ethernet/qualcomm/essedma/edma.h -index 015e5f5..abb0bd5 100644 --- a/drivers/net/ethernet/qualcomm/essedma/edma.h +++ b/drivers/net/ethernet/qualcomm/essedma/edma.h @@ -324,6 +324,7 @@ struct edma_common_info { @@ -87,11 +83,9 @@ index 015e5f5..abb0bd5 100644 u32 default_vlan_tag; /* vlan tag */ u32 dp_bitmap; uint8_t phy_id[MII_BUS_ID_SIZE + 3]; -diff --git a/drivers/net/ethernet/qualcomm/essedma/edma_axi.c b/drivers/net/ethernet/qualcomm/essedma/edma_axi.c -index d53c63b..2d4770c 100644 --- a/drivers/net/ethernet/qualcomm/essedma/edma_axi.c +++ b/drivers/net/ethernet/qualcomm/essedma/edma_axi.c -@@ -719,11 +719,7 @@ static int edma_axi_probe(struct platform_device *pdev) +@@ -719,11 +719,7 @@ static int edma_axi_probe(struct platfor int i, j, k, err = 0; int portid_bmp; int idx = 0, idx_mac = 0; @@ -104,7 +98,7 @@ index d53c63b..2d4770c 100644 if ((num_rxq != 4) && (num_rxq != 8)) { dev_err(&pdev->dev, "Invalid RX queue, edma probe failed\n"); -@@ -747,7 +743,7 @@ static int edma_axi_probe(struct platform_device *pdev) +@@ -747,7 +743,7 @@ static int edma_axi_probe(struct platfor /* Initialize the netdev array before allocation * to avoid double free */ @@ -113,7 +107,7 @@ index d53c63b..2d4770c 100644 edma_netdev[i] = NULL; for (i = 0 ; i < edma_cinfo->num_gmac ; i++) { -@@ -768,8 +764,11 @@ static int edma_axi_probe(struct platform_device *pdev) +@@ -768,8 +764,11 @@ static int edma_axi_probe(struct platfor /* Fill ring details */ edma_cinfo->num_tx_queues = EDMA_MAX_TRANSMIT_QUEUE; @@ -126,7 +120,7 @@ index d53c63b..2d4770c 100644 /* Update num rx queues based on module parameter */ edma_cinfo->num_rx_queues = num_rxq; -@@ -939,6 +938,13 @@ static int edma_axi_probe(struct platform_device *pdev) +@@ -939,6 +938,13 @@ static int edma_axi_probe(struct platfor idx_mac++; } @@ -140,7 +134,7 @@ index d53c63b..2d4770c 100644 /* Populate the adapter structure register the netdevice */ for (i = 0; i < edma_cinfo->num_gmac; i++) { int k, m; -@@ -946,17 +952,16 @@ static int edma_axi_probe(struct platform_device *pdev) +@@ -946,17 +952,16 @@ static int edma_axi_probe(struct platfor adapter[i] = netdev_priv(edma_netdev[i]); adapter[i]->netdev = edma_netdev[i]; adapter[i]->pdev = pdev; @@ -162,7 +156,7 @@ index d53c63b..2d4770c 100644 if (edma_fill_netdev(edma_cinfo, k, i, j)) { pr_err("Netdev overflow Error\n"); goto err_register; -@@ -1109,9 +1114,12 @@ static int edma_axi_probe(struct platform_device *pdev) +@@ -1109,9 +1114,12 @@ static int edma_axi_probe(struct platfor /* populate per_core_info, do a napi_Add, request 16 TX irqs, * 8 RX irqs, do a napi enable */ @@ -176,7 +170,7 @@ index d53c63b..2d4770c 100644 edma_cinfo->edma_percpu_info[i].napi.state = 0; netif_napi_add(edma_netdev[0], -@@ -1131,7 +1139,7 @@ static int edma_axi_probe(struct platform_device *pdev) +@@ -1131,7 +1139,7 @@ static int edma_axi_probe(struct platfor /* Request irq per core */ for (j = edma_cinfo->edma_percpu_info[i].tx_start; @@ -185,7 +179,7 @@ index d53c63b..2d4770c 100644 sprintf(&edma_tx_irq[j][0], "edma_eth_tx%d", j); err = request_irq(edma_cinfo->tx_irq[j], edma_interrupt, -@@ -1253,7 +1261,7 @@ static int edma_axi_probe(struct platform_device *pdev) +@@ -1255,7 +1263,7 @@ err_configure: #endif err_rmap_add_fail: edma_free_irqs(adapter[0]); @@ -194,7 +188,7 @@ index d53c63b..2d4770c 100644 napi_disable(&edma_cinfo->edma_percpu_info[i].napi); err_reset: err_unregister_sysctl_tbl: -@@ -1301,7 +1309,7 @@ static int edma_axi_remove(struct platform_device *pdev) +@@ -1303,7 +1311,7 @@ static int edma_axi_remove(struct platfo unregister_netdev(edma_netdev[i]); edma_stop_rx_tx(hw); diff --git a/target/linux/ipq40xx/patches-5.4/716-essedma-reduce-write-reg.patch b/target/linux/ipq40xx/patches-5.4/716-essedma-reduce-write-reg.patch index 58b87467d6..e179fa6cfb 100644 --- a/target/linux/ipq40xx/patches-5.4/716-essedma-reduce-write-reg.patch +++ b/target/linux/ipq40xx/patches-5.4/716-essedma-reduce-write-reg.patch @@ -1,8 +1,6 @@ -diff --git a/drivers/net/ethernet/qualcomm/essedma/edma.c b/drivers/net/ethernet/qualcomm/essedma/edma.c -index fc274c8..e9d12a4 100644 --- a/drivers/net/ethernet/qualcomm/essedma/edma.c +++ b/drivers/net/ethernet/qualcomm/essedma/edma.c -@@ -2075,15 +2075,13 @@ int edma_poll(struct napi_struct *napi, int budget) +@@ -2079,15 +2079,13 @@ int edma_poll(struct napi_struct *napi, int i, work_done = 0; u16 rx_pending_fill; @@ -21,7 +19,7 @@ index fc274c8..e9d12a4 100644 /* Every core will have a start, which will be computed * in probe and stored in edma_percpu_info->tx_start variable. -@@ -2098,6 +2096,14 @@ int edma_poll(struct napi_struct *napi, int budget) +@@ -2102,6 +2100,14 @@ int edma_poll(struct napi_struct *napi, edma_percpu_info->tx_status &= ~(1 << queue_id); } @@ -36,7 +34,7 @@ index fc274c8..e9d12a4 100644 /* Every core will have a start, which will be computed * in probe and stored in edma_percpu_info->tx_start variable. * We will shift the status bit by tx_start to obtain -@@ -2122,15 +2128,6 @@ int edma_poll(struct napi_struct *napi, int budget) +@@ -2126,15 +2132,6 @@ int edma_poll(struct napi_struct *napi, } } diff --git a/target/linux/ipq40xx/patches-5.4/901-essedma-disable-default-vlan-tagging.patch b/target/linux/ipq40xx/patches-5.4/901-essedma-disable-default-vlan-tagging.patch index ec339c4795..0ea092c0c7 100644 --- a/target/linux/ipq40xx/patches-5.4/901-essedma-disable-default-vlan-tagging.patch +++ b/target/linux/ipq40xx/patches-5.4/901-essedma-disable-default-vlan-tagging.patch @@ -22,11 +22,9 @@ Signed-off-by: Chen Minqiang drivers/net/ethernet/qualcomm/essedma/edma.c | 14 +++++--------- 2 files changed, 7 insertions(+), 12 deletions(-) -diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi -index 3c4617f..7c3af8e 100644 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -598,8 +598,7 @@ +@@ -647,8 +647,7 @@ qcom,page-mode = <0>; qcom,rx_head_buf_size = <1540>; qcom,mdio_supported; @@ -36,7 +34,7 @@ index 3c4617f..7c3af8e 100644 interrupts = <0 65 IRQ_TYPE_EDGE_RISING 0 66 IRQ_TYPE_EDGE_RISING 0 67 IRQ_TYPE_EDGE_RISING -@@ -637,7 +636,7 @@ +@@ -686,7 +685,7 @@ gmac0: gmac0 { local-mac-address = [00 00 00 00 00 00]; @@ -45,11 +43,9 @@ index 3c4617f..7c3af8e 100644 }; gmac1: gmac1 { -diff --git a/drivers/net/ethernet/qualcomm/essedma/edma.c b/drivers/net/ethernet/qualcomm/essedma/edma.c -index 05f9ce9..a3c0d66 100644 --- a/drivers/net/ethernet/qualcomm/essedma/edma.c +++ b/drivers/net/ethernet/qualcomm/essedma/edma.c -@@ -750,13 +750,11 @@ static void edma_rx_complete(struct edma_common_info *edma_cinfo, +@@ -721,13 +721,11 @@ static u16 edma_rx_complete(struct edma_ edma_receive_checksum(rd, skb); /* Process VLAN HW acceleration indication provided by HW */ @@ -68,7 +64,7 @@ index 05f9ce9..a3c0d66 100644 /* Update rx statistics */ adapter->stats.rx_packets++; -@@ -1434,8 +1432,6 @@ netdev_tx_t edma_xmit(struct sk_buff *skb, +@@ -1408,8 +1406,6 @@ netdev_tx_t edma_xmit(struct sk_buff *sk if (!adapter->edma_cinfo->is_single_phy) { if (unlikely(skb_vlan_tag_present(skb))) flags_transmit |= EDMA_VLAN_TX_TAG_INSERT_FLAG; @@ -77,6 +73,3 @@ index 05f9ce9..a3c0d66 100644 } /* Check and mark checksum offload */ --- -2.7.4 - diff --git a/target/linux/ipq40xx/patches-5.4/998-4g-add-u9300-driver.patch b/target/linux/ipq40xx/patches-5.4/998-4g-add-u9300-driver.patch index aeae334d60..a7a0f781a2 100644 --- a/target/linux/ipq40xx/patches-5.4/998-4g-add-u9300-driver.patch +++ b/target/linux/ipq40xx/patches-5.4/998-4g-add-u9300-driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1297,6 +1297,7 @@ static const struct usb_device_id products[] = { +@@ -1366,6 +1366,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ @@ -10,7 +10,7 @@ {QMI_FIXED_INTF(0x2c7c, 0x0296, 4)}, /* Quectel BG96 */ --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -381,6 +381,7 @@ static void option_instat_callback(struct urb *urb); +@@ -381,6 +381,7 @@ static void option_instat_callback(struc * Mobidata, etc sell under their own brand names. */ #define LONGCHEER_VENDOR_ID 0x1c9e @@ -18,7 +18,7 @@ /* 4G Systems products */ /* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick * -@@ -571,6 +572,16 @@ static void option_instat_callback(struct urb *urb); +@@ -571,6 +572,16 @@ static void option_instat_callback(struc /* Device needs ZLP */ #define ZLP BIT(17) @@ -35,7 +35,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, -@@ -605,6 +616,8 @@ static const struct usb_device_id option_ids[] = { +@@ -605,6 +616,8 @@ static const struct usb_device_id option { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), .driver_info = RSVD(4) }, diff --git a/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch b/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch index 58fb20aabb..722607d2a6 100644 --- a/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch +++ b/target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch @@ -22,11 +22,10 @@ Signed-off-by: Tim Harvey #include #include #include -@@ -5497,3 +5498,34 @@ out_disable: - DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_NVIDIA, 0x13b1, +@@ -5547,6 +5548,37 @@ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR PCI_CLASS_DISPLAY_VGA, 8, quirk_reset_lenovo_thinkpad_p50_nvgpu); -+ + +#ifdef CONFIG_PCI_HOST_THUNDER_PEM +/* + * fixup for PLX PEX8909 bridge to configure GPIO1-7 as output High @@ -57,3 +56,7 @@ Signed-off-by: Tim Harvey +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_PLX, 0x8606, newport_pciesw_early_fixup); +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_PLX, 0x8604, newport_pciesw_early_fixup); +#endif /* CONFIG_PCI_HOST_THUNDER_PEM */ ++ + /* + * Device [1b21:2142] + * When in D0, PME# doesn't get asserted when plugging USB 3.0 device. diff --git a/target/linux/ramips/patches-5.4/998-thermal-bool.patch b/target/linux/ramips/patches-5.4/998-thermal-bool.patch index 5d2732ef64..ba05101d78 100644 --- a/target/linux/ramips/patches-5.4/998-thermal-bool.patch +++ b/target/linux/ramips/patches-5.4/998-thermal-bool.patch @@ -2,7 +2,7 @@ +++ b/drivers/thermal/Kconfig @@ -4,7 +4,7 @@ # - + menuconfig THERMAL - tristate "Generic Thermal sysfs driver" + bool "Generic Thermal sysfs driver"