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

Commit 723bd3b9 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Greg Kroah-Hartman
Browse files

usb: gadget: udc: renesas_usb3: fix pm_runtime functions calling 



commit cdc876877ebc3f0677b267756d4564e2a429e730 upstream.

This patch fixes an issue that this driver is possible to access
the registers before pm_runtime_get_sync() if a gadget driver is
installed first. After that, oops happens on R-Car Gen3 environment.
To avoid it, this patch changes the pm_runtime call timing from
probe/remove to udc_start/udc_stop.

Fixes: 746bfe63 ("usb: gadget: renesas_usb3: add support for Renesas USB3.0 peripheral controller")
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b51e4b0a

drivers/usb/gadget/udc/renesas_usb3.c

+6 −6
Original line number Diff line number Diff line
@@ -1707,6 +1707,9 @@ static int renesas_usb3_start(struct usb_gadget *gadget, 
	/* hook up the driver */

	usb3->driver = driver;



	pm_runtime_enable(usb3_to_dev(usb3));

	pm_runtime_get_sync(usb3_to_dev(usb3));



	renesas_usb3_init_controller(usb3);



	return 0;
@@ -1724,6 +1727,9 @@ static int renesas_usb3_stop(struct usb_gadget *gadget) 
	renesas_usb3_stop_controller(usb3);

	spin_unlock_irqrestore(&usb3->lock, flags);



	pm_runtime_put(usb3_to_dev(usb3));

	pm_runtime_disable(usb3_to_dev(usb3));



	return 0;

}
@@ -1761,9 +1767,6 @@ static int renesas_usb3_remove(struct platform_device *pdev) 
{

	struct renesas_usb3 *usb3 = platform_get_drvdata(pdev);



	pm_runtime_put(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	usb_del_gadget_udc(&usb3->gadget);



	__renesas_usb3_ep_free_request(usb3->ep0_req);
@@ -1948,9 +1951,6 @@ static int renesas_usb3_probe(struct platform_device *pdev) 


	usb3->workaround_for_vbus = priv->workaround_for_vbus;



	pm_runtime_enable(&pdev->dev);

	pm_runtime_get_sync(&pdev->dev);



	dev_info(&pdev->dev, "probed\n");



	return 0;