Skip to content

Commit 7a21b27

Browse files
pawellcdnsgregkh
authored andcommitted
usb: cdnsp: fix issue with ZLP - added TD_SIZE = 1
Patch modifies the TD_SIZE in TRB before ZLP TRB. The TD_SIZE in TRB before ZLP TRB must be set to 1 to force processing ZLP TRB by controller. cc: <stable@vger.kernel.org> Fixes: 3d82904 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver") Signed-off-by: Pawel Laszczak <pawell@cadence.com> Reviewed-by: Peter Chen <peter.chen@kernel.org> Link: https://lore.kernel.org/r/20221115092218.421267-1-pawell@cadence.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f90f5af commit 7a21b27

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

drivers/usb/cdns3/cdnsp-ring.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,10 +1763,15 @@ static u32 cdnsp_td_remainder(struct cdnsp_device *pdev,
17631763
int trb_buff_len,
17641764
unsigned int td_total_len,
17651765
struct cdnsp_request *preq,
1766-
bool more_trbs_coming)
1766+
bool more_trbs_coming,
1767+
bool zlp)
17671768
{
17681769
u32 maxp, total_packet_count;
17691770

1771+
/* Before ZLP driver needs set TD_SIZE = 1. */
1772+
if (zlp)
1773+
return 1;
1774+
17701775
/* One TRB with a zero-length data packet. */
17711776
if (!more_trbs_coming || (transferred == 0 && trb_buff_len == 0) ||
17721777
trb_buff_len == td_total_len)
@@ -1960,7 +1965,8 @@ int cdnsp_queue_bulk_tx(struct cdnsp_device *pdev, struct cdnsp_request *preq)
19601965
/* Set the TRB length, TD size, and interrupter fields. */
19611966
remainder = cdnsp_td_remainder(pdev, enqd_len, trb_buff_len,
19621967
full_len, preq,
1963-
more_trbs_coming);
1968+
more_trbs_coming,
1969+
zero_len_trb);
19641970

19651971
length_field = TRB_LEN(trb_buff_len) | TRB_TD_SIZE(remainder) |
19661972
TRB_INTR_TARGET(0);
@@ -2025,7 +2031,7 @@ int cdnsp_queue_ctrl_tx(struct cdnsp_device *pdev, struct cdnsp_request *preq)
20252031

20262032
if (preq->request.length > 0) {
20272033
remainder = cdnsp_td_remainder(pdev, 0, preq->request.length,
2028-
preq->request.length, preq, 1);
2034+
preq->request.length, preq, 1, 0);
20292035

20302036
length_field = TRB_LEN(preq->request.length) |
20312037
TRB_TD_SIZE(remainder) | TRB_INTR_TARGET(0);
@@ -2226,7 +2232,7 @@ static int cdnsp_queue_isoc_tx(struct cdnsp_device *pdev,
22262232
/* Set the TRB length, TD size, & interrupter fields. */
22272233
remainder = cdnsp_td_remainder(pdev, running_total,
22282234
trb_buff_len, td_len, preq,
2229-
more_trbs_coming);
2235+
more_trbs_coming, 0);
22302236

22312237
length_field = TRB_LEN(trb_buff_len) | TRB_INTR_TARGET(0);
22322238

0 commit comments

Comments
 (0)