svn commit: r277368 - stable/10/sys/dev/usb/controller

[Hans Petter Selasky]

Author: hselasky
Date: Mon Jan 19 07:18:59 2015
New Revision: 277368
URL: https://svnweb.freebsd.org/changeset/base/277368

Log:
  MFC r276798:
  Fix handling of an error case when the MUSB driver is operating in USB
  device side mode.

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

Modified: stable/10/sys/dev/usb/controller/musb_otg.c
==============================================================================
--- stable/10/sys/dev/usb/controller/musb_otg.c	Mon Jan 19 07:16:22 2015	(r277367)
+++ stable/10/sys/dev/usb/controller/musb_otg.c	Mon Jan 19 07:18:59 2015	(r277368)
@@ -401,7 +401,7 @@ musbotg_dev_ctrl_setup_rx(struct musbotg
 		/* do not stall at this point */
 		td->did_stall = 1;
 		/* wait for interrupt */
-		DPRINTFN(0, "CSR0 DATAEND\n");
+		DPRINTFN(1, "CSR0 DATAEND\n");
 		goto not_complete;
 	}
 
@@ -423,32 +423,37 @@ musbotg_dev_ctrl_setup_rx(struct musbotg
 		sc->sc_ep0_busy = 0;
 	}
 	if (sc->sc_ep0_busy) {
-		DPRINTFN(0, "EP0 BUSY\n");
+		DPRINTFN(1, "EP0 BUSY\n");
 		goto not_complete;
 	}
 	if (!(csr & MUSB2_MASK_CSR0L_RXPKTRDY)) {
 		goto not_complete;
 	}
-	/* clear did stall flag */
-	td->did_stall = 0;
 	/* get the packet byte count */
 	count = MUSB2_READ_2(sc, MUSB2_REG_RXCOUNT);
 
 	/* verify data length */
 	if (count != td->remainder) {
-		DPRINTFN(0, "Invalid SETUP packet "
+		DPRINTFN(1, "Invalid SETUP packet "
 		    "length, %d bytes\n", count);
 		MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRL,
 		      MUSB2_MASK_CSR0L_RXPKTRDY_CLR);
+		/* don't clear stall */
+		td->did_stall = 1;
 		goto not_complete;
 	}
 	if (count != sizeof(req)) {
-		DPRINTFN(0, "Unsupported SETUP packet "
+		DPRINTFN(1, "Unsupported SETUP packet "
 		    "length, %d bytes\n", count);
 		MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRL,
 		      MUSB2_MASK_CSR0L_RXPKTRDY_CLR);
+		/* don't clear stall */
+		td->did_stall = 1;
 		goto not_complete;
 	}
+	/* clear did stall flag */
+	td->did_stall = 0;
+
 	/* receive data */
 	bus_space_read_multi_1(sc->sc_io_tag, sc->sc_io_hdl,
 	    MUSB2_REG_EPFIFO(0), (void *)&req, sizeof(req));