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

Commit cebfdbf3 authored by Yunzhi Li's avatar Yunzhi Li Committed by Felipe Balbi
Browse files

usb: dwc2: reset dwc2 core before dwc2_get_hwparams() 



We initiate dwc2 usb controller in BIOS, dwc2_core_reset() should
be called before dwc2_get_hwparams() to reset core registers to
default value. Without this the FIFO setting might be incorrect
because calculating FIFO size need power-on value of
GRXFSIZ/GNPTXFSIZ/HPTXFSIZ registers.

This patch could avoid warnning massage like in rk3288 platform:
[    2.074764] dwc2 ff580000.usb: 256 invalid for
host_perio_tx_fifo_size. Check HW configuration.

Signed-off-by: default avatarYunzhi Li <lyz@rock-chips.com>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 99182467

drivers/usb/dwc2/core.c

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static void dwc2_init_fs_ls_pclk_sel(struct dwc2_hsotg *hsotg) 
 * Do core a soft reset of the core.  Be careful with this because it

 * resets all the internal state machines of the core.

 */

static int dwc2_core_reset(struct dwc2_hsotg *hsotg)

int dwc2_core_reset(struct dwc2_hsotg *hsotg)

{

	u32 greset;

	int count = 0;

drivers/usb/dwc2/core.h

+1 −0
Original line number Diff line number Diff line
@@ -880,6 +880,7 @@ enum dwc2_halt_status { 
 * The following functions support initialization of the core driver component

 * and the DWC_otg controller

 */

extern int dwc2_core_reset(struct dwc2_hsotg *hsotg);

extern void dwc2_core_host_init(struct dwc2_hsotg *hsotg);

extern int dwc2_enter_hibernation(struct dwc2_hsotg *hsotg);

extern int dwc2_exit_hibernation(struct dwc2_hsotg *hsotg, bool restore);

drivers/usb/dwc2/platform.c

+6 −0
Original line number Diff line number Diff line
@@ -456,6 +456,12 @@ static int dwc2_driver_probe(struct platform_device *dev) 
	if (retval)

		return retval;



	/*

	 * Reset before dwc2_get_hwparams() then it could get power-on real

	 * reset value form registers.

	 */

	dwc2_core_reset(hsotg);



	/* Detect config values from hardware */

	retval = dwc2_get_hwparams(hsotg);

	if (retval)