Commit 4c4e162d authored by Pawel Laszczak's avatar Pawel Laszczak Committed by Greg Kroah-Hartman
Browse files

usb: cdnsp: Fix lack of spin_lock_irqsave/spin_lock_restore 



Patch puts content of cdnsp_gadget_pullup function inside
spin_lock_irqsave and spin_lock_restore section.
This construction is required here to keep the data consistency,
otherwise some data can be changed e.g. from interrupt context.

Fixes: 3d829045 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver")
Reported-by: default avatarKen (Jian) He <jianhe@ambarella.com>
cc: <stable@vger.kernel.org>
Signed-off-by: default avatarPawel Laszczak <pawell@cadence.com>
--

Changelog:
v2:
- added disable_irq/enable_irq as sugester by Peter Chen

drivers/usb/cdns3/cdnsp-gadget.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Reviewed-by: default avatarPeter Chen <peter.chen@kernel.org>
Link: https://lore.kernel.org/r/20211214045527.26823-1-pawell@gli-login.cadence.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ad3bd56

drivers/usb/cdns3/cdnsp-gadget.c

+12 −0
Original line number Diff line number Diff line
@@ -1541,15 +1541,27 @@ static int cdnsp_gadget_pullup(struct usb_gadget *gadget, int is_on) 
{

	struct cdnsp_device *pdev = gadget_to_cdnsp(gadget);

	struct cdns *cdns = dev_get_drvdata(pdev->dev);

	unsigned long flags;



	trace_cdnsp_pullup(is_on);



	/*

	 * Disable events handling while controller is being

	 * enabled/disabled.

	 */

	disable_irq(cdns->dev_irq);

	spin_lock_irqsave(&pdev->lock, flags);



	if (!is_on) {

		cdnsp_reset_device(pdev);

		cdns_clear_vbus(cdns);

	} else {

		cdns_set_vbus(cdns);

	}



	spin_unlock_irqrestore(&pdev->lock, flags);

	enable_irq(cdns->dev_irq);



	return 0;

}