leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] swiotlb: support syncing DMA_BIDIRECTIONAL mappings

Browse Source 
The current implementation of sync_single in swiotlb.c chokes on
DMA_BIDIRECTIONAL mappings. This patch adds the capability to sync
those mappings, and optimizes other syncs by accounting for the
sync target (i.e. cpu or device) in addition to the DMA direction of
the mapping.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
John W. Linville 2005-09-29 14:44:57 -07:00 committed by Tony Luck
parent 878a97cfd7
commit de69e0f0b3
1 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/swiotlb.c
View File

@ -58,6 +58,14 @@
*/ */
#define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT) #define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT)
/*
* Enumeration for sync targets
*/
enum dma_sync_target {
SYNC_FOR_CPU = 0,
SYNC_FOR_DEVICE = 1,
};
int swiotlb_force; int swiotlb_force;
/* /*
@ -397,21 +405,28 @@ unmap_single(struct device *hwdev, char *dma_addr, size_t size, int dir)
} }
static void static void
sync_single(struct device *hwdev, char *dma_addr, size_t size, int dir) sync_single(struct device *hwdev, char *dma_addr, size_t size,
int dir, int target)
{ {
int index = (dma_addr - io_tlb_start) >> IO_TLB_SHIFT; int index = (dma_addr - io_tlb_start) >> IO_TLB_SHIFT;
char *buffer = io_tlb_orig_addr[index]; char *buffer = io_tlb_orig_addr[index];
/* switch (target) {
* bounce... copy the data back into/from the original buffer case SYNC_FOR_CPU:
* XXX How do you handle DMA_BIDIRECTIONAL here ? if (likely(dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL))
*/
if (dir == DMA_FROM_DEVICE)
memcpy(buffer, dma_addr, size); memcpy(buffer, dma_addr, size);
else if (dir == DMA_TO_DEVICE) else if (dir != DMA_TO_DEVICE)
memcpy(dma_addr, buffer, size);
else
BUG(); BUG();
break;
case SYNC_FOR_DEVICE:
if (likely(dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL))
memcpy(dma_addr, buffer, size);
else if (dir != DMA_FROM_DEVICE)
BUG();
break;
default:
BUG();
}
} }
void * void *
@ -596,14 +611,14 @@ swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr, size_t size,
*/ */
static inline void static inline void
swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr, swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,
size_t size, int dir) size_t size, int dir, int target)
{ {
char *dma_addr = phys_to_virt(dev_addr); char *dma_addr = phys_to_virt(dev_addr);
if (dir == DMA_NONE) if (dir == DMA_NONE)
BUG(); BUG();
if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)
sync_single(hwdev, dma_addr, size, dir); sync_single(hwdev, dma_addr, size, dir, target);
else if (dir == DMA_FROM_DEVICE) else if (dir == DMA_FROM_DEVICE)
mark_clean(dma_addr, size); mark_clean(dma_addr, size);
} }
@ -612,14 +627,14 @@ void
swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr, swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr,
size_t size, int dir) size_t size, int dir)
{ {
swiotlb_sync_single(hwdev, dev_addr, size, dir); swiotlb_sync_single(hwdev, dev_addr, size, dir, SYNC_FOR_CPU);
} }
void void
swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr, swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr,
size_t size, int dir) size_t size, int dir)
{ {
swiotlb_sync_single(hwdev, dev_addr, size, dir); swiotlb_sync_single(hwdev, dev_addr, size, dir, SYNC_FOR_DEVICE);
} }
/* /*
@ -627,14 +642,15 @@ swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr,
*/ */
static inline void static inline void
swiotlb_sync_single_range(struct device *hwdev, dma_addr_t dev_addr, swiotlb_sync_single_range(struct device *hwdev, dma_addr_t dev_addr,
unsigned long offset, size_t size, int dir) unsigned long offset, size_t size,
int dir, int target)
{ {
char *dma_addr = phys_to_virt(dev_addr) + offset; char *dma_addr = phys_to_virt(dev_addr) + offset;
if (dir == DMA_NONE) if (dir == DMA_NONE)
BUG(); BUG();
if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)
sync_single(hwdev, dma_addr, size, dir); sync_single(hwdev, dma_addr, size, dir, target);
else if (dir == DMA_FROM_DEVICE) else if (dir == DMA_FROM_DEVICE)
mark_clean(dma_addr, size); mark_clean(dma_addr, size);
} }
@ -643,14 +659,16 @@ void
swiotlb_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dev_addr, swiotlb_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dev_addr,
unsigned long offset, size_t size, int dir) unsigned long offset, size_t size, int dir)
{ {
swiotlb_sync_single_range(hwdev, dev_addr, offset, size, dir); swiotlb_sync_single_range(hwdev, dev_addr, offset, size, dir,
SYNC_FOR_CPU);
} }
void void
swiotlb_sync_single_range_for_device(struct device *hwdev, dma_addr_t dev_addr, swiotlb_sync_single_range_for_device(struct device *hwdev, dma_addr_t dev_addr,
unsigned long offset, size_t size, int dir) unsigned long offset, size_t size, int dir)
{ {
swiotlb_sync_single_range(hwdev, dev_addr, offset, size, dir); swiotlb_sync_single_range(hwdev, dev_addr, offset, size, dir,
SYNC_FOR_DEVICE);
} }
/* /*
@ -729,7 +747,7 @@ swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nelems,
*/ */
static inline void static inline void
swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sg, swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sg,
int nelems, int dir) int nelems, int dir, int target)
{ {
int i; int i;
@ -739,21 +757,21 @@ swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sg,
for (i = 0; i < nelems; i++, sg++) for (i = 0; i < nelems; i++, sg++)
if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg)) if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg))
sync_single(hwdev, (void *) sg->dma_address, sync_single(hwdev, (void *) sg->dma_address,
sg->dma_length, dir); sg->dma_length, dir, target);
} }
void void
swiotlb_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg, swiotlb_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg,
int nelems, int dir) int nelems, int dir)
{ {
swiotlb_sync_sg(hwdev, sg, nelems, dir); swiotlb_sync_sg(hwdev, sg, nelems, dir, SYNC_FOR_CPU);
} }
void void
swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg, swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,
int nelems, int dir) int nelems, int dir)
{ {
swiotlb_sync_sg(hwdev, sg, nelems, dir); swiotlb_sync_sg(hwdev, sg, nelems, dir, SYNC_FOR_DEVICE);
} }
int int