diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 07818622f4..dd48b5eab0 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .280 -LINUX_VERSION-4.14 = .244 -LINUX_VERSION-4.19 = .204 +LINUX_VERSION-4.9 = .282 +LINUX_VERSION-4.14 = .246 +LINUX_VERSION-4.19 = .206 -LINUX_KERNEL_HASH-4.9.280 = 43d9fcaff6854d083b8c940b436f18b7a158c10b7399f80b7344a220d3c3a92a -LINUX_KERNEL_HASH-4.14.244 = b6e0bfa171959aef36817e28f9010f5a949488db122a6ea7a4e8b8325923a574 -LINUX_KERNEL_HASH-4.19.204 = c4e3410762a62c591ff71da2a2fdc3965eb7056f2245344213f939f2754a9de5 +LINUX_KERNEL_HASH-4.9.282 = 67727389771a858406f773b4db62d7d3248209e26120df47507ea4a8898d2e15 +LINUX_KERNEL_HASH-4.14.246 = 9c5612ef428441b7c85cf211a455c06ce695b81a9a40c064d0ea424dd08bef3a +LINUX_KERNEL_HASH-4.19.206 = b7eb776f408b3ea71c97dde4888cc4549edf925a18cd158e7c9681d6ffa684c0 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/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch index 748784dacc..46d781eda6 100644 --- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch @@ -171,7 +171,7 @@ #define UDP_CORK 1 /* Never send partially complete segments */ --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -263,8 +263,8 @@ nf_ct_get_tuple(const struct sk_buff *sk +@@ -258,8 +258,8 @@ nf_ct_get_tuple(const struct sk_buff *sk switch (l3num) { case NFPROTO_IPV4: diff --git a/target/linux/bcm27xx/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/target/linux/bcm27xx/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch index 3f59db2cbe..24f989d74b 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2473,6 +2473,11 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2481,6 +2481,11 @@ static int lan78xx_reset(struct lan78xx_ int ret = 0; unsigned long timeout; u8 sig; @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell ret = lan78xx_read_reg(dev, HW_CFG, &buf); buf |= HW_CFG_LRST_; -@@ -2526,6 +2531,9 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2534,6 +2539,9 @@ static int lan78xx_reset(struct lan78xx_ ret = lan78xx_read_reg(dev, HW_CFG, &buf); buf |= HW_CFG_MEF_; @@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell ret = lan78xx_write_reg(dev, HW_CFG, buf); ret = lan78xx_read_reg(dev, USB_CFG0, &buf); -@@ -2581,6 +2589,9 @@ static int lan78xx_reset(struct lan78xx_ +@@ -2589,6 +2597,9 @@ static int lan78xx_reset(struct lan78xx_ buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_; } } diff --git a/target/linux/bcm27xx/patches-4.19/950-0058-fbdev-add-FBIOCOPYAREA-ioctl.patch b/target/linux/bcm27xx/patches-4.19/950-0058-fbdev-add-FBIOCOPYAREA-ioctl.patch index 16c15d59f2..b7043cc214 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0058-fbdev-add-FBIOCOPYAREA-ioctl.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0058-fbdev-add-FBIOCOPYAREA-ioctl.patch @@ -171,7 +171,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma return -ENOTTY; --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c -@@ -1081,6 +1081,31 @@ fb_blank(struct fb_info *info, int blank +@@ -1085,6 +1085,31 @@ fb_blank(struct fb_info *info, int blank } EXPORT_SYMBOL(fb_blank); @@ -203,7 +203,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { -@@ -1091,6 +1116,7 @@ static long do_fb_ioctl(struct fb_info * +@@ -1095,6 +1120,7 @@ static long do_fb_ioctl(struct fb_info * struct fb_cmap cmap_from; struct fb_cmap_user cmap; struct fb_event event; @@ -211,7 +211,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma void __user *argp = (void __user *)arg; long ret = 0; -@@ -1208,6 +1234,15 @@ static long do_fb_ioctl(struct fb_info * +@@ -1212,6 +1238,15 @@ static long do_fb_ioctl(struct fb_info * unlock_fb_info(info); console_unlock(); break; @@ -227,7 +227,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma default: if (!lock_fb_info(info)) return -ENODEV; -@@ -1353,6 +1388,7 @@ static long fb_compat_ioctl(struct file +@@ -1357,6 +1392,7 @@ static long fb_compat_ioctl(struct file case FBIOPAN_DISPLAY: case FBIOGET_CON2FBMAP: case FBIOPUT_CON2FBMAP: diff --git a/target/linux/bcm27xx/patches-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch b/target/linux/bcm27xx/patches-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch index 7aa3c7e745..8b97994673 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0120-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 -@@ -2655,6 +2655,22 @@ static int lan78xx_open(struct net_devic +@@ -2663,6 +2663,22 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/bcm27xx/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/bcm27xx/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch index 2b39efa03b..b35dfa2323 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0127-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); -@@ -2940,8 +2949,14 @@ static int lan78xx_bind(struct lan78xx_n +@@ -2948,8 +2957,14 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_RX_CSUM_ENABLE) dev->net->features |= NETIF_F_RXCSUM; diff --git a/target/linux/bcm27xx/patches-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/target/linux/bcm27xx/patches-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch index 9685f43ee4..c26ba13560 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0128-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 -@@ -2187,6 +2187,22 @@ static int lan78xx_phy_init(struct lan78 +@@ -2195,6 +2195,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 if (phydev->mdio.dev.of_node) { u32 reg; int len; -@@ -2664,22 +2680,6 @@ static int lan78xx_open(struct net_devic +@@ -2672,22 +2688,6 @@ static int lan78xx_open(struct net_devic netif_dbg(dev, ifup, dev->net, "phy initialised successfully"); diff --git a/target/linux/bcm27xx/patches-4.19/950-0259-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/bcm27xx/patches-4.19/950-0259-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch index 1929a882ee..463c211e52 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0259-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0259-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); -@@ -3787,7 +3792,12 @@ static int lan78xx_probe(struct usb_inte +@@ -3795,7 +3800,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/bcm27xx/patches-4.19/950-0316-lan78xx-EEE-support-is-now-a-PHY-property.patch b/target/linux/bcm27xx/patches-4.19/950-0316-lan78xx-EEE-support-is-now-a-PHY-property.patch index b387136beb..dbc74cca8c 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0316-lan78xx-EEE-support-is-now-a-PHY-property.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0316-lan78xx-EEE-support-is-now-a-PHY-property.patch @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -2192,7 +2192,7 @@ static int lan78xx_phy_init(struct lan78 +@@ -2200,7 +2200,7 @@ 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/bcm27xx/patches-4.19/950-0413-lan78xx-use-default-alignment-for-rx-buffers.patch b/target/linux/bcm27xx/patches-4.19/950-0413-lan78xx-use-default-alignment-for-rx-buffers.patch index 9700c2c09f..91fc9075bf 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0413-lan78xx-use-default-alignment-for-rx-buffers.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0413-lan78xx-use-default-alignment-for-rx-buffers.patch @@ -12,7 +12,7 @@ in both dwc_otg and in ipv6 processing. --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -3187,7 +3187,7 @@ static int rx_submit(struct lan78xx_net +@@ -3195,7 +3195,7 @@ static int rx_submit(struct lan78xx_net size_t size = dev->rx_urb_size; int ret = 0; diff --git a/target/linux/generic/backport-4.14/605-0004-tcp_bbr-remove-bbr-tso_segs_goal.patch b/target/linux/generic/backport-4.14/605-0004-tcp_bbr-remove-bbr-tso_segs_goal.patch index 72f086dcc7..a9b02e4686 100644 --- a/target/linux/generic/backport-4.14/605-0004-tcp_bbr-remove-bbr-tso_segs_goal.patch +++ b/target/linux/generic/backport-4.14/605-0004-tcp_bbr-remove-bbr-tso_segs_goal.patch @@ -72,5 +72,5 @@ Signed-off-by: UtsavisGreat bbr->prior_cwnd = 0; - bbr->tso_segs_goal = 0; /* default segs per skb until first ACK */ bbr->rtt_cnt = 0; - bbr->next_rtt_delivered = 0; + bbr->next_rtt_delivered = tp->delivered; bbr->prev_ca_state = TCP_CA_Open; diff --git a/target/linux/generic/backport-4.14/605-0005-net-tcp_bbr-set-tp-snd_ssthresh-to-BDP-upon-STARTUP-exit.patch b/target/linux/generic/backport-4.14/605-0005-net-tcp_bbr-set-tp-snd_ssthresh-to-BDP-upon-STARTUP-exit.patch index 16a98e0e96..e26120e6e1 100644 --- a/target/linux/generic/backport-4.14/605-0005-net-tcp_bbr-set-tp-snd_ssthresh-to-BDP-upon-STARTUP-exit.patch +++ b/target/linux/generic/backport-4.14/605-0005-net-tcp_bbr-set-tp-snd_ssthresh-to-BDP-upon-STARTUP-exit.patch @@ -36,7 +36,7 @@ Signed-off-by: UtsavisGreat bbr->prior_cwnd = 0; + tp->snd_ssthresh = TCP_INFINITE_SSTHRESH; bbr->rtt_cnt = 0; - bbr->next_rtt_delivered = 0; + bbr->next_rtt_delivered = tp->delivered; bbr->prev_ca_state = TCP_CA_Open; @@ -891,7 +894,7 @@ static u32 bbr_undo_cwnd(struct sock *sk static u32 bbr_ssthresh(struct sock *sk) diff --git a/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch b/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch index b16550ef21..712c4910ba 100644 --- a/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch +++ b/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch @@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -1184,18 +1184,6 @@ static bool gc_worker_can_early_drop(con +@@ -1179,18 +1179,6 @@ static bool gc_worker_can_early_drop(con return false; } @@ -39,11 +39,11 @@ Signed-off-by: Felix Fietkau - static void gc_worker(struct work_struct *work) { - unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u); -@@ -1232,10 +1220,8 @@ static void gc_worker(struct work_struct + unsigned long end_time = jiffies + GC_SCAN_MAX_DURATION; +@@ -1222,10 +1210,8 @@ static void gc_worker(struct work_struct + tmp = nf_ct_tuplehash_to_ctrack(h); - scanned++; - if (test_bit(IPS_OFFLOAD_BIT, &tmp->status)) { - nf_ct_offload_timeout(tmp); + if (test_bit(IPS_OFFLOAD_BIT, &tmp->status)) diff --git a/target/linux/generic/backport-4.9/605-0005-tcp_bbr-remove-bbr-tso_segs_goal.patch b/target/linux/generic/backport-4.9/605-0005-tcp_bbr-remove-bbr-tso_segs_goal.patch index f0a36056bb..fed9af90a0 100644 --- a/target/linux/generic/backport-4.9/605-0005-tcp_bbr-remove-bbr-tso_segs_goal.patch +++ b/target/linux/generic/backport-4.9/605-0005-tcp_bbr-remove-bbr-tso_segs_goal.patch @@ -72,5 +72,5 @@ Signed-off-by: Albert I bbr->prior_cwnd = 0; - bbr->tso_segs_goal = 0; /* default segs per skb until first ACK */ bbr->rtt_cnt = 0; - bbr->next_rtt_delivered = 0; + bbr->next_rtt_delivered = tp->delivered; bbr->prev_ca_state = TCP_CA_Open; diff --git a/target/linux/generic/backport-4.9/605-0006-net-tcp_bbr-set-tp-snd_ssthresh-to-BDP-upon-STARTUP-exit.patch b/target/linux/generic/backport-4.9/605-0006-net-tcp_bbr-set-tp-snd_ssthresh-to-BDP-upon-STARTUP-exit.patch index c01e721b6c..acf1335bee 100644 --- a/target/linux/generic/backport-4.9/605-0006-net-tcp_bbr-set-tp-snd_ssthresh-to-BDP-upon-STARTUP-exit.patch +++ b/target/linux/generic/backport-4.9/605-0006-net-tcp_bbr-set-tp-snd_ssthresh-to-BDP-upon-STARTUP-exit.patch @@ -37,7 +37,7 @@ Signed-off-by: Albert I bbr->prior_cwnd = 0; + tp->snd_ssthresh = TCP_INFINITE_SSTHRESH; bbr->rtt_cnt = 0; - bbr->next_rtt_delivered = 0; + bbr->next_rtt_delivered = tp->delivered; bbr->prev_ca_state = TCP_CA_Open; @@ -861,7 +864,7 @@ static u32 bbr_undo_cwnd(struct sock *sk static u32 bbr_ssthresh(struct sock *sk) 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/generic/hack-4.14/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-4.14/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index fecdf3f147..8515129766 100644 --- a/target/linux/generic/hack-4.14/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-4.14/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -133,7 +133,7 @@ connections. */ --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c -@@ -668,3 +668,26 @@ void br_port_flags_change(struct net_bri +@@ -670,3 +670,26 @@ void br_port_flags_change(struct net_bri if (mask & BR_AUTO_MASK) nbp_update_port_count(br); } diff --git a/target/linux/generic/hack-4.19/221-module_exports.patch b/target/linux/generic/hack-4.19/221-module_exports.patch index 005615351a..978ad5e92b 100644 --- a/target/linux/generic/hack-4.19/221-module_exports.patch +++ b/target/linux/generic/hack-4.19/221-module_exports.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau } \ \ /* __*init sections */ \ -@@ -864,6 +874,8 @@ +@@ -865,6 +875,8 @@ EXIT_TEXT \ EXIT_DATA \ EXIT_CALL \ diff --git a/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch index b36760b172..2beae28673 100644 --- a/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch @@ -120,7 +120,7 @@ Signed-off-by: Zhi Chen depends on NETFILTER_ADVANCED --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -2453,6 +2453,10 @@ int nf_conntrack_init_net(struct net *ne +@@ -2426,6 +2426,10 @@ int nf_conntrack_init_net(struct net *ne ret = nf_conntrack_proto_pernet_init(net); if (ret < 0) goto err_proto; diff --git a/target/linux/generic/hack-4.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-4.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index 84deb56275..11232887b3 100644 --- a/target/linux/generic/hack-4.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-4.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -133,7 +133,7 @@ connections. */ --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c -@@ -756,3 +756,26 @@ void br_port_flags_change(struct net_bri +@@ -758,3 +758,26 @@ void br_port_flags_change(struct net_bri if (mask & BR_NEIGH_SUPPRESS) br_recalculate_neigh_suppress_enabled(br); } diff --git a/target/linux/generic/hack-4.9/220-gc_sections.patch b/target/linux/generic/hack-4.9/220-gc_sections.patch index bcf4262b3e..75cc9422f8 100644 --- a/target/linux/generic/hack-4.9/220-gc_sections.patch +++ b/target/linux/generic/hack-4.9/220-gc_sections.patch @@ -380,7 +380,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__stop___modver) = .; \ . = ALIGN((align)); \ VMLINUX_SYMBOL(__end_rodata) = .; \ -@@ -500,7 +501,7 @@ +@@ -501,7 +502,7 @@ #define ENTRY_TEXT \ ALIGN_FUNCTION(); \ VMLINUX_SYMBOL(__entry_text_start) = .; \ @@ -389,7 +389,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__entry_text_end) = .; #if defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN) -@@ -538,7 +539,7 @@ +@@ -539,7 +540,7 @@ . = ALIGN(align); \ __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___ex_table) = .; \ @@ -398,7 +398,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__stop___ex_table) = .; \ } -@@ -554,9 +555,9 @@ +@@ -555,9 +556,9 @@ #ifdef CONFIG_CONSTRUCTORS #define KERNEL_CTORS() . = ALIGN(8); \ VMLINUX_SYMBOL(__ctors_start) = .; \ @@ -410,7 +410,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__ctors_end) = .; #else #define KERNEL_CTORS() -@@ -613,7 +614,7 @@ +@@ -614,7 +615,7 @@ #define SBSS(sbss_align) \ . = ALIGN(sbss_align); \ .sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \ @@ -419,7 +419,7 @@ Signed-off-by: Gabor Juhos *(.scommon) \ } -@@ -682,7 +683,7 @@ +@@ -683,7 +684,7 @@ . = ALIGN(8); \ __bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start___bug_table) = .; \ @@ -428,7 +428,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__stop___bug_table) = .; \ } #else -@@ -694,7 +695,7 @@ +@@ -695,7 +696,7 @@ . = ALIGN(4); \ .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__tracedata_start) = .; \ @@ -437,7 +437,7 @@ Signed-off-by: Gabor Juhos VMLINUX_SYMBOL(__tracedata_end) = .; \ } #else -@@ -711,7 +712,7 @@ +@@ -712,7 +713,7 @@ #define INIT_SETUP(initsetup_align) \ . = ALIGN(initsetup_align); \ VMLINUX_SYMBOL(__setup_start) = .; \ diff --git a/target/linux/generic/hack-4.9/221-module_exports.patch b/target/linux/generic/hack-4.9/221-module_exports.patch index 3fb5551973..9a4bd2068f 100644 --- a/target/linux/generic/hack-4.9/221-module_exports.patch +++ b/target/linux/generic/hack-4.9/221-module_exports.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau } \ \ /* __*init sections */ \ -@@ -769,6 +779,8 @@ +@@ -770,6 +780,8 @@ EXIT_TEXT \ EXIT_DATA \ EXIT_CALL \ diff --git a/target/linux/generic/hack-4.9/951-bridge-Add-new-bridge-APIs-needed-for-network-HW-acc.patch b/target/linux/generic/hack-4.9/951-bridge-Add-new-bridge-APIs-needed-for-network-HW-acc.patch index 83c5d7fb36..78dea56445 100644 --- a/target/linux/generic/hack-4.9/951-bridge-Add-new-bridge-APIs-needed-for-network-HW-acc.patch +++ b/target/linux/generic/hack-4.9/951-bridge-Add-new-bridge-APIs-needed-for-network-HW-acc.patch @@ -36,7 +36,7 @@ Signed-off-by: Murat Sezgin extern br_should_route_hook_t __rcu *br_should_route_hook; --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c -@@ -669,3 +669,28 @@ void br_port_flags_change(struct net_bri +@@ -671,3 +671,28 @@ void br_port_flags_change(struct net_bri if (mask & BR_AUTO_MASK) nbp_update_port_count(br); } diff --git a/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch b/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch index 520c7bd371..f5154403a8 100644 --- a/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch +++ b/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch @@ -1132,7 +1132,7 @@ /* Interface address info used in eth_type_trans() */ unsigned char *dev_addr; -@@ -3969,6 +3974,19 @@ static inline void netif_tx_unlock_bh(st +@@ -3973,6 +3978,19 @@ static inline void netif_tx_unlock_bh(st } \ } diff --git a/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch b/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch index d0eca7415b..761305ef20 100644 --- a/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch +++ b/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch @@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos /* * The Mellanox Tavor device gives false positive parity errors. Mark this * device with a broken_parity_status to allow PCI scanning code to "skip" -@@ -3227,6 +3228,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -3228,6 +3229,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); @@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos /* * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. * To work around this, query the size it should be configured to by the -@@ -3252,6 +3255,8 @@ static void quirk_intel_ntb(struct pci_d +@@ -3253,6 +3256,8 @@ static void quirk_intel_ntb(struct pci_d DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb); @@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos /* * Some BIOS implementations leave the Intel GPU interrupts enabled, even * though no one is handling them (e.g., if the i915 driver is never -@@ -3290,6 +3295,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN +@@ -3291,6 +3296,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq); 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 865d6c0bce..b666fc9e32 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/layerscape/patches-4.14/807-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch index 43e680c543..873024ecfb 100644 --- a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch @@ -528,7 +528,7 @@ Signed-off-by: Zhao Chenhui reg &= ~DWC3_DCTL_INITU2ENA; --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c -@@ -3245,6 +3245,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3244,6 +3244,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) { int ret; int irq; @@ -536,7 +536,7 @@ Signed-off-by: Zhao Chenhui irq = dwc3_gadget_get_irq(dwc); if (irq < 0) { -@@ -3323,6 +3324,12 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3322,6 +3323,12 @@ int dwc3_gadget_init(struct dwc3 *dwc) dwc3_gadget_set_speed(&dwc->gadget, dwc->maximum_speed); 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); diff --git a/target/linux/x86/patches-4.9/901-x86-fpu-Fix-x86-fpu-Legacy-x87-FPU-detected-message.patch b/target/linux/x86/patches-4.9/901-x86-fpu-Fix-x86-fpu-Legacy-x87-FPU-detected-message.patch index 82fa5d909e..84997ed997 100644 --- a/target/linux/x86/patches-4.9/901-x86-fpu-Fix-x86-fpu-Legacy-x87-FPU-detected-message.patch +++ b/target/linux/x86/patches-4.9/901-x86-fpu-Fix-x86-fpu-Legacy-x87-FPU-detected-message.patch @@ -1,6 +1,6 @@ --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c -@@ -703,8 +703,14 @@ void __init fpu__init_system_xstate(void +@@ -735,8 +735,14 @@ void __init fpu__init_system_xstate(void WARN_ON_FPU(!on_boot_cpu); on_boot_cpu = 0;