public inbox for linux-usb@vger.kernel.org
 help / color / mirror / Atom feed
From: Xu Yang <xu.yang_2@nxp.com>
To: peter.chen@kernel.org, gregkh@linuxfoundation.org
Cc: linux-usb@vger.kernel.org, imx@lists.linux.dev, jun.li@nxp.com
Subject: [PATCH 3/3] usb: chipidea: udc: make isoc endpoint a bit error tolerant
Date: Thu, 12 Sep 2024 11:35:51 +0800	[thread overview]
Message-ID: <20240912033551.910337-3-xu.yang_2@nxp.com> (raw)
In-Reply-To: <20240912033551.910337-1-xu.yang_2@nxp.com>

When a endpoint met errors, the usb controller will firstly assert
related error bit in status filed of dTD, then ENDPTCOMPLETE will be
asserted. Finally, USBSTS.UEI will be set.

Due to isoc transfers are error-tolerant transfers, we can make isoc
endpoint a bit error tolerant on device mode too. In case of error,
it's possilbe to resume the endpoint by reprime the corresponding
endpoint.

When error occurs, this will allow error dTD be deleted from dQH and
giveback request to user. Then, a reprime/prime operation is executed
depends on whether dQH is empty or not. If dQH is not empty, reprime
will be done during dequeue process. If dQH is empty, prime will be
done when new dTD is linked. In this way, isoc transfer can be recovered
from a small number of errors.

Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
---
 drivers/usb/chipidea/udc.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 0ab57b87b07b..b1a1be6439b6 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -683,6 +683,7 @@ static int _hardware_dequeue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
 	unsigned remaining_length;
 	unsigned actual = hwreq->req.length;
 	struct ci_hdrc *ci = hwep->ci;
+	bool is_isoc = hwep->type == USB_ENDPOINT_XFER_ISOC;
 
 	if (hwreq->req.status != -EALREADY)
 		return -EINVAL;
@@ -696,7 +697,7 @@ static int _hardware_dequeue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
 			int n = hw_ep_bit(hwep->num, hwep->dir);
 
 			if (ci->rev == CI_REVISION_24 ||
-			    ci->rev == CI_REVISION_22)
+			    ci->rev == CI_REVISION_22 || is_isoc)
 				if (!hw_read(ci, OP_ENDPTSTAT, BIT(n)))
 					reprime_dtd(ci, hwep, node);
 			hwreq->req.status = -EALREADY;
@@ -707,7 +708,6 @@ static int _hardware_dequeue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
 		remaining_length >>= __ffs(TD_TOTAL_BYTES);
 		actual -= remaining_length;
 
-		hwreq->req.status = tmptoken & TD_STATUS;
 		if ((TD_STATUS_HALTED & hwreq->req.status)) {
 			hwreq->req.status = -EPIPE;
 			break;
@@ -715,11 +715,13 @@ static int _hardware_dequeue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq)
 			hwreq->req.status = -EPROTO;
 			break;
 		} else if ((TD_STATUS_TR_ERR & hwreq->req.status)) {
-			hwreq->req.status = -EILSEQ;
-			break;
+			if (!is_isoc) {
+				hwreq->req.status = -EILSEQ;
+				break;
+			}
 		}
 
-		if (remaining_length) {
+		if (remaining_length && !is_isoc) {
 			if (hwep->dir == TX) {
 				hwreq->req.status = -EPROTO;
 				break;
-- 
2.34.1


  parent reply	other threads:[~2024-09-12  3:35 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-12  3:35 [PATCH 1/3] usb: chipidea: udc: handle USB Error Interrupt if IOC not set Xu Yang
2024-09-12  3:35 ` [PATCH 2/3] usb: chipidea: udc: improve dTD link logic Xu Yang
2024-09-12  4:54   ` Frank Li
2024-09-13  1:52     ` Xu Yang
2024-09-13  8:51   ` kernel test robot
2024-09-12  3:35 ` Xu Yang [this message]
2024-09-12  5:13   ` [PATCH 3/3] usb: chipidea: udc: make isoc endpoint a bit error tolerant Frank Li
2024-09-13  1:55     ` Xu Yang
2024-09-13  1:49   ` Peter Chen
2024-09-13  3:12     ` Xu Yang
2024-09-12  5:26 ` [PATCH 1/3] usb: chipidea: udc: handle USB Error Interrupt if IOC not set Frank Li
2024-09-13  3:21   ` Xu Yang
2024-09-13  1:37 ` Peter Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240912033551.910337-3-xu.yang_2@nxp.com \
    --to=xu.yang_2@nxp.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=imx@lists.linux.dev \
    --cc=jun.li@nxp.com \
    --cc=linux-usb@vger.kernel.org \
    --cc=peter.chen@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox