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

Commit a2547380 authored by Marek Szyprowski's avatar Marek Szyprowski
Browse files

drivers: dma-contiguous: clean source code and prepare for device tree 



This patch cleans the initialization of dma contiguous framework. The
all-in-one dma_declare_contiguous() function is now separated into
dma_contiguous_reserve_area() which only steals the the memory from
memblock allocator and dma_contiguous_add_device() function, which
assigns given device to the specified reserved memory area. This improves
the flexibility in defining contiguous memory areas and assigning device
to them, because now it is possible to assign more than one device to
the given contiguous memory area. Such split in initialization procedure
is also required for upcoming device tree support.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Acked-by: default avatarTomasz Figa <t.figa@samsung.com>
parent f7d8f1e9

arch/arm/include/asm/dma-contiguous.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,6 @@ 
#ifdef CONFIG_DMA_CMA

#ifdef CONFIG_DMA_CMA





#include <linux/types.h>

#include <linux/types.h>

#include <asm-generic/dma-contiguous.h>





void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size);

void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size);

arch/x86/include/asm/dma-contiguous.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ 
#ifdef __KERNEL__

#ifdef __KERNEL__





#include <linux/types.h>

#include <linux/types.h>

#include <asm-generic/dma-contiguous.h>





static inline void

static inline void

dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }

dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }

drivers/base/dma-contiguous.c

+44 −75
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ static inline __maybe_unused phys_addr_t cma_early_percent_memory(void) 
#endif

#endif





/**

/**

 * dma_contiguous_reserve() - reserve area for contiguous memory handling

 * dma_contiguous_reserve() - reserve area(s) for contiguous memory handling

 * @limit: End address of the reserved memory (optional, 0 for any).

 * @limit: End address of the reserved memory (optional, 0 for any).

 *

 *

 * This function reserves memory from early allocator. It should be

 * This function reserves memory from early allocator. It should be
@@ -124,22 +124,29 @@ void __init dma_contiguous_reserve(phys_addr_t limit) 
#endif

#endif

	}

	}





	if (selected_size) {

	if (selected_size && !dma_contiguous_default_area) {

		pr_debug("%s: reserving %ld MiB for global area\n", __func__,

		pr_debug("%s: reserving %ld MiB for global area\n", __func__,

			 (unsigned long)selected_size / SZ_1M);

			 (unsigned long)selected_size / SZ_1M);





		dma_declare_contiguous(NULL, selected_size, 0, limit);

		dma_contiguous_reserve_area(selected_size, 0, limit,

					    &dma_contiguous_default_area);

	}

	}

};

};





static DEFINE_MUTEX(cma_mutex);

static DEFINE_MUTEX(cma_mutex);





static __init int cma_activate_area(unsigned long base_pfn, unsigned long count)

static int __init cma_activate_area(struct cma *cma)

{

{

	unsigned long pfn = base_pfn;

	int bitmap_size = BITS_TO_LONGS(cma->count) * sizeof(long);

	unsigned i = count >> pageblock_order;

	unsigned long base_pfn = cma->base_pfn, pfn = base_pfn;

	unsigned i = cma->count >> pageblock_order;

	struct zone *zone;

	struct zone *zone;





	cma->bitmap = kzalloc(bitmap_size, GFP_KERNEL);



	if (!cma->bitmap)

		return -ENOMEM;



	WARN_ON_ONCE(!pfn_valid(pfn));

	WARN_ON_ONCE(!pfn_valid(pfn));

	zone = page_zone(pfn_to_page(pfn));

	zone = page_zone(pfn_to_page(pfn));
@@ -153,92 +160,53 @@ static __init int cma_activate_area(unsigned long base_pfn, unsigned long count) 
		}

		}

		init_cma_reserved_pageblock(pfn_to_page(base_pfn));

		init_cma_reserved_pageblock(pfn_to_page(base_pfn));

	} while (--i);

	} while (--i);

	return 0;

}





static __init struct cma *cma_create_area(unsigned long base_pfn,

	return 0;

				     unsigned long count)

{

	int bitmap_size = BITS_TO_LONGS(count) * sizeof(long);

	struct cma *cma;

	int ret = -ENOMEM;



	pr_debug("%s(base %08lx, count %lx)\n", __func__, base_pfn, count);



	cma = kmalloc(sizeof *cma, GFP_KERNEL);

	if (!cma)

		return ERR_PTR(-ENOMEM);



	cma->base_pfn = base_pfn;

	cma->count = count;

	cma->bitmap = kzalloc(bitmap_size, GFP_KERNEL);



	if (!cma->bitmap)

		goto no_mem;



	ret = cma_activate_area(base_pfn, count);

	if (ret)

		goto error;



	pr_debug("%s: returned %p\n", __func__, (void *)cma);

	return cma;



error:

	kfree(cma->bitmap);

no_mem:

	kfree(cma);

	return ERR_PTR(ret);

}

}





static struct cma_reserved {

static struct cma cma_areas[MAX_CMA_AREAS];

	phys_addr_t start;

static unsigned cma_area_count;

	unsigned long size;

	struct device *dev;

} cma_reserved[MAX_CMA_AREAS] __initdata;

static unsigned cma_reserved_count __initdata;





static int __init cma_init_reserved_areas(void)

static int __init cma_init_reserved_areas(void)

{

{

	struct cma_reserved *r = cma_reserved;

	int i;

	unsigned i = cma_reserved_count;



	pr_debug("%s()\n", __func__);





	for (; i; --i, ++r) {

	for (i = 0; i < cma_area_count; i++) {

		struct cma *cma;

		int ret = cma_activate_area(&cma_areas[i]);

		cma = cma_create_area(PFN_DOWN(r->start),

		if (ret)

				      r->size >> PAGE_SHIFT);

			return ret;

		if (!IS_ERR(cma))

			dev_set_cma_area(r->dev, cma);

	}

	}



	return 0;

	return 0;

}

}

core_initcall(cma_init_reserved_areas);

core_initcall(cma_init_reserved_areas);





/**

/**

 * dma_declare_contiguous() - reserve area for contiguous memory handling

 * dma_contiguous_reserve_area() - reserve custom contiguous area

 *			      for particular device

 * @size: Size of the reserved area (in bytes),

 * @dev:   Pointer to device structure.

 * @base: Base address of the reserved area optional, use 0 for any

 * @size:  Size of the reserved memory.

 * @base:  Start address of the reserved memory (optional, 0 for any).

 * @limit: End address of the reserved memory (optional, 0 for any).

 * @limit: End address of the reserved memory (optional, 0 for any).

 * @res_cma: Pointer to store the created cma region.

 *

 *

 * This function reserves memory for specified device. It should be

 * This function reserves memory from early allocator. It should be

 * called by board specific code when early allocator (memblock or bootmem)

 * called by arch specific code once the early allocator (memblock or bootmem)

 * is still activate.

 * has been activated and all other subsystems have already allocated/reserved

 * memory. This function allows to create custom reserved areas for specific

 * devices.

 */

 */

int __init dma_declare_contiguous(struct device *dev, phys_addr_t size,

int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,

				  phys_addr_t base, phys_addr_t limit)

				       phys_addr_t limit, struct cma **res_cma)

{

{

	struct cma_reserved *r = &cma_reserved[cma_reserved_count];

	struct cma *cma = &cma_areas[cma_area_count];

	phys_addr_t alignment;

	phys_addr_t alignment;

	int ret = 0;





	pr_debug("%s(size %lx, base %08lx, limit %08lx)\n", __func__,

	pr_debug("%s(size %lx, base %08lx, limit %08lx)\n", __func__,

		 (unsigned long)size, (unsigned long)base,

		 (unsigned long)size, (unsigned long)base,

		 (unsigned long)limit);

		 (unsigned long)limit);





	/* Sanity checks */

	/* Sanity checks */

	if (cma_reserved_count == ARRAY_SIZE(cma_reserved)) {

	if (cma_area_count == ARRAY_SIZE(cma_areas)) {

		pr_err("Not enough slots for CMA reserved regions!\n");

		pr_err("Not enough slots for CMA reserved regions!\n");

		return -ENOSPC;

		return -ENOSPC;

	}

	}
@@ -256,7 +224,7 @@ int __init dma_declare_contiguous(struct device *dev, phys_addr_t size, 
	if (base) {

	if (base) {

		if (memblock_is_region_reserved(base, size) ||

		if (memblock_is_region_reserved(base, size) ||

		    memblock_reserve(base, size) < 0) {

		    memblock_reserve(base, size) < 0) {

			base = -EBUSY;

			ret = -EBUSY;

			goto err;

			goto err;

		}

		}

	} else {

	} else {
@@ -266,7 +234,7 @@ int __init dma_declare_contiguous(struct device *dev, phys_addr_t size, 
		 */

		 */

		phys_addr_t addr = __memblock_alloc_base(size, alignment, limit);

		phys_addr_t addr = __memblock_alloc_base(size, alignment, limit);

		if (!addr) {

		if (!addr) {

			base = -ENOMEM;

			ret = -ENOMEM;

			goto err;

			goto err;

		} else {

		} else {

			base = addr;

			base = addr;
@@ -277,10 +245,11 @@ int __init dma_declare_contiguous(struct device *dev, phys_addr_t size, 
	 * Each reserved area must be initialised later, when more kernel

	 * Each reserved area must be initialised later, when more kernel

	 * subsystems (like slab allocator) are available.

	 * subsystems (like slab allocator) are available.

	 */

	 */

	r->start = base;

	cma->base_pfn = PFN_DOWN(base);

	r->size = size;

	cma->count = size >> PAGE_SHIFT;

	r->dev = dev;

	*res_cma = cma;

	cma_reserved_count++;

	cma_area_count++;



	pr_info("CMA: reserved %ld MiB at %08lx\n", (unsigned long)size / SZ_1M,

	pr_info("CMA: reserved %ld MiB at %08lx\n", (unsigned long)size / SZ_1M,

		(unsigned long)base);

		(unsigned long)base);
@@ -289,7 +258,7 @@ int __init dma_declare_contiguous(struct device *dev, phys_addr_t size, 
	return 0;

	return 0;

err:

err:

	pr_err("CMA: failed to reserve %ld MiB\n", (unsigned long)size / SZ_1M);

	pr_err("CMA: failed to reserve %ld MiB\n", (unsigned long)size / SZ_1M);

	return base;

	return ret;

}

}





/**

/**

include/asm-generic/dma-contiguous.h

deleted100644 → 0
+0 −28
Original line number Original line Diff line number Diff line 
#ifndef ASM_DMA_CONTIGUOUS_H

#define ASM_DMA_CONTIGUOUS_H



#ifdef __KERNEL__

#ifdef CONFIG_CMA



#include <linux/device.h>

#include <linux/dma-contiguous.h>



static inline struct cma *dev_get_cma_area(struct device *dev)

{

	if (dev && dev->cma_area)

		return dev->cma_area;

	return dma_contiguous_default_area;

}



static inline void dev_set_cma_area(struct device *dev, struct cma *cma)

{

	if (dev)

		dev->cma_area = cma;

	if (!dev && !dma_contiguous_default_area)

		dma_contiguous_default_area = cma;

}



#endif

#endif



#endif

include/linux/device.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -711,7 +711,7 @@ struct device { 




	struct dma_coherent_mem	*dma_mem; /* internal for coherent mem

	struct dma_coherent_mem	*dma_mem; /* internal for coherent mem

					     override */

					     override */

#ifdef CONFIG_CMA

#ifdef CONFIG_DMA_CMA

	struct cma *cma_area;		/* contiguous memory area for dma

	struct cma *cma_area;		/* contiguous memory area for dma

					   allocations */

					   allocations */

#endif

#endif