projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 6.1 to 6.1.89
[openwrt/openwrt.git]
/
target
/
linux
/
bcm27xx
/
patches-6.1
/
950-0361-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
diff --git
a/target/linux/bcm27xx/patches-6.1/950-0361-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
b/target/linux/bcm27xx/patches-6.1/950-0361-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
index ab76ad76cd17ae0ec692a28eb8230bb96f6ff397..414716760031f109b41d765faf5c71c9fef1e79c 100644
(file)
--- a/
target/linux/bcm27xx/patches-6.1/950-0361-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
+++ b/
target/linux/bcm27xx/patches-6.1/950-0361-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
@@
-144,7
+144,7
@@
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
if (ret)
return -ENOMEM;
if (ret)
return -ENOMEM;
-@@ -181
1,7 +1815
,7 @@ int xhci_alloc_erst(struct xhci_hcd *xhc
+@@ -181
3,7 +1817
,7 @@ int xhci_alloc_erst(struct xhci_hcd *xhc
for (val = 0; val < evt_ring->num_segs; val++) {
entry = &erst->entries[val];
entry->seg_addr = cpu_to_le64(seg->dma);
for (val = 0; val < evt_ring->num_segs; val++) {
entry = &erst->entries[val];
entry->seg_addr = cpu_to_le64(seg->dma);
@@
-204,7
+204,7
@@
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
xhci_err(xhci, "Tried to move enqueue past ring segment\n");
return;
}
xhci_err(xhci, "Tried to move enqueue past ring segment\n");
return;
}
-@@ -315
0,7 +3153
,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd
+@@ -315
1,7 +3154
,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd
* that clears the EHB.
*/
while (xhci_handle_event(xhci) > 0) {
* that clears the EHB.
*/
while (xhci_handle_event(xhci) > 0) {
@@
-213,7
+213,7
@@
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
continue;
xhci_update_erst_dequeue(xhci, event_ring_deq);
event_ring_deq = xhci->event_ring->dequeue;
continue;
xhci_update_erst_dequeue(xhci, event_ring_deq);
event_ring_deq = xhci->event_ring->dequeue;
-@@ -329
2,7 +3295
,8 @@ static int prepare_ring(struct xhci_hcd
+@@ -329
3,7 +3296
,8 @@ static int prepare_ring(struct xhci_hcd
}
}
}
}
@@
-247,7
+247,7
@@
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
* when the cycle bit is set to 1.
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
* when the cycle bit is set to 1.
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
-@@ -163
4,6 +1634
,7 @@ struct xhci_ring {
+@@ -163
9,6 +1639
,7 @@ struct xhci_ring {
unsigned int num_trbs_free;
unsigned int num_trbs_free_temp;
unsigned int bounce_buf_len;
unsigned int num_trbs_free;
unsigned int num_trbs_free_temp;
unsigned int bounce_buf_len;