[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  kernel: bump 5.18 to 5.18.15 (coolsnowwolf#9859)
  kernel: bump 5.15 to 5.15.58 (coolsnowwolf#9860)
  ipq806x: Archer VR2600: fix switch ports numbering
  firmware-utils: update to git HEAD
  tools: add 7z host package
  ramips: 5.4: fix build error (coolsnowwolf#9849)
  ramips: 5.4: fixes nand patches (coolsnowwolf#9848)
  kernel: bump 5.10 to 5.10.133 (coolsnowwolf#9845)
  ramips: move mt7621_nand driver to files and sync with upstream (coolsnowwolf#9844)
  rockchip: drop most ugly hack code
  wolfssl: Do not activate HW acceleration on armvirt by default
  generic: 5.15: Disable more config symbols
  tools/libressl: bump to v3.5.3
  rockchip：add doornet2 lpddr4 4gb (coolsnowwolf#9817)

Author: github-actions[bot]

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .131
-LINUX_KERNEL_HASH-5.10.131 = 8bc441442c16c330a7148fe3cca9edcd98bc0fc9f68304633c7eb641770d21ce
+LINUX_VERSION-5.10 = .133
+LINUX_KERNEL_HASH-5.10.133 = 3b5c4c7d5bca720c11f1024c9aa00ac04397b6c7de37fd4170444077c723280e

include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .57
-LINUX_KERNEL_HASH-5.15.57 = 62e3095a1fc876315150c93aad1546cc198e3ba5863b3d7ff7da21fbee20f0fd
+LINUX_VERSION-5.15 = .58
+LINUX_KERNEL_HASH-5.15.58 = d75bd9579c4b318e6162e21c591878fd37efda0f79c5cdd0dc4eb9ea9dfc4fa8

include/kernel-5.18

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.18 = .14
-LINUX_KERNEL_HASH-5.18.14 = e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af
+LINUX_VERSION-5.18 = .15
+LINUX_KERNEL_HASH-5.18.15 = 69804febdc388a69dfb64493b7b58d402853de3a14144ea8db7fd67c30dcbe3c

package/boot/uboot-rockchip/Makefile

@@ -97,7 +97,8 @@ define U-Boot/guangmiao-g4c-rk3399
   BUILD_SUBTARGET:=armv8
   NAME:=GuangMiao G4C
   BUILD_DEVICES:= \
-    sharevdi_guangmiao-g4c
+    sharevdi_guangmiao-g4c \
+    embedfire_doornet2-4gb
   DEPENDS:=+PACKAGE_u-boot-guangmiao-g4c-rk3399:arm-trusted-firmware-rockchip
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
   ATF:=rk3399_bl31.elf

package/libs/wolfssl/Config.in

@@ -72,7 +72,7 @@ config WOLFSSL_ASM_CAPABLE
 
 choice
 	prompt "Hardware Acceleration"
-	default WOLFSSL_HAS_CPU_CRYPTO if WOLFSSL_ASM_CAPABLE
+	default WOLFSSL_HAS_CPU_CRYPTO if WOLFSSL_ASM_CAPABLE && !TARGET_armvirt
 	default WOLFSSL_HAS_NO_HW
 
 	config WOLFSSL_HAS_NO_HW

target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch

@@ -13,9 +13,9 @@ Signed-off-by: John Crispin <[email protected]>
 
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -929,6 +929,17 @@ config LEDS_ACER_A500
- 	  This option enables support for the Power Button LED of
- 	  Acer Iconia Tab A500.
+@@ -931,6 +931,17 @@ config LEDS_ACER_A500
+
+ source "drivers/leds/blink/Kconfig"
 
 +config LEDS_RESET
 +	tristate "LED support for reset-controller API"

target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch

@@ -706,7 +706,7 @@
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -4133,14 +4133,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4138,14 +4138,16 @@ static bool tcp_parse_aligned_timestamp(
  {
  	const __be32 *ptr = (const __be32 *)(th + 1);
 

target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch

@@ -1162,7 +1162,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
-@@ -444,7 +444,7 @@ static int dwc_eth_dwmac_probe(struct pl
+@@ -445,7 +445,7 @@ static int dwc_eth_dwmac_probe(struct pl
  	if (IS_ERR(stmmac_res.addr))
  		return PTR_ERR(stmmac_res.addr);
 

target/linux/generic/config-5.15

@@ -923,6 +923,7 @@ CONFIG_CIFS_XATTR=y
 # CONFIG_CLEANCACHE is not set
 # CONFIG_CLKSRC_PISTACHIO is not set
 # CONFIG_CLKSRC_VERSATILE is not set
+# CONFIG_CLKSRC_PISTACHIO is not set
 # CONFIG_CLK_GFM_LPASS_SM8250 is not set
 # CONFIG_CLK_HSDK is not set
 # CONFIG_CLK_QORIQ is not set

target/linux/generic/hack-5.10/221-module_exports.patch

@@ -115,7 +115,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	.previous
 --- a/scripts/Makefile.build
 +++ b/scripts/Makefile.build
-@@ -367,7 +367,7 @@ targets += $(lib-y) $(always-y) $(MAKECM
+@@ -373,7 +373,7 @@ targets += $(lib-y) $(always-y) $(MAKECM
  # Linker scripts preprocessor (.lds.S -> .lds)
  # ---------------------------------------------------------------------------
  quiet_cmd_cpp_lds_S = LDS     $@

target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch

@@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
   */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -2771,6 +2771,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2816,6 +2816,10 @@ static inline int pskb_trim(struct sk_bu
  	return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }
 
@@ -82,7 +82,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  /**
   *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *	@skb: buffer to alter
-@@ -2921,16 +2925,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2966,16 +2970,6 @@ static inline struct sk_buff *dev_alloc_
  }
 
 

target/linux/generic/hack-5.15/760-net-usb-r8152-add-LED-configuration-from-OF.patch

@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <[email protected]>
  #include <linux/crc32.h>
  #include <linux/if_vlan.h>
  #include <linux/uaccess.h>
-@@ -6852,6 +6853,22 @@ static void rtl_tally_reset(struct r8152
+@@ -6864,6 +6865,22 @@ static void rtl_tally_reset(struct r8152
  	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
  }
 
@@ -45,7 +45,7 @@ Signed-off-by: David Bauer <[email protected]>
  static void r8152b_init(struct r8152 *tp)
  {
  	u32 ocp_data;
-@@ -6893,6 +6910,8 @@ static void r8152b_init(struct r8152 *tp
+@@ -6905,6 +6922,8 @@ static void r8152b_init(struct r8152 *tp
  	ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
  	ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
  	ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@@ -54,7 +54,7 @@ Signed-off-by: David Bauer <[email protected]>
  }
 
  static void r8153_init(struct r8152 *tp)
-@@ -7033,6 +7052,8 @@ static void r8153_init(struct r8152 *tp)
+@@ -7045,6 +7064,8 @@ static void r8153_init(struct r8152 *tp)
  		tp->coalesce = COALESCE_SLOW;
  		break;
  	}
@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <[email protected]>
  }
 
  static void r8153b_init(struct r8152 *tp)
-@@ -7115,6 +7136,8 @@ static void r8153b_init(struct r8152 *tp
+@@ -7127,6 +7148,8 @@ static void r8153b_init(struct r8152 *tp
  	rtl_tally_reset(tp);
 
  	tp->coalesce = 15000;	/* 15 us */

target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

@@ -12,7 +12,7 @@
  			       struct list_head *br_ip_list);
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -877,6 +877,10 @@ struct sk_buff {
+@@ -912,6 +912,10 @@ struct sk_buff {
  #endif
  	__u8			slow_gro:1;
 
@@ -111,7 +111,7 @@
 
  #ifdef CONFIG_ETHERNET_PACKET_MANGLE
  	if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
-@@ -5213,6 +5221,11 @@ void netdev_rx_handler_unregister(struct
+@@ -5214,6 +5222,11 @@ void netdev_rx_handler_unregister(struct
  }
  EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
 
@@ -123,7 +123,7 @@
  /*
   * Limit the use of PFMEMALLOC reserves to those protocols that implement
   * the special handling of PFMEMALLOC skbs.
-@@ -5261,6 +5274,10 @@ static int __netif_receive_skb_core(stru
+@@ -5262,6 +5275,10 @@ static int __netif_receive_skb_core(stru
  	int ret = NET_RX_DROP;
  	__be16 type;
 
@@ -134,7 +134,7 @@
  	net_timestamp_check(!netdev_tstamp_prequeue, skb);
 
  	trace_netif_receive_skb(skb);
-@@ -5298,6 +5315,15 @@ another_round:
+@@ -5299,6 +5316,15 @@ another_round:
  			goto out;
  	}
 

target/linux/generic/hack-5.18/760-net-usb-r8152-add-LED-configuration-from-OF.patch

@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <[email protected]>
  #include <linux/crc32.h>
  #include <linux/if_vlan.h>
  #include <linux/uaccess.h>
-@@ -6852,6 +6853,22 @@ static void rtl_tally_reset(struct r8152
+@@ -6864,6 +6865,22 @@ static void rtl_tally_reset(struct r8152
  	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
  }
 
@@ -45,7 +45,7 @@ Signed-off-by: David Bauer <[email protected]>
  static void r8152b_init(struct r8152 *tp)
  {
  	u32 ocp_data;
-@@ -6893,6 +6910,8 @@ static void r8152b_init(struct r8152 *tp
+@@ -6905,6 +6922,8 @@ static void r8152b_init(struct r8152 *tp
  	ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
  	ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
  	ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@@ -54,7 +54,7 @@ Signed-off-by: David Bauer <[email protected]>
  }
 
  static void r8153_init(struct r8152 *tp)
-@@ -7033,6 +7052,8 @@ static void r8153_init(struct r8152 *tp)
+@@ -7045,6 +7064,8 @@ static void r8153_init(struct r8152 *tp)
  		tp->coalesce = COALESCE_SLOW;
  		break;
  	}
@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <[email protected]>
  }
 
  static void r8153b_init(struct r8152 *tp)
-@@ -7115,6 +7136,8 @@ static void r8153b_init(struct r8152 *tp
+@@ -7127,6 +7148,8 @@ static void r8153b_init(struct r8152 *tp
  	rtl_tally_reset(tp);
 
  	tp->coalesce = 15000;	/* 15 us */

target/linux/generic/pending-5.10/203-kallsyms_uncompressed.patch

@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  		}
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
-@@ -186,6 +186,10 @@ kallsyms()
+@@ -192,6 +192,10 @@ kallsyms()
  		kallsymopt="${kallsymopt} --base-relative"
  	fi
 

target/linux/generic/pending-5.15/655-increase_skb_pad.patch

@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -2737,7 +2737,7 @@ static inline int pskb_network_may_pull(
+@@ -2782,7 +2782,7 @@ static inline int pskb_network_may_pull(
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD

target/linux/generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch

@@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #endif
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -855,6 +855,7 @@ struct sk_buff {
+@@ -890,6 +890,7 @@ struct sk_buff {
  #ifdef CONFIG_IPV6_NDISC_NODETYPE
  	__u8			ndisc_nodetype:2;
  #endif
@@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	__u8			inner_protocol_type:1;
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -6061,6 +6061,9 @@ static enum gro_result dev_gro_receive(s
+@@ -6062,6 +6062,9 @@ static enum gro_result dev_gro_receive(s
  	int same_flow;
  	int grow;
 
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	if (netif_elide_gro(skb->dev))
  		goto normal;
 
-@@ -8075,6 +8078,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -8076,6 +8079,48 @@ static void __netdev_adjacent_dev_unlink
  					   &upper_dev->adj_list.lower);
  }
 
@@ -91,23 +91,23 @@ Signed-off-by: Felix Fietkau <[email protected]>
  static int __netdev_upper_dev_link(struct net_device *dev,
  				   struct net_device *upper_dev, bool master,
  				   void *upper_priv, void *upper_info,
-@@ -8126,6 +8171,7 @@ static int __netdev_upper_dev_link(struc
+@@ -8127,6 +8172,7 @@ static int __netdev_upper_dev_link(struc
  	if (ret)
  		return ret;
 
 +	netdev_update_addr_mask(dev);
  	ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
  					    &changeupper_info.info);
  	ret = notifier_to_errno(ret);
-@@ -8222,6 +8268,7 @@ static void __netdev_upper_dev_unlink(st
+@@ -8223,6 +8269,7 @@ static void __netdev_upper_dev_unlink(st
 
  	__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
 
 +	netdev_update_addr_mask(dev);
  	call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
  				      &changeupper_info.info);
 
-@@ -9041,6 +9088,7 @@ int dev_set_mac_address(struct net_devic
+@@ -9042,6 +9089,7 @@ int dev_set_mac_address(struct net_devic
  	if (err)
  		return err;
  	dev->addr_assign_type = NET_ADDR_SET;

target/linux/ipq806x/base-files/etc/board.d/02_network

@@ -30,8 +30,7 @@ netgear,d7800 |\
 netgear,r7500 |\
 netgear,r7500v2 |\
 qcom,ipq8064-ap148 |\
-surf,g-nat200 |\
-tplink,vr2600v)
+surf,g-nat200)
 	ucidef_add_switch "switch0" \
 		"1:lan" "2:lan" "3:lan" "4:lan" "6@eth1" "5:wan" "0@eth0"
 	;;
@@ -66,7 +65,8 @@ nec,wg2600hp3)
 	;;
 netgear,r7800 |\
 netgear,xr500 |\
-tplink,c2600)
+tplink,c2600 |\
+tplink,vr2600v)
 	ucidef_add_switch "switch0" \
 		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "6@eth1" "5:wan" "0@eth0"
 	;;