kernel: bump 5.15 to 5.15.90
All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
		 John Audia
					John Audia
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							8f47b87b0c
						
					
				
				
					commit
					4e9365a654
				
			| @@ -1,2 +1,2 @@ | |||||||
| LINUX_VERSION-5.15 = .89 | LINUX_VERSION-5.15 = .90 | ||||||
| LINUX_KERNEL_HASH-5.15.89 = e7311b874e014bb6d37c051319bd6a4a4e3d05a1c32546522deabbfd2d752fe8 | LINUX_KERNEL_HASH-5.15.90 = e6fd430022686753af7516fe7544f96aab379509dc5b7829017bdcd92b393b42 | ||||||
|   | |||||||
| @@ -1123,7 +1123,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> | |||||||
|  } |  } | ||||||
| --- a/drivers/usb/core/hub.c
 | --- a/drivers/usb/core/hub.c
 | ||||||
| +++ b/drivers/usb/core/hub.c
 | +++ b/drivers/usb/core/hub.c
 | ||||||
| @@ -5582,7 +5582,7 @@ static void port_event(struct usb_hub *h
 | @@ -5585,7 +5585,7 @@ static void port_event(struct usb_hub *h
 | ||||||
|  		port_dev->over_current_count++; |  		port_dev->over_current_count++; | ||||||
|  		port_over_current_notify(port_dev); |  		port_over_current_notify(port_dev); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -70,7 +70,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> | |||||||
|   * @dev: the device whose endpoint is being disabled |   * @dev: the device whose endpoint is being disabled | ||||||
| --- a/include/linux/usb.h | --- a/include/linux/usb.h | ||||||
| +++ b/include/linux/usb.h | +++ b/include/linux/usb.h | ||||||
| @@ -1842,6 +1842,8 @@ extern int usb_clear_halt(struct usb_dev | @@ -1845,6 +1845,8 @@ extern int usb_clear_halt(struct usb_dev | ||||||
|  extern int usb_reset_configuration(struct usb_device *dev); |  extern int usb_reset_configuration(struct usb_device *dev); | ||||||
|  extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate); |  extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate); | ||||||
|  extern void usb_reset_endpoint(struct usb_device *dev, unsigned int epaddr); |  extern void usb_reset_endpoint(struct usb_device *dev, unsigned int epaddr); | ||||||
|   | |||||||
| @@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> | |||||||
|   * non-error returns are a promise to giveback() the urb later |   * non-error returns are a promise to giveback() the urb later | ||||||
|   * we drop ownership so next owner (or urb unlink) can get it |   * we drop ownership so next owner (or urb unlink) can get it | ||||||
|   */ |   */ | ||||||
| @@ -5443,6 +5546,7 @@ static const struct hc_driver xhci_hc_dr | @@ -5457,6 +5560,7 @@ static const struct hc_driver xhci_hc_dr | ||||||
|  	.endpoint_reset =	xhci_endpoint_reset, |  	.endpoint_reset =	xhci_endpoint_reset, | ||||||
|  	.check_bandwidth =	xhci_check_bandwidth, |  	.check_bandwidth =	xhci_check_bandwidth, | ||||||
|  	.reset_bandwidth =	xhci_reset_bandwidth, |  	.reset_bandwidth =	xhci_reset_bandwidth, | ||||||
|   | |||||||
| @@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  |  | ||||||
| --- a/drivers/usb/host/xhci-pci.c | --- a/drivers/usb/host/xhci-pci.c | ||||||
| +++ b/drivers/usb/host/xhci-pci.c | +++ b/drivers/usb/host/xhci-pci.c | ||||||
| @@ -293,6 +293,7 @@ static void xhci_pci_quirks(struct devic | @@ -296,6 +296,7 @@ static void xhci_pci_quirks(struct devic | ||||||
|  	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) { |  	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) { | ||||||
|  		xhci->quirks |= XHCI_LPM_SUPPORT; |  		xhci->quirks |= XHCI_LPM_SUPPORT; | ||||||
|  		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; |  		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; | ||||||
| @@ -50,7 +50,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  	addr = xhci_trb_virt_to_dma(new_seg, new_deq); |  	addr = xhci_trb_virt_to_dma(new_seg, new_deq); | ||||||
| --- a/drivers/usb/host/xhci.h | --- a/drivers/usb/host/xhci.h | ||||||
| +++ b/drivers/usb/host/xhci.h | +++ b/drivers/usb/host/xhci.h | ||||||
| @@ -1905,6 +1905,7 @@ struct xhci_hcd { | @@ -1906,6 +1906,7 @@ struct xhci_hcd { | ||||||
|  #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(42) |  #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(42) | ||||||
|  #define XHCI_SUSPEND_RESUME_CLKS	BIT_ULL(43) |  #define XHCI_SUSPEND_RESUME_CLKS	BIT_ULL(43) | ||||||
|  #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44) |  #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44) | ||||||
|   | |||||||
| @@ -205,7 +205,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  		xhci_err(xhci, "Tried to move enqueue past ring segment\n"); |  		xhci_err(xhci, "Tried to move enqueue past ring segment\n"); | ||||||
|  		return; |  		return; | ||||||
|  	} |  	} | ||||||
| @@ -3159,7 +3162,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd | @@ -3162,7 +3165,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd | ||||||
|  	 * that clears the EHB. |  	 * that clears the EHB. | ||||||
|  	 */ |  	 */ | ||||||
|  	while (xhci_handle_event(xhci) > 0) { |  	while (xhci_handle_event(xhci) > 0) { | ||||||
| @@ -214,7 +214,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  			continue; |  			continue; | ||||||
|  		xhci_update_erst_dequeue(xhci, event_ring_deq); |  		xhci_update_erst_dequeue(xhci, event_ring_deq); | ||||||
|  		event_ring_deq = xhci->event_ring->dequeue; |  		event_ring_deq = xhci->event_ring->dequeue; | ||||||
| @@ -3301,7 +3304,8 @@ static int prepare_ring(struct xhci_hcd | @@ -3304,7 +3307,8 @@ static int prepare_ring(struct xhci_hcd | ||||||
|  		} |  		} | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
|   | |||||||
| @@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  			cycle_state, type, max_packet, flags); |  			cycle_state, type, max_packet, flags); | ||||||
| --- a/drivers/usb/host/xhci-pci.c | --- a/drivers/usb/host/xhci-pci.c | ||||||
| +++ b/drivers/usb/host/xhci-pci.c | +++ b/drivers/usb/host/xhci-pci.c | ||||||
| @@ -294,6 +294,7 @@ static void xhci_pci_quirks(struct devic | @@ -297,6 +297,7 @@ static void xhci_pci_quirks(struct devic | ||||||
|  		xhci->quirks |= XHCI_LPM_SUPPORT; |  		xhci->quirks |= XHCI_LPM_SUPPORT; | ||||||
|  		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; |  		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; | ||||||
|  		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; |  		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; | ||||||
| @@ -63,7 +63,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && |  	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && | ||||||
| --- a/drivers/usb/host/xhci.h | --- a/drivers/usb/host/xhci.h | ||||||
| +++ b/drivers/usb/host/xhci.h | +++ b/drivers/usb/host/xhci.h | ||||||
| @@ -1907,6 +1907,7 @@ struct xhci_hcd { | @@ -1908,6 +1908,7 @@ struct xhci_hcd { | ||||||
|  #define XHCI_SUSPEND_RESUME_CLKS	BIT_ULL(43) |  #define XHCI_SUSPEND_RESUME_CLKS	BIT_ULL(43) | ||||||
|  #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44) |  #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44) | ||||||
|  #define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(45) |  #define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(45) | ||||||
|   | |||||||
| @@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  |  | ||||||
| --- a/drivers/usb/host/xhci-pci.c | --- a/drivers/usb/host/xhci-pci.c | ||||||
| +++ b/drivers/usb/host/xhci-pci.c | +++ b/drivers/usb/host/xhci-pci.c | ||||||
| @@ -295,6 +295,7 @@ static void xhci_pci_quirks(struct devic | @@ -298,6 +298,7 @@ static void xhci_pci_quirks(struct devic | ||||||
|  		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; |  		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; | ||||||
|  		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; |  		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; | ||||||
|  		xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG; |  		xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG; | ||||||
| @@ -36,7 +36,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && |  	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && | ||||||
| --- a/drivers/usb/host/xhci-ring.c | --- a/drivers/usb/host/xhci-ring.c | ||||||
| +++ b/drivers/usb/host/xhci-ring.c | +++ b/drivers/usb/host/xhci-ring.c | ||||||
| @@ -3614,14 +3614,15 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | @@ -3617,14 +3617,15 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | ||||||
|  	unsigned int num_trbs; |  	unsigned int num_trbs; | ||||||
|  	unsigned int start_cycle, num_sgs = 0; |  	unsigned int start_cycle, num_sgs = 0; | ||||||
|  	unsigned int enqd_len, block_len, trb_buff_len, full_len; |  	unsigned int enqd_len, block_len, trb_buff_len, full_len; | ||||||
| @@ -54,7 +54,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  	full_len = urb->transfer_buffer_length; |  	full_len = urb->transfer_buffer_length; | ||||||
|  	/* If we have scatter/gather list, we use it. */ |  	/* If we have scatter/gather list, we use it. */ | ||||||
|  	if (urb->num_sgs && !(urb->transfer_flags & URB_DMA_MAP_SINGLE)) { |  	if (urb->num_sgs && !(urb->transfer_flags & URB_DMA_MAP_SINGLE)) { | ||||||
| @@ -3658,6 +3659,17 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | @@ -3661,6 +3662,17 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | ||||||
|  	start_cycle = ring->cycle_state; |  	start_cycle = ring->cycle_state; | ||||||
|  	send_addr = addr; |  	send_addr = addr; | ||||||
|   |   | ||||||
| @@ -72,7 +72,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  	/* Queue the TRBs, even if they are zero-length */ |  	/* Queue the TRBs, even if they are zero-length */ | ||||||
|  	for (enqd_len = 0; first_trb || enqd_len < full_len; |  	for (enqd_len = 0; first_trb || enqd_len < full_len; | ||||||
|  			enqd_len += trb_buff_len) { |  			enqd_len += trb_buff_len) { | ||||||
| @@ -3670,6 +3682,11 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | @@ -3673,6 +3685,11 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | ||||||
|  		if (enqd_len + trb_buff_len > full_len) |  		if (enqd_len + trb_buff_len > full_len) | ||||||
|  			trb_buff_len = full_len - enqd_len; |  			trb_buff_len = full_len - enqd_len; | ||||||
|   |   | ||||||
| @@ -86,7 +86,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  			first_trb = false; |  			first_trb = false; | ||||||
| --- a/drivers/usb/host/xhci.h | --- a/drivers/usb/host/xhci.h | ||||||
| +++ b/drivers/usb/host/xhci.h | +++ b/drivers/usb/host/xhci.h | ||||||
| @@ -1908,6 +1908,7 @@ struct xhci_hcd { | @@ -1909,6 +1909,7 @@ struct xhci_hcd { | ||||||
|  #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44) |  #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44) | ||||||
|  #define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(45) |  #define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(45) | ||||||
|  #define XHCI_VLI_TRB_CACHE_BUG	BIT_ULL(46) |  #define XHCI_VLI_TRB_CACHE_BUG	BIT_ULL(46) | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  |  | ||||||
| --- a/drivers/usb/host/xhci-ring.c | --- a/drivers/usb/host/xhci-ring.c | ||||||
| +++ b/drivers/usb/host/xhci-ring.c | +++ b/drivers/usb/host/xhci-ring.c | ||||||
| @@ -3614,7 +3614,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | @@ -3617,7 +3617,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | ||||||
|  	unsigned int num_trbs; |  	unsigned int num_trbs; | ||||||
|  	unsigned int start_cycle, num_sgs = 0; |  	unsigned int start_cycle, num_sgs = 0; | ||||||
|  	unsigned int enqd_len, block_len, trb_buff_len, full_len; |  	unsigned int enqd_len, block_len, trb_buff_len, full_len; | ||||||
| @@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  	u32 field, length_field, remainder, maxpacket; |  	u32 field, length_field, remainder, maxpacket; | ||||||
|  	u64 addr, send_addr; |  	u64 addr, send_addr; | ||||||
|   |   | ||||||
| @@ -3660,14 +3660,9 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | @@ -3663,14 +3663,9 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | ||||||
|  	send_addr = addr; |  	send_addr = addr; | ||||||
|   |   | ||||||
|  	if (xhci->quirks & XHCI_VLI_SS_BULK_OUT_BUG && |  	if (xhci->quirks & XHCI_VLI_SS_BULK_OUT_BUG && | ||||||
| @@ -40,7 +40,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  	} |  	} | ||||||
|   |   | ||||||
|  	/* Queue the TRBs, even if they are zero-length */ |  	/* Queue the TRBs, even if they are zero-length */ | ||||||
| @@ -3682,7 +3677,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | @@ -3685,7 +3680,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | ||||||
|  		if (enqd_len + trb_buff_len > full_len) |  		if (enqd_len + trb_buff_len > full_len) | ||||||
|  			trb_buff_len = full_len - enqd_len; |  			trb_buff_len = full_len - enqd_len; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -127,7 +127,7 @@ it on BCM4708 family. | |||||||
|  /* |  /* | ||||||
| --- a/drivers/usb/host/xhci.h | --- a/drivers/usb/host/xhci.h | ||||||
| +++ b/drivers/usb/host/xhci.h | +++ b/drivers/usb/host/xhci.h | ||||||
| @@ -1905,6 +1905,7 @@ struct xhci_hcd { | @@ -1906,6 +1906,7 @@ struct xhci_hcd { | ||||||
|  #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(42) |  #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(42) | ||||||
|  #define XHCI_SUSPEND_RESUME_CLKS	BIT_ULL(43) |  #define XHCI_SUSPEND_RESUME_CLKS	BIT_ULL(43) | ||||||
|  #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44) |  #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44) | ||||||
|   | |||||||
| @@ -29,7 +29,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support | |||||||
|   |   | ||||||
|  #define QUECTEL_VENDOR_ID			0x2c7c |  #define QUECTEL_VENDOR_ID			0x2c7c | ||||||
|  /* These Quectel products use Quectel's vendor ID */ |  /* These Quectel products use Quectel's vendor ID */ | ||||||
| @@ -1156,6 +1158,11 @@ static const struct usb_device_id option | @@ -1162,6 +1164,11 @@ static const struct usb_device_id option | ||||||
|  	  .driver_info = ZLP }, |  	  .driver_info = ZLP }, | ||||||
|  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), |  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), | ||||||
|  	  .driver_info = RSVD(4) }, |  	  .driver_info = RSVD(4) }, | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user