Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 013c0b6d authored by Manu Gautam's avatar Manu Gautam Committed by Gerrit - the friendly Code Review server
Browse files

usb: gadget: f_mbim: Handle response complete before notify_complete 



Some UDCs can report response_complete before notify_complete if ep0
events are processed before interrupt EP and interrupt EP completion
could be delayed due to interrupt moderation.
Handle this by checking same in response_complete and send notification
from delayed notify_complete.

Change-Id: Ia6c68706a3fdedb34ce5f144c1a3f8f1d78d6ca1
Signed-off-by: default avatarManu Gautam <mgautam@codeaurora.org>
parent d8d55bae

drivers/usb/gadget/function/f_mbim.c

+14 −2
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ struct mbim_notify_port { 
	struct usb_ep			*notify;

	struct usb_request		*notify_req;

	bool				notify_req_queued;

	bool				notify_pending;

};



struct f_mbim {
@@ -732,12 +733,15 @@ static void mbim_notify_complete(struct usb_ep *ep, struct usb_request *req) 
{

	struct f_mbim *mbim = req->context;



	pr_debug("dev:%pK\n", mbim);

	pr_debug("dev:%pK, pending:%d\n", mbim, mbim->not_port.notify_pending);



	spin_lock(&mbim->lock);

	mbim->not_port.notify_req_queued = false;

	switch (req->status) {

	case 0:

		/* Notify now if send_response completed before it */

		if (mbim->not_port.notify_pending)

			mbim_do_notify(mbim);

		break;



	case -ECONNRESET:
@@ -753,6 +757,7 @@ static void mbim_notify_complete(struct usb_ep *ep, struct usb_request *req) 
		pr_err("Unknown status --> %d\n", req->status);

		break;

	}

	mbim->not_port.notify_pending = false;



	spin_unlock(&mbim->lock);
@@ -869,7 +874,14 @@ static void mbim_response_complete(struct usb_ep *ep, struct usb_request *req) 


	pr_debug("%s: queue notify request if any new response available [%d]\n"

			, __func__, mbim->not_port.notify_req_queued);

	/*

	 * Some UDCs could report response_complete before nofify_complete.

	 * Handle this by marking flag and notify from delayed notify_complete.

	 */

	spin_lock(&mbim->lock);

	if (mbim->not_port.notify_req_queued)

		mbim->not_port.notify_pending = true;

	else

		mbim_do_notify(mbim);

	spin_unlock(&mbim->lock);

}