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

Commit 468bcc2a authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: musb: dsps: kill OTG timer on suspend 



if we don't make sure to kill the timer, it could
expire after we have already gated our clocks.

That will trigger a Data Abort exception because
we would try to access register while clock is gated.

Fix that bug.

Cc: <stable@vger.kernel.org> # v3.14+
Fixes 869c5978 (usb: musb: dsps: add support for suspend and resume)
Tested-by: default avatarDave Gerlach <d-gerlach@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 6dd5b021

drivers/usb/musb/musb_dsps.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -870,6 +870,7 @@ static int dsps_suspend(struct device *dev) 
	struct musb *musb = platform_get_drvdata(glue->musb);

	struct musb *musb = platform_get_drvdata(glue->musb);

	void __iomem *mbase = musb->ctrl_base;

	void __iomem *mbase = musb->ctrl_base;





	del_timer_sync(&glue->timer);

	glue->context.control = dsps_readl(mbase, wrp->control);

	glue->context.control = dsps_readl(mbase, wrp->control);

	glue->context.epintr = dsps_readl(mbase, wrp->epintr_set);

	glue->context.epintr = dsps_readl(mbase, wrp->epintr_set);

	glue->context.coreintr = dsps_readl(mbase, wrp->coreintr_set);

	glue->context.coreintr = dsps_readl(mbase, wrp->coreintr_set);
@@ -895,6 +896,7 @@ static int dsps_resume(struct device *dev) 
	dsps_writel(mbase, wrp->mode, glue->context.mode);

	dsps_writel(mbase, wrp->mode, glue->context.mode);

	dsps_writel(mbase, wrp->tx_mode, glue->context.tx_mode);

	dsps_writel(mbase, wrp->tx_mode, glue->context.tx_mode);

	dsps_writel(mbase, wrp->rx_mode, glue->context.rx_mode);

	dsps_writel(mbase, wrp->rx_mode, glue->context.rx_mode);

	setup_timer(&glue->timer, otg_timer, (unsigned long) musb);





	return 0;

	return 0;

}

}