From 2f87d28880a0f75a04858b98117d6464f0a08f79 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 5 Mar 2021 16:32:13 +0800 Subject: [PATCH] kernel: 5.10: refresh generic and rockchip patches Signed-off-by: Tianling Shen --- ...k-events-support-multiple-registrant.patch | 4 +- ...-linux-kernel-to-support-shortcut-fe.patch | 37 +++++++++---------- .../993-usb-serial-option-add-u9300.patch | 8 ++-- ...add-compatible-to-NanoPi-R2S-etherne.patch | 2 +- ...ckchip-enable-LAN-port-on-NanoPi-R2S.patch | 4 +- ...dd-OF-node-for-USB-eth-on-NanoPi-R2S.patch | 2 +- ...8-add-i2c0-controller-for-nanopi-r2s.patch | 2 +- ...ip-add-hardware-random-number-genera.patch | 2 +- 8 files changed, 30 insertions(+), 31 deletions(-) diff --git a/target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch index 2981c3d906..b9743c9681 100644 --- a/target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch @@ -93,7 +93,7 @@ depends on NETFILTER_ADVANCED --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -2748,6 +2748,9 @@ int nf_conntrack_init_net(struct net *ne +@@ -2744,6 +2744,9 @@ int nf_conntrack_init_net(struct net *ne nf_conntrack_helper_pernet_init(net); nf_conntrack_proto_pernet_init(net); @@ -273,7 +273,7 @@ struct nf_conn *ct = item->ct; struct sk_buff *skb; unsigned int type; -@@ -3783,9 +3790,15 @@ static int ctnetlink_stat_exp_cpu(struct +@@ -3784,9 +3791,15 @@ static int ctnetlink_stat_exp_cpu(struct } #ifdef CONFIG_NF_CONNTRACK_EVENTS diff --git a/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index ece2b89af1..e6ac67c6f8 100644 --- a/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -1,6 +1,6 @@ --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h -@@ -52,6 +52,9 @@ struct br_ip_list { +@@ -61,6 +61,9 @@ struct br_ip_list { extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *)); @@ -12,7 +12,7 @@ struct list_head *br_ip_list); --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -826,6 +826,10 @@ struct sk_buff { +@@ -860,6 +860,10 @@ struct sk_buff { #endif __u8 gro_skip:1; @@ -49,7 +49,7 @@ int (*fcn)(unsigned int events, struct nf_ct_event *item); --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c -@@ -746,6 +746,28 @@ void br_port_flags_change(struct net_bri +@@ -762,6 +762,28 @@ void br_port_flags_change(struct net_bri br_recalculate_neigh_suppress_enabled(br); } @@ -78,10 +78,9 @@ bool br_port_flag_is_set(const struct net_device *dev, unsigned long flag) { struct net_bridge_port *p; - --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3189,8 +3189,17 @@ static int xmit_one(struct sk_buff *skb, struct net_device *dev, +@@ -3602,8 +3602,17 @@ static int xmit_one(struct sk_buff *skb, unsigned int len; int rc; @@ -97,9 +96,9 @@ + } +#endif - #ifdef CONFIG_ETHERNET_PACKET_MANGLE - if (!dev->eth_mangle_tx || -@@ -4683,6 +4691,11 @@ void netdev_rx_handler_unregister(struct + len = skb->len; + PRANDOM_ADD_NOISE(skb, dev, txq, len + jiffies); +@@ -5108,6 +5117,11 @@ void netdev_rx_handler_unregister(struct } EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); @@ -111,7 +110,7 @@ /* * Limit the use of PFMEMALLOC reserves to those protocols that implement * the special handling of PFMEMALLOC skbs. -@@ -4733,6 +4746,10 @@ static int __netif_receive_skb_core(stru +@@ -5156,6 +5170,10 @@ static int __netif_receive_skb_core(stru int ret = NET_RX_DROP; __be16 type; @@ -122,7 +121,7 @@ net_timestamp_check(!netdev_tstamp_prequeue, skb); trace_netif_receive_skb(skb); -@@ -4772,6 +4789,16 @@ another_round: +@@ -5195,6 +5213,16 @@ another_round: goto out; } @@ -141,7 +140,7 @@ --- a/net/Kconfig +++ b/net/Kconfig -@@ -473,3 +473,6 @@ config HAVE_CBPF_JIT +@@ -475,3 +475,6 @@ config HAVE_CBPF_JIT # Extended BPF JIT (eBPF) config HAVE_EBPF_JIT bool @@ -172,7 +171,7 @@ static int nf_ct_tcp_loose __read_mostly = 1; --- a/net/netfilter/nf_conntrack_ecache.c +++ b/net/netfilter/nf_conntrack_ecache.c -@@ -162,7 +162,11 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct, +@@ -171,7 +171,11 @@ int nf_conntrack_eventmask_report(unsign rcu_read_lock(); notify = rcu_dereference(net->ct.nf_conntrack_event_cb); @@ -184,7 +183,7 @@ goto out_unlock; e = nf_ct_ecache_find(ct); -@@ -181,7 +185,14 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct, +@@ -190,7 +194,14 @@ int nf_conntrack_eventmask_report(unsign if (!((eventmask | missed) & e->ctmask)) goto out_unlock; @@ -199,7 +198,7 @@ if (unlikely(ret < 0 || missed)) { spin_lock_bh(&ct->lock); if (ret < 0) { -@@ -263,7 +274,11 @@ void nf_ct_deliver_cached_events(struct nf_conn *ct) +@@ -272,7 +283,11 @@ void nf_ct_deliver_cached_events(struct rcu_read_lock(); notify = rcu_dereference(net->ct.nf_conntrack_event_cb); @@ -210,8 +209,8 @@ +#endif goto out_unlock; - e = nf_ct_ecache_find(ct); -@@ -287,7 +302,15 @@ void nf_ct_deliver_cached_events(struct nf_conn *ct) + if (!nf_ct_is_confirmed(ct) || nf_ct_is_dying(ct)) +@@ -296,7 +311,15 @@ void nf_ct_deliver_cached_events(struct item.portid = 0; item.report = 0; @@ -227,9 +226,9 @@ if (likely(ret == 0 && !missed)) goto out_unlock; -@@ -340,6 +363,11 @@ int nf_conntrack_register_notifier(struct net *net, struct notifier_block *nb) +@@ -350,6 +373,11 @@ int nf_conntrack_register_notifier(struc { - return atomic_notifier_chain_register(&net->ct.nf_conntrack_chain, nb); + return atomic_notifier_chain_register(&net->ct.nf_conntrack_chain, nb); } +int nf_conntrack_register_chain_notifier(struct net *net, struct notifier_block *nb) +{ @@ -239,7 +238,7 @@ #else int nf_conntrack_register_notifier(struct net *net, struct nf_ct_event_notifier *new) -@@ -369,6 +397,11 @@ int nf_conntrack_unregister_notifier(struct net *net, struct notifier_block *nb) +@@ -379,6 +407,11 @@ int nf_conntrack_unregister_notifier(str { return atomic_notifier_chain_unregister(&net->ct.nf_conntrack_chain, nb); } diff --git a/target/linux/generic/hack-5.10/993-usb-serial-option-add-u9300.patch b/target/linux/generic/hack-5.10/993-usb-serial-option-add-u9300.patch index 9c8768154f..a819283239 100644 --- a/target/linux/generic/hack-5.10/993-usb-serial-option-add-u9300.patch +++ b/target/linux/generic/hack-5.10/993-usb-serial-option-add-u9300.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1368,6 +1368,7 @@ static const struct usb_device_id produc +@@ -1350,6 +1350,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_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */ --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -382,6 +382,7 @@ static void option_instat_callback(struc +@@ -383,6 +383,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 * -@@ -573,6 +574,16 @@ static void option_instat_callback(struc +@@ -580,6 +581,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) }, -@@ -607,6 +618,8 @@ static const struct usb_device_id option +@@ -614,6 +625,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/rockchip/patches-5.10/005-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch b/target/linux/rockchip/patches-5.10/005-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch index 897a42fea2..085dd392c9 100644 --- a/target/linux/rockchip/patches-5.10/005-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch +++ b/target/linux/rockchip/patches-5.10/005-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch @@ -14,7 +14,7 @@ Signed-off-by: David Bauer --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -134,6 +134,8 @@ +@@ -138,6 +138,8 @@ #size-cells = <0>; rtl8211e: ethernet-phy@1 { diff --git a/target/linux/rockchip/patches-5.10/102-rockchip-enable-LAN-port-on-NanoPi-R2S.patch b/target/linux/rockchip/patches-5.10/102-rockchip-enable-LAN-port-on-NanoPi-R2S.patch index 243c1ac78d..82e2137a8b 100644 --- a/target/linux/rockchip/patches-5.10/102-rockchip-enable-LAN-port-on-NanoPi-R2S.patch +++ b/target/linux/rockchip/patches-5.10/102-rockchip-enable-LAN-port-on-NanoPi-R2S.patch @@ -32,7 +32,7 @@ Signed-off-by: David Bauer leds { compatible = "gpio-leds"; pinctrl-0 = <&lan_led_pin>, <&sys_led_pin>, <&wan_led_pin>; -@@ -269,6 +281,12 @@ +@@ -273,6 +285,12 @@ }; }; }; @@ -45,7 +45,7 @@ Signed-off-by: David Bauer }; &io_domains { -@@ -375,3 +393,12 @@ +@@ -379,3 +397,12 @@ &usb_host0_ohci { status = "okay"; }; diff --git a/target/linux/rockchip/patches-5.10/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch b/target/linux/rockchip/patches-5.10/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch index e318f3136f..0acfae5de3 100644 --- a/target/linux/rockchip/patches-5.10/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch +++ b/target/linux/rockchip/patches-5.10/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch @@ -14,7 +14,7 @@ Signed-off-by: David Bauer --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -401,4 +401,11 @@ +@@ -405,4 +405,11 @@ &usbdrd_dwc3 { dr_mode = "host"; status = "okay"; diff --git a/target/linux/rockchip/patches-5.10/201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch b/target/linux/rockchip/patches-5.10/201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch index 28798047fd..edf007eefa 100644 --- a/target/linux/rockchip/patches-5.10/201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch +++ b/target/linux/rockchip/patches-5.10/201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch @@ -9,7 +9,7 @@ Subject: [PATCH] rockchip: rk3328: add i2c0 controller for nanopi r2s --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -165,6 +165,10 @@ +@@ -169,6 +169,10 @@ }; }; diff --git a/target/linux/rockchip/patches-5.10/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch b/target/linux/rockchip/patches-5.10/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch index 1de560e33f..4f18b5c8d5 100644 --- a/target/linux/rockchip/patches-5.10/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch +++ b/target/linux/rockchip/patches-5.10/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch @@ -31,7 +31,7 @@ Signed-off-by: wevsty reg = <0x0 0xff100000 0x0 0x1000>; --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -1906,6 +1906,16 @@ +@@ -1905,6 +1905,16 @@ }; };