Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05887cb6 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Tested-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Tested-by: default avatarTony Luck <tony.luck@intel.com>
parent 7f0fee24

drivers/base/platform.c

+0 −31
Original line number Diff line number Diff line
@@ -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);

kernel/dma/mapping.c

+33 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright (c) 2006  SUSE Linux Products GmbH

 * Copyright (c) 2006  Tejun Heo <teheo@suse.de>

 */



#include <linux/memblock.h> /* for max_pfn */

#include <linux/acpi.h>

#include <linux/dma-noncoherent.h>

#include <linux/export.h>
@@ -262,3 +262,35 @@ int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, 
#endif /* !CONFIG_ARCH_NO_COHERENT_DMA_MMAP */

}

EXPORT_SYMBOL(dma_common_mmap);



#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