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

Commit 2e112345 authored by Ivan T. Ivanov's avatar Ivan T. Ivanov Committed by Felipe Balbi
Browse files

usb: dwc3: core: modify IO memory resource after deferred probe completes 



When deferred probe happens driver will try to ioremap multiple times
and will fail. Memory resource.start variable is a global variable,
modifications in this field will be accumulated on every probe.
Fix this by moving the above operations after driver hold all
required PHY's.

Signed-off-by: default avatarIvan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent a554aea6

drivers/usb/dwc3/core.c

+16 −15
Original line number Diff line number Diff line
@@ -384,21 +384,6 @@ static int dwc3_probe(struct platform_device *pdev) 
		dev_err(dev, "missing memory resource\n");

		return -ENODEV;

	}

	dwc->xhci_resources[0].start = res->start;

	dwc->xhci_resources[0].end = dwc->xhci_resources[0].start +

					DWC3_XHCI_REGS_END;

	dwc->xhci_resources[0].flags = res->flags;

	dwc->xhci_resources[0].name = res->name;



	res->start += DWC3_GLOBALS_REGS_START;



	 /*

	  * Request memory region but exclude xHCI regs,

	  * since it will be requested by the xhci-plat driver.

	  */

	regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(regs))

		return PTR_ERR(regs);



	if (node) {

		dwc->maximum_speed = of_usb_get_maximum_speed(node);
@@ -452,6 +437,22 @@ static int dwc3_probe(struct platform_device *pdev) 
		return -EPROBE_DEFER;

	}



	dwc->xhci_resources[0].start = res->start;

	dwc->xhci_resources[0].end = dwc->xhci_resources[0].start +

					DWC3_XHCI_REGS_END;

	dwc->xhci_resources[0].flags = res->flags;

	dwc->xhci_resources[0].name = res->name;



	res->start += DWC3_GLOBALS_REGS_START;



	/*

	 * Request memory region but exclude xHCI regs,

	 * since it will be requested by the xhci-plat driver.

	 */

	regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(regs))

		return PTR_ERR(regs);



	usb_phy_set_suspend(dwc->usb2_phy, 0);

	usb_phy_set_suspend(dwc->usb3_phy, 0);