From e89c161dde14dde9bbb0e44150417b7f2de4ae49 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 26 Dec 2020 11:38:34 +0800 Subject: [PATCH] linux: refresh kernel patches Signed-off-by: CN_SZTL --- .../930-ar8216-make-reg-access-atomic.patch | 6 +++--- ...t-patch-linux-kernel-to-support-shortcut-fe.patch | 12 ++++++------ .../hack-5.4/993-usb-serial-option-add-u9300.patch | 8 ++++---- .../901-essedma-disable-default-vlan-tagging.patch | 2 +- .../102-rockchip-enable-LAN-port-on-NanoPi-R2S.patch | 4 ++-- ...kchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch | 2 +- ...p-rk3328-add-i2c0-controller-for-nanopi-r2s.patch | 2 +- ...-rockchip-add-hardware-random-number-genera.patch | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/target/linux/ath79/patches-5.4/930-ar8216-make-reg-access-atomic.patch b/target/linux/ath79/patches-5.4/930-ar8216-make-reg-access-atomic.patch index 2378d1502e..02f763534e 100644 --- a/target/linux/ath79/patches-5.4/930-ar8216-make-reg-access-atomic.patch +++ b/target/linux/ath79/patches-5.4/930-ar8216-make-reg-access-atomic.patch @@ -14,7 +14,7 @@ with interrupts used. --- --- a/drivers/net/phy/ar8216.c +++ b/drivers/net/phy/ar8216.c -@@ -238,6 +238,7 @@ ar8xxx_mii_write32(struct ar8xxx_priv *p +@@ -252,6 +252,7 @@ ar8xxx_mii_write32(struct ar8xxx_priv *p u32 ar8xxx_read(struct ar8xxx_priv *priv, int reg) { @@ -22,7 +22,7 @@ with interrupts used. struct mii_bus *bus = priv->mii_bus; u16 r1, r2, page; u32 val; -@@ -245,11 +246,13 @@ ar8xxx_read(struct ar8xxx_priv *priv, in +@@ -259,11 +260,13 @@ ar8xxx_read(struct ar8xxx_priv *priv, in split_addr((u32) reg, &r1, &r2, &page); mutex_lock(&bus->mdio_lock); @@ -36,7 +36,7 @@ with interrupts used. mutex_unlock(&bus->mdio_lock); return val; -@@ -258,17 +261,20 @@ ar8xxx_read(struct ar8xxx_priv *priv, in +@@ -272,17 +275,20 @@ ar8xxx_read(struct ar8xxx_priv *priv, in void ar8xxx_write(struct ar8xxx_priv *priv, int reg, u32 val) { diff --git a/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index 96ace539de..04a3839233 100644 --- a/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -80,7 +80,7 @@ struct net_bridge_port *p; --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3198,9 +3198,17 @@ static int xmit_one(struct sk_buff *skb, +@@ -3199,9 +3199,17 @@ static int xmit_one(struct sk_buff *skb, if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) #endif @@ -99,7 +99,7 @@ #ifdef CONFIG_ETHERNET_PACKET_MANGLE if (!dev->eth_mangle_tx || (skb = dev->eth_mangle_tx(dev, skb)) != NULL) -@@ -4694,6 +4702,11 @@ void netdev_rx_handler_unregister(struct +@@ -4695,6 +4703,11 @@ void netdev_rx_handler_unregister(struct } EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); @@ -111,7 +111,7 @@ /* * Limit the use of PFMEMALLOC reserves to those protocols that implement * the special handling of PFMEMALLOC skbs. -@@ -4744,6 +4757,10 @@ static int __netif_receive_skb_core(stru +@@ -4745,6 +4758,10 @@ static int __netif_receive_skb_core(stru int ret = NET_RX_DROP; __be16 type; @@ -122,7 +122,7 @@ net_timestamp_check(!netdev_tstamp_prequeue, skb); trace_netif_receive_skb(skb); -@@ -4783,6 +4800,16 @@ another_round: +@@ -4784,6 +4801,16 @@ another_round: goto out; } @@ -227,7 +227,7 @@ if (likely(ret == 0 && !missed)) goto out_unlock; -@@ -337,6 +358,11 @@ int nf_conntrack_register_notifier(struc +@@ -337,6 +360,11 @@ int nf_conntrack_register_notifier(struc { return atomic_notifier_chain_register(&net->ct.nf_conntrack_chain, nb); } @@ -239,7 +239,7 @@ #else int nf_conntrack_register_notifier(struct net *net, struct nf_ct_event_notifier *new) -@@ -366,6 +392,11 @@ int nf_conntrack_unregister_notifier(str +@@ -366,6 +394,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.4/993-usb-serial-option-add-u9300.patch b/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch index 9c8768154f..4193fd013a 100644 --- a/target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch +++ b/target/linux/generic/hack-5.4/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 +@@ -1369,6 +1369,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 +@@ -575,6 +576,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 +@@ -609,6 +620,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/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 6916c08294..c302fb2928 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 @@ -34,7 +34,7 @@ Signed-off-by: Chen Minqiang interrupts = <0 65 IRQ_TYPE_EDGE_RISING 0 66 IRQ_TYPE_EDGE_RISING 0 67 IRQ_TYPE_EDGE_RISING -@@ -704,7 +704,7 @@ +@@ -704,7 +703,7 @@ gmac0: gmac0 { local-mac-address = [00 00 00 00 00 00]; diff --git a/target/linux/rockchip/patches-5.4/102-rockchip-enable-LAN-port-on-NanoPi-R2S.patch b/target/linux/rockchip/patches-5.4/102-rockchip-enable-LAN-port-on-NanoPi-R2S.patch index aa8f72e84b..37dcb88948 100644 --- a/target/linux/rockchip/patches-5.4/102-rockchip-enable-LAN-port-on-NanoPi-R2S.patch +++ b/target/linux/rockchip/patches-5.4/102-rockchip-enable-LAN-port-on-NanoPi-R2S.patch @@ -32,7 +32,7 @@ Signed-off-by: David Bauer }; &cpu0 { -@@ -318,6 +330,12 @@ +@@ -320,6 +332,12 @@ rockchip,pins = <1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>; }; }; @@ -45,7 +45,7 @@ Signed-off-by: David Bauer }; &pwm2 { -@@ -373,3 +391,12 @@ +@@ -375,3 +393,12 @@ &usb_host0_ohci { status = "okay"; }; diff --git a/target/linux/rockchip/patches-5.4/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch b/target/linux/rockchip/patches-5.4/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch index 473c265016..e318f3136f 100644 --- a/target/linux/rockchip/patches-5.4/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch +++ b/target/linux/rockchip/patches-5.4/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 -@@ -399,4 +399,11 @@ +@@ -401,4 +401,11 @@ &usbdrd_dwc3 { dr_mode = "host"; status = "okay"; diff --git a/target/linux/rockchip/patches-5.4/104-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch b/target/linux/rockchip/patches-5.4/104-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch index 30dbcc17a4..28798047fd 100644 --- a/target/linux/rockchip/patches-5.4/104-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch +++ b/target/linux/rockchip/patches-5.4/104-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 -@@ -163,6 +163,10 @@ +@@ -165,6 +165,10 @@ }; }; diff --git a/target/linux/rockchip/patches-5.4/106-arm64-dts-rockchip-add-hardware-random-number-genera.patch b/target/linux/rockchip/patches-5.4/106-arm64-dts-rockchip-add-hardware-random-number-genera.patch index 75e283ab3e..3e21ee2e74 100644 --- a/target/linux/rockchip/patches-5.4/106-arm64-dts-rockchip-add-hardware-random-number-genera.patch +++ b/target/linux/rockchip/patches-5.4/106-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 -@@ -1879,6 +1879,16 @@ +@@ -1882,6 +1882,16 @@ }; };