PERFORCE change 157030 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=157030

Change 157030 by hselasky at hselasky_laptop001 on 2009/02/02 10:43:38

	
	Hopefully the final version of my BUS-DMA patch.

Affected files ...

.. //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#11 edit
.. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#19 edit
.. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#14 edit
.. //depot/projects/usb/src/sys/ia64/ia64/busdma_machdep.c#10 edit
.. //depot/projects/usb/src/sys/sys/bus_dma.h#8 edit

Differences ...

==== //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#11 (text+ko) ====

@@ -1128,11 +1128,13 @@
 	bz->active_bpages++;
 	mtx_unlock(&bounce_lock);
 
-	/* page offset needs to be preserved */
-	bpage->vaddr &= ~PAGE_MASK;
-	bpage->busaddr &= ~PAGE_MASK;
-	bpage->vaddr |= vaddr & PAGE_MASK;
-	bpage->busaddr |= vaddr & PAGE_MASK;
+	if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) {
+		/* page offset needs to be preserved */
+		bpage->vaddr &= ~PAGE_MASK;
+		bpage->busaddr &= ~PAGE_MASK;
+		bpage->vaddr |= vaddr & PAGE_MASK;
+		bpage->busaddr |= vaddr & PAGE_MASK;
+	}
 	bpage->datavaddr = vaddr;
 	bpage->datacount = size;
 	STAILQ_INSERT_TAIL(&(map->bpages), bpage, links);

==== //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#14 (text+ko) ====

@@ -1417,11 +1417,13 @@
 	bz->active_bpages++;
 	mtx_unlock(&bounce_lock);
 
-	/* page offset needs to be preserved */
-	bpage->vaddr &= ~PAGE_MASK;
-	bpage->busaddr &= ~PAGE_MASK;
-	bpage->vaddr |= vaddr & PAGE_MASK;
-	bpage->busaddr |= vaddr & PAGE_MASK;
+	if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) {
+		/* page offset needs to be preserved */
+		bpage->vaddr &= ~PAGE_MASK;
+		bpage->busaddr &= ~PAGE_MASK;
+		bpage->vaddr |= vaddr & PAGE_MASK;
+		bpage->busaddr |= vaddr & PAGE_MASK;
+	}
 	bpage->datavaddr = vaddr;
 	bpage->datacount = size;
 	STAILQ_INSERT_TAIL(&(map->bpages), bpage, links);

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#19 (text+ko) ====

@@ -351,7 +351,7 @@
 	    (2 + (size / USB_PAGE_SIZE)) : 1,
 	     /* maxsegsz  */ (align == 1) ?
 	    USB_PAGE_SIZE : size,
-	     /* flags     */ 0,
+	     /* flags     */ BUS_DMA_KEEP_PG_OFFSET,
 	     /* lockfn    */ &usb2_dma_lock_cb,
 	     /* lockarg   */ NULL,
 	    &tag)) {

==== //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#14 (text+ko) ====

@@ -1146,11 +1146,13 @@
 	bz->active_bpages++;
 	mtx_unlock(&bounce_lock);
 
-	/* page offset needs to be preserved */
-	bpage->vaddr &= ~PAGE_MASK;
-	bpage->busaddr &= ~PAGE_MASK;
-	bpage->vaddr |= vaddr & PAGE_MASK;
-	bpage->busaddr |= vaddr & PAGE_MASK;
+	if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) {
+		/* page offset needs to be preserved */
+		bpage->vaddr &= ~PAGE_MASK;
+		bpage->busaddr &= ~PAGE_MASK;
+		bpage->vaddr |= vaddr & PAGE_MASK;
+		bpage->busaddr |= vaddr & PAGE_MASK;
+	}
 	bpage->datavaddr = vaddr;
 	bpage->datacount = size;
 	STAILQ_INSERT_TAIL(&(map->bpages), bpage, links);

==== //depot/projects/usb/src/sys/ia64/ia64/busdma_machdep.c#10 (text+ko) ====

@@ -936,12 +936,13 @@
 	active_bpages++;
 	mtx_unlock(&bounce_lock);
 
-	/* page offset needs to be preserved */
-	bpage->vaddr &= ~PAGE_MASK;
-	bpage->busaddr &= ~PAGE_MASK;
-	bpage->vaddr |= vaddr & PAGE_MASK;
-	bpage->busaddr |= vaddr & PAGE_MASK;
-
+	if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) {
+		/* page offset needs to be preserved */
+		bpage->vaddr &= ~PAGE_MASK;
+		bpage->busaddr &= ~PAGE_MASK;
+		bpage->vaddr |= vaddr & PAGE_MASK;
+		bpage->busaddr |= vaddr & PAGE_MASK;
+	}
 	bpage->datavaddr = vaddr;
 	bpage->datacount = size;
 	STAILQ_INSERT_TAIL(&(map->bpages), bpage, links);

==== //depot/projects/usb/src/sys/sys/bus_dma.h#8 (text+ko) ====

@@ -102,6 +102,13 @@
 #define	BUS_DMA_NOWRITE		0x100
 #define	BUS_DMA_NOCACHE		0x200
 
+/*
+ * The following flag is a DMA tag hint that the page offset of the
+ * loaded kernel virtual address must be preserved in the first
+ * physical segment address, when the KVA is loaded into DMA.
+ */
+#define	BUS_DMA_KEEP_PG_OFFSET	0x400
+
 /* Forwards needed by prototypes below. */
 struct mbuf;
 struct uio;