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

Commit 2f87f50b authored by Laura Abbott's avatar Laura Abbott Committed by Greg Kroah-Hartman
Browse files

staging: android: ion: Rework heap registration/enumeration 



The current model of Ion heap registration  is based on the outdated
model of board files. The replacement for board files (devicetree)
isn't a good replacement for what Ion wants to do. In actuality, Ion
wants to show what memory is available in the system for something else
to figure out what to use. Switch to a model where Ion creates its
device unconditionally and heaps are registed as available regions.
Currently, only system and CMA heaps are converted over to the new
model. Carveout and chunk heaps can be converted over when someone wants
to figure out how.

Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb9751db

drivers/staging/android/ion/Kconfig

+25 −0
Original line number Diff line number Diff line
@@ -10,6 +10,31 @@ menuconfig ION 
	  If you're not using Android its probably safe to

	  say N here.



config ION_SYSTEM_HEAP

	bool "Ion system heap"

	depends on ION

	help

	  Choose this option to enable the Ion system heap. The system heap

	  is backed by pages from the buddy allocator. If in doubt, say Y.



config ION_CARVEOUT_HEAP

	bool "Ion carveout heap support"

	depends on ION

	help

	  Choose this option to enable carveout heaps with Ion. Carveout heaps

	  are backed by memory reserved from the system. Allocation times are

	  typically faster at the cost of memory not being used. Unless you

	  know your system has these regions, you should say N here.



config ION_CHUNK_HEAP

	bool "Ion chunk heap support"

	depends on ION

	help

          Choose this option to enable chunk heaps with Ion. This heap is

	  similar in function the carveout heap but memory is broken down

	  into smaller chunk sizes, typically corresponding to a TLB size.

	  Unless you know your system has these regions, you should say N here.



config ION_CMA_HEAP

	bool "Ion CMA heap support"

	depends on ION && CMA

drivers/staging/android/ion/Makefile

+4 −3
Original line number Diff line number Diff line 
obj-$(CONFIG_ION) +=	ion.o ion-ioctl.o ion_heap.o \

			ion_page_pool.o ion_system_heap.o \

			ion_carveout_heap.o ion_chunk_heap.o

obj-$(CONFIG_ION) +=	ion.o ion-ioctl.o ion_heap.o

obj-$(CONFIG_ION_SYSTEM_HEAP) += ion_system_heap.o ion_page_pool.o

obj-$(CONFIG_ION_CARVEOUT_HEAP) += ion_carveout_heap.o

obj-$(CONFIG_ION_CHUNK_HEAP) += ion_chunk_heap.o

obj-$(CONFIG_ION_CMA_HEAP) += ion_cma_heap.o

drivers/staging/android/ion/ion.c

+12 −16
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ 


#include "ion.h"



static struct ion_device *internal_dev;

static int heap_id = 0;



bool ion_buffer_cached(struct ion_buffer *buffer)

{

	return !!(buffer->flags & ION_FLAG_CACHED);
@@ -1198,9 +1201,10 @@ static int debug_shrink_get(void *data, u64 *val) 
DEFINE_SIMPLE_ATTRIBUTE(debug_shrink_fops, debug_shrink_get,

			debug_shrink_set, "%llu\n");



void ion_device_add_heap(struct ion_device *dev, struct ion_heap *heap)

void ion_device_add_heap(struct ion_heap *heap)

{

	struct dentry *debug_file;

	struct ion_device *dev = internal_dev;



	if (!heap->ops->allocate || !heap->ops->free)

		pr_err("%s: can not add heap with invalid ops struct.\n",
@@ -1217,6 +1221,7 @@ void ion_device_add_heap(struct ion_device *dev, struct ion_heap *heap) 


	heap->dev = dev;

	down_write(&dev->lock);

	heap->id = heap_id++;

	/*

	 * use negative heap->id to reverse the priority -- when traversing

	 * the list later attempt higher id numbers first
@@ -1256,14 +1261,14 @@ void ion_device_add_heap(struct ion_device *dev, struct ion_heap *heap) 
}

EXPORT_SYMBOL(ion_device_add_heap);



struct ion_device *ion_device_create(void)

int ion_device_create(void)

{

	struct ion_device *idev;

	int ret;



	idev = kzalloc(sizeof(*idev), GFP_KERNEL);

	if (!idev)

		return ERR_PTR(-ENOMEM);

		return -ENOMEM;



	idev->dev.minor = MISC_DYNAMIC_MINOR;

	idev->dev.name = "ion";
@@ -1273,7 +1278,7 @@ struct ion_device *ion_device_create(void) 
	if (ret) {

		pr_err("ion: failed to register misc device.\n");

		kfree(idev);

		return ERR_PTR(ret);

		return ret;

	}



	idev->debug_root = debugfs_create_dir("ion", NULL);
@@ -1292,7 +1297,6 @@ struct ion_device *ion_device_create(void) 
		pr_err("ion: failed to create debugfs clients directory.\n");



debugfs_done:



	idev->buffers = RB_ROOT;

	mutex_init(&idev->buffer_lock);

	init_rwsem(&idev->lock);
@@ -1300,15 +1304,7 @@ struct ion_device *ion_device_create(void) 
	idev->clients = RB_ROOT;

	ion_root_client = &idev->clients;

	mutex_init(&debugfs_mutex);

	return idev;

}

EXPORT_SYMBOL(ion_device_create);



void ion_device_destroy(struct ion_device *dev)

{

	misc_deregister(&dev->dev);

	debugfs_remove_recursive(dev->debug_root);

	/* XXX need to free the heaps and clients ? */

	kfree(dev);

	internal_dev = idev;

	return 0;

}

EXPORT_SYMBOL(ion_device_destroy);
 
subsys_initcall(ion_device_create);

drivers/staging/android/ion/ion.h

+1 −39
Original line number Diff line number Diff line
@@ -279,25 +279,11 @@ bool ion_buffer_cached(struct ion_buffer *buffer); 
 */

bool ion_buffer_fault_user_mappings(struct ion_buffer *buffer);



/**

 * ion_device_create - allocates and returns an ion device

 *

 * returns a valid device or -PTR_ERR

 */

struct ion_device *ion_device_create(void);



/**

 * ion_device_destroy - free and device and it's resource

 * @dev:		the device

 */

void ion_device_destroy(struct ion_device *dev);



/**

 * ion_device_add_heap - adds a heap to the ion device

 * @dev:		the device

 * @heap:		the heap to add

 */

void ion_device_add_heap(struct ion_device *dev, struct ion_heap *heap);

void ion_device_add_heap(struct ion_heap *heap);



/**

 * some helpers for common operations on buffers using the sg_table
@@ -389,30 +375,6 @@ size_t ion_heap_freelist_shrink(struct ion_heap *heap, 
size_t ion_heap_freelist_size(struct ion_heap *heap);





/**

 * functions for creating and destroying the built in ion heaps.

 * architectures can add their own custom architecture specific

 * heaps as appropriate.

 */





struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data);

void ion_heap_destroy(struct ion_heap *heap);



struct ion_heap *ion_system_heap_create(struct ion_platform_heap *unused);

void ion_system_heap_destroy(struct ion_heap *heap);

struct ion_heap *ion_system_contig_heap_create(struct ion_platform_heap *heap);

void ion_system_contig_heap_destroy(struct ion_heap *heap);



struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data);

void ion_carveout_heap_destroy(struct ion_heap *heap);



struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data);

void ion_chunk_heap_destroy(struct ion_heap *heap);



struct ion_heap *ion_cma_heap_create(struct ion_platform_heap *data);

void ion_cma_heap_destroy(struct ion_heap *heap);



/**

 * functions for creating and destroying a heap pool -- allows you

 * to keep a pool of pre allocated memory to use from your heap.  Keeping

drivers/staging/android/ion/ion_carveout_heap.c

+0 −10
Original line number Diff line number Diff line
@@ -145,13 +145,3 @@ struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data) 


	return &carveout_heap->heap;

}
 


void ion_carveout_heap_destroy(struct ion_heap *heap)

{

	struct ion_carveout_heap *carveout_heap =

	     container_of(heap, struct  ion_carveout_heap, heap);



	gen_pool_destroy(carveout_heap->pool);

	kfree(carveout_heap);

	carveout_heap = NULL;

}