kernel: bump 5.10 to 5.10.23

update kernel to 5.10.23, rebase patches, deleted upstreamed patch:

target/linux/generic/backport-5.10/830-v5.12-0001-net-usb-qmi_wwan-support-ZTE-P685M-modem.patch

compile / test - mvebu / mamba, rango

Signed-off-by: Kabuli Chana <newtownBuild@gmail.com>
[refresh again]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

9 files changed, 16 insertions, 102 deletions

diff --git a/target/linux/generic/backport-5.10/800-v5.13-0001-firmware-bcm47xx_nvram-rename-finding-function-and-i.patch b/target/linux/generic/backport-5.10/800-v5.13-0001-firmware-bcm47xx_nvram-rename-finding-function-and-i.patch
index 711ec28f52..19938704b7 100644
--- a/target/linux/generic/backport-5.10/800-v5.13-0001-firmware-bcm47xx_nvram-rename-finding-function-and-i.patch
+++ b/target/linux/generic/backport-5.10/800-v5.13-0001-firmware-bcm47xx_nvram-rename-finding-function-and-i.patch
@@ -17,11 +17,9 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  drivers/firmware/broadcom/bcm47xx_nvram.c | 24 ++++++++++++-----------
  1 file changed, 13 insertions(+), 11 deletions(-)
 
-diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
-index 835ece9c00f1..b04007adc79f 100644
 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c
 +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
-@@ -48,11 +48,13 @@ static u32 find_nvram_size(void __iomem *end)
+@@ -48,11 +48,13 @@ static u32 find_nvram_size(void __iomem
  	return 0;
  }
  
@@ -38,7 +36,7 @@ index 835ece9c00f1..b04007adc79f 100644
  	u32 size;
  
  	if (nvram_len) {
-@@ -61,25 +63,25 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
+@@ -61,25 +63,25 @@ static int nvram_find_and_copy(void __io
  	}
  
  	/* TODO: when nvram is on nand flash check for bad blocks first. */
@@ -71,7 +69,7 @@ index 835ece9c00f1..b04007adc79f 100644
  	if (header->magic == NVRAM_MAGIC) {
  		size = NVRAM_SPACE;
  		goto found;
-@@ -124,7 +126,7 @@ int bcm47xx_nvram_init_from_mem(u32 base, u32 lim)
+@@ -124,7 +126,7 @@ int bcm47xx_nvram_init_from_mem(u32 base
  	if (!iobase)
  		return -ENOMEM;
  
@@ -80,6 +78,3 @@ index 835ece9c00f1..b04007adc79f 100644
  
  	iounmap(iobase);
  
--- 
-2.26.2
-
diff --git a/target/linux/generic/backport-5.10/800-v5.13-0002-firmware-bcm47xx_nvram-add-helper-checking-for-NVRAM.patch b/target/linux/generic/backport-5.10/800-v5.13-0002-firmware-bcm47xx_nvram-add-helper-checking-for-NVRAM.patch
index beef1cf675..6ab072883d 100644
--- a/target/linux/generic/backport-5.10/800-v5.13-0002-firmware-bcm47xx_nvram-add-helper-checking-for-NVRAM.patch
+++ b/target/linux/generic/backport-5.10/800-v5.13-0002-firmware-bcm47xx_nvram-add-helper-checking-for-NVRAM.patch
@@ -14,8 +14,6 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  drivers/firmware/broadcom/bcm47xx_nvram.c | 30 ++++++++++++++---------
  1 file changed, 18 insertions(+), 12 deletions(-)
 
-diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
-index b04007adc79f..99f3ec180be6 100644
 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c
 +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
 @@ -34,14 +34,20 @@ static char nvram_buf[NVRAM_SPACE];
@@ -42,7 +40,7 @@ index b04007adc79f..99f3ec180be6 100644
  			return nvram_sizes[i];
  	}
  
-@@ -55,6 +61,7 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz
+@@ -55,6 +61,7 @@ static int bcm47xx_nvram_find_and_copy(v
  {
  	struct nvram_header __iomem *header;
  	size_t flash_size;
@@ -50,7 +48,7 @@ index b04007adc79f..99f3ec180be6 100644
  	u32 size;
  
  	if (nvram_len) {
-@@ -68,31 +75,30 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz
+@@ -68,31 +75,30 @@ static int bcm47xx_nvram_find_and_copy(v
  		/* Windowed flash access */
  		size = find_nvram_size(flash_start + flash_size);
  		if (size) {
@@ -90,6 +88,3 @@ index b04007adc79f..99f3ec180be6 100644
  	if (nvram_len > size) {
  		pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");
  		nvram_len = size;
--- 
-2.26.2
-
diff --git a/target/linux/generic/backport-5.10/800-v5.13-0003-firmware-bcm47xx_nvram-extract-code-copying-NVRAM.patch b/target/linux/generic/backport-5.10/800-v5.13-0003-firmware-bcm47xx_nvram-extract-code-copying-NVRAM.patch
index 67ec157f5e..a1351f1197 100644
--- a/target/linux/generic/backport-5.10/800-v5.13-0003-firmware-bcm47xx_nvram-extract-code-copying-NVRAM.patch
+++ b/target/linux/generic/backport-5.10/800-v5.13-0003-firmware-bcm47xx_nvram-extract-code-copying-NVRAM.patch
@@ -15,15 +15,12 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  drivers/firmware/broadcom/bcm47xx_nvram.c | 43 +++++++++++++----------
  1 file changed, 25 insertions(+), 18 deletions(-)
 
-diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
-index 99f3ec180be6..09f51b95849e 100644
 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c
 +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
-@@ -54,12 +54,35 @@ static u32 find_nvram_size(void __iomem *end)
- 	return 0;
+@@ -55,11 +55,34 @@ static u32 find_nvram_size(void __iomem
  }
  
-+/**
+ /**
 + * bcm47xx_nvram_copy - copy NVRAM to internal buffer
 + */
 +static void bcm47xx_nvram_copy(void __iomem *nvram_start, size_t res_size)
@@ -47,7 +44,7 @@ index 99f3ec180be6..09f51b95849e 100644
 +	nvram_len = copy_size;
 +}
 +
- /**
++/**
   * bcm47xx_nvram_find_and_copy - find NVRAM on flash mapping & copy it
   */
  static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_size)
@@ -56,7 +53,7 @@ index 99f3ec180be6..09f51b95849e 100644
  	size_t flash_size;
  	size_t offset;
  	u32 size;
-@@ -95,23 +118,7 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz
+@@ -95,23 +118,7 @@ static int bcm47xx_nvram_find_and_copy(v
  	return -ENXIO;
  
  found:
@@ -81,6 +78,3 @@ index 99f3ec180be6..09f51b95849e 100644
  
  	return 0;
  }
--- 
-2.26.2
-
diff --git a/target/linux/generic/backport-5.10/800-v5.13-0004-firmware-bcm47xx_nvram-look-for-NVRAM-with-for-inste.patch b/target/linux/generic/backport-5.10/800-v5.13-0004-firmware-bcm47xx_nvram-look-for-NVRAM-with-for-inste.patch
index 0dadc601a9..059a13220b 100644
--- a/target/linux/generic/backport-5.10/800-v5.13-0004-firmware-bcm47xx_nvram-look-for-NVRAM-with-for-inste.patch
+++ b/target/linux/generic/backport-5.10/800-v5.13-0004-firmware-bcm47xx_nvram-look-for-NVRAM-with-for-inste.patch
@@ -16,11 +16,9 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  drivers/firmware/broadcom/bcm47xx_nvram.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
-diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
-index 09f51b95849e..1d2271b1e07a 100644
 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c
 +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
-@@ -93,15 +93,13 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz
+@@ -93,15 +93,13 @@ static int bcm47xx_nvram_find_and_copy(v
  	}
  
  	/* TODO: when nvram is on nand flash check for bad blocks first. */
@@ -37,6 +35,3 @@ index 09f51b95849e..1d2271b1e07a 100644
  	}
  
  	/* Try embedded NVRAM at 4 KB and 1 KB as last resorts */
--- 
-2.26.2
-
diff --git a/target/linux/generic/backport-5.10/800-v5.13-0005-firmware-bcm47xx_nvram-inline-code-checking-NVRAM-si.patch b/target/linux/generic/backport-5.10/800-v5.13-0005-firmware-bcm47xx_nvram-inline-code-checking-NVRAM-si.patch
index 065543184f..21d250049e 100644
--- a/target/linux/generic/backport-5.10/800-v5.13-0005-firmware-bcm47xx_nvram-inline-code-checking-NVRAM-si.patch
+++ b/target/linux/generic/backport-5.10/800-v5.13-0005-firmware-bcm47xx_nvram-inline-code-checking-NVRAM-si.patch
@@ -19,11 +19,9 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  drivers/firmware/broadcom/bcm47xx_nvram.c | 25 +++++++----------------
  1 file changed, 7 insertions(+), 18 deletions(-)
 
-diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
-index 1d2271b1e07a..bd235833b687 100644
 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c
 +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
-@@ -42,18 +42,6 @@ static bool bcm47xx_nvram_is_valid(void __iomem *nvram)
+@@ -42,18 +42,6 @@ static bool bcm47xx_nvram_is_valid(void
  	return ((struct nvram_header *)nvram)->magic == NVRAM_MAGIC;
  }
  
@@ -42,7 +40,7 @@ index 1d2271b1e07a..bd235833b687 100644
  /**
   * bcm47xx_nvram_copy - copy NVRAM to internal buffer
   */
-@@ -85,7 +73,7 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz
+@@ -85,7 +73,7 @@ static int bcm47xx_nvram_find_and_copy(v
  {
  	size_t flash_size;
  	size_t offset;
@@ -51,7 +49,7 @@ index 1d2271b1e07a..bd235833b687 100644
  
  	if (nvram_len) {
  		pr_warn("nvram already initialized\n");
-@@ -93,12 +81,13 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz
+@@ -93,12 +81,13 @@ static int bcm47xx_nvram_find_and_copy(v
  	}
  
  	/* TODO: when nvram is on nand flash check for bad blocks first. */
@@ -70,6 +68,3 @@ index 1d2271b1e07a..bd235833b687 100644
  		}
  	}
  
--- 
-2.26.2
-
diff --git a/target/linux/generic/backport-5.10/830-v5.12-0001-net-usb-qmi_wwan-support-ZTE-P685M-modem.patch b/target/linux/generic/backport-5.10/830-v5.12-0001-net-usb-qmi_wwan-support-ZTE-P685M-modem.patch
deleted file mode 100644
index af3b17cc91..0000000000
--- a/target/linux/generic/backport-5.10/830-v5.12-0001-net-usb-qmi_wwan-support-ZTE-P685M-modem.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 88eee9b7b42e69fb622ddb3ff6f37e8e4347f5b2 Mon Sep 17 00:00:00 2001
-From: Lech Perczak <lech.perczak@gmail.com>
-Date: Tue, 23 Feb 2021 19:34:56 +0100
-Subject: net: usb: qmi_wwan: support ZTE P685M modem
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Now that interface 3 in "option" driver is no longer mapped, add device
-ID matching it to qmi_wwan.
-
-The modem is used inside ZTE MF283+ router and carriers identify it as
-such.
-Interface mapping is:
-0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB
-
-T:  Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#=  3 Spd=480  MxCh= 0
-D:  Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
-P:  Vendor=19d2 ProdID=1275 Rev=f0.00
-S:  Manufacturer=ZTE,Incorporated
-S:  Product=ZTE Technologies MSM
-S:  SerialNumber=P685M510ZTED0000CP&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&0
-C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA
-I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
-E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-E:  Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
-E:  Ad=83(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
-E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
-E:  Ad=85(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
-E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-E:  Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
-E:  Ad=87(I) Atr=03(Int.) MxPS=   8 Ivl=32ms
-E:  Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-E:  Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
-E:  Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-E:  Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-
-Acked-by: Bjørn Mork <bjorn@mork.no>
-Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
-Link: https://lore.kernel.org/r/20210223183456.6377-1-lech.perczak@gmail.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
----
- drivers/net/usb/qmi_wwan.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/usb/qmi_wwan.c
-+++ b/drivers/net/usb/qmi_wwan.c
-@@ -1258,6 +1258,7 @@ static const struct usb_device_id produc
- 	{QMI_FIXED_INTF(0x19d2, 0x1255, 4)},
- 	{QMI_FIXED_INTF(0x19d2, 0x1256, 4)},
- 	{QMI_FIXED_INTF(0x19d2, 0x1270, 5)},	/* ZTE MF667 */
-+	{QMI_FIXED_INTF(0x19d2, 0x1275, 3)},	/* ZTE P685M */
- 	{QMI_FIXED_INTF(0x19d2, 0x1401, 2)},
- 	{QMI_FIXED_INTF(0x19d2, 0x1402, 2)},	/* ZTE MF60 */
- 	{QMI_FIXED_INTF(0x19d2, 0x1424, 2)},
diff --git a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch
index 3c5af9d666..2f5f685063 100644
--- a/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch
+++ b/target/linux/generic/hack-5.10/904-debloat_dma_buf.patch
@@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +MODULE_LICENSE("GPL");
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -3054,6 +3054,7 @@ int wake_up_state(struct task_struct *p,
+@@ -3051,6 +3051,7 @@ int wake_up_state(struct task_struct *p,
  {
  	return try_to_wake_up(p, state, 0);
  }
diff --git a/target/linux/generic/pending-5.10/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-5.10/690-net-add-support-for-threaded-NAPI-polling.patch
index 626bac99f6..9b1bd6e976 100644
--- a/target/linux/generic/pending-5.10/690-net-add-support-for-threaded-NAPI-polling.patch
+++ b/target/linux/generic/pending-5.10/690-net-add-support-for-threaded-NAPI-polling.patch
@@ -288,7 +288,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	/* Some drivers may have called napi_schedule
  	 * prior to exhausting their budget.
  	 */
-@@ -11291,6 +11352,10 @@ static int __init net_dev_init(void)
+@@ -11333,6 +11394,10 @@ static int __init net_dev_init(void)
  		sd->backlog.weight = weight_p;
  	}
  
diff --git a/target/linux/ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch
index 410f369f70..e0703db1bc 100644
--- a/target/linux/ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch
+++ b/target/linux/ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/media/usb/uvc/uvc_driver.c
 +++ b/drivers/media/usb/uvc/uvc_driver.c
-@@ -2969,6 +2969,18 @@ static const struct usb_device_id uvc_id
+@@ -2972,6 +2972,18 @@ static const struct usb_device_id uvc_id
  	  .bInterfaceSubClass	= 1,
  	  .bInterfaceProtocol	= 0,
  	  .driver_info		= UVC_INFO_META(V4L2_META_FMT_D4XX) },