svn commit: r261465 - in stable/10/sys/dev/usb: . controller

[Hans Petter Selasky]

Author: hselasky
Date: Tue Feb  4 08:44:12 2014
New Revision: 261465
URL: http://svnweb.freebsd.org/changeset/base/261465

Log:
  MFC r261004, r261005 and r261033:
  Adjust the DMA delay logic so that the DMA delay does not become too small.

Modified:
  stable/10/sys/dev/usb/controller/ehci.c
  stable/10/sys/dev/usb/usb_freebsd.h
  stable/10/sys/dev/usb/usb_freebsd_loader.h
  stable/10/sys/dev/usb/usb_transfer.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/controller/ehci.c
==============================================================================
--- stable/10/sys/dev/usb/controller/ehci.c	Tue Feb  4 08:37:47 2014	(r261464)
+++ stable/10/sys/dev/usb/controller/ehci.c	Tue Feb  4 08:44:12 2014	(r261465)
@@ -3781,7 +3781,7 @@ ehci_get_dma_delay(struct usb_device *ud
 	 * Wait until the hardware has finished any possible use of
 	 * the transfer descriptor(s) and QH
 	 */
-	*pus = (188);			/* microseconds */
+	*pus = (1125);			/* microseconds */
 }
 
 static void

Modified: stable/10/sys/dev/usb/usb_freebsd.h
==============================================================================
--- stable/10/sys/dev/usb/usb_freebsd.h	Tue Feb  4 08:37:47 2014	(r261464)
+++ stable/10/sys/dev/usb/usb_freebsd.h	Tue Feb  4 08:44:12 2014	(r261465)
@@ -50,6 +50,9 @@
 #define	USB_HAVE_FIXED_CONFIG 0
 #define	USB_HAVE_FIXED_PORT 0
 
+/* define zero ticks callout value */
+#define	USB_CALLOUT_ZERO_TICKS 1
+
 #define	USB_TD_GET_PROC(td) (td)->td_proc
 #define	USB_PROC_GET_GID(td) (td)->p_pgid
 

Modified: stable/10/sys/dev/usb/usb_freebsd_loader.h
==============================================================================
--- stable/10/sys/dev/usb/usb_freebsd_loader.h	Tue Feb  4 08:37:47 2014	(r261464)
+++ stable/10/sys/dev/usb/usb_freebsd_loader.h	Tue Feb  4 08:44:12 2014	(r261465)
@@ -50,6 +50,8 @@
 #define	USB_HAVE_FIXED_CONFIG 0
 #define	USB_HAVE_FIXED_PORT 0
 
+#define	USB_CALLOUT_ZERO_TICKS 1
+
 #define	USB_TD_GET_PROC(td) (td)->td_proc
 #define	USB_PROC_GET_GID(td) (td)->p_pgid
 

Modified: stable/10/sys/dev/usb/usb_transfer.c
==============================================================================
--- stable/10/sys/dev/usb/usb_transfer.c	Tue Feb  4 08:37:47 2014	(r261464)
+++ stable/10/sys/dev/usb/usb_transfer.c	Tue Feb  4 08:44:12 2014	(r261465)
@@ -2723,7 +2723,7 @@ usbd_transfer_timeout_ms(struct usb_xfer
 
 	/* defer delay */
 	usb_callout_reset(&xfer->timeout_handle,
-	    USB_MS_TO_TICKS(ms), cb, xfer);
+	    USB_MS_TO_TICKS(ms) + USB_CALLOUT_ZERO_TICKS, cb, xfer);
 }
 
 /*------------------------------------------------------------------------*