kernel: bump 5.15 to 5.15.136

Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.136 Manually rebased: bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
graysky2 · Oct 20, 2023 · c0d024c · c0d024c
1 parent 67ce60c
commit c0d024c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/include/kernel-5.15 b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .135
-LINUX_KERNEL_HASH-5.15.135 = 14835e629e237f136cfed484fdb533c95242429809bdcdb2a2d66dfcb7447170
+LINUX_VERSION-5.15 = .136
+LINUX_KERNEL_HASH-5.15.136 = c624b9fe7ee4708d34cfd0b7ebc58037afac7463338cc498641ea31c55eeacb8
diff --git a/...et/linux/bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/...et/linux/bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
@@ -90,33 +90,38 @@ it on BCM4708 family.
  /*
   * Reset a halted HC.
   *
-@@ -611,10 +654,20 @@ static int xhci_init(struct usb_hcd *hcd
+@@ -629,11 +672,24 @@ static int xhci_run_finished(struct xhci
+ 	temp = readl(&xhci->ir_set->irq_pending);
+ 	writel(ER_IRQ_ENABLE(temp), &xhci->ir_set->irq_pending);
 
- static int xhci_run_finished(struct xhci_hcd *xhci)
- {
 -	if (xhci_start(xhci)) {
 -		xhci_halt(xhci);
+-		spin_unlock_irqrestore(&xhci->lock, flags);
 -		return -ENODEV;
++	-if (xhci_start(xhci)) {
++	-	xhci_halt(xhci);
++	-	spin_unlock_irqrestore(&xhci->lock, flags);
++	-	return -ENODEV;
 +	int err;
 +
 +	err = xhci_start(xhci);
 +	if (err) {
 +		err = -ENODEV;
 +		goto err_halt;
- 	}
++	}
 +
 +	if (xhci->quirks & XHCI_FAKE_DOORBELL) {
 +		err = xhci_fake_doorbell(xhci, 1);
 +		if (err)
 +			goto err_halt;
-+	}
+ 	}
 +
  	xhci->shared_hcd->state = HC_STATE_RUNNING;
  	xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;
 
-@@ -624,6 +677,10 @@ static int xhci_run_finished(struct xhci
- 	xhci_dbg_trace(xhci, trace_xhci_dbg_init,
- 			"Finished xhci_run for USB3 roothub");
+@@ -646,6 +702,10 @@ static int xhci_run_finished(struct xhci
+ 	spin_unlock_irqrestore(&xhci->lock, flags);
+
  	return 0;
 +
 +err_halt: