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

Commit aca5b9eb authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Felipe Balbi
Browse files

usb: gadget: udc: renesas_usb3: Fix usb_gadget_giveback_request() calling 



According to the gadget.h, a "complete" function will always be called
with interrupts disabled. However, sometimes usb3_request_done() function
is called with interrupts enabled. So, this function should be held
by spin_lock_irqsave() to disable interruption. Also, this driver has
to call spin_unlock() to avoid spinlock recursion by this driver before
calling usb_gadget_giveback_request().

Reported-by: default avatarKazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
Tested-by: default avatarKazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
Fixes: 746bfe63 ("usb: gadget: renesas_usb3: add support for Renesas USB3.0 peripheral controller")
Cc: <stable@vger.kernel.org> # v4.5+
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 40d829fb

drivers/usb/gadget/udc/renesas_usb3.c

+16 −5
Original line number Diff line number Diff line
@@ -838,21 +838,32 @@ static struct renesas_usb3_request *usb3_get_request(struct renesas_usb3_ep 
	return usb3_req;

}



static void usb3_request_done(struct renesas_usb3_ep *usb3_ep,

			      struct renesas_usb3_request *usb3_req, int status)

static void __usb3_request_done(struct renesas_usb3_ep *usb3_ep,

				struct renesas_usb3_request *usb3_req,

				int status)

{

	struct renesas_usb3 *usb3 = usb3_ep_to_usb3(usb3_ep);

	unsigned long flags;



	dev_dbg(usb3_to_dev(usb3), "giveback: ep%2d, %u, %u, %d\n",

		usb3_ep->num, usb3_req->req.length, usb3_req->req.actual,

		status);

	usb3_req->req.status = status;

	spin_lock_irqsave(&usb3->lock, flags);

	usb3_ep->started = false;

	list_del_init(&usb3_req->queue);

	spin_unlock_irqrestore(&usb3->lock, flags);

	spin_unlock(&usb3->lock);

	usb_gadget_giveback_request(&usb3_ep->ep, &usb3_req->req);

	spin_lock(&usb3->lock);

}



static void usb3_request_done(struct renesas_usb3_ep *usb3_ep,

			      struct renesas_usb3_request *usb3_req, int status)

{

	struct renesas_usb3 *usb3 = usb3_ep_to_usb3(usb3_ep);

	unsigned long flags;



	spin_lock_irqsave(&usb3->lock, flags);

	__usb3_request_done(usb3_ep, usb3_req, status);

	spin_unlock_irqrestore(&usb3->lock, flags);

}



static void usb3_irq_epc_pipe0_status_end(struct renesas_usb3 *usb3)