]> www.infradead.org Git - users/hch/misc.git/commitdiff
usb: gadget: f_tcm: Handle abort command
authorThinh Nguyen <Thinh.Nguyen@synopsys.com>
Wed, 11 Dec 2024 00:33:19 +0000 (00:33 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Dec 2024 07:56:07 +0000 (08:56 +0100)
Implement usbg_aborted_task() to cancel aborted outstanding requests.

Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://lore.kernel.org/r/6d2a05f120a0384e36b5150b50eec53a0991f400.1733876548.git.Thinh.Nguyen@synopsys.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/function/f_tcm.c

index 696d34e04e7de71ed8e83c4d218b92cf2d13612f..2a74414c7fd14122a4d5034d65568431cf45ebf3 100644 (file)
@@ -1257,6 +1257,24 @@ static void usbg_queue_tm_rsp(struct se_cmd *se_cmd)
 
 static void usbg_aborted_task(struct se_cmd *se_cmd)
 {
+       struct usbg_cmd *cmd = container_of(se_cmd, struct usbg_cmd, se_cmd);
+       struct f_uas *fu = cmd->fu;
+       struct usb_gadget *gadget = fuas_to_gadget(fu);
+       struct uas_stream *stream = &fu->stream[se_cmd->map_tag];
+       int ret = 0;
+
+       if (stream->req_out->status == -EINPROGRESS)
+               ret = usb_ep_dequeue(fu->ep_out, stream->req_out);
+       else if (stream->req_in->status == -EINPROGRESS)
+               ret = usb_ep_dequeue(fu->ep_in, stream->req_in);
+       else if (stream->req_status->status == -EINPROGRESS)
+               ret = usb_ep_dequeue(fu->ep_status, stream->req_status);
+
+       if (ret)
+               dev_err(&gadget->dev, "Failed to abort cmd tag %d, (%d)\n",
+                       cmd->tag, ret);
+
+       cmd->state = UASP_QUEUE_COMMAND;
 }
 
 static const char *usbg_check_wwn(const char *name)