diff options
| author | Christoph Hellwig | 2018-12-06 21:25:54 +0100 |
|---|---|---|
| committer | Christoph Hellwig | 2018-12-13 21:06:09 +0100 |
| commit | 05887cb610a54bf568de7f0bc07c4a64e45ac6f9 (patch) | |
| tree | 8850d8c8140123823a2dd6e373accf85b17313a0 /drivers/base/platform.c | |
| parent | dma-mapping: merge dma_unmap_page_attrs and dma_unmap_single_attrs (diff) | |
| download | kernel-qcow2-linux-05887cb610a54bf568de7f0bc07c4a64e45ac6f9.tar.gz kernel-qcow2-linux-05887cb610a54bf568de7f0bc07c4a64e45ac6f9.tar.xz kernel-qcow2-linux-05887cb610a54bf568de7f0bc07c4a64e45ac6f9.zip | |
dma-mapping: move dma_get_required_mask to kernel/dma
dma_get_required_mask should really be with the rest of the DMA mapping
implementation instead of in drivers/base as a lone outlier.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Tested-by: Jesper Dangaard Brouer <brouer@redhat.com>
Tested-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'drivers/base/platform.c')
| -rw-r--r-- | drivers/base/platform.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 41b91af95afb..eae841935a45 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -1179,37 +1179,6 @@ int __init platform_bus_init(void) return error; } -#ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK -static u64 dma_default_get_required_mask(struct device *dev) -{ - u32 low_totalram = ((max_pfn - 1) << PAGE_SHIFT); - u32 high_totalram = ((max_pfn - 1) >> (32 - PAGE_SHIFT)); - u64 mask; - - if (!high_totalram) { - /* convert to mask just covering totalram */ - low_totalram = (1 << (fls(low_totalram) - 1)); - low_totalram += low_totalram - 1; - mask = low_totalram; - } else { - high_totalram = (1 << (fls(high_totalram) - 1)); - high_totalram += high_totalram - 1; - mask = (((u64)high_totalram) << 32) + 0xffffffff; - } - return mask; -} - -u64 dma_get_required_mask(struct device *dev) -{ - const struct dma_map_ops *ops = get_dma_ops(dev); - - if (ops->get_required_mask) - return ops->get_required_mask(dev); - return dma_default_get_required_mask(dev); -} -EXPORT_SYMBOL_GPL(dma_get_required_mask); -#endif - static __initdata LIST_HEAD(early_platform_driver_list); static __initdata LIST_HEAD(early_platform_device_list); |