From patchwork Thu Mar 25 11:54:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ray Chi X-Patchwork-Id: 12163881 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31322C433C1 for ; Thu, 25 Mar 2021 11:55:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0598619FE for ; Thu, 25 Mar 2021 11:55:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230260AbhCYLzG (ORCPT ); Thu, 25 Mar 2021 07:55:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230313AbhCYLyo (ORCPT ); Thu, 25 Mar 2021 07:54:44 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51390C06174A for ; Thu, 25 Mar 2021 04:54:44 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id x10so5929462ybr.11 for ; Thu, 25 Mar 2021 04:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=ikLgmRAmctyhP9E2Kd6Mo/ZLj4wWce8h02FacFXyEtQ=; b=Vw5vnKK7UFsOz+6sl0VNdfUgwheXMGOl1X8NUTpPCok2o1MObp7k4SHZV6bZTbLMAB j7MoVHKqMG+cFUs7cZf94WlGctw2xWYaE6eMdEpH1UhDEDn3sraQY3114QQtrI08xfDj SE3U+TNIbINEuBGVqH3YrFYrs9g0iF4l6cqrqRFl6EwPyecfyd5mKvi8L6ONXfvsWDld OZHCUz8RN9LAX79m23TUWkGOUwef7SUgj1EAYFLDhmKJaWTUUvHfObxm/y75CNcckzxR 7U0ivx5dnihGnOlVvicDOgh9yd8AEFHD8NNI5MfNZkoaU0pjRdTZ8sd25Vj8lpHoEeuq lacQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=ikLgmRAmctyhP9E2Kd6Mo/ZLj4wWce8h02FacFXyEtQ=; b=JoKstisvUQCgJjiRbof1+SwaAIkoXMa7HohMcXQ9kSaI5yhyP/otklcf48VAgcVTgh dtVCH4k2zJuCJqLMMqnJ59VdwpEtDpkKM0LwdD1WEXNHzR1v/hnzilFSmkqwnZ8nb324 Wd8CISPiuu/lczhdHhstG8sdMLHEUiNJfGGawJS7UimNOZuO+jBl9pCwWSOMdA8KXD9M rljMh9Fm1wpuB1jh1NfHWQTz8EFH5G/mteFMAZhWsC7Jh5H/wVOWoAzkMZ0N8MGN9kX1 1Olh9hBscGmVttMJ1+aFdoYd1+tiglzzPgZikkXjFMnnN32Hoz2UYEAEE4vywbZ7KGGx /zXQ== X-Gm-Message-State: AOAM53194h21SXomPIXYTNnrv1Nn8K1HBG/zZ3nhl/K/2kmRQwFxMLbe 6iNa8i6kX1s6MnS+SjAU9ka/yHvKkjg= X-Google-Smtp-Source: ABdhPJyVNer/NremsS8yTd2Fa3OjjSiWRdmqEQyiWBmvb1b80EbvmlnoCSMZq7cLpUz1qgY6nlrJOgiOgek= X-Received: from raychi.tao.corp.google.com ([2401:fa00:fc:202:ce8:375c:966a:532c]) (user=raychi job=sendgmr) by 2002:a25:16d4:: with SMTP id 203mr11317016ybw.80.1616673283555; Thu, 25 Mar 2021 04:54:43 -0700 (PDT) Date: Thu, 25 Mar 2021 19:54:36 +0800 Message-Id: <20210325115436.861299-1-raychi@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog Subject: [PATCH] usb: dwc3: add cancelled reason for dwc3 requests From: Ray Chi To: balbi@kernel.org, gregkh@linuxfoundation.org, Thinh.Nguyen@synopsys.com Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, albertccwang@google.com, Ray Chi Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Currently, when dwc3 handles request cancelled, dwc3 just returns -ECONNRESET for all requests. It will cause USB class drivers can't know if the requests are cancelled by other reasons. This patch will add the reason when the requests are cancelled. Signed-off-by: Ray Chi --- drivers/usb/dwc3/gadget.c | 6 +++--- drivers/usb/dwc3/gadget.h | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index e1442fc763e1..cc65fc064078 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1402,7 +1402,7 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep) dwc3_stop_active_transfer(dep, true, true); list_for_each_entry_safe(req, tmp, &dep->started_list, list) - dwc3_gadget_move_cancelled_request(req); + dwc3_gadget_move_cancelled_request(req, DWC3_REQUEST_DEQUEUED); /* If ep isn't started, then there's no end transfer pending */ if (!(dep->flags & DWC3_EP_END_TRANSFER_PENDING)) @@ -1776,7 +1776,7 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, * cancelled. */ list_for_each_entry_safe(r, t, &dep->started_list, list) - dwc3_gadget_move_cancelled_request(r); + dwc3_gadget_move_cancelled_request(r, DWC3_REQUEST_DEQUEUED); dep->flags &= ~DWC3_EP_WAIT_TRANSFER_COMPLETE; @@ -1848,7 +1848,7 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol) dwc3_stop_active_transfer(dep, true, true); list_for_each_entry_safe(req, tmp, &dep->started_list, list) - dwc3_gadget_move_cancelled_request(req); + dwc3_gadget_move_cancelled_request(req, DWC3_REQUEST_STALL); if (dep->flags & DWC3_EP_END_TRANSFER_PENDING) { dep->flags |= DWC3_EP_PENDING_CLEAR_STALL; diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h index 0cd281949970..a23e85bd3933 100644 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -56,6 +56,12 @@ struct dwc3; /* Frame/Microframe Number Mask */ #define DWC3_FRNUMBER_MASK 0x3fff + +/* Cancel reason for dwc3 request */ +#define DWC3_REQUEST_DEQUEUED -ECONNRESET /* Request get dequeued */ +#define DWC3_REQUEST_DISCONNECTED -ESHUTDOWN /* Device is disconnected/disabled */ +#define DWC3_REQUEST_STALL -EPIPE /* Bus or protocol error */ + /* -------------------------------------------------------------------------- */ #define to_dwc3_request(r) (container_of(r, struct dwc3_request, request)) @@ -90,15 +96,17 @@ static inline void dwc3_gadget_move_started_request(struct dwc3_request *req) /** * dwc3_gadget_move_cancelled_request - move @req to the cancelled_list * @req: the request to be moved + * @reason: cancelled reason for the dwc3 request * * Caller should take care of locking. This function will move @req from its * current list to the endpoint's cancelled_list. */ -static inline void dwc3_gadget_move_cancelled_request(struct dwc3_request *req) +static inline void dwc3_gadget_move_cancelled_request(struct dwc3_request *req, int reason) { struct dwc3_ep *dep = req->dep; req->status = DWC3_REQUEST_STATUS_CANCELLED; + req->request.status = reason; list_move_tail(&req->list, &dep->cancelled_list); }