From owner-p4-projects@FreeBSD.ORG Mon Sep 24 18:23:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECF1716A41A; Mon, 24 Sep 2007 18:23:04 +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 AB21C16A418 for ; Mon, 24 Sep 2007 18:23:04 +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 AB95D13C494 for ; Mon, 24 Sep 2007 18:23:04 +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 l8OIN4uj096341 for ; Mon, 24 Sep 2007 18:23:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8OIN466096338 for perforce@freebsd.org; Mon, 24 Sep 2007 18:23:04 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 24 Sep 2007 18:23:04 GMT Message-Id: <200709241823.l8OIN466096338@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 126781 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: Mon, 24 Sep 2007 18:23:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=126781 Change 126781 by hselasky@hselasky_laptop001 on 2007/09/24 18:22:37 - add missing include "sys/uio.h" - clean up the CPU cache flush and CPU cache invalidate stuff - disabling interrupts to avoid CPU cache pollution is not necessary hence the CPUs can usually do cache operations on a per range basis. - remove recursive counter from "struct usbd_page". The only real reason for this is some fixup code in "uhci.c" which I will modify so that it does not recurse the cache operations on the same memory region. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#43 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#45 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#43 (text+ko) ==== @@ -60,6 +60,7 @@ #include #include #include +#include #include #include @@ -2356,13 +2357,10 @@ page->physaddr = physaddr; page->buffer = ptr; page->length = size; - page->exit_level = 0; - page->intr_temp = 0; + usbd_page_dma_exit(page); bzero(ptr, size); - - bus_dmamap_sync(page->tag, page->map, - BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); + usbd_page_dma_enter(page); #ifdef USB_DEBUG if(usbdebug > 14) @@ -2389,14 +2387,6 @@ bus_dmamap_t map = page->map; void *ptr = page->buffer; - if (page->exit_level == 0) { - bus_dmamap_sync(page->tag, page->map, - BUS_DMASYNC_POSTWRITE|BUS_DMASYNC_POSTREAD); - } else { - panic("%s:%d: exit_level is not zero!\n", - __FUNCTION__, __LINE__); - } - bus_dmamap_unload(tag, map); bus_dmamem_free(tag, ptr, map); @@ -2411,31 +2401,28 @@ return; } +/*------------------------------------------------------------------------* + * usbd_page_dma_exit - invalidate CPU cache + * + * NOTE: Make sure that this function does not appear alone without a + * "usbd_page_dma_enter()" call unless you know what you are doing ! + *------------------------------------------------------------------------*/ void usbd_page_dma_exit(struct usbd_page *page) { - if ((page->exit_level)++ == 0) { - /* - * Disable interrupts so that the - * PCI controller can continue - * using the memory as quick as - * possible: - */ - page->intr_temp = intr_disable(); - bus_dmamap_sync(page->tag, page->map, - BUS_DMASYNC_POSTWRITE|BUS_DMASYNC_POSTREAD); - } + bus_dmamap_sync(page->tag, page->map, + BUS_DMASYNC_POSTWRITE|BUS_DMASYNC_POSTREAD); return; } +/*------------------------------------------------------------------------* + * usbd_page_dma_enter - flush CPU cache + *------------------------------------------------------------------------*/ void usbd_page_dma_enter(struct usbd_page *page) { - if (--(page->exit_level) == 0) { - bus_dmamap_sync(page->tag, page->map, - BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); - intr_restore(page->intr_temp); - } + bus_dmamap_sync(page->tag, page->map, + BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); return; } #endif @@ -2493,13 +2480,12 @@ page->physaddr = page->map->dm_segs[0].ds_addr; page->buffer = ptr; page->length = size; - page->exit_level = 0; - page->intr_temp = 0; + + usbd_page_dma_exit(page); bzero(ptr, size); - bus_dmamap_sync(page->tag, page->map, 0, page->length, - BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); + usbd_page_dma_enter(page); #ifdef USB_DEBUG if(usbdebug > 14) @@ -2533,14 +2519,6 @@ */ struct usbd_page temp = *page; - if (temp.exit_level == 0) { - bus_dmamap_sync(temp.tag, temp.map, 0, temp.length, - BUS_DMASYNC_POSTWRITE|BUS_DMASYNC_POSTREAD); - } else { - panic("%s:%d: exit_level is not zero!\n", - __FUNCTION__, __LINE__); - } - bus_dmamap_unload(temp.tag, temp.map); bus_dmamap_destroy(temp.tag, temp.map); bus_dmamem_unmap(temp.tag, temp.buffer, temp.length); @@ -2556,31 +2534,28 @@ return; } +/*------------------------------------------------------------------------* + * usbd_page_dma_exit - invalidate CPU cache + * + * NOTE: Make sure that this function does not appear alone without a + * "usbd_page_dma_enter()" call unless you know what you are doing ! + *------------------------------------------------------------------------*/ void usbd_page_dma_exit(struct usbd_page *page) { - if ((page->exit_level)++ == 0) { - /* - * Disable interrupts so that the - * PCI controller can continue - * using the memory as quick as - * possible: - */ - page->intr_temp = intr_disable(); - bus_dmamap_sync(page->tag, page->map, 0, page->length, - BUS_DMASYNC_POSTWRITE|BUS_DMASYNC_POSTREAD); - } + bus_dmamap_sync(page->tag, page->map, 0, page->length, + BUS_DMASYNC_POSTWRITE|BUS_DMASYNC_POSTREAD); return; } +/*------------------------------------------------------------------------* + * usbd_page_dma_enter - flush CPU cache + *------------------------------------------------------------------------*/ void usbd_page_dma_enter(struct usbd_page *page) { - if (--(page->exit_level) == 0) { - bus_dmamap_sync(page->tag, page->map, 0, page->length, - BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); - intr_restore(page->intr_temp); - } + bus_dmamap_sync(page->tag, page->map, 0, page->length, + BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD); return; } #endif ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#45 (text+ko) ==== @@ -158,18 +158,15 @@ #ifdef __FreeBSD__ bus_dma_tag_t tag; bus_dmamap_t map; - register_t intr_temp; #endif #ifdef __NetBSD__ bus_dma_tag_t tag; bus_dmamap_t map; bus_dma_segment_t seg; - register_t intr_temp; int32_t seg_count; #endif uint32_t length; - uint16_t exit_level; }; struct usbd_page_search {