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

* https://github.com/coolsnowwolf/lede:
  kernel: bump 5.4 to 5.4.156 (coolsnowwolf#8149)
  aliyundrive-webdav: update to 0.5.2 (coolsnowwolf#8170)
  ramips: 5.10: fix issuse coolsnowwolf#8171 (coolsnowwolf#8172)
  ramips: Add support for Beeline SmartBox TURBO+ (coolsnowwolf#8161)
  kernel: bump 5.10 to 5.10.77 (coolsnowwolf#8167)

include/kernel-version.mk

@@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-5.4 = .155
-LINUX_VERSION-5.10 = .76
+LINUX_VERSION-5.4 = .156
+LINUX_VERSION-5.10 = .77
 
-LINUX_KERNEL_HASH-5.4.155 = cc0c0f902748d251cb22d0e69e3b8d260c447eb0072ef853da15da6cce775038
-LINUX_KERNEL_HASH-5.10.76 = 480a09ba1962862ff18df9453fa0df6ba11cbe19eefedeab81bf2c84f49e1890
+LINUX_KERNEL_HASH-5.4.156 = 06fe73e4623fcf1b3c0d0e1983d8286a2ff5b8fffbcb2163f4c01696a1c377fe
+LINUX_KERNEL_HASH-5.10.77 = d3b64edfc1dd7212e62ed733aeeb73d64ffd6d9658d322d44cddf1b41d5b8fc3
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

package/boot/uboot-envtools/files/ramips

@@ -28,6 +28,10 @@ ampedwireless,ally-00x19k|\
 ampedwireless,ally-r1900k)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x20000" "4"
 	;;
+beeline,smartbox-giga|\
+beeline,smartbox-turbo-plus)
+	ubootenv_add_uci_config "/dev/mtd0" "0x80000" "0x1000" "0x20000"
+	;;
 buffalo,wsr-1166dhp|\
 buffalo,wsr-600dhp|\
 mediatek,linkit-smart-7688|\

package/lean/aliyundrive-webdav/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aliyundrive-webdav
-PKG_VERSION:=0.5.1
+PKG_VERSION:=0.5.2
 PKG_RELEASE:=$(AUTORELESE)
 
 PKG_LICENSE:=MIT

package/lean/luci-app-aliyundrive-webdav/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-aliyundrive-webdav
-PKG_VERSION:=0.5.1
+PKG_VERSION:=0.5.2
 PKG_RELEASE:=1
 
 PKG_LICENSE:=MIT

scripts/sercomm-kernel.sh

@@ -0,0 +1,122 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (c) 2021 Mikhail Zhilkin <[email protected]>
+#
+###
+### sercomm-kernel.sh  - calculates and appends a special kernel header.
+###                      Intended for some Sercomm devices (e.g., Beeline
+###                      SmartBox GIGA, Beeline SmartBox Turbo+, Sercomm
+###                      S3).
+#
+# Credits to @kar200 for the header description. More details are here:
+# https://forum.openwrt.org/t/add-support-for-sercomm-s3-on-stock-uboot
+#
+if [ $# -ne 3 ]; then
+	echo "SYNTAX: $0 <kernel> <kernel_offset> <rootfs_offset>"
+	exit 1
+fi
+
+FILE_TMP=$1.shdr
+KERNEL_IMG=$1
+KERNEL_OFFSET=$2
+ROOTFS_OFFSET=$3
+
+# Sercomm HDR (0x53657200), 0xffffffff for hdr crc32 calc
+hdr_sign_offs=0x0
+hdr_sign_val=0x53657200
+# Absoulte lenght for Sercomm footer
+hdr_footer_size_offs=0x4
+hdr_footer_size_val=
+# Header checksum. 0xffffffff for hdr crc32 calc
+hdr_head_chksum_offs=0x8
+hdr_head_chksum_val=
+# Magic constant (0x2ffffff)
+hdr_int04_offs=0xc
+hdr_int04_val=0x2ffffff
+# Kernel flash offset
+hdr_kern_offs_offs=0x10
+hdr_kern_offs_val=$KERNEL_OFFSET
+# Kernel lenght
+hdr_kern_len_offs=0x14
+hdr_kern_len_val=
+# Kernel checksum
+hdr_kern_chksum_offs=0x18
+hdr_kern_chksum_val=
+# Magic constant (0x0)
+hdr_int08_offs=0x1c
+hdr_int08_val=0x0
+# Rootfs flash offset
+hdr_rootfs_offs_offs=0x28
+hdr_rootfs_offs_val=$ROOTFS_OFFSET
+# Rootfs flash lenght. We're checking only first 4 bytes
+hdr_rootfs_len_offs=0x2c
+hdr_rootfs_len_val=0x4
+# Rootfs checksum. Checksum is a constant for UBI (first 4 bytes)
+hdr_rootfs_chksum_offs=0x30
+hdr_rootfs_chksum_val=0x1cfc552d
+# Magic constant (0x0)
+hdr_int10_offs=0x34
+hdr_int10_val=0x0
+
+pad_zeros () {
+	awk '{ printf "%8s\n", $0 }' | sed 's/ /0/g'
+}
+
+# Remove leading 0x
+trim_hx () {
+	printf "%x\n" $1 | pad_zeros
+}
+
+# Change endian
+swap_hx () {
+	pad_zeros | awk '{for (i=7;i>=1;i=i-2) printf "%s%s", \
+		substr($1,i,2), (i>1?"":"\n")}'
+}
+
+# Check file size
+fsize () {
+	printf "%x\n" `stat -c "%s" $1`
+}
+
+# Calculate checksum
+chksum () {
+	dd if=$1 2>/dev/null | gzip -c | tail -c 8 | od -An -tx4 -N4 \
+		--endian=big | tr -d ' \n' | pad_zeros
+}
+
+# Write 4 bytes in the header by offset
+write_hdr () {
+	echo -ne "$(echo $1 | sed 's/../\\x&/g')" | dd of=$FILE_TMP bs=1 \
+	seek=$(($2)) count=4 conv=notrunc status=none 2>/dev/null
+}
+
+# Pad a new header with 0xff
+dd if=/dev/zero ibs=1 count=256 status=none | tr "\000" "\377" > \
+	$FILE_TMP 2>/dev/null
+
+# Write constants
+write_hdr $(trim_hx $hdr_int04_val) $hdr_int04_offs
+write_hdr $(trim_hx $hdr_int08_val) $hdr_int08_offs
+write_hdr $(trim_hx $hdr_int10_val) $hdr_int10_offs
+# Write footer data
+hdr_footer_size_val=$(($hdr_rootfs_offs_val + $hdr_rootfs_len_val))
+write_hdr $(trim_hx $hdr_footer_size_val | swap_hx) $hdr_footer_size_offs
+# Write kernel data
+write_hdr $(trim_hx $hdr_kern_offs_val | swap_hx) $hdr_kern_offs_offs
+hdr_kern_len_val=$(fsize $KERNEL_IMG | pad_zeros)
+write_hdr $(echo $hdr_kern_len_val | swap_hx) $hdr_kern_len_offs
+hdr_kern_chksum_val=$(chksum $KERNEL_IMG)
+write_hdr $hdr_kern_chksum_val $hdr_kern_chksum_offs
+# Write rootfs data
+write_hdr $(trim_hx $hdr_rootfs_offs_val | swap_hx) $hdr_rootfs_offs_offs
+write_hdr $(trim_hx $hdr_rootfs_len_val | swap_hx) $hdr_rootfs_len_offs
+write_hdr $(trim_hx $hdr_rootfs_chksum_val) $hdr_rootfs_chksum_offs
+# Write header checksum
+hdr_head_chksum_val=$(chksum $FILE_TMP)
+write_hdr $hdr_head_chksum_val $hdr_head_chksum_offs
+# Place Sercomm signature
+write_hdr $(trim_hx $hdr_sign_val) $hdr_sign_offs
+
+dd if=$KERNEL_IMG >> $FILE_TMP
+mv $FILE_TMP $KERNEL_IMG

target/linux/bcm27xx/patches-5.10/950-0057-Improve-__copy_to_user-and-__copy_from_user-performa.patch

@@ -76,7 +76,7 @@ Signed-off-by: Christopher Blake <[email protected]>
  #endif
 --- a/arch/arm/include/asm/uaccess.h
 +++ b/arch/arm/include/asm/uaccess.h
-@@ -516,6 +516,9 @@ do {									\
+@@ -518,6 +518,9 @@ do {									\
  extern unsigned long __must_check
  arm_copy_from_user(void *to, const void __user *from, unsigned long n);
 

target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch

@@ -119,7 +119,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
   * non-error returns are a promise to giveback() the urb later
   * we drop ownership so next owner (or urb unlink) can get it
   */
-@@ -5362,6 +5459,7 @@ static const struct hc_driver xhci_hc_dr
+@@ -5367,6 +5464,7 @@ static const struct hc_driver xhci_hc_dr
  	.endpoint_reset =	xhci_endpoint_reset,
  	.check_bandwidth =	xhci_check_bandwidth,
  	.reset_bandwidth =	xhci_reset_bandwidth,

target/linux/bcm27xx/patches-5.10/950-0201-mmc-sdhci-Silence-MMC-warnings.patch

@@ -22,7 +22,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
 
  #define MAX_TUNING_LOOP 40
 
-@@ -3127,7 +3127,7 @@ static void sdhci_timeout_timer(struct t
+@@ -3133,7 +3133,7 @@ static void sdhci_timeout_timer(struct t
  	spin_lock_irqsave(&host->lock, flags);
 
  	if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
@@ -31,7 +31,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
  		       mmc_hostname(host->mmc));
  		sdhci_dumpregs(host);
 
-@@ -3149,7 +3149,7 @@ static void sdhci_timeout_data_timer(str
+@@ -3155,7 +3155,7 @@ static void sdhci_timeout_data_timer(str
 
  	if (host->data || host->data_cmd ||
  	    (host->cmd && sdhci_data_line_cmd(host->cmd))) {

target/linux/bcm27xx/patches-5.10/950-0376-ARM-dts-bcm27xx-Remove-enable_headphones-setting.patch

@@ -77,7 +77,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  	aliases {
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -322,7 +322,7 @@
+@@ -323,7 +323,7 @@
 
  / {
  	chosen {

target/linux/bcm27xx/patches-5.10/950-0438-dt-Add-a-camera-regulator-node-to-all-downstream-Pi-.patch

@@ -277,15 +277,15 @@ Signed-off-by: Dave Stevenson <[email protected]>
  &uart0 {
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -319,6 +319,7 @@
+@@ -320,6 +320,7 @@
  #include "bcm2711-rpi.dtsi"
  #include "bcm283x-rpi-csi1-2lane.dtsi"
  #include "bcm283x-rpi-i2c0mux_0_44.dtsi"
 +#include "bcm283x-rpi-cam1-regulator.dtsi"
 
  / {
  	chosen {
-@@ -585,6 +586,10 @@
+@@ -586,6 +587,10 @@
  	pinctrl-0 = <&audio_pins>;
  };
 

target/linux/bcm27xx/patches-5.10/950-0509-ARM-dts-bcm2711-Add-aliases-for-additional-SPIs.patch

@@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -354,6 +354,10 @@
+@@ -355,6 +355,10 @@
  		i2c4 = &i2c4;
  		i2c5 = &i2c5;
  		i2c6 = &i2c6;

target/linux/bcm27xx/patches-5.10/950-0639-cgroup-Disable-cgroup-memory-by-default.patch

@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -5665,6 +5665,9 @@ int __init cgroup_init_early(void)
+@@ -5667,6 +5667,9 @@ int __init cgroup_init_early(void)
  	return 0;
  }
 
@@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  /**
   * cgroup_init - cgroup initialization
   *
-@@ -5703,6 +5706,12 @@ int __init cgroup_init(void)
+@@ -5705,6 +5708,12 @@ int __init cgroup_init(void)
 
  	mutex_unlock(&cgroup_mutex);
 
@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  	for_each_subsys(ss, ssid) {
  		if (ss->early_init) {
  			struct cgroup_subsys_state *css =
-@@ -6240,6 +6249,10 @@ static int __init cgroup_disable(char *s
+@@ -6242,6 +6251,10 @@ static int __init cgroup_disable(char *s
  			    strcmp(token, ss->legacy_name))
  				continue;
 
@@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  			static_branch_disable(cgroup_subsys_enabled_key[i]);
  			pr_info("Disabling %s control group subsystem\n",
  				ss->name);
-@@ -6249,6 +6262,31 @@ static int __init cgroup_disable(char *s
+@@ -6251,6 +6264,31 @@ static int __init cgroup_disable(char *s
  }
  __setup("cgroup_disable=", cgroup_disable);
 

target/linux/bcm27xx/patches-5.10/950-0706-ARM-dts-bcm2711-Tidy-the-HDMI-I2C-aliases.patch

@@ -20,7 +20,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -349,11 +349,12 @@
+@@ -350,11 +350,12 @@
  		mmc0 = &emmc2;
  		mmc1 = &mmcnr;
  		mmc2 = &sdhost;
@@ -34,7 +34,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  		spi3 = &spi3;
  		spi4 = &spi4;
  		spi5 = &spi5;
-@@ -559,13 +560,6 @@
+@@ -560,13 +561,6 @@
  	pinctrl-0 = <&i2s_pins>;
  };
 

target/linux/bcm27xx/patches-5.10/950-0733-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch

@@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
 
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -4256,9 +4256,9 @@ void xhci_queue_new_dequeue_state(struct
+@@ -4252,9 +4252,9 @@ void xhci_queue_new_dequeue_state(struct
  	}
  	ep = &xhci->devs[slot_id]->eps[ep_index];
  	if ((ep->ep_state & SET_DEQ_PENDING)) {

target/linux/bcm27xx/patches-5.10/950-0736-ARM-dts-Adapt-to-upstream-changes.patch

@@ -191,7 +191,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  		gpios = <&virtgpio 0 0>;
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -579,13 +579,13 @@
+@@ -580,13 +580,13 @@
  };
 
  &leds {

target/linux/generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch

@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -6793,15 +6793,10 @@ void __netif_napi_del(struct napi_struct
+@@ -6799,15 +6799,10 @@ void __netif_napi_del(struct napi_struct
  }
  EXPORT_SYMBOL(__netif_napi_del);
 
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	weight = n->weight;
 
  	/* This NAPI_STATE_SCHED test is for avoiding a race
-@@ -6821,7 +6816,7 @@ static int napi_poll(struct napi_struct
+@@ -6827,7 +6822,7 @@ static int napi_poll(struct napi_struct
  			    n->poll, work, weight);
 
  	if (likely(work < weight))
@@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
  	/* Drivers must not modify the NAPI state if they
  	 * consume the entire weight.  In such cases this code
-@@ -6830,7 +6825,7 @@ static int napi_poll(struct napi_struct
+@@ -6836,7 +6831,7 @@ static int napi_poll(struct napi_struct
  	 */
  	if (unlikely(napi_disable_pending(n))) {
  		napi_complete(n);
@@ -53,7 +53,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	}
 
  	if (n->gro_bitmask) {
-@@ -6848,12 +6843,29 @@ static int napi_poll(struct napi_struct
+@@ -6854,12 +6849,29 @@ static int napi_poll(struct napi_struct
  	if (unlikely(!list_empty(&n->poll_list))) {
  		pr_warn_once("%s: Budget exhausted after napi rescheduled\n",
  			     n->dev ? n->dev->name : "backlog");

target/linux/generic/backport-5.10/601-v5.12-net-implement-threaded-able-napi-poll-loop-support.patch

@@ -131,7 +131,7 @@ Signed-off-by: David S. Miller <[email protected]>
  static int __dev_open(struct net_device *dev, struct netlink_ext_ack *extack)
  {
  	const struct net_device_ops *ops = dev->netdev_ops;
-@@ -4255,6 +4277,21 @@ int gro_normal_batch __read_mostly = 8;
+@@ -4261,6 +4283,21 @@ int gro_normal_batch __read_mostly = 8;
  static inline void ____napi_schedule(struct softnet_data *sd,
  				     struct napi_struct *napi)
  {
@@ -153,7 +153,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	list_add_tail(&napi->poll_list, &sd->poll_list);
  	__raise_softirq_irqoff(NET_RX_SOFTIRQ);
  }
-@@ -6746,6 +6783,12 @@ void netif_napi_add(struct net_device *d
+@@ -6752,6 +6789,12 @@ void netif_napi_add(struct net_device *d
  	set_bit(NAPI_STATE_NPSVC, &napi->state);
  	list_add_rcu(&napi->dev_list, &dev->napi_list);
  	napi_hash_add(napi);
@@ -166,7 +166,7 @@ Signed-off-by: David S. Miller <[email protected]>
  }
  EXPORT_SYMBOL(netif_napi_add);
 
-@@ -6762,9 +6805,28 @@ void napi_disable(struct napi_struct *n)
+@@ -6768,9 +6811,28 @@ void napi_disable(struct napi_struct *n)
  	hrtimer_cancel(&n->timer);
 
  	clear_bit(NAPI_STATE_DISABLE, &n->state);
@@ -195,7 +195,7 @@ Signed-off-by: David S. Miller <[email protected]>
  static void flush_gro_hash(struct napi_struct *napi)
  {
  	int i;
-@@ -6790,6 +6852,11 @@ void __netif_napi_del(struct napi_struct
+@@ -6796,6 +6858,11 @@ void __netif_napi_del(struct napi_struct
 
  	flush_gro_hash(napi);
  	napi->gro_bitmask = 0;
@@ -207,7 +207,7 @@ Signed-off-by: David S. Miller <[email protected]>
  }
  EXPORT_SYMBOL(__netif_napi_del);
 
-@@ -6871,6 +6938,51 @@ static int napi_poll(struct napi_struct
+@@ -6877,6 +6944,51 @@ static int napi_poll(struct napi_struct
  	return work;
  }