[openwrt/openwrt] kernel: bump 5.10 to 5.10.145

LEDE Commits lede-commits at lists.infradead.org
Mon Oct 3 15:13:42 PDT 2022 

hauke pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/f04515e7bd44c770f801d1dbd1e8d8964499d092

commit f04515e7bd44c770f801d1dbd1e8d8964499d092
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Fri Sep 23 16:58:05 2022 -0400

    kernel: bump 5.10 to 5.10.145
    
    Manually rebased:
      hack-5.10/780-usb-net-MeigLink_modem_support.patch
    
    Removed upstreamed:
      patches-5.10/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch[1]
    
    All other patches automatically rebased.
    
    1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.145&id=24196210b198e8e39296e277bb93b362aa207775
    
    Signed-off-by: John Audia <therealgraysky at proton.me>
    (cherry picked from commit 8fe67fae1d619467b2b3300178d4309f17cfdb54)
---
 include/kernel-5.10                                |  4 +--
 .../710-net-dsa-mv88e6xxx-default-VID-1.patch      |  4 +--
 ...1-net-dsa-mv88e6xxx-disable-ATU-violation.patch |  2 +-
 .../780-usb-net-MeigLink_modem_support.patch       |  4 +--
 .../760-net-dsa-mv88e6xxx-fix-vlan-setup.patch     |  2 +-
 ...xxx-Request-assisted-learning-on-CPU-port.patch |  2 +-
 ...t-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch |  2 +-
 ...x-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch | 42 ----------------------
 8 files changed, 10 insertions(+), 52 deletions(-)

diff --git a/include/kernel-5.10 b/include/kernel-5.10
index 3dee01cdcf..fdc44a78fc 100644
--- a/include/kernel-5.10
+++ b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .144
-LINUX_KERNEL_HASH-5.10.144 = 20c6d26f4d9d0d15d628982bc5e35862b3016d1832f5a545b3bdb131203cd3ca
+LINUX_VERSION-5.10 = .145
+LINUX_KERNEL_HASH-5.10.145 = fc5990f3e57479369eaf193bd7760b84f26d2b670c2d88e473101cb679c5ac61
diff --git a/target/linux/generic/hack-5.10/710-net-dsa-mv88e6xxx-default-VID-1.patch b/target/linux/generic/hack-5.10/710-net-dsa-mv88e6xxx-default-VID-1.patch
index 03725653f9..a09291f0e3 100644
--- a/target/linux/generic/hack-5.10/710-net-dsa-mv88e6xxx-default-VID-1.patch
+++ b/target/linux/generic/hack-5.10/710-net-dsa-mv88e6xxx-default-VID-1.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2097,6 +2097,7 @@ static int mv88e6xxx_port_fdb_add(struct
+@@ -2101,6 +2101,7 @@ static int mv88e6xxx_port_fdb_add(struct
  	struct mv88e6xxx_chip *chip = ds->priv;
  	int err;
  
@@ -8,7 +8,7 @@
  	mv88e6xxx_reg_lock(chip);
  	err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid,
  					   MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC);
-@@ -2111,6 +2112,7 @@ static int mv88e6xxx_port_fdb_del(struct
+@@ -2115,6 +2116,7 @@ static int mv88e6xxx_port_fdb_del(struct
  	struct mv88e6xxx_chip *chip = ds->priv;
  	int err;
  
diff --git a/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
index 68cac73935..7ec2afb2d2 100644
--- a/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
+++ b/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2659,6 +2659,9 @@ static int mv88e6xxx_setup_port(struct m
+@@ -2663,6 +2663,9 @@ static int mv88e6xxx_setup_port(struct m
  	if (dsa_is_cpu_port(ds, port))
  		reg = 0;
  
diff --git a/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
index 0c0739e7eb..a7782eb8df 100644
--- a/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
+++ b/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
@@ -1,9 +1,9 @@
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1024,6 +1024,7 @@ static const struct usb_device_id produc
- 	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0512)},	/* Quectel EG12/EM12 */
+@@ -1025,6 +1025,7 @@ static const struct usb_device_id produc
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)},	/* Quectel EM160R-GL */
  	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)},	/* Quectel RM500Q-GL */
+ 	{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)},	/* Quectel RM520N */
 +	{QMI_MATCH_FF_FF_FF(0x05c6, 0xf601)},   /* MeigLink SLM750 */
  
  	/* 3. Combined interface devices matching on interface number */
diff --git a/target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch b/target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
index 16be95ea38..6b94f2ed91 100644
--- a/target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
+++ b/target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
@@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang <dqfext at gmail.com>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2869,6 +2869,7 @@ static int mv88e6xxx_setup(struct dsa_sw
+@@ -2873,6 +2873,7 @@ static int mv88e6xxx_setup(struct dsa_sw
  
  	chip->ds = ds;
  	ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);
diff --git a/target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
index a24d6df7cd..35ddad2416 100644
--- a/target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
+++ b/target/linux/generic/pending-5.10/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias at waldekranz.com>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -5438,6 +5438,7 @@ static int mv88e6xxx_register_switch(str
+@@ -5442,6 +5442,7 @@ static int mv88e6xxx_register_switch(str
  	ds->ops = &mv88e6xxx_switch_ops;
  	ds->ageing_time_min = chip->info->age_time_coeff;
  	ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
diff --git a/target/linux/generic/pending-5.10/842-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch b/target/linux/generic/pending-5.10/842-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch
index f2f0e61089..c6f127add1 100644
--- a/target/linux/generic/pending-5.10/842-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch
+++ b/target/linux/generic/pending-5.10/842-net-qmi_wwan-add-ZTE-MF286D-modem-19d2-1485.patch
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
 
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
-@@ -1252,6 +1252,7 @@ static const struct usb_device_id produc
+@@ -1253,6 +1253,7 @@ static const struct usb_device_id produc
  	{QMI_FIXED_INTF(0x19d2, 0x1426, 2)},	/* ZTE MF91 */
  	{QMI_FIXED_INTF(0x19d2, 0x1428, 2)},	/* Telewell TW-LTE 4G v2 */
  	{QMI_FIXED_INTF(0x19d2, 0x1432, 3)},	/* ZTE ME3620 */
diff --git a/target/linux/mpc85xx/patches-5.10/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch b/target/linux/mpc85xx/patches-5.10/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch
deleted file mode 100644
index c4d7a5d5af..0000000000
--- a/target/linux/mpc85xx/patches-5.10/110-gpio-mpc8xxx-Fix-support-for-IRQ_TYPE_LEVEL_LOW-flow.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 29af30435022442ec4eccf3166956b8e0b8a2134 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali at kernel.org>
-Date: Mon, 5 Sep 2022 23:13:47 +0200
-Subject: [PATCH] gpio: mpc8xxx: Fix support for IRQ_TYPE_LEVEL_LOW flow_type
- in mpc85xx
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit e39d5ef67804 ("powerpc/5xxx: extend mpc8xxx_gpio driver to support
-mpc512x gpios") implemented support for IRQ_TYPE_LEVEL_LOW flow type in
-mpc512x via falling edge type. Do same for mpc85xx which support was added
-in commit 345e5c8a1cc3 ("powerpc: Add interrupt support to mpc8xxx_gpio").
-
-Fixes probing of lm90 hwmon driver on mpc85xx based board which use level
-interrupt. Without it kernel prints error and refuse lm90 to work:
-
-    [   15.258370] genirq: Setting trigger mode 8 for irq 49 failed (mpc8xxx_irq_set_type+0x0/0xf8)
-    [   15.267168] lm90 0-004c: cannot request IRQ 49
-    [   15.272708] lm90: probe of 0-004c failed with error -22
-
-Fixes: 345e5c8a1cc3 ("powerpc: Add interrupt support to mpc8xxx_gpio")
-Signed-off-by: Pali Rohár <pali at kernel.org>
----
- drivers/gpio/gpio-mpc8xxx.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
-index d60d5520707d..60c2533a39a5 100644
---- a/drivers/gpio/gpio-mpc8xxx.c
-+++ b/drivers/gpio/gpio-mpc8xxx.c
-@@ -169,6 +169,7 @@ static int mpc8xxx_irq_set_type(struct irq_data *d, unsigned int flow_type)
- 
- 	switch (flow_type) {
- 	case IRQ_TYPE_EDGE_FALLING:
-+	case IRQ_TYPE_LEVEL_LOW:
- 		raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
- 		gc->write_reg(mpc8xxx_gc->regs + GPIO_ICR,
- 			gc->read_reg(mpc8xxx_gc->regs + GPIO_ICR)
--- 
-2.34.1
-

More information about the lede-commits mailing list