From: CMY <cmy@rock-chips.com>
Date: Wed, 9 Apr 2014 01:28:12 +0000 (+0800)
Subject: rk: ion: support carveout heap
X-Git-Tag: firefly_0821_release~5602
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=30a19b9b334a986f10887d83198145a486fc32f7;p=firefly-linux-kernel-4.4.55.git

rk: ion: support carveout heap
---

diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
index 5165de2ce343..2bd0e51aba86 100644
--- a/drivers/staging/android/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/ion_carveout_heap.c
@@ -158,6 +158,8 @@ struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data)
 	page = pfn_to_page(PFN_DOWN(heap_data->base));
 	size = heap_data->size;
 
+	printk("base:%x  size:%x  page:%p\n", heap_data->base, size, page);
+
 	ion_pages_sync_for_device(NULL, page, size, DMA_BIDIRECTIONAL);
 
 	ret = ion_heap_pages_zero(page, size, pgprot_writecombine(PAGE_KERNEL));
diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion.c b/drivers/staging/android/ion/rockchip/rockchip_ion.c
index 5673ad315b97..10a0a3926b59 100755
--- a/drivers/staging/android/ion/rockchip/rockchip_ion.c
+++ b/drivers/staging/android/ion/rockchip/rockchip_ion.c
@@ -22,6 +22,7 @@
 #include "../ion_priv.h"
 #include <linux/dma-buf.h>
 #include <asm-generic/dma-contiguous.h>
+#include <linux/memblock.h>
 
 #ifdef CONFIG_OF
 #include <linux/of.h>
@@ -50,9 +51,9 @@ extern int ion_do_cache_op(struct ion_client *client, struct ion_handle *handle,
 
 static struct ion_heap_desc ion_heap_meta[] = {
 	{
-		.id		= ION_SYSTEM_HEAP_ID,
+		.id		= ION_VMALLOC_HEAP_ID,
 		.type	= ION_HEAP_TYPE_SYSTEM,
-		.name	= ION_SYSTEM_HEAP_NAME,
+		.name	= ION_VMALLOC_HEAP_NAME,
 	},
 	{
 		.id		= ION_CMA_HEAP_ID,
@@ -69,6 +70,11 @@ static struct ion_heap_desc ion_heap_meta[] = {
 		.type	= ION_HEAP_TYPE_DMA,
 		.name	= ION_DRM_HEAP_NAME,
 	},
+	{
+		.id 	= ION_CARVEOUT_HEAP_ID,
+		.type	= ION_HEAP_TYPE_CARVEOUT,
+		.name	= ION_CARVEOUT_HEAP_NAME,
+	},
 };
 
 struct device rockchip_ion_cma_dev = {
@@ -96,20 +102,22 @@ static int rockchip_ion_populate_heap(struct ion_platform_heap *heap)
 	return ret;
 }
 
-static int rockchip_ion_get_heap_size(struct device_node *node,
+static int rockchip_ion_get_heap_base_size(struct device_node *node,
 				 struct ion_platform_heap *heap)
 {
-	unsigned int val;
+	unsigned int val[2];
 	int ret = 0;
 
-	ret = of_property_read_u32(node, "rockchip,memory-reservation-size", &val);
+	ret = of_property_read_u32_array(node,
+			"memory-reservation", val, 2);
 	if (!ret) {
-		heap->size = val;
-	} else {
-		ret = 0;
+		heap->base = val[0];
+		heap->size = val[1];
 	}
 
-	return ret;
+	printk("heap: %x@%x\n", heap->size, heap->base);
+
+	return 0;
 }
 
 static struct ion_platform_data *rockchip_ion_parse_dt(
@@ -151,7 +159,7 @@ static struct ion_platform_data *rockchip_ion_parse_dt(
 			goto free_heaps;
 
 //		rockchip_ion_get_heap_align(node, &pdata->heaps[idx]);
-		ret = rockchip_ion_get_heap_size(node, &pdata->heaps[idx]);
+		ret = rockchip_ion_get_heap_base_size(node, &pdata->heaps[idx]);
 		if (ret)
 			goto free_heaps;
 
@@ -450,6 +458,7 @@ int __init rockchip_ion_find_reserve_mem(unsigned long node, const char *uname,
 	unsigned long len;
 	phys_addr_t size;
 	phys_addr_t base;
+	u32 heap_type;
 
 	if (!of_flat_dt_is_compatible(node, "rockchip,ion-reserve"))
 		return 0;
@@ -461,12 +470,24 @@ int __init rockchip_ion_find_reserve_mem(unsigned long node, const char *uname,
 	base = be32_to_cpu(prop[0]);
 	size = be32_to_cpu(prop[1]);
 
-	pr_info("%s: reserve cma memory: %x %x\n", __func__, base, size);
+	prop = of_get_flat_dt_prop(node, "reg", &len);
+	if (!prop || (len != sizeof(unsigned long)))
+		return 0;
+
+	heap_type = be32_to_cpu(prop[0]);
+
+	pr_info("%s: heap type is %x\n", __func__, heap_type);
 
-	dma_declare_contiguous(&rockchip_ion_cma_dev, size, base, 0);
+	if (heap_type==ION_CARVEOUT_HEAP_ID) {
+		pr_info("%s: reserve carveout memory: %x@%x\n", __func__, size, base);
+		memblock_remove(base, size);
+	} else {
+		pr_info("%s: reserve cma memory: %x@%x\n", __func__, size, base);
+		dma_declare_contiguous(&rockchip_ion_cma_dev, size, base, 0);
+	}
 #endif
 
-	return 1;
+	return 0;
 }
 
 static const struct of_device_id rockchip_ion_dt_ids[] = {
diff --git a/include/linux/rockchip_ion.h b/include/linux/rockchip_ion.h
index f674e11416df..34762b044b3d 100755
--- a/include/linux/rockchip_ion.h
+++ b/include/linux/rockchip_ion.h
@@ -26,8 +26,9 @@ enum ion_heap_ids {
 	INVALID_HEAP_ID = -1,
 	ION_CMA_HEAP_ID = 1,
 	ION_IOMMU_HEAP_ID,
-	ION_SYSTEM_HEAP_ID,
+	ION_VMALLOC_HEAP_ID,
 	ION_DRM_HEAP_ID,
+	ION_CARVEOUT_HEAP_ID,
 
 	ION_HEAP_ID_RESERVED = 31
 };
@@ -36,8 +37,9 @@ enum ion_heap_ids {
 
 #define ION_CMA_HEAP_NAME		"cma"
 #define ION_IOMMU_HEAP_NAME		"iommu"
-#define ION_SYSTEM_HEAP_NAME	"vmalloc"
+#define ION_VMALLOC_HEAP_NAME	"vmalloc"
 #define ION_DRM_HEAP_NAME		"drm"
+#define ION_CARVEOUT_HEAP_NAME	"carveout"
 
 #define ION_SET_CACHED(__cache)		(__cache | ION_FLAG_CACHED)
 #define ION_SET_UNCACHED(__cache)	(__cache & ~ION_FLAG_CACHED)