video: tegra: nvmap: Seperate carveout functions from dev

Move carveout functions into a seperate file
for better code cohesion.

JIRA: TMM-114

Change-Id: Iad34c90616063bdac42f549218bfe412299fc354
Signed-off-by: David Gilhooley <dgilhooley@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1728409
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 154 insertions, 90 deletions

diff --git a/drivers/video/tegra/nvmap/Makefile b/drivers/video/tegra/nvmap/Makefile
index 2defaf4b6..2c045cde3 100644
--- a/drivers/video/tegra/nvmap/Makefile
+++ b/drivers/video/tegra/nvmap/Makefile
@@ -23,6 +23,7 @@ obj-y += nvmap_init.o
 obj-y += nvmap_tag.o
 obj-y += nvmap_mm.o
 obj-y += nvmap_stats.o
+obj-y += nvmap_carveout.o
 
 obj-$(CONFIG_NVMAP_PAGE_POOLS) += nvmap_pp.o
 
diff --git a/drivers/video/tegra/nvmap/nvmap_carveout.c b/drivers/video/tegra/nvmap/nvmap_carveout.c
new file mode 100644
index 000000000..51134456d
--- /dev/null
+++ b/drivers/video/tegra/nvmap/nvmap_carveout.c
@@ -0,0 +1,151 @@
+/*
+ * drivers/video/tegra/nvmap/nvmap_dev.c
+ *
+ * Interface with nvmap carveouts
+ *
+ * Copyright (c) 2011-2018, NVIDIA CORPORATION. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#include <linux/debugfs.h>
+
+#include "nvmap_priv.h"
+
+extern struct nvmap_device *nvmap_dev;
+
+extern const struct file_operations debug_clients_fops;
+extern const struct file_operations debug_allocations_fops;
+extern const struct file_operations debug_all_allocations_fops;
+extern const struct file_operations debug_orphan_handles_fops;
+extern const struct file_operations debug_maps_fops;
+
+int nvmap_create_carveout(const struct nvmap_platform_carveout *co)
+{
+        int i, err = 0;
+        struct nvmap_carveout_node *node;
+
+        if (!nvmap_dev->heaps) {
+                nvmap_dev->nr_carveouts = 0;
+                nvmap_dev->nr_heaps = nvmap_dev->plat->nr_carveouts + 1;
+                nvmap_dev->heaps = kzalloc(sizeof(struct nvmap_carveout_node) *
+                                     nvmap_dev->nr_heaps, GFP_KERNEL);
+                if (!nvmap_dev->heaps) {
+                        err = -ENOMEM;
+                        pr_err("couldn't allocate carveout memory\n");
+                        goto out;
+                }
+        } else if (nvmap_dev->nr_carveouts >= nvmap_dev->nr_heaps) {
+                node = krealloc(nvmap_dev->heaps,
+                                sizeof(*node) * (nvmap_dev->nr_carveouts + 1),
+                                GFP_KERNEL);
+                if (!node) {
+                        err = -ENOMEM;
+                        pr_err("nvmap heap array resize failed\n");
+                        goto out;
+                }
+                nvmap_dev->heaps = node;
+                nvmap_dev->nr_heaps = nvmap_dev->nr_carveouts + 1;
+        }
+
+        for (i = 0; i < nvmap_dev->nr_heaps; i++)
+                if ((co->usage_mask != NVMAP_HEAP_CARVEOUT_IVM) &&
+                    (nvmap_dev->heaps[i].heap_bit & co->usage_mask)) {
+                        pr_err("carveout %s already exists\n", co->name);
+                        return -EEXIST;
+                }
+
+        node = &nvmap_dev->heaps[nvmap_dev->nr_carveouts];
+
+        node->base = round_up(co->base, PAGE_SIZE);
+        node->size = round_down(co->size -
+                                (node->base - co->base), PAGE_SIZE);
+        if (!co->size)
+                goto out;
+
+        node->carveout = nvmap_heap_create(
+                        nvmap_dev->dev_user.this_device, co,
+                        node->base, node->size, node);
+
+        if (!node->carveout) {
+                err = -ENOMEM;
+                pr_err("couldn't create %s\n", co->name);
+                goto out;
+        }
+        node->index = nvmap_dev->nr_carveouts;
+        nvmap_dev->nr_carveouts++;
+        node->heap_bit = co->usage_mask;
+
+        if (!IS_ERR_OR_NULL(nvmap_dev->debug_root)) {
+                struct dentry *heap_root =
+                        debugfs_create_dir(co->name, nvmap_dev->debug_root);
+                if (!IS_ERR_OR_NULL(heap_root)) {
+                        debugfs_create_file("clients", S_IRUGO,
+                                heap_root,
+                                (void *)(uintptr_t)node->heap_bit,
+                                &debug_clients_fops);
+                        debugfs_create_file("allocations", S_IRUGO,
+                                heap_root,
+                                (void *)(uintptr_t)node->heap_bit,
+                                &debug_allocations_fops);
+                        debugfs_create_file("all_allocations", S_IRUGO,
+                                heap_root,
+                                (void *)(uintptr_t)node->heap_bit,
+                                &debug_all_allocations_fops);
+                        debugfs_create_file("orphan_handles", S_IRUGO,
+                                heap_root,
+                                (void *)(uintptr_t)node->heap_bit,
+                                &debug_orphan_handles_fops);
+                        debugfs_create_file("maps", S_IRUGO,
+                                heap_root,
+                                (void *)(uintptr_t)node->heap_bit,
+                                &debug_maps_fops);
+                        nvmap_heap_debugfs_init(heap_root,
+                                                node->carveout);
+                }
+        }
+out:
+        return err;
+}
+
+static
+struct nvmap_heap_block *do_nvmap_carveout_alloc(struct nvmap_client *client,
+                                              struct nvmap_handle *handle,
+                                              unsigned long type,
+                                              phys_addr_t *start)
+{
+        struct nvmap_carveout_node *co_heap;
+        struct nvmap_device *dev = nvmap_dev;
+        int i;
+
+        for (i = 0; i < dev->nr_carveouts; i++) {
+                struct nvmap_heap_block *block;
+                co_heap = &dev->heaps[i];
+
+                if (!(co_heap->heap_bit & type))
+                        continue;
+
+                if (type & NVMAP_HEAP_CARVEOUT_IVM)
+                        handle->size = ALIGN(handle->size, NVMAP_IVM_ALIGNMENT);
+
+                block = nvmap_heap_alloc(co_heap->carveout, handle, start);
+                if (block)
+                        return block;
+        }
+        return NULL;
+}
+
+struct nvmap_heap_block *nvmap_carveout_alloc(struct nvmap_client *client,
+                                              struct nvmap_handle *handle,
+                                              unsigned long type,
+                                              phys_addr_t *start)
+{
+        return do_nvmap_carveout_alloc(client, handle, type, start);
+}
diff --git a/drivers/video/tegra/nvmap/nvmap_dev.c b/drivers/video/tegra/nvmap/nvmap_dev.c
index 34f1e68d4..65c921450 100644
--- a/drivers/video/tegra/nvmap/nvmap_dev.c
+++ b/drivers/video/tegra/nvmap/nvmap_dev.c
@@ -266,7 +266,7 @@ struct nvmap_handle *nvmap_validate_get(struct nvmap_handle *id)
         return NULL;
 }
 
-static const struct file_operations debug_handles_by_pid_fops;
+const struct file_operations debug_handles_by_pid_fops;
 
 struct nvmap_pid_data {
         struct rb_node node;
@@ -699,7 +699,7 @@ static int nvmap_debug_##name##_open(struct inode *inode, \
                             inode->i_private); \
 } \
 \
-static const struct file_operations debug_##name##_fops = { \
+const struct file_operations debug_##name##_fops = { \
         .open = nvmap_debug_##name##_open, \
         .read = seq_read, \
         .llseek = seq_lseek, \
@@ -1362,94 +1362,6 @@ ulong nvmap_iovmm_get_used_pages(void)