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

Commit 5a1e1456 authored by Peter Chen's avatar Peter Chen Committed by Greg Kroah-Hartman
Browse files

usb: chipidea: fix nobody cared IRQ when booting with host role 



If we connect Male-A-To-Male-A cable between otg-host and host pc,
the ci->vbus_active is set wrongly, and cause the controller run
at peripheral mode when we load gadget module (ci_udc_start will be run),
but the software runs at host mode due to id = 0. The ehci_irq
can't handle suspend (USBi_SLI) interrupt which is enabled for
peripheral mode, it causes no one will handle irq error.

This patch is needed for 3.12 stable

Cc: stable <stable@vger.kernel.org>
Acked-by: default avatarMichael Grzeschik <mgr@pengutronix.de>
Reported-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Tested-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cc5c9eb6

drivers/usb/chipidea/core.c

+4 −0
Original line number Diff line number Diff line
@@ -642,6 +642,10 @@ static int ci_hdrc_probe(struct platform_device *pdev) 
			: CI_ROLE_GADGET;

	}



	/* only update vbus status for peripheral */

	if (ci->role == CI_ROLE_GADGET)

		ci_handle_vbus_change(ci);



	ret = ci_role_start(ci, ci->role);

	if (ret) {

		dev_err(dev, "can't start %s role\n", ci_role(ci)->name);

drivers/usb/chipidea/udc.c

+0 −3
Original line number Diff line number Diff line
@@ -1795,9 +1795,6 @@ static int udc_start(struct ci_hdrc *ci) 
	pm_runtime_no_callbacks(&ci->gadget.dev);

	pm_runtime_enable(&ci->gadget.dev);



	/* Update ci->vbus_active */

	ci_handle_vbus_change(ci);



	return retval;



destroy_eps: