diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2008-08-19 10:32:41 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-22 02:34:47 -0400 |
commit | e4ad68b651f22fa71820c0b30bb2807999b2b49f (patch) | |
tree | d66553173f7d6de7b3d83133f276b22aae7a05f7 /arch/x86/kernel/pci-calgary_64.c | |
parent | 43a5a5a09b8cfd56047706cf904718d073ccfd33 (diff) |
x86: add free_coherent dma_ops callback to Calgary IOMMU driver
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/pci-calgary_64.c')
-rw-r--r-- | arch/x86/kernel/pci-calgary_64.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index 218d783ed7a8..afb020fdb19c 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c | |||
@@ -511,8 +511,22 @@ error: | |||
511 | return ret; | 511 | return ret; |
512 | } | 512 | } |
513 | 513 | ||
514 | static void calgary_free_coherent(struct device *dev, size_t size, | ||
515 | void *vaddr, dma_addr_t dma_handle) | ||
516 | { | ||
517 | unsigned int npages; | ||
518 | struct iommu_table *tbl = find_iommu_table(dev); | ||
519 | |||
520 | size = PAGE_ALIGN(size); | ||
521 | npages = size >> PAGE_SHIFT; | ||
522 | |||
523 | iommu_free(tbl, dma_handle, npages); | ||
524 | free_pages((unsigned long)vaddr, get_order(size)); | ||
525 | } | ||
526 | |||
514 | static struct dma_mapping_ops calgary_dma_ops = { | 527 | static struct dma_mapping_ops calgary_dma_ops = { |
515 | .alloc_coherent = calgary_alloc_coherent, | 528 | .alloc_coherent = calgary_alloc_coherent, |
529 | .free_coherent = calgary_free_coherent, | ||
516 | .map_single = calgary_map_single, | 530 | .map_single = calgary_map_single, |
517 | .unmap_single = calgary_unmap_single, | 531 | .unmap_single = calgary_unmap_single, |
518 | .map_sg = calgary_map_sg, | 532 | .map_sg = calgary_map_sg, |