From owner-p4-projects@FreeBSD.ORG Tue Aug 3 15:41:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C1741065672; Tue, 3 Aug 2010 15:41:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10B34106564A for ; Tue, 3 Aug 2010 15:41:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D76268FC26 for ; Tue, 3 Aug 2010 15:41:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o73FfZRW002815 for ; Tue, 3 Aug 2010 15:41:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o73FfZpd002813 for perforce@freebsd.org; Tue, 3 Aug 2010 15:41:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 3 Aug 2010 15:41:35 GMT Message-Id: <201008031541.o73FfZpd002813@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181770 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Aug 2010 15:41:36 -0000 http://p4web.freebsd.org/@@181770?ac=10 Change 181770 by hselasky@hselasky_laptop001 on 2010/08/03 15:41:21 USB core: - add support for event driven DMA delay. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#180 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#180 (text+ko) ==== @@ -109,7 +109,6 @@ static void usb_callback_proc(struct usb_proc_msg *); static void usbd_callback_ss_done_defer(struct usb_xfer *); static void usbd_callback_wrapper(struct usb_xfer_queue *); -static void usb_dma_delay_done_cb(void *); static void usbd_transfer_start_cb(void *); static uint8_t usbd_callback_wrapper_sub(struct usb_xfer *); static void usbd_get_std_packet_size(struct usb_std_packet_size *ptr, @@ -2195,11 +2194,9 @@ * transfer. This code path is ususally only used when there is an USB * error like USB_ERR_CANCELLED. *------------------------------------------------------------------------*/ -static void -usb_dma_delay_done_cb(void *arg) +void +usb_dma_delay_done_cb(struct usb_xfer *xfer) { - struct usb_xfer *xfer = arg; - USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); DPRINTFN(3, "Completed %p\n", xfer); @@ -2600,8 +2597,18 @@ if (temp != 0) { USB_BUS_LOCK(xfer->xroot->bus); - usbd_transfer_timeout_ms(xfer, - &usb_dma_delay_done_cb, temp); + /* + * Some hardware solutions have dedicated + * events when it is safe to free DMA'ed + * memory. For the other hardware platforms we + * use a static delay. + */ + if (xfer->endpoint->methods->dma_delay != NULL) { + (xfer->endpoint->methods->dma_delay) (xfer); + } else { + usbd_transfer_timeout_ms(xfer, + (void *)&usb_dma_delay_done_cb, temp); + } USB_BUS_UNLOCK(xfer->xroot->bus); return (1); /* wait for new callback */ } ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#16 (text+ko) ==== @@ -114,6 +114,7 @@ uint8_t usbd_transfer_setup_sub_malloc(struct usb_setup_params *parm, struct usb_page_cache **ppc, usb_size_t size, usb_size_t align, usb_size_t count); +void usb_dma_delay_done_cb(struct usb_xfer *); void usb_command_wrapper(struct usb_xfer_queue *pq, struct usb_xfer *xfer); void usbd_pipe_enter(struct usb_xfer *xfer);