diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-18 08:06:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-18 08:06:00 -0800 |
| commit | b6584065ee833dcec20683be7fc25da3f2268cee (patch) | |
| tree | 29e2a8cbc5ada9c81492133f71cd4a84ec2c6fde | |
| parent | 376fdd2a5d2484c90caabef483390a2cd3cda7a0 (diff) | |
| parent | 1e74f3000b86969de421ca0da08f42e7d21cbd99 (diff) | |
| download | kernel_samsung_crespo-b6584065ee833dcec20683be7fc25da3f2268cee.zip kernel_samsung_crespo-b6584065ee833dcec20683be7fc25da3f2268cee.tar.gz kernel_samsung_crespo-b6584065ee833dcec20683be7fc25da3f2268cee.tar.bz2 | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
swiotlb: use coherent_dma_mask in alloc_coherent
MAINTAINERS: remove me as RAID maintainer
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | lib/swiotlb.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8e0777f..627e4c89 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3928,8 +3928,6 @@ M: bootc@bootc.net S: Maintained SOFTWARE RAID (Multiple Disks) SUPPORT -P: Ingo Molnar -M: mingo@redhat.com P: Neil Brown M: neilb@suse.de L: linux-raid@vger.kernel.org diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 78330c3..5f6c629 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -467,9 +467,13 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t dev_addr; void *ret; int order = get_order(size); + u64 dma_mask = DMA_32BIT_MASK; + + if (hwdev && hwdev->coherent_dma_mask) + dma_mask = hwdev->coherent_dma_mask; ret = (void *)__get_free_pages(flags, order); - if (ret && address_needs_mapping(hwdev, virt_to_bus(ret), size)) { + if (ret && !is_buffer_dma_capable(dma_mask, virt_to_bus(ret), size)) { /* * The allocated memory isn't reachable by the device. * Fall back on swiotlb_map_single(). @@ -493,9 +497,9 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size, dev_addr = virt_to_bus(ret); /* Confirm address can be DMA'd by device */ - if (address_needs_mapping(hwdev, dev_addr, size)) { + if (!is_buffer_dma_capable(dma_mask, dev_addr, size)) { printk("hwdev DMA mask = 0x%016Lx, dev_addr = 0x%016Lx\n", - (unsigned long long)*hwdev->dma_mask, + (unsigned long long)dma_mask, (unsigned long long)dev_addr); /* DMA_TO_DEVICE to avoid memcpy in unmap_single */ |