Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 5 May 2015 19:56:23 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r282508 - stable/10/sys/dev/usb/controller
Message-ID:  <201505051956.t45JuNxs077274@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: hselasky
Date: Tue May  5 19:56:23 2015
New Revision: 282508
URL: https://svnweb.freebsd.org/changeset/base/282508

Log:
  MFC r281881:
  Disable multi process interrupts, because the current code doesn't use
  them. Else we can end up in an infinite interrupt loop in USB device
  mode.

Modified:
  stable/10/sys/dev/usb/controller/dwc_otg.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/controller/dwc_otg.c
==============================================================================
--- stable/10/sys/dev/usb/controller/dwc_otg.c	Tue May  5 19:52:22 2015	(r282507)
+++ stable/10/sys/dev/usb/controller/dwc_otg.c	Tue May  5 19:56:23 2015	(r282508)
@@ -3872,20 +3872,18 @@ dwc_otg_init(struct dwc_otg_softc *sc)
 		if (temp & GHWCFG2_MPI) {
 			uint8_t x;
 
-			DPRINTF("Multi Process Interrupts\n");
+			DPRINTF("Disable Multi Process Interrupts\n");
 
 			for (x = 0; x != sc->sc_dev_in_ep_max; x++) {
-				DWC_OTG_WRITE_4(sc, DOTG_DIEPEACHINTMSK(x),
-				    DIEPMSK_XFERCOMPLMSK);
+				DWC_OTG_WRITE_4(sc, DOTG_DIEPEACHINTMSK(x), 0);
 				DWC_OTG_WRITE_4(sc, DOTG_DOEPEACHINTMSK(x), 0);
 			}
-			DWC_OTG_WRITE_4(sc, DOTG_DEACHINTMSK, 0xFFFF);
-		} else {
-			DWC_OTG_WRITE_4(sc, DOTG_DIEPMSK,
-			    DIEPMSK_XFERCOMPLMSK);
-			DWC_OTG_WRITE_4(sc, DOTG_DOEPMSK, 0);
-			DWC_OTG_WRITE_4(sc, DOTG_DAINTMSK, 0xFFFF);
+			DWC_OTG_WRITE_4(sc, DOTG_DEACHINTMSK, 0);
 		}
+		DWC_OTG_WRITE_4(sc, DOTG_DIEPMSK,
+		    DIEPMSK_XFERCOMPLMSK);
+		DWC_OTG_WRITE_4(sc, DOTG_DOEPMSK, 0);
+		DWC_OTG_WRITE_4(sc, DOTG_DAINTMSK, 0xFFFF);
 	}
 
 	if (sc->sc_mode == DWC_MODE_OTG || sc->sc_mode == DWC_MODE_HOST) {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505051956.t45JuNxs077274>