kernel: bump 5.15 to 5.15.112
Manually adjusted before running quilt due to new location in tree: backport-5.15/780-v5.16-bus-mhi-pci_generic-Introduce-Sierra-EM919X-support.patch backport-5.15/781-v6.1-bus-mhi-host-always-print-detected-modem-name.patch pending-5.15/790-bus-mhi-core-add-SBL-state-callback.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
		@@ -1,2 +1,2 @@
 | 
				
			|||||||
LINUX_VERSION-5.15 = .111
 | 
					LINUX_VERSION-5.15 = .112
 | 
				
			||||||
LINUX_KERNEL_HASH-5.15.111 = 77ceea259c0158dd624304871170d09b2e59ed612f3a4d436fe0f07362dcaec2
 | 
					LINUX_KERNEL_HASH-5.15.112 = b0e8ebdba38e0c369f64ec4dc2a69ec59ffe87a64b82f940dbdf8e752b6ad651
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,11 +16,11 @@ Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 | 
				
			|||||||
Link: https://lore.kernel.org/r/20211216081227.237749-11-manivannan.sadhasivam@linaro.org
 | 
					Link: https://lore.kernel.org/r/20211216081227.237749-11-manivannan.sadhasivam@linaro.org
 | 
				
			||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 | 
					Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
 drivers/bus/mhi/pci_generic.c | 43 +++++++++++++++++++++++++++++++++++
 | 
					 drivers/bus/mhi/host/pci_generic.c | 43 +++++++++++++++++++++++++++++++++++
 | 
				
			||||||
 1 file changed, 43 insertions(+)
 | 
					 1 file changed, 43 insertions(+)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
--- a/drivers/bus/mhi/pci_generic.c
 | 
					--- a/drivers/bus/mhi/host/pci_generic.c
 | 
				
			||||||
+++ b/drivers/bus/mhi/pci_generic.c
 | 
					+++ b/drivers/bus/mhi/host/pci_generic.c
 | 
				
			||||||
@@ -406,6 +406,46 @@ static const struct mhi_pci_dev_info mhi
 | 
					@@ -406,6 +406,46 @@ static const struct mhi_pci_dev_info mhi
 | 
				
			||||||
 	.mru_default = 32768,
 | 
					 	.mru_default = 32768,
 | 
				
			||||||
 };
 | 
					 };
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,11 +21,11 @@ Link: https://lore.kernel.org/r/20220831100349.1488762-1-koen.vandeputte@citymes
 | 
				
			|||||||
[mani: added missing review tags]
 | 
					[mani: added missing review tags]
 | 
				
			||||||
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 | 
					Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
 drivers/bus/mhi/pci_generic.c | 2 +-
 | 
					 drivers/bus/mhi/host/pci_generic.c | 2 +-
 | 
				
			||||||
 1 file changed, 1 insertion(+), 1 deletion(-)
 | 
					 1 file changed, 1 insertion(+), 1 deletion(-)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
--- a/drivers/bus/mhi/pci_generic.c
 | 
					--- a/drivers/bus/mhi/host/pci_generic.c
 | 
				
			||||||
+++ b/drivers/bus/mhi/pci_generic.c
 | 
					+++ b/drivers/bus/mhi/host/pci_generic.c
 | 
				
			||||||
@@ -806,7 +806,7 @@ static int mhi_pci_probe(struct pci_dev
 | 
					@@ -806,7 +806,7 @@ static int mhi_pci_probe(struct pci_dev
 | 
				
			||||||
 	struct mhi_controller *mhi_cntrl;
 | 
					 	struct mhi_controller *mhi_cntrl;
 | 
				
			||||||
 	int err;
 | 
					 	int err;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 | 
				
			|||||||
 #include <linux/crc32.h>
 | 
					 #include <linux/crc32.h>
 | 
				
			||||||
 #include <linux/if_vlan.h>
 | 
					 #include <linux/if_vlan.h>
 | 
				
			||||||
 #include <linux/uaccess.h>
 | 
					 #include <linux/uaccess.h>
 | 
				
			||||||
@@ -6864,6 +6865,22 @@ static void rtl_tally_reset(struct r8152
 | 
					@@ -6886,6 +6887,22 @@ static void rtl_tally_reset(struct r8152
 | 
				
			||||||
 	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
 | 
					 	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
 | 
				
			||||||
 }
 | 
					 }
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
@@ -45,7 +45,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 | 
				
			|||||||
 static void r8152b_init(struct r8152 *tp)
 | 
					 static void r8152b_init(struct r8152 *tp)
 | 
				
			||||||
 {
 | 
					 {
 | 
				
			||||||
 	u32 ocp_data;
 | 
					 	u32 ocp_data;
 | 
				
			||||||
@@ -6905,6 +6922,8 @@ static void r8152b_init(struct r8152 *tp
 | 
					@@ -6927,6 +6944,8 @@ static void r8152b_init(struct r8152 *tp
 | 
				
			||||||
 	ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
 | 
					 	ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
 | 
				
			||||||
 	ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
 | 
					 	ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
 | 
				
			||||||
 	ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
 | 
					 	ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
 | 
				
			||||||
@@ -54,7 +54,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 | 
				
			|||||||
 }
 | 
					 }
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 static void r8153_init(struct r8152 *tp)
 | 
					 static void r8153_init(struct r8152 *tp)
 | 
				
			||||||
@@ -7045,6 +7064,8 @@ static void r8153_init(struct r8152 *tp)
 | 
					@@ -7067,6 +7086,8 @@ static void r8153_init(struct r8152 *tp)
 | 
				
			||||||
 		tp->coalesce = COALESCE_SLOW;
 | 
					 		tp->coalesce = COALESCE_SLOW;
 | 
				
			||||||
 		break;
 | 
					 		break;
 | 
				
			||||||
 	}
 | 
					 	}
 | 
				
			||||||
@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 | 
				
			|||||||
 }
 | 
					 }
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 static void r8153b_init(struct r8152 *tp)
 | 
					 static void r8153b_init(struct r8152 *tp)
 | 
				
			||||||
@@ -7127,6 +7148,8 @@ static void r8153b_init(struct r8152 *tp
 | 
					@@ -7149,6 +7170,8 @@ static void r8153b_init(struct r8152 *tp
 | 
				
			||||||
 	rtl_tally_reset(tp);
 | 
					 	rtl_tally_reset(tp);
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 	tp->coalesce = 15000;	/* 15 us */
 | 
					 	tp->coalesce = 15000;	/* 15 us */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
 | 
					--- a/drivers/net/dsa/mv88e6xxx/chip.c
 | 
				
			||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
 | 
					+++ b/drivers/net/dsa/mv88e6xxx/chip.c
 | 
				
			||||||
@@ -6332,6 +6332,7 @@ static int mv88e6xxx_register_switch(str
 | 
					@@ -6333,6 +6333,7 @@ static int mv88e6xxx_register_switch(str
 | 
				
			||||||
 	ds->ops = &mv88e6xxx_switch_ops;
 | 
					 	ds->ops = &mv88e6xxx_switch_ops;
 | 
				
			||||||
 	ds->ageing_time_min = chip->info->age_time_coeff;
 | 
					 	ds->ageing_time_min = chip->info->age_time_coeff;
 | 
				
			||||||
 	ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
 | 
					 	ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,12 +14,12 @@ callback that the controller can trigger off.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
Signed-off-by: Robert Marko <robimarko@gmail.com>
 | 
					Signed-off-by: Robert Marko <robimarko@gmail.com>
 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
 drivers/bus/mhi/core/main.c | 1 +
 | 
					 drivers/bus/mhi/host/main.c | 1 +
 | 
				
			||||||
 include/linux/mhi.h         | 2 ++
 | 
					 include/linux/mhi.h         | 2 ++
 | 
				
			||||||
 2 files changed, 3 insertions(+)
 | 
					 2 files changed, 3 insertions(+)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
--- a/drivers/bus/mhi/core/main.c
 | 
					--- a/drivers/bus/mhi/host/main.c
 | 
				
			||||||
+++ b/drivers/bus/mhi/core/main.c
 | 
					+++ b/drivers/bus/mhi/host/main.c
 | 
				
			||||||
@@ -891,6 +891,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_
 | 
					@@ -891,6 +891,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_
 | 
				
			||||||
 			switch (event) {
 | 
					 			switch (event) {
 | 
				
			||||||
 			case MHI_EE_SBL:
 | 
					 			case MHI_EE_SBL:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@
 | 
				
			|||||||
 	},
 | 
					 	},
 | 
				
			||||||
 	[PORT_NPCM] = {
 | 
					 	[PORT_NPCM] = {
 | 
				
			||||||
 		.name		= "Nuvoton 16550",
 | 
					 		.name		= "Nuvoton 16550",
 | 
				
			||||||
@@ -2760,6 +2760,11 @@ serial8250_do_set_termios(struct uart_po
 | 
					@@ -2766,6 +2766,11 @@ serial8250_do_set_termios(struct uart_po
 | 
				
			||||||
 	unsigned long flags;
 | 
					 	unsigned long flags;
 | 
				
			||||||
 	unsigned int baud, quot, frac = 0;
 | 
					 	unsigned int baud, quot, frac = 0;
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user