Attachment 208501 Details for Bug 240471 – Experimental fix to make Xen swiotlb accept DMA_BIDIRECTIONAL DMA mappings

[patch] Experimental fix to make Xen swiotlb accept DMA_BIDIRECTIONAL DMA mappings

linux-2.6-xen-swiotlb-dma_bidir.patch (text/plain), 2.35 KB, created by Eduardo Habkost on 2007-09-27 15:01:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eduardo Habkost

Created: 2007-09-27 15:01:15 UTC

Size: 2.35 KB

patch

obsolete

># HG changeset patch
># User Eduardo Habkost <ehabkost@redhat.com>
># Date 1190901132 10800
># Node ID 724e42a60ed5d891e20b9943ac3a09298349ab5e
># Parent  4b1b115de5debf988f267a1cd1e566a750b391a2
>swiotlb: Accept DMA_BIDIRECTIONAL on sync functions
>
>Make swiotlb_sync_{single,sg}_for_{device,cpu}() accept DMA_BIDIRECTIONAL.
>
>Pass DMA_TO_DEVICE or DMA_FROM_DEVICE direction to sync_single() depending
>if for_device or for_cpu functions were called.
>
>This should make fw-ohci module work under Xen, as it uses
>dma_sync_single_for_device() with dir==DMA_BIDIRECTIONAL.
>
>diff -r 4b1b115de5de -r 724e42a60ed5 arch/i386/kernel/swiotlb.c
>--- a/arch/i386/kernel/swiotlb.c	Tue Jun 19 19:16:04 2007 +0200
>+++ b/arch/i386/kernel/swiotlb.c	Thu Sep 27 10:52:12 2007 -0300
>@@ -529,18 +529,18 @@ swiotlb_sync_single_for_cpu(struct devic
> swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr,
> 			    size_t size, int dir)
> {
>-	BUG_ON(dir == DMA_NONE);
>+	BUG_ON((dir != DMA_FROM_DEVICE) || (dir != DMA_BIDIRECTIONAL));
> 	if (in_swiotlb_aperture(dev_addr))
>-		sync_single(hwdev, bus_to_virt(dev_addr), size, dir);
>+		sync_single(hwdev, bus_to_virt(dev_addr), size, DMA_FROM_DEVICE);
> }
> 
> void
> swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr,
> 			       size_t size, int dir)
> {
>-	BUG_ON(dir == DMA_NONE);
>+	BUG_ON((dir != DMA_TO_DEVICE) || (dir != DMA_BIDIRECTIONAL));
> 	if (in_swiotlb_aperture(dev_addr))
>-		sync_single(hwdev, bus_to_virt(dev_addr), size, dir);
>+		sync_single(hwdev, bus_to_virt(dev_addr), size, DMA_TO_DEVICE);
> }
> 
> /*
>@@ -624,13 +624,13 @@ swiotlb_sync_sg_for_cpu(struct device *h
> {
> 	int i;
> 
>-	BUG_ON(dir == DMA_NONE);
>+	BUG_ON((dir != DMA_FROM_DEVICE) || (dir != DMA_BIDIRECTIONAL));
> 
> 	for (i = 0; i < nelems; i++, sg++)
> 		if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg))
> 			sync_single(hwdev,
> 				    (void *)bus_to_virt(sg->dma_address),
>-				    sg->dma_length, dir);
>+				    sg->dma_length, DMA_FROM_DEVICE);
> }
> 
> void
>@@ -640,12 +640,13 @@ swiotlb_sync_sg_for_device(struct device
> 	int i;
> 
> 	BUG_ON(dir == DMA_NONE);
>+	BUG_ON((dir != DMA_TO_DEVICE) || (dir != DMA_BIDIRECTIONAL));
> 
> 	for (i = 0; i < nelems; i++, sg++)
> 		if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg))
> 			sync_single(hwdev,
> 				    (void *)bus_to_virt(sg->dma_address),
>-				    sg->dma_length, dir);
>+				    sg->dma_length, DMA_TO_DEVICE);
> }
> 
> #ifdef CONFIG_HIGHMEM

Actions: View | Diff

Attachments on bug 240471: 208501