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

Commit 15ddbe5d authored by Wesley Cheng's avatar Wesley Cheng Committed by Vijayavardhan Vennapusa
Browse files

USB: dwc3_msm: Disable all events before error recovery for Erratic event 



Currently as part of Erratic event handling, dumping all relevant registers
and then scheduling work for block reset. This does lead to erratic event
getting fired continuously and might result in watchdog crash. Hence
disable all events in DEVTEN regiser before doing block reset and reenable
the events once block reset is completed.

Change-Id: Ib2644ea8471cb87792a9524dc5103b61b2d0a74c
Signed-off-by: default avatarWesley Cheng <wcheng@codeaurora.org>
Signed-off-by: default avatarVijayavardhan Vennapusa <vvreddy@codeaurora.org>
parent a260c9b2

drivers/usb/dwc3/dwc3-msm.c

+15 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -957,6 +957,7 @@ static void dwc3_msm_notify_event(struct dwc3 *dwc, unsigned event) 
	case DWC3_CONTROLLER_ERROR_EVENT:

		dev_info(mdwc->dev, "DWC3_CONTROLLER_ERROR_EVENT received\n");

		dwc3_msm_dump_phy_info(mdwc);

		dwc3_msm_write_reg(mdwc->base, DWC3_DEVTEN, 0);

		/*

		 * schedule work for doing block reset for recovery from erratic

		 * error event.
@@ -1024,10 +1025,23 @@ static void dwc3_block_reset_usb_work(struct work_struct *w) 
{

	struct dwc3_msm *mdwc = container_of(w, struct dwc3_msm,

						usb_block_reset_work);

	u32 reg;



	dev_dbg(mdwc->dev, "%s\n", __func__);



	dwc3_msm_block_reset(&mdwc->ext_xceiv, true);



	reg = (DWC3_DEVTEN_EVNTOVERFLOWEN |

			DWC3_DEVTEN_CMDCMPLTEN |

			DWC3_DEVTEN_ERRTICERREN |

			DWC3_DEVTEN_WKUPEVTEN |

			DWC3_DEVTEN_ULSTCNGEN |

			DWC3_DEVTEN_CONNECTDONEEN |

			DWC3_DEVTEN_USBRSTEN |

			DWC3_DEVTEN_DISCONNEVTEN);

	dwc3_msm_write_reg(mdwc->base, DWC3_DEVTEN, reg);





}



static void dwc3_chg_enable_secondary_det(struct dwc3_msm *mdwc)