X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fusb%2Fgadget%2Fether.c;h=9fb0e80ad1f3b01a13d881fd09304d346d2d10a1;hb=20831061d8cec4ec537fada6b9abe263e208b4ae;hp=f909267f65a6341d51645a30617923a564b3c261;hpb=7612a43d0803ebd70071894658291300d4acc615;p=u-boot

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index f909267f65..9fb0e80ad1 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -1921,10 +1921,22 @@ static void eth_start(struct eth_dev *dev, gfp_t gfp_flags)
 
 static int eth_stop(struct eth_dev *dev)
 {
+#ifdef RNDIS_COMPLETE_SIGNAL_DISCONNECT
+	unsigned long ts;
+	unsigned long timeout = CONFIG_SYS_HZ; /* 1 sec to stop RNDIS */
+#endif
+
 	if (rndis_active(dev)) {
 		rndis_set_param_medium(dev->rndis_config, NDIS_MEDIUM_802_3, 0);
 		rndis_signal_disconnect(dev->rndis_config);
 
+#ifdef RNDIS_COMPLETE_SIGNAL_DISCONNECT
+		/* Wait until host receives OID_GEN_MEDIA_CONNECT_STATUS */
+		ts = get_timer(0);
+		while (get_timer(ts) < timeout)
+			usb_gadget_handle_interrupts();
+#endif
+
 		rndis_uninit(dev->rndis_config);
 		dev->rndis = 0;
 	}
@@ -2486,6 +2498,17 @@ void usb_eth_halt(struct eth_device *netdev)
 	if (!dev->gadget)
 		return;
 
+	/*
+	 * Some USB controllers may need additional deinitialization here
+	 * before dropping pull-up (also due to hardware issues).
+	 * For example: unhandled interrupt with status stage started may
+	 * bring the controller to fully broken state (until board reset).
+	 * There are some variants to debug and fix such cases:
+	 * 1) In the case of RNDIS connection eth_stop can perform additional
+	 * interrupt handling. See RNDIS_COMPLETE_SIGNAL_DISCONNECT definition.
+	 * 2) 'pullup' callback in your UDC driver can be improved to perform
+	 * this deinitialization.
+	 */
 	eth_stop(dev);
 
 	usb_gadget_disconnect(dev->gadget);