From 9882a54c4848e2e282bca435c6aa0025d9fa37df Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 30 Aug 2021 00:46:33 +0200 Subject: [PATCH] kernel: bump 4.14 to 4.14.245 Compile-tested: ath79-generic Run-tested: ath79-generic Signed-off-by: David Bauer --- include/kernel-version.mk | 4 ++-- ...lan78xx-Avoid-spurious-kevent-4-error.patch | 2 +- ...n78xx-Read-initial-EEE-status-from-DT.patch | 2 +- ...-Change-LEDs-to-include-10Mb-activity.patch | 4 ++-- ...78xx-Read-LED-states-from-Device-Tree.patch | 4 ++-- ...8xx-Allow-for-VLAN-headers-in-timeout.patch | 4 ++-- ...ve-enabling-of-EEE-into-PHY-init-code.patch | 4 ++-- ...uest-s-w-csum-check-on-VLAN-tagged-pa.patch | 2 +- ...an78xx-Add-support-for-VLAN-filtering.patch | 4 ++-- ...xx-Add-support-for-VLAN-tag-stripping.patch | 10 +++++----- ...an78xx-Reduce-s-w-csum-check-on-VLANs.patch | 2 +- ...-Disable-TCP-Segmentation-Offload-TSO.patch | 2 +- ...-rx-handling-before-first-packet-is-s.patch | 2 +- ...lan78xx-Fix-link-status-notifications.patch | 2 +- ...8xx-Support-auto-downshift-to-100Mb-s.patch | 4 ++-- ...ce-link-events-to-minimize-poll-storm.patch | 2 +- .../patches-4.14/961-lan78xx-enable-LED.patch | 2 +- .../generic/hack-4.14/220-gc_sections.patch | 4 ++-- .../generic/hack-4.14/221-module_exports.patch | 2 +- .../202-core-linux-support-layerscape.patch | 4 ++-- ...k-add-support-for-GMAC2-wired-to-ext-.patch | 2 +- .../patches-4.14/0033-dsa-multi-cpu.patch | 18 +++++++++--------- ...diatek-tell-GDMA-when-we-are-turning-.patch | 2 +- ...sa-mediatek-turn-into-platform-driver.patch | 10 +++++----- 24 files changed, 49 insertions(+), 49 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index a3527c142d..5636a11216 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.14 = .244 +LINUX_VERSION-4.14 = .245 -LINUX_KERNEL_HASH-4.14.244 = b6e0bfa171959aef36817e28f9010f5a949488db122a6ea7a4e8b8325923a574 +LINUX_KERNEL_HASH-4.14.245 = 0d7461890bca7eb836ff9f61b129cead97c80725577f7077a5fd67b18ea6b220 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/brcm2708/patches-4.14/950-0170-lan78xx-Avoid-spurious-kevent-4-error.patch b/target/linux/brcm2708/patches-4.14/950-0170-lan78xx-Avoid-spurious-kevent-4-error.patch index 273dc54cd2..e9b4d3855d 100644 --- a/target/linux/brcm2708/patches-4.14/950-0170-lan78xx-Avoid-spurious-kevent-4-error.patch +++ b/target/linux/brcm2708/patches-4.14/950-0170-lan78xx-Avoid-spurious-kevent-4-error.patch @@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2496,7 +2496,7 @@ static void lan78xx_init_stats(struct la +@@ -2504,7 +2504,7 @@ static void lan78xx_init_stats(struct la dev->stats.rollover_max.eee_tx_lpi_transitions = 0xFFFFFFFF; dev->stats.rollover_max.eee_tx_lpi_time = 0xFFFFFFFF; diff --git a/target/linux/brcm2708/patches-4.14/950-0251-lan78xx-Read-initial-EEE-status-from-DT.patch b/target/linux/brcm2708/patches-4.14/950-0251-lan78xx-Read-initial-EEE-status-from-DT.patch index 41f7d8d2d3..7b7c04f11c 100644 --- a/target/linux/brcm2708/patches-4.14/950-0251-lan78xx-Read-initial-EEE-status-from-DT.patch +++ b/target/linux/brcm2708/patches-4.14/950-0251-lan78xx-Read-initial-EEE-status-from-DT.patch @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2512,6 +2512,22 @@ static int lan78xx_open(struct net_devic +@@ -2520,6 +2520,22 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/brcm2708/patches-4.14/950-0252-lan78xx-Change-LEDs-to-include-10Mb-activity.patch b/target/linux/brcm2708/patches-4.14/950-0252-lan78xx-Change-LEDs-to-include-10Mb-activity.patch index 768c92100b..47c20a7f13 100644 --- a/target/linux/brcm2708/patches-4.14/950-0252-lan78xx-Change-LEDs-to-include-10Mb-activity.patch +++ b/target/linux/brcm2708/patches-4.14/950-0252-lan78xx-Change-LEDs-to-include-10Mb-activity.patch @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -1996,6 +1996,7 @@ static int lan78xx_phy_init(struct lan78 +@@ -2004,6 +2004,7 @@ static int lan78xx_phy_init(struct lan78 { int ret; u32 mii_adv; @@ -22,7 +22,7 @@ Signed-off-by: Phil Elwell struct phy_device *phydev = dev->net->phydev; phydev = phy_find_first(dev->mdiobus); -@@ -2068,6 +2069,19 @@ static int lan78xx_phy_init(struct lan78 +@@ -2076,6 +2077,19 @@ static int lan78xx_phy_init(struct lan78 mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control); phydev->advertising |= mii_adv_to_ethtool_adv_t(mii_adv); diff --git a/target/linux/brcm2708/patches-4.14/950-0257-lan78xx-Read-LED-states-from-Device-Tree.patch b/target/linux/brcm2708/patches-4.14/950-0257-lan78xx-Read-LED-states-from-Device-Tree.patch index b32ff390d6..d9de18f401 100644 --- a/target/linux/brcm2708/patches-4.14/950-0257-lan78xx-Read-LED-states-from-Device-Tree.patch +++ b/target/linux/brcm2708/patches-4.14/950-0257-lan78xx-Read-LED-states-from-Device-Tree.patch @@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -1996,7 +1996,9 @@ static int lan78xx_phy_init(struct lan78 +@@ -2004,7 +2004,9 @@ static int lan78xx_phy_init(struct lan78 { int ret; u32 mii_adv; @@ -30,7 +30,7 @@ Signed-off-by: Phil Elwell struct phy_device *phydev = dev->net->phydev; phydev = phy_find_first(dev->mdiobus); -@@ -2069,18 +2071,27 @@ static int lan78xx_phy_init(struct lan78 +@@ -2077,18 +2079,27 @@ static int lan78xx_phy_init(struct lan78 mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control); phydev->advertising |= mii_adv_to_ethtool_adv_t(mii_adv); diff --git a/target/linux/brcm2708/patches-4.14/950-0265-net-lan78xx-Allow-for-VLAN-headers-in-timeout.patch b/target/linux/brcm2708/patches-4.14/950-0265-net-lan78xx-Allow-for-VLAN-headers-in-timeout.patch index fc495f1911..fa4dbcd35e 100644 --- a/target/linux/brcm2708/patches-4.14/950-0265-net-lan78xx-Allow-for-VLAN-headers-in-timeout.patch +++ b/target/linux/brcm2708/patches-4.14/950-0265-net-lan78xx-Allow-for-VLAN-headers-in-timeout.patch @@ -17,7 +17,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2192,7 +2192,7 @@ static int lan78xx_change_mtu(struct net +@@ -2200,7 +2200,7 @@ static int lan78xx_change_mtu(struct net if ((ll_mtu % dev->maxpacket) == 0) return -EDOM; @@ -26,7 +26,7 @@ Signed-off-by: Dave Stevenson netdev->mtu = new_mtu; -@@ -2485,7 +2485,8 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2493,7 +2493,8 @@ static int lan78xx_reset(struct lan78xx_ buf |= FCT_TX_CTL_EN_; ret = lan78xx_write_reg(dev, FCT_TX_CTL, buf); diff --git a/target/linux/brcm2708/patches-4.14/950-0268-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/target/linux/brcm2708/patches-4.14/950-0268-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch index 7608325ed7..1d334d0091 100644 --- a/target/linux/brcm2708/patches-4.14/950-0268-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch +++ b/target/linux/brcm2708/patches-4.14/950-0268-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2071,6 +2071,22 @@ static int lan78xx_phy_init(struct lan78 +@@ -2079,6 +2079,22 @@ static int lan78xx_phy_init(struct lan78 mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control); phydev->advertising |= mii_adv_to_ethtool_adv_t(mii_adv); @@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell /* Set LED modes: * led: 0=link/activity 1=link1000/activity * 2=link100/activity 3=link10/activity -@@ -2538,22 +2554,6 @@ static int lan78xx_open(struct net_devic +@@ -2546,22 +2562,6 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/brcm2708/patches-4.14/950-0269-net-lan78xx-Request-s-w-csum-check-on-VLAN-tagged-pa.patch b/target/linux/brcm2708/patches-4.14/950-0269-net-lan78xx-Request-s-w-csum-check-on-VLAN-tagged-pa.patch index 23d29ca983..206bd2588d 100644 --- a/target/linux/brcm2708/patches-4.14/950-0269-net-lan78xx-Request-s-w-csum-check-on-VLAN-tagged-pa.patch +++ b/target/linux/brcm2708/patches-4.14/950-0269-net-lan78xx-Request-s-w-csum-check-on-VLAN-tagged-pa.patch @@ -24,7 +24,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2890,8 +2890,12 @@ static void lan78xx_rx_csum_offload(stru +@@ -2898,8 +2898,12 @@ static void lan78xx_rx_csum_offload(stru struct sk_buff *skb, u32 rx_cmd_a, u32 rx_cmd_b) { diff --git a/target/linux/brcm2708/patches-4.14/950-0270-net-lan78xx-Add-support-for-VLAN-filtering.patch b/target/linux/brcm2708/patches-4.14/950-0270-net-lan78xx-Add-support-for-VLAN-filtering.patch index 732d96c824..c66a6cde5e 100644 --- a/target/linux/brcm2708/patches-4.14/950-0270-net-lan78xx-Add-support-for-VLAN-filtering.patch +++ b/target/linux/brcm2708/patches-4.14/950-0270-net-lan78xx-Add-support-for-VLAN-filtering.patch @@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2277,7 +2277,7 @@ static int lan78xx_set_features(struct n +@@ -2285,7 +2285,7 @@ static int lan78xx_set_features(struct n pdata->rfe_ctl &= ~(RFE_CTL_ICMP_COE_ | RFE_CTL_IGMP_COE_); } @@ -24,7 +24,7 @@ Signed-off-by: Dave Stevenson pdata->rfe_ctl |= RFE_CTL_VLAN_FILTER_; else pdata->rfe_ctl &= ~RFE_CTL_VLAN_FILTER_; -@@ -2826,6 +2826,9 @@ static int lan78xx_bind(struct lan78xx_n +@@ -2834,6 +2834,9 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_TSO_CSUM_ENABLE) dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG; diff --git a/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch b/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch index 1b4a8db537..ece8542c01 100644 --- a/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch +++ b/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch @@ -24,7 +24,7 @@ Signed-off-by: Dave Stevenson #define TX_OVERHEAD (8) #define RXW_PADDING 2 -@@ -2277,6 +2278,11 @@ static int lan78xx_set_features(struct n +@@ -2285,6 +2286,11 @@ static int lan78xx_set_features(struct n pdata->rfe_ctl &= ~(RFE_CTL_ICMP_COE_ | RFE_CTL_IGMP_COE_); } @@ -36,7 +36,7 @@ Signed-off-by: Dave Stevenson if (features & NETIF_F_HW_VLAN_CTAG_FILTER) pdata->rfe_ctl |= RFE_CTL_VLAN_FILTER_; else -@@ -2826,6 +2832,9 @@ static int lan78xx_bind(struct lan78xx_n +@@ -2834,6 +2840,9 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_TSO_CSUM_ENABLE) dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG; @@ -46,7 +46,7 @@ Signed-off-by: Dave Stevenson if (DEFAULT_VLAN_FILTER_ENABLE) dev->net->features |= NETIF_F_HW_VLAN_CTAG_FILTER; -@@ -2906,6 +2915,16 @@ static void lan78xx_rx_csum_offload(stru +@@ -2914,6 +2923,16 @@ static void lan78xx_rx_csum_offload(stru } } @@ -63,7 +63,7 @@ Signed-off-by: Dave Stevenson static void lan78xx_skb_return(struct lan78xx_net *dev, struct sk_buff *skb) { int status; -@@ -2970,6 +2989,8 @@ static int lan78xx_rx(struct lan78xx_net +@@ -2978,6 +2997,8 @@ static int lan78xx_rx(struct lan78xx_net if (skb->len == size) { lan78xx_rx_csum_offload(dev, skb, rx_cmd_a, rx_cmd_b); @@ -72,7 +72,7 @@ Signed-off-by: Dave Stevenson skb_trim(skb, skb->len - 4); /* remove fcs */ skb->truesize = size + sizeof(struct sk_buff); -@@ -2988,6 +3009,7 @@ static int lan78xx_rx(struct lan78xx_net +@@ -2996,6 +3017,7 @@ static int lan78xx_rx(struct lan78xx_net skb_set_tail_pointer(skb2, size); lan78xx_rx_csum_offload(dev, skb2, rx_cmd_a, rx_cmd_b); diff --git a/target/linux/brcm2708/patches-4.14/950-0272-net-lan78xx-Reduce-s-w-csum-check-on-VLANs.patch b/target/linux/brcm2708/patches-4.14/950-0272-net-lan78xx-Reduce-s-w-csum-check-on-VLANs.patch index 0621b34939..7aa49a9b03 100644 --- a/target/linux/brcm2708/patches-4.14/950-0272-net-lan78xx-Reduce-s-w-csum-check-on-VLANs.patch +++ b/target/linux/brcm2708/patches-4.14/950-0272-net-lan78xx-Reduce-s-w-csum-check-on-VLANs.patch @@ -16,7 +16,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2902,12 +2902,13 @@ static void lan78xx_rx_csum_offload(stru +@@ -2910,12 +2910,13 @@ static void lan78xx_rx_csum_offload(stru struct sk_buff *skb, u32 rx_cmd_a, u32 rx_cmd_b) { diff --git a/target/linux/brcm2708/patches-4.14/950-0314-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/brcm2708/patches-4.14/950-0314-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch index d26737bcad..c860f5bacb 100644 --- a/target/linux/brcm2708/patches-4.14/950-0314-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch +++ b/target/linux/brcm2708/patches-4.14/950-0314-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch @@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -2829,8 +2838,14 @@ static int lan78xx_bind(struct lan78xx_n +@@ -2837,8 +2846,14 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_RX_CSUM_ENABLE) dev->net->features |= NETIF_F_RXCSUM; diff --git a/target/linux/brcm2708/patches-4.14/950-0359-net-lan78xx-fix-rx-handling-before-first-packet-is-s.patch b/target/linux/brcm2708/patches-4.14/950-0359-net-lan78xx-fix-rx-handling-before-first-packet-is-s.patch index bb35c544d3..d308f08214 100644 --- a/target/linux/brcm2708/patches-4.14/950-0359-net-lan78xx-fix-rx-handling-before-first-packet-is-s.patch +++ b/target/linux/brcm2708/patches-4.14/950-0359-net-lan78xx-fix-rx-handling-before-first-packet-is-s.patch @@ -19,7 +19,7 @@ Signed-off-by: Stefan Wahren --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2587,6 +2587,8 @@ static int lan78xx_open(struct net_devic +@@ -2595,6 +2595,8 @@ static int lan78xx_open(struct net_devic dev->link_on = false; diff --git a/target/linux/brcm2708/patches-4.14/950-0360-lan78xx-Fix-link-status-notifications.patch b/target/linux/brcm2708/patches-4.14/950-0360-lan78xx-Fix-link-status-notifications.patch index 8a44e8c100..5a279cdebd 100644 --- a/target/linux/brcm2708/patches-4.14/950-0360-lan78xx-Fix-link-status-notifications.patch +++ b/target/linux/brcm2708/patches-4.14/950-0360-lan78xx-Fix-link-status-notifications.patch @@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2587,8 +2587,6 @@ static int lan78xx_open(struct net_devic +@@ -2595,8 +2595,6 @@ static int lan78xx_open(struct net_devic dev->link_on = false; diff --git a/target/linux/brcm2708/patches-4.14/950-0443-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch b/target/linux/brcm2708/patches-4.14/950-0443-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch index 8ca3290d1b..3bb2569573 100644 --- a/target/linux/brcm2708/patches-4.14/950-0443-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch +++ b/target/linux/brcm2708/patches-4.14/950-0443-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch @@ -85,7 +85,7 @@ Signed-off-by: Phil Elwell #include #include "lan78xx.h" -@@ -1760,6 +1761,7 @@ done: +@@ -1768,6 +1769,7 @@ done: static int lan78xx_mdio_init(struct lan78xx_net *dev) { @@ -93,7 +93,7 @@ Signed-off-by: Phil Elwell int ret; dev->mdiobus = mdiobus_alloc(); -@@ -1789,7 +1791,9 @@ static int lan78xx_mdio_init(struct lan7 +@@ -1797,7 +1799,9 @@ static int lan78xx_mdio_init(struct lan7 break; } diff --git a/target/linux/brcm2708/patches-4.14/950-0454-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/brcm2708/patches-4.14/950-0454-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch index ba3927794f..c323ced943 100644 --- a/target/linux/brcm2708/patches-4.14/950-0454-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch +++ b/target/linux/brcm2708/patches-4.14/950-0454-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch @@ -28,7 +28,7 @@ See: https://github.com/raspberrypi/linux/issues/2447 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -3679,7 +3684,12 @@ static int lan78xx_probe(struct usb_inte +@@ -3687,7 +3692,12 @@ static int lan78xx_probe(struct usb_inte netdev->max_mtu = MAX_SINGLE_PACKET_SIZE; netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER); diff --git a/target/linux/brcm2708/patches-4.14/961-lan78xx-enable-LED.patch b/target/linux/brcm2708/patches-4.14/961-lan78xx-enable-LED.patch index 79243675f7..2b9f91137b 100644 --- a/target/linux/brcm2708/patches-4.14/961-lan78xx-enable-LED.patch +++ b/target/linux/brcm2708/patches-4.14/961-lan78xx-enable-LED.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2460,6 +2460,15 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2468,6 +2468,15 @@ static int lan78xx_reset(struct lan78xx_ ret = lan78xx_read_reg(dev, HW_CFG, &buf); buf |= HW_CFG_MEF_; diff --git a/target/linux/generic/hack-4.14/220-gc_sections.patch b/target/linux/generic/hack-4.14/220-gc_sections.patch index c91c25dab1..db6564ed7a 100644 --- a/target/linux/generic/hack-4.14/220-gc_sections.patch +++ b/target/linux/generic/hack-4.14/220-gc_sections.patch @@ -238,7 +238,7 @@ Signed-off-by: Gabor Juhos /* * Data section helpers -@@ -500,7 +501,7 @@ +@@ -501,7 +502,7 @@ #define ENTRY_TEXT \ ALIGN_FUNCTION(); \ VMLINUX_SYMBOL(__entry_text_start) = .; \ @@ -247,7 +247,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__entry_text_end) = .; #define IRQENTRY_TEXT \ -@@ -607,7 +608,7 @@ +@@ -608,7 +609,7 @@ . = ALIGN(sbss_align); \ .sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \ *(.dynsbss) \ diff --git a/target/linux/generic/hack-4.14/221-module_exports.patch b/target/linux/generic/hack-4.14/221-module_exports.patch index 8faa3e752a..bf08819cb6 100644 --- a/target/linux/generic/hack-4.14/221-module_exports.patch +++ b/target/linux/generic/hack-4.14/221-module_exports.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau } \ \ /* __*init sections */ \ -@@ -804,6 +814,8 @@ +@@ -805,6 +815,8 @@ EXIT_TEXT \ EXIT_DATA \ EXIT_CALL \ diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch index 083a518bba..f9cb810b5c 100644 --- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch @@ -509,7 +509,7 @@ Signed-off-by: Yangbo Lu * @dma_pfn_offset: offset of DMA memory range relatively of RAM * @dma_parms: A low level driver may set these to teach IOMMU code about * segment limitations. -@@ -930,6 +938,7 @@ struct device { +@@ -931,6 +939,7 @@ struct device { not all hardware supports 64 bit addresses for consistent allocations such descriptors. */ @@ -517,7 +517,7 @@ Signed-off-by: Yangbo Lu unsigned long dma_pfn_offset; struct device_dma_parameters *dma_parms; -@@ -1268,6 +1277,7 @@ extern const char *dev_driver_string(con +@@ -1269,6 +1278,7 @@ extern const char *dev_driver_string(con struct device_link *device_link_add(struct device *consumer, struct device *supplier, u32 flags); void device_link_del(struct device_link *link); diff --git a/target/linux/mediatek/patches-4.14/0032-net-dsa-mediatek-add-support-for-GMAC2-wired-to-ext-.patch b/target/linux/mediatek/patches-4.14/0032-net-dsa-mediatek-add-support-for-GMAC2-wired-to-ext-.patch index c01703d07b..44d6cdfe4f 100644 --- a/target/linux/mediatek/patches-4.14/0032-net-dsa-mediatek-add-support-for-GMAC2-wired-to-ext-.patch +++ b/target/linux/mediatek/patches-4.14/0032-net-dsa-mediatek-add-support-for-GMAC2-wired-to-ext-.patch @@ -12,7 +12,7 @@ Signed-off-by: John Crispin --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -991,6 +991,11 @@ mt7530_setup(struct dsa_switch *ds) +@@ -992,6 +992,11 @@ mt7530_setup(struct dsa_switch *ds) val = mt7530_read(priv, MT7530_MHWTRAP); val &= ~MHWTRAP_P6_DIS & ~MHWTRAP_PHY_ACCESS; val |= MHWTRAP_MANUAL; diff --git a/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch b/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch index 0442506977..a317b52e13 100644 --- a/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch +++ b/target/linux/mediatek/patches-4.14/0033-dsa-multi-cpu.patch @@ -1,6 +1,6 @@ --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -670,6 +670,9 @@ static int +@@ -671,6 +671,9 @@ static int mt7530_cpu_port_enable(struct mt7530_priv *priv, int port) { @@ -10,7 +10,7 @@ /* Enable Mediatek header mode on the cpu port */ mt7530_write(priv, MT7530_PVC_P(port), PORT_SPEC_TAG); -@@ -686,8 +689,12 @@ mt7530_cpu_port_enable(struct mt7530_pri +@@ -687,8 +690,12 @@ mt7530_cpu_port_enable(struct mt7530_pri /* CPU port gets connected to all user ports of * the switch */ @@ -24,7 +24,7 @@ return 0; } -@@ -697,6 +704,7 @@ mt7530_port_enable(struct dsa_switch *ds +@@ -698,6 +705,7 @@ mt7530_port_enable(struct dsa_switch *ds struct phy_device *phy) { struct mt7530_priv *priv = ds->priv; @@ -32,7 +32,7 @@ mutex_lock(&priv->reg_mutex); -@@ -707,7 +715,7 @@ mt7530_port_enable(struct dsa_switch *ds +@@ -708,7 +716,7 @@ mt7530_port_enable(struct dsa_switch *ds * restore the port matrix if the port is the member of a certain * bridge. */ @@ -41,7 +41,7 @@ priv->ports[port].enable = true; mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK, priv->ports[port].pm); -@@ -770,7 +778,8 @@ mt7530_port_bridge_join(struct dsa_switc +@@ -771,7 +779,8 @@ mt7530_port_bridge_join(struct dsa_switc struct net_device *bridge) { struct mt7530_priv *priv = ds->priv; @@ -51,7 +51,7 @@ int i; mutex_lock(&priv->reg_mutex); -@@ -808,6 +817,7 @@ mt7530_port_bridge_leave(struct dsa_swit +@@ -809,6 +818,7 @@ mt7530_port_bridge_leave(struct dsa_swit struct net_device *bridge) { struct mt7530_priv *priv = ds->priv; @@ -59,7 +59,7 @@ int i; mutex_lock(&priv->reg_mutex); -@@ -832,8 +842,8 @@ mt7530_port_bridge_leave(struct dsa_swit +@@ -833,8 +843,8 @@ mt7530_port_bridge_leave(struct dsa_swit */ if (priv->ports[port].enable) mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK, @@ -70,7 +70,7 @@ mutex_unlock(&priv->reg_mutex); } -@@ -908,15 +918,7 @@ err: +@@ -909,15 +919,7 @@ err: static enum dsa_tag_protocol mtk_get_tag_protocol(struct dsa_switch *ds) { @@ -87,7 +87,7 @@ } static int -@@ -989,7 +991,7 @@ mt7530_setup(struct dsa_switch *ds) +@@ -990,7 +992,7 @@ mt7530_setup(struct dsa_switch *ds) /* Enable Port 6 only; P5 as GMAC5 which currently is not supported */ val = mt7530_read(priv, MT7530_MHWTRAP); diff --git a/target/linux/mediatek/patches-4.14/0044-net-next-dsa-mediatek-tell-GDMA-when-we-are-turning-.patch b/target/linux/mediatek/patches-4.14/0044-net-next-dsa-mediatek-tell-GDMA-when-we-are-turning-.patch index 4a69e7aadf..9bb7ce152e 100644 --- a/target/linux/mediatek/patches-4.14/0044-net-next-dsa-mediatek-tell-GDMA-when-we-are-turning-.patch +++ b/target/linux/mediatek/patches-4.14/0044-net-next-dsa-mediatek-tell-GDMA-when-we-are-turning-.patch @@ -16,7 +16,7 @@ Signed-off-by: John Crispin --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -677,6 +677,11 @@ mt7530_cpu_port_enable(struct mt7530_pri +@@ -678,6 +678,11 @@ mt7530_cpu_port_enable(struct mt7530_pri mt7530_write(priv, MT7530_PVC_P(port), PORT_SPEC_TAG); diff --git a/target/linux/mediatek/patches-4.14/0045-net-dsa-mediatek-turn-into-platform-driver.patch b/target/linux/mediatek/patches-4.14/0045-net-dsa-mediatek-turn-into-platform-driver.patch index 55f1015770..01c62b03ac 100644 --- a/target/linux/mediatek/patches-4.14/0045-net-dsa-mediatek-turn-into-platform-driver.patch +++ b/target/linux/mediatek/patches-4.14/0045-net-dsa-mediatek-turn-into-platform-driver.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -1049,10 +1049,10 @@ static const struct dsa_switch_ops mt753 +@@ -1050,10 +1050,10 @@ static const struct dsa_switch_ops mt753 }; static int @@ -23,7 +23,7 @@ Signed-off-by: John Crispin dn = mdiodev->dev.of_node; -@@ -1100,7 +1100,12 @@ mt7530_probe(struct mdio_device *mdiodev +@@ -1101,7 +1101,12 @@ mt7530_probe(struct mdio_device *mdiodev } } @@ -37,7 +37,7 @@ Signed-off-by: John Crispin priv->dev = &mdiodev->dev; priv->ds->priv = priv; priv->ds->ops = &mt7530_switch_ops; -@@ -1110,8 +1115,8 @@ mt7530_probe(struct mdio_device *mdiodev +@@ -1111,8 +1116,8 @@ mt7530_probe(struct mdio_device *mdiodev return dsa_register_switch(priv->ds); } @@ -48,7 +48,7 @@ Signed-off-by: John Crispin { struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev); int ret = 0; -@@ -1128,6 +1133,8 @@ mt7530_remove(struct mdio_device *mdiode +@@ -1129,6 +1134,8 @@ mt7530_remove(struct mdio_device *mdiode dsa_unregister_switch(priv->ds); mutex_destroy(&priv->reg_mutex); @@ -57,7 +57,7 @@ Signed-off-by: John Crispin } static const struct of_device_id mt7530_of_match[] = { -@@ -1136,16 +1143,16 @@ static const struct of_device_id mt7530_ +@@ -1137,16 +1144,16 @@ static const struct of_device_id mt7530_ }; MODULE_DEVICE_TABLE(of, mt7530_of_match); -- 2.30.2