Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1301934 > unrolled thread
| Started by | Kamal Mostafa <kamal@canonical.com> |
|---|---|
| First post | 2016-01-05 20:50 +0100 |
| Last post | 2016-01-07 04:00 +0100 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 4.2.y-ckt 009/211] xhci: don't finish a TD if we get a short transfer event mid TD Kamal Mostafa <kamal@canonical.com> - 2016-01-05 20:50 +0100
Re: [PATCH 4.2.y-ckt 009/211] xhci: don't finish a TD if we get a short transfer event mid TD Ben Hutchings <ben@decadent.org.uk> - 2016-01-06 18:10 +0100
Re: [PATCH 4.2.y-ckt 009/211] xhci: don't finish a TD if we get a short transfer event mid TD Kamal Mostafa <kamal@canonical.com> - 2016-01-06 21:00 +0100
Re: [PATCH 4.2.y-ckt 009/211] xhci: don't finish a TD if we get a short transfer event mid TD Ben Hutchings <ben@decadent.org.uk> - 2016-01-07 04:00 +0100
| From | Kamal Mostafa <kamal@canonical.com> |
|---|---|
| Date | 2016-01-05 20:50 +0100 |
| Subject | [PATCH 4.2.y-ckt 009/211] xhci: don't finish a TD if we get a short transfer event mid TD |
| Message-ID | <qNFMe-7nV-35@gated-at.bofh.it> |
4.2.8-ckt1 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <mathias.nyman@linux.intel.com>
commit e210c422b6fdd2dc123bedc588f399aefd8bf9de upstream.
If the difference is big enough between the bytes asked and received
in a bulk transfer we can get a short transfer event pointing to a TRB in
the middle of the TD. We don't want to handle the TD yet as we will anyway
receive a new event for the last TRB in the TD.
Hold off from finishing the TD and removing it from the list until we
receive an event for the last TRB in the TD
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[ kamal: backport to 4.2-stable: context ]
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
drivers/usb/host/xhci-ring.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 63041c1..d08d1f1 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2156,6 +2156,10 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
EVENT_TRB_LEN(le32_to_cpu(event->transfer_len)));
/* Fast path - was this the last TRB in the TD for this URB? */
if (event_trb == td->last_trb) {
+ if (td->urb_length_set && trb_comp_code == COMP_SHORT_TX)
+ return finish_td(xhci, td, event_trb, event, ep,
+ status, false);
+
if (EVENT_TRB_LEN(le32_to_cpu(event->transfer_len)) != 0) {
td->urb->actual_length =
td->urb->transfer_buffer_length -
@@ -2207,6 +2211,12 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
td->urb->actual_length +=
TRB_LEN(le32_to_cpu(cur_trb->generic.field[2])) -
EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
+
+ if (trb_comp_code == COMP_SHORT_TX) {
+ xhci_dbg(xhci, "mid bulk/intr SP, wait for last TRB event\n");
+ td->urb_length_set = true;
+ return 0;
+ }
}
return finish_td(xhci, td, event_trb, event, ep, status, false);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| Date | 2016-01-06 18:10 +0100 |
| Subject | Re: [PATCH 4.2.y-ckt 009/211] xhci: don't finish a TD if we get a short transfer event mid TD |
| Message-ID | <qNZKX-43H-27@gated-at.bofh.it> |
| In reply to | #1301934 |
[Multipart message — attachments visible in raw view] — view raw
On Tue, 2016-01-05 at 11:41 -0800, Kamal Mostafa wrote: > 4.2.8-ckt1 -stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Mathias Nyman <mathias.nyman@linux.intel.com> > > commit e210c422b6fdd2dc123bedc588f399aefd8bf9de upstream. > > If the difference is big enough between the bytes asked and received > in a bulk transfer we can get a short transfer event pointing to a TRB in > the middle of the TD. We don't want to handle the TD yet as we will anyway > receive a new event for the last TRB in the TD. > > Hold off from finishing the TD and removing it from the list until we > receive an event for the last TRB in the TD > > Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > [ kamal: backport to 4.2-stable: context ] > Signed-off-by: Kamal Mostafa <kamal@canonical.com> [...] This causes regressions (see https://bugs.debian.org/808602 and https://bugs.debian.org/808953 ) so please hold off until there's a complete fix upstream. Ben. -- Ben Hutchings It is easier to write an incorrect program than to understand a correct one.
[toc] | [prev] | [next] | [standalone]
| From | Kamal Mostafa <kamal@canonical.com> |
|---|---|
| Date | 2016-01-06 21:00 +0100 |
| Subject | Re: [PATCH 4.2.y-ckt 009/211] xhci: don't finish a TD if we get a short transfer event mid TD |
| Message-ID | <qO2pt-5zb-27@gated-at.bofh.it> |
| In reply to | #1302900 |
On Wed, 2016-01-06 at 17:05 +0000, Ben Hutchings wrote: > On Tue, 2016-01-05 at 11:41 -0800, Kamal Mostafa wrote: > > 4.2.8-ckt1 -stable review patch. If anyone has any objections, please let me know. > > > > ------------------ > > > > From: Mathias Nyman <mathias.nyman@linux.intel.com> > > > > commit e210c422b6fdd2dc123bedc588f399aefd8bf9de upstream. > > > > If the difference is big enough between the bytes asked and received > > in a bulk transfer we can get a short transfer event pointing to a TRB in > > the middle of the TD. We don't want to handle the TD yet as we will anyway > > receive a new event for the last TRB in the TD. > > > > Hold off from finishing the TD and removing it from the list until we > > receive an event for the last TRB in the TD > > > > Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > [ kamal: backport to 4.2-stable: context ] > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > [...] > > This causes regressions (see https://bugs.debian.org/808602 and > https://bugs.debian.org/808953 ) so please hold off until there's a > complete fix upstream. Thanks for the heads-up, Ben. I'll defer it for 4.2-stable. I'm thinking that it should also be reverted from the stable kernels that already carry it (3.2, 3.13, 3.16, 3.19), unless that complete upstream fix is really imminent. Is it? -Kamal -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| Date | 2016-01-07 04:00 +0100 |
| Subject | Re: [PATCH 4.2.y-ckt 009/211] xhci: don't finish a TD if we get a short transfer event mid TD |
| Message-ID | <qO8XU-1Eh-7@gated-at.bofh.it> |
| In reply to | #1303034 |
[Multipart message — attachments visible in raw view] — view raw
On Wed, 2016-01-06 at 11:55 -0800, Kamal Mostafa wrote: > On Wed, 2016-01-06 at 17:05 +0000, Ben Hutchings wrote: > > On Tue, 2016-01-05 at 11:41 -0800, Kamal Mostafa wrote: > > > 4.2.8-ckt1 -stable review patch. If anyone has any objections, please let me know. > > > > > > ------------------ > > > > > > From: Mathias Nyman <mathias.nyman@linux.intel.com> > > > > > > commit e210c422b6fdd2dc123bedc588f399aefd8bf9de upstream. > > > > > > If the difference is big enough between the bytes asked and received > > > in a bulk transfer we can get a short transfer event pointing to a TRB in > > > the middle of the TD. We don't want to handle the TD yet as we will anyway > > > receive a new event for the last TRB in the TD. > > > > > > Hold off from finishing the TD and removing it from the list until we > > > receive an event for the last TRB in the TD > > > > > > Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > [ kamal: backport to 4.2-stable: context ] > > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > > [...] > > > > This causes regressions (see https://bugs.debian.org/808602 and > > https://bugs.debian.org/808953 ) so please hold off until there's a > > complete fix upstream. > > Thanks for the heads-up, Ben. I'll defer it for 4.2-stable. > > I'm thinking that it should also be reverted from the stable kernels > that already carry it (3.2, 3.13, 3.16, 3.19), unless that complete > upstream fix is really imminent. Is it? Normally if there's a regression that affects both mainline and stable branches, we wait for it to be fixed in mainline first. Ben. -- Ben Hutchings Life would be so much easier if we could look at the source code.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web