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

Commit 2991b7a0 authored by Rebecca Schultz Zavin's avatar Rebecca Schultz Zavin Committed by Greg Kroah-Hartman
Browse files

ion: Add reserve function to ion 



Rather than requiring each platform call memblock_remove or reserve
from the board file, add this to ion

Signed-off-by: default avatarRebecca Schultz Zavin <rebecca@android.com>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d5ca329

drivers/staging/android/ion/ion.c

+17 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/fs.h>

#include <linux/anon_inodes.h>

#include <linux/list.h>

#include <linux/memblock.h>

#include <linux/miscdevice.h>

#include <linux/export.h>

#include <linux/mm.h>
@@ -1185,3 +1186,19 @@ void ion_device_destroy(struct ion_device *dev) 
	/* XXX need to free the heaps and clients ? */

	kfree(dev);

}



void __init ion_reserve(struct ion_platform_data *data)

{

	int i, ret;



	for (i = 0; i < data->nr; i++) {

		if (data->heaps[i].size == 0)

			continue;

		ret = memblock_reserve(data->heaps[i].base,

				       data->heaps[i].size);

		if (ret)

			pr_err("memblock reserve of %x@%lx failed\n",

			       data->heaps[i].size,

			       data->heaps[i].base);

	}

}

drivers/staging/android/ion/ion.h

+11 −0
Original line number Diff line number Diff line
@@ -86,6 +86,17 @@ struct ion_platform_data { 
	struct ion_platform_heap heaps[];

};



/**

 * ion_reserve() - reserve memory for ion heaps if applicable

 * @data:	platform data specifying starting physical address and

 *		size

 *

 * Calls memblock reserve to set aside memory for heaps that are

 * located at specific memory addresses or of specfic sizes not

 * managed by the kernel

 */

void ion_reserve(struct ion_platform_data *data);



/**

 * ion_client_create() -  allocate a client and returns it

 * @dev:	the global ion device