From owner-p4-projects@FreeBSD.ORG Sun Nov 25 10:53:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BD1E16A418; Sun, 25 Nov 2007 10:53:18 +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 BE9AF16A419 for ; Sun, 25 Nov 2007 10:53:17 +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 AD56913C45A for ; Sun, 25 Nov 2007 10:53:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAPArHIu079209 for ; Sun, 25 Nov 2007 10:53:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAPArHqh079206 for perforce@freebsd.org; Sun, 25 Nov 2007 10:53:17 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 25 Nov 2007 10:53:17 GMT Message-Id: <200711251053.lAPArHqh079206@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 Cc: Subject: PERFORCE change 129492 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Nov 2007 10:53:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=129492 Change 129492 by hselasky@hselasky_laptop001 on 2007/11/25 10:53:09 Add BUS-DMA sync operations when loading virtual memory. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#54 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#59 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#48 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#54 (text+ko) ==== @@ -2244,6 +2244,28 @@ } /*------------------------------------------------------------------------* + * usbd_dma_load_pre_sync - flush CPU cache, if any + *------------------------------------------------------------------------*/ +void +usbd_dma_load_pre_sync(struct usbd_xfer *xfer) +{ + bus_dmamap_sync(xfer->udev->bus->dma_tag_1b, xfer->dma_tx_map, + BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); + return; +} + +/*------------------------------------------------------------------------* + * usbd_dma_load_post_sync - invalidate CPU cache, if any + *------------------------------------------------------------------------*/ +void +usbd_dma_load_post_sync(struct usbd_xfer *xfer) +{ + bus_dmamap_sync(xfer->udev->bus->dma_tag_1b, xfer->dma_rx_map, + BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); + return; +} + +/*------------------------------------------------------------------------* * usbd_page_cpu_invalidate - invalidate CPU cache *------------------------------------------------------------------------*/ void @@ -2269,7 +2291,8 @@ * usbd_dma_load_mem_callback - internal callback *------------------------------------------------------------------------*/ static void -usbd_dma_load_mem_callback(void *arg, bus_dma_segment_t *segs, int nseg, int error) +usbd_dma_load_mem_callback(void *arg, bus_dma_segment_t *segs, + int nseg, int error) { struct usbd_page_cache *pc; struct usbd_xfer *xfer; ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#59 (text+ko) ==== @@ -710,6 +710,8 @@ void usbd_dma_tag_free(bus_dma_tag_t tag); void *usbd_mem_alloc_sub(bus_dma_tag_t tag, struct usbd_page *page, uint32_t size, uint32_t alignment); void usbd_mem_free_sub(struct usbd_page *page); +void usbd_dma_load_pre_sync(struct usbd_xfer *xfer); +void usbd_dma_load_post_sync(struct usbd_xfer *xfer); void usbd_page_cpu_invalidate(struct usbd_page *page); void usbd_page_cpu_flush(struct usbd_page *page); void usbd_pio_load_mem(struct usbd_xfer *xfer, struct usbd_dma_load_mem_info *info); ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#48 (text+ko) ==== @@ -1520,6 +1520,9 @@ /* report error */ usbd_premature_callback(xfer, USBD_DMA_LOAD_FAILED); } else { + if (xfer->flags_int.bdma_enable) { + usbd_dma_load_pre_sync(xfer); + } /* finally start the hardware */ usbd_pipe_enter_wrapper(xfer); } @@ -1777,10 +1780,16 @@ xfer->usb_state = USBD_ST_SETUP; } else { xfer->flags_int.transferring = 0; - if (xfer->error) + if (xfer->error) { xfer->usb_state = USBD_ST_ERROR; - else + } else { xfer->usb_state = USBD_ST_TRANSFERRED; + + if (xfer->flags.bdma_enable && + xfer->flags_int.bdma_enable) { + usbd_dma_load_post_sync(xfer); + } + } } /* call processing routine */