diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 0325cf318..6e2453a98 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-5.4 = .150 -LINUX_VERSION-5.10 = .72 +LINUX_VERSION-5.10 = .73 LINUX_KERNEL_HASH-5.4.150 = f424a9bbb05007f04c17f96a2e4f041a8001554a9060d2c291606e8a97c62aa2 -LINUX_KERNEL_HASH-5.10.72 = b4d635afe7646ac6a6617c738e747ba0a6006675cd9735d18f672f8b1fba4c7c +LINUX_KERNEL_HASH-5.10.73 = edb228032b23efa14077a68d968bc5b0d4026c1d1ef8bb958547a87ccb030e76 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-5.10/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch index 1ade1e918..818d9803c 100644 --- a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch @@ -682,7 +682,7 @@ struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh) --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c -@@ -415,7 +415,7 @@ static void tcp_sack(const struct sk_buf +@@ -423,7 +423,7 @@ static void tcp_sack(const struct sk_buf /* Fast path for timestamp-only option */ if (length == TCPOLEN_TSTAMP_ALIGNED diff --git a/target/linux/bmips/patches-5.10/510-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch b/target/linux/bmips/patches-5.10/510-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch index 41655231f..45872f8c1 100644 --- a/target/linux/bmips/patches-5.10/510-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch +++ b/target/linux/bmips/patches-5.10/510-net-dsa-b53-add-support-for-BCM63xx-RGMIIs.patch @@ -58,7 +58,7 @@ Signed-off-by: Álvaro Fernández Rojas + b53_adjust_63xx_rgmii(ds, port, phydev->interface); + if (is531x5(dev) && phy_interface_is_rgmii(phydev)) { - if (port == 8) + if (port == dev->imp_port) off = B53_RGMII_CTRL_IMP; @@ -1366,6 +1399,9 @@ void b53_phylink_mac_link_up(struct dsa_ { diff --git a/target/linux/generic/hack-5.10/220-gc_sections.patch b/target/linux/generic/hack-5.10/220-gc_sections.patch index 810c5aecf..e4226b031 100644 --- a/target/linux/generic/hack-5.10/220-gc_sections.patch +++ b/target/linux/generic/hack-5.10/220-gc_sections.patch @@ -22,7 +22,7 @@ Signed-off-by: Gabor Juhos select OF_EARLY_FLATTREE if OF --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile -@@ -98,6 +98,7 @@ $(foreach o, $(libfdt_objs) atags_to_fdt +@@ -100,6 +100,7 @@ $(foreach o, $(libfdt_objs) atags_to_fdt ifdef building_out_of_srctree $(shell rm -f $(addprefix $(obj)/, fdt_rw.c fdt_ro.c fdt_wip.c fdt.c)) endif diff --git a/target/linux/generic/hack-5.10/410-block-fit-partition-parser.patch b/target/linux/generic/hack-5.10/410-block-fit-partition-parser.patch index 385b00422..c417c78eb 100644 --- a/target/linux/generic/hack-5.10/410-block-fit-partition-parser.patch +++ b/target/linux/generic/hack-5.10/410-block-fit-partition-parser.patch @@ -252,4 +252,4 @@ + FIT_PARTITION = 0x2e, /* U-Boot uImage.FIT */ SOLARIS_X86_PARTITION = 0x82, /* also Linux swap partitions */ NEW_SOLARIS_X86_PARTITION = 0xbf, - + 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 ed49d1123..923bec69b 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 @@ -84,7 +84,7 @@ Signed-off-by: Zhi Chen #else --- a/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h -@@ -112,7 +112,11 @@ struct netns_ct { +@@ -120,7 +120,11 @@ struct netns_ct { struct ct_pcpu __percpu *pcpu_lists; struct ip_conntrack_stat __percpu *stat; @@ -115,7 +115,7 @@ Signed-off-by: Zhi Chen depends on NETFILTER_ADVANCED --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -2744,6 +2744,9 @@ int nf_conntrack_init_net(struct net *ne +@@ -2726,6 +2726,9 @@ int nf_conntrack_init_net(struct net *ne nf_conntrack_helper_pernet_init(net); nf_conntrack_proto_pernet_init(net); @@ -274,7 +274,7 @@ Signed-off-by: Zhi Chen int nf_ct_expect_register_notifier(struct net *net, --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c -@@ -703,13 +703,20 @@ static size_t ctnetlink_nlmsg_size(const +@@ -706,13 +706,20 @@ static size_t ctnetlink_nlmsg_size(const } static int @@ -295,7 +295,7 @@ Signed-off-by: Zhi Chen struct nf_conn *ct = item->ct; struct sk_buff *skb; unsigned int type; -@@ -3784,9 +3791,15 @@ static int ctnetlink_stat_exp_cpu(struct +@@ -3788,9 +3795,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 d952c8fae..058263a2a 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 @@ -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 -@@ -762,6 +762,28 @@ void br_port_flags_change(struct net_bri +@@ -779,6 +779,28 @@ void br_port_flags_change(struct net_bri br_recalculate_neigh_suppress_enabled(br); } @@ -80,7 +80,7 @@ struct net_bridge_port *p; --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3623,8 +3623,17 @@ static int xmit_one(struct sk_buff *skb, +@@ -3635,8 +3635,17 @@ static int xmit_one(struct sk_buff *skb, unsigned int len; int rc; @@ -98,7 +98,7 @@ len = skb->len; PRANDOM_ADD_NOISE(skb, dev, txq, len + jiffies); -@@ -5147,6 +5156,11 @@ void netdev_rx_handler_unregister(struct +@@ -5178,6 +5187,11 @@ void netdev_rx_handler_unregister(struct } EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); @@ -110,7 +110,7 @@ /* * Limit the use of PFMEMALLOC reserves to those protocols that implement * the special handling of PFMEMALLOC skbs. -@@ -5195,6 +5209,10 @@ static int __netif_receive_skb_core(stru +@@ -5226,6 +5240,10 @@ static int __netif_receive_skb_core(stru int ret = NET_RX_DROP; __be16 type; @@ -121,7 +121,7 @@ net_timestamp_check(!netdev_tstamp_prequeue, skb); trace_netif_receive_skb(skb); -@@ -5234,6 +5252,16 @@ another_round: +@@ -5265,6 +5283,16 @@ another_round: goto out; } diff --git a/target/linux/ipq807x/patches-5.10/012-v5.11-PCI-dwc-Rework-MSI-initialization.patch b/target/linux/ipq807x/patches-5.10/012-v5.11-PCI-dwc-Rework-MSI-initialization.patch index bffa02507..eac6c12fa 100644 --- a/target/linux/ipq807x/patches-5.10/012-v5.11-PCI-dwc-Rework-MSI-initialization.patch +++ b/target/linux/ipq807x/patches-5.10/012-v5.11-PCI-dwc-Rework-MSI-initialization.patch @@ -174,7 +174,7 @@ Cc: linuxppc-dev@lists.ozlabs.org u32 cfg0_size; --- a/drivers/pci/controller/dwc/pcie-intel-gw.c +++ b/drivers/pci/controller/dwc/pcie-intel-gw.c -@@ -401,14 +401,6 @@ static int intel_pcie_rc_init(struct pci +@@ -403,14 +403,6 @@ static int intel_pcie_rc_init(struct pci return intel_pcie_host_setup(lpp); } @@ -189,7 +189,7 @@ Cc: linuxppc-dev@lists.ozlabs.org static u64 intel_pcie_cpu_addr(struct dw_pcie *pcie, u64 cpu_addr) { return cpu_addr + BUS_IATU_OFFSET; -@@ -420,7 +412,6 @@ static const struct dw_pcie_ops intel_pc +@@ -422,7 +414,6 @@ static const struct dw_pcie_ops intel_pc static const struct dw_pcie_host_ops intel_pcie_dw_ops = { .host_init = intel_pcie_rc_init, diff --git a/target/linux/ipq807x/patches-5.10/118-arm64-dts-ipq8074-Fixup-PCIe-dts-nodes.patch b/target/linux/ipq807x/patches-5.10/118-arm64-dts-ipq8074-Fixup-PCIe-dts-nodes.patch index 8ff39ad6b..62dab4aac 100644 --- a/target/linux/ipq807x/patches-5.10/118-arm64-dts-ipq8074-Fixup-PCIe-dts-nodes.patch +++ b/target/linux/ipq807x/patches-5.10/118-arm64-dts-ipq8074-Fixup-PCIe-dts-nodes.patch @@ -95,21 +95,6 @@ Signed-off-by: Sivaprakash Murugesan }; mdio: mdio@90000 { -@@ -671,10 +703,10 @@ - - pcie1: pci@10000000 { - compatible = "qcom,pcie-ipq8074"; -- reg = <0x10000000 0xf1d>, -- <0x10000f20 0xa8>, -- <0x00088000 0x2000>, -- <0x10100000 0x1000>; -+ reg = <0x10000000 0xf1d>, -+ <0x10000f20 0xa8>, -+ <0x00088000 0x2000>, -+ <0x10100000 0x1000>; - reg-names = "dbi", "elbi", "parf", "config"; - device_type = "pci"; - linux,pci-domain = <1>; @@ -687,9 +719,9 @@ phy-names = "pciephy"; diff --git a/target/linux/ipq807x/patches-5.10/140-clk-qcom-ipq8074-make-apss-clock-as-child-of-mailbox.patch b/target/linux/ipq807x/patches-5.10/140-clk-qcom-ipq8074-make-apss-clock-as-child-of-mailbox.patch index dbad03980..995e65676 100644 --- a/target/linux/ipq807x/patches-5.10/140-clk-qcom-ipq8074-make-apss-clock-as-child-of-mailbox.patch +++ b/target/linux/ipq807x/patches-5.10/140-clk-qcom-ipq8074-make-apss-clock-as-child-of-mailbox.patch @@ -90,7 +90,7 @@ Change-Id: Ic26ee78b6f680fa0655a73d3176bae271725ab05 apcs = devm_kzalloc(&pdev->dev, sizeof(*apcs), GFP_KERNEL); if (!apcs) -@@ -125,9 +136,10 @@ ret = devm_mbox_controller_register(&pdev->dev +@@ -125,9 +136,10 @@ static int qcom_apcs_ipc_probe(struct pl return ret; } diff --git a/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch b/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch index 99d5f6e8d..7870884c7 100644 --- a/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch +++ b/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch @@ -322,7 +322,7 @@ if (swdev_notify) br_switchdev_fdb_notify(br, fdb, type); -@@ -1302,3 +1364,44 @@ void br_fdb_clear_offload(const struct n +@@ -1317,3 +1379,44 @@ void br_fdb_clear_offload(const struct n spin_unlock_bh(&p->br->hash_lock); } EXPORT_SYMBOL_GPL(br_fdb_clear_offload); @@ -382,7 +382,7 @@ /* * Determine initial path cost based on speed. * using recommendations from 802.1d standard -@@ -697,6 +703,8 @@ int br_add_if(struct net_bridge *br, str +@@ -711,6 +717,8 @@ int br_add_if(struct net_bridge *br, str kobject_uevent(&p->kobj, KOBJ_ADD); @@ -391,7 +391,7 @@ return 0; err7: -@@ -730,6 +738,8 @@ int br_del_if(struct net_bridge *br, str +@@ -747,6 +755,8 @@ int br_del_if(struct net_bridge *br, str if (!p || p->br != br) return -EINVAL; @@ -400,7 +400,7 @@ /* Since more than one interface can be attached to a bridge, * there still maybe an alternate path for netconsole to use; * therefore there is no reason for a NETDEV_RELEASE event. -@@ -795,3 +805,74 @@ bool br_port_flag_is_set(const struct ne +@@ -812,3 +822,74 @@ bool br_port_flag_is_set(const struct ne return p->flags & flag; } EXPORT_SYMBOL_GPL(br_port_flag_is_set); @@ -668,7 +668,7 @@ const struct in6_addr *daddr) --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -3737,6 +3737,9 @@ out_free: +@@ -3748,6 +3748,9 @@ out_free: return ERR_PTR(err); } @@ -678,7 +678,7 @@ int ip6_route_add(struct fib6_config *cfg, gfp_t gfp_flags, struct netlink_ext_ack *extack) { -@@ -3748,6 +3751,10 @@ int ip6_route_add(struct fib6_config *cf +@@ -3759,6 +3762,10 @@ int ip6_route_add(struct fib6_config *cf return PTR_ERR(rt); err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack); @@ -689,7 +689,7 @@ fib6_info_release(rt); return err; -@@ -3769,6 +3776,9 @@ static int __ip6_del_rt(struct fib6_info +@@ -3780,6 +3787,9 @@ static int __ip6_del_rt(struct fib6_info err = fib6_del(rt, info); spin_unlock_bh(&table->tb6_lock); @@ -699,7 +699,7 @@ out: fib6_info_release(rt); return err; -@@ -6120,6 +6130,20 @@ static int ip6_route_dev_notify(struct n +@@ -6132,6 +6142,20 @@ static int ip6_route_dev_notify(struct n return NOTIFY_OK; } diff --git a/target/linux/ipq807x/patches-5.10/602-qca-add-pppoe-offload-support.patch b/target/linux/ipq807x/patches-5.10/602-qca-add-pppoe-offload-support.patch index b75327bf2..40a5e3536 100644 --- a/target/linux/ipq807x/patches-5.10/602-qca-add-pppoe-offload-support.patch +++ b/target/linux/ipq807x/patches-5.10/602-qca-add-pppoe-offload-support.patch @@ -34,7 +34,7 @@ /* Prototypes. */ static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf, struct file *file, unsigned int cmd, unsigned long arg); -@@ -3283,7 +3303,10 @@ ppp_connect_channel(struct channel *pch, +@@ -3294,7 +3314,10 @@ ppp_connect_channel(struct channel *pch, struct ppp_net *pn; int ret = -ENXIO; int hdrlen; @@ -45,7 +45,7 @@ pn = ppp_pernet(pch->chan_net); mutex_lock(&pn->all_ppp_mutex); -@@ -3314,13 +3337,40 @@ ppp_connect_channel(struct channel *pch, +@@ -3325,13 +3348,40 @@ ppp_connect_channel(struct channel *pch, ++ppp->n_channels; pch->ppp = ppp; refcount_inc(&ppp->file.refcnt); @@ -87,7 +87,7 @@ return ret; } -@@ -3338,6 +3388,13 @@ ppp_disconnect_channel(struct channel *p +@@ -3349,6 +3399,13 @@ ppp_disconnect_channel(struct channel *p pch->ppp = NULL; write_unlock_bh(&pch->upl); if (ppp) { @@ -101,7 +101,7 @@ /* remove it from the ppp unit's list */ ppp_lock(ppp); list_del(&pch->clist); -@@ -3417,6 +3474,222 @@ static void *unit_find(struct idr *p, in +@@ -3428,6 +3485,222 @@ static void *unit_find(struct idr *p, in return idr_find(p, n); } @@ -324,7 +324,7 @@ /* Module/initialization stuff */ module_init(ppp_init); -@@ -3433,6 +3706,7 @@ EXPORT_SYMBOL(ppp_input_error); +@@ -3444,6 +3717,7 @@ EXPORT_SYMBOL(ppp_input_error); EXPORT_SYMBOL(ppp_output_wakeup); EXPORT_SYMBOL(ppp_register_compressor); EXPORT_SYMBOL(ppp_unregister_compressor); diff --git a/target/linux/ipq807x/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch b/target/linux/ipq807x/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch index 616645192..23b0e3139 100644 --- a/target/linux/ipq807x/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch +++ b/target/linux/ipq807x/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch @@ -31,7 +31,7 @@ Change-Id: Ib3cd341e5b2d4dcf552e02e38d3f34a4f00351cd __u8 redirected:1; --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h -@@ -738,6 +738,40 @@ static inline bool skb_skip_tc_classify( +@@ -750,6 +750,40 @@ static inline bool skb_skip_tc_classify( return false; } diff --git a/target/linux/ipq807x/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch b/target/linux/ipq807x/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch index f76ea3147..ac7c81452 100644 --- a/target/linux/ipq807x/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch +++ b/target/linux/ipq807x/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch @@ -35,7 +35,7 @@ Change-Id: Iddb97d6ba0a443b830d1ac23728434a417bc8a92 __u8 redirected:1; --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h -@@ -741,31 +741,31 @@ static inline bool skb_skip_tc_classify( +@@ -753,31 +753,31 @@ static inline bool skb_skip_tc_classify( /* * Set skb classify bit field. */ diff --git a/target/linux/mvebu/patches-5.10/803-Revert-cpufreq-armada-37xx-Fix-setting-TBG-parent-fo.patch b/target/linux/mvebu/patches-5.10/803-Revert-cpufreq-armada-37xx-Fix-setting-TBG-parent-fo.patch index 65184df58..694c2377e 100644 --- a/target/linux/mvebu/patches-5.10/803-Revert-cpufreq-armada-37xx-Fix-setting-TBG-parent-fo.patch +++ b/target/linux/mvebu/patches-5.10/803-Revert-cpufreq-armada-37xx-Fix-setting-TBG-parent-fo.patch @@ -33,7 +33,7 @@ Signed-off-by: Robert Marko /* Power management in North Bridge register set */ #define ARMADA_37XX_NB_L0L1 0x18 #define ARMADA_37XX_NB_L2L3 0x1C -@@ -126,15 +122,10 @@ static struct armada_37xx_dvfs *armada_3 +@@ -130,15 +126,10 @@ static struct armada_37xx_dvfs *armada_3 * will be configured then the DVFS will be enabled. */ static void __init armada37xx_cpufreq_dvfs_setup(struct regmap *base, @@ -51,7 +51,7 @@ Signed-off-by: Robert Marko for (load_lvl = 0; load_lvl < LOAD_LEVEL_NR; load_lvl++) { unsigned int reg, mask, val, offset = 0; -@@ -153,11 +144,6 @@ static void __init armada37xx_cpufreq_dv +@@ -157,11 +148,6 @@ static void __init armada37xx_cpufreq_dv mask = (ARMADA_37XX_NB_CLK_SEL_MASK << ARMADA_37XX_NB_CLK_SEL_OFF); @@ -63,7 +63,7 @@ Signed-off-by: Robert Marko /* * Set cpu divider based on the pre-computed array in * order to have balanced step. -@@ -176,6 +162,14 @@ static void __init armada37xx_cpufreq_dv +@@ -180,6 +166,14 @@ static void __init armada37xx_cpufreq_dv regmap_update_bits(base, reg, mask, val); } @@ -78,7 +78,7 @@ Signed-off-by: Robert Marko } /* -@@ -401,16 +395,11 @@ static int __init armada37xx_cpufreq_dri +@@ -405,16 +399,11 @@ static int __init armada37xx_cpufreq_dri struct platform_device *pdev; unsigned long freq; unsigned int cur_frequency, base_frequency; @@ -96,7 +96,7 @@ Signed-off-by: Robert Marko nb_pm_base = syscon_regmap_lookup_by_compatible("marvell,armada-3700-nb-pm"); -@@ -487,7 +476,7 @@ static int __init armada37xx_cpufreq_dri +@@ -491,7 +480,7 @@ static int __init armada37xx_cpufreq_dri armada37xx_cpufreq_avs_configure(avs_base, dvfs); armada37xx_cpufreq_avs_setup(avs_base, dvfs); diff --git a/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch index 531a23ef4..8f4a2d984 100644 --- a/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch +++ b/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch @@ -14,7 +14,7 @@ Signed-off-by: René van Dorst --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -2911,6 +2911,7 @@ static const struct net_device_ops mtk_n +@@ -2914,6 +2914,7 @@ static const struct net_device_ops mtk_n static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) { @@ -22,9 +22,9 @@ Signed-off-by: René van Dorst const __be32 *_id = of_get_property(np, "reg", NULL); phy_interface_t phy_mode; struct phylink *phylink; -@@ -3003,6 +3004,9 @@ static int mtk_add_mac(struct mtk_eth *e - - eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN; +@@ -3008,6 +3009,9 @@ static int mtk_add_mac(struct mtk_eth *e + + of_platform_device_create(np, NULL, NULL); + if (name) + strlcpy(eth->netdev[id]->name, name, IFNAMSIZ); diff --git a/target/linux/ramips/patches-5.10/710-at803x.patch b/target/linux/ramips/patches-5.10/710-at803x.patch index 2d874b125..d15dd9296 100644 --- a/target/linux/ramips/patches-5.10/710-at803x.patch +++ b/target/linux/ramips/patches-5.10/710-at803x.patch @@ -149,4 +149,4 @@ Signed-off-by: René van Dorst + .config_aneg = at803x_config_aneg, .flags = PHY_POLL_CABLE_TEST, .probe = at803x_probe, - .remove = at803x_remove, \ No newline at end of file + .remove = at803x_remove, diff --git a/target/linux/ramips/patches-5.10/999-crypto-eip93-fix.patch b/target/linux/ramips/patches-5.10/999-crypto-eip93-fix.patch index f5b36b9b6..e11808bf1 100644 --- a/target/linux/ramips/patches-5.10/999-crypto-eip93-fix.patch +++ b/target/linux/ramips/patches-5.10/999-crypto-eip93-fix.patch @@ -1,5 +1,5 @@ ---- a/include/linux/crypto.h 2021-07-19 15:45:03.000000000 +0800 -+++ b/include/linux/crypto.h 2021-07-31 00:41:39.404278501 +0800 +--- a/include/linux/crypto.h ++++ b/include/linux/crypto.h @@ -101,6 +101,11 @@ #define CRYPTO_NOLOAD 0x00008000 diff --git a/target/linux/ramips/patches-5.10/999-fix-hwnat.patch b/target/linux/ramips/patches-5.10/999-fix-hwnat.patch index abb1d601e..ef821d6d9 100644 --- a/target/linux/ramips/patches-5.10/999-fix-hwnat.patch +++ b/target/linux/ramips/patches-5.10/999-fix-hwnat.patch @@ -1,9 +1,9 @@ --- a/arch/mips/include/asm/mach-ralink/mt7621/cpu-feature-overrides.h -+++ a/arch/mips/include/asm/mach-ralink/mt7621/cpu-feature-overrides.h -@@ -47,6 +47,9 @@ ++++ b/arch/mips/include/asm/mach-ralink/mt7621/cpu-feature-overrides.h +@@ -43,6 +43,9 @@ #define cpu_has_dsp2 0 #define cpu_has_mipsmt 1 - + +#define cpu_has_vint 0 +#define cpu_has_veic 0 + diff --git a/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch b/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch index 29befbb2d..f7e84c4ee 100644 --- a/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch +++ b/target/linux/rockchip/patches-5.10/203-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch @@ -1,8 +1,8 @@ --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a9 - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb +@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-od dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-doornet1.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb diff --git a/target/linux/rockchip/patches-5.10/804-clk-rockchip-support-setting-ddr-clock-via-SIP-Version-2-.patch b/target/linux/rockchip/patches-5.10/804-clk-rockchip-support-setting-ddr-clock-via-SIP-Version-2-.patch index 4e688f8eb..430a4fd5e 100644 --- a/target/linux/rockchip/patches-5.10/804-clk-rockchip-support-setting-ddr-clock-via-SIP-Version-2-.patch +++ b/target/linux/rockchip/patches-5.10/804-clk-rockchip-support-setting-ddr-clock-via-SIP-Version-2-.patch @@ -15,11 +15,9 @@ Signed-off-by: hmz007 include/soc/rockchip/rockchip_sip.h | 11 +++ 4 files changed, 147 insertions(+), 4 deletions(-) -diff --git a/drivers/clk/rockchip/clk-ddr.c b/drivers/clk/rockchip/clk-ddr.c -index 9273bce4d7b6..555aaf4e758d 100644 --- a/drivers/clk/rockchip/clk-ddr.c +++ b/drivers/clk/rockchip/clk-ddr.c -@@ -87,6 +87,133 @@ static const struct clk_ops rockchip_ddrclk_sip_ops = { +@@ -87,6 +87,133 @@ static const struct clk_ops rockchip_ddr .get_parent = rockchip_ddrclk_get_parent, }; @@ -153,7 +151,7 @@ index 9273bce4d7b6..555aaf4e758d 100644 struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, const char *const *parent_names, u8 num_parents, int mux_offset, -@@ -114,6 +241,9 @@ struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, +@@ -114,6 +241,9 @@ struct clk *rockchip_clk_register_ddrclk case ROCKCHIP_DDRCLK_SIP: init.ops = &rockchip_ddrclk_sip_ops; break; @@ -163,11 +161,9 @@ index 9273bce4d7b6..555aaf4e758d 100644 default: pr_err("%s: unsupported ddrclk type %d\n", __func__, ddr_flag); kfree(ddrclk); -diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c -index c186a1985bf4..ac6e6163a232 100644 --- a/drivers/clk/rockchip/clk-rk3328.c +++ b/drivers/clk/rockchip/clk-rk3328.c -@@ -314,9 +314,10 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { +@@ -314,9 +314,10 @@ static struct rockchip_clk_branch rk3328 RK3328_CLKGATE_CON(14), 1, GFLAGS), /* PD_DDR */ @@ -181,11 +177,9 @@ index c186a1985bf4..ac6e6163a232 100644 GATE(0, "clk_ddrmsch", "clk_ddr", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(18), 6, GFLAGS), GATE(0, "clk_ddrupctl", "clk_ddr", CLK_IGNORE_UNUSED, -diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h -index 2271a84124b0..7405aaf965ec 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h -@@ -362,7 +362,8 @@ struct clk *rockchip_clk_register_mmc(const char *name, +@@ -362,7 +362,8 @@ struct clk *rockchip_clk_register_mmc(co * DDRCLK flags, including method of setting the rate * ROCKCHIP_DDRCLK_SIP: use SIP call to bl31 to change ddrclk rate. */ @@ -195,8 +189,6 @@ index 2271a84124b0..7405aaf965ec 100644 struct clk *rockchip_clk_register_ddrclk(const char *name, int flags, const char *const *parent_names, -diff --git a/include/soc/rockchip/rockchip_sip.h b/include/soc/rockchip/rockchip_sip.h -index c46a9ae2a2ab..fa7e0a2d72cc 100644 --- a/include/soc/rockchip/rockchip_sip.h +++ b/include/soc/rockchip/rockchip_sip.h @@ -16,5 +16,16 @@