gpu: nvgpu: use nvgpu rbtree for buddy allocator

Use nvgpu rbtree instead of linux rbtree for buddy allocator
Move to use nvgpu_rbtree_node structure and
nvgpu_rbtree_* APIs

Jira NVGPU-13

Change-Id: I8041a9634898b23638d14884a772e8fa6fb61074
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1466549
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 19 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/buddy_allocator_priv.h b/drivers/gpu/nvgpu/common/mm/buddy_allocator_priv.h
index 549ab3d1..5c0b31c9 100644
--- a/drivers/gpu/nvgpu/common/mm/buddy_allocator_priv.h
+++ b/drivers/gpu/nvgpu/common/mm/buddy_allocator_priv.h
@@ -17,8 +17,7 @@
 #ifndef BUDDY_ALLOCATOR_PRIV_H
 #define BUDDY_ALLOCATOR_PRIV_H
 
-#include <linux/rbtree.h>
-
+#include <nvgpu/rbtree.h>
 #include <nvgpu/list.h>
 
 struct nvgpu_kmem_cache;
@@ -35,7 +34,7 @@ struct nvgpu_buddy {
         struct nvgpu_buddy *right;      /* Higher address sub-node. */
 
         struct nvgpu_list_node buddy_entry;     /* List entry for various lists. */
-        struct rb_node alloced_entry;   /* RB tree of allocations. */
+        struct nvgpu_rbtree_node alloced_entry; /* RB tree of allocations. */
 
         u64 start;                      /* Start address of this buddy. */
         u64 end;                        /* End address of this buddy. */
@@ -62,6 +61,13 @@ nvgpu_buddy_from_buddy_entry(struct nvgpu_list_node *node)
                 ((uintptr_t)node - offsetof(struct nvgpu_buddy, buddy_entry));
 };
 
+static inline struct nvgpu_buddy *
+nvgpu_buddy_from_rbtree_node(struct nvgpu_rbtree_node *node)
+{
+        return (struct nvgpu_buddy *)
+                ((uintptr_t)node - offsetof(struct nvgpu_buddy, alloced_entry));
+};
+
 #define __buddy_flag_ops(flag, flag_up)                                 \
         static inline int buddy_is_ ## flag(struct nvgpu_buddy *b)      \
         {                                                               \
@@ -98,12 +104,19 @@ __buddy_flag_ops(in_list, IN_LIST);
  */
 struct nvgpu_fixed_alloc {
         struct nvgpu_list_node buddies; /* List of buddies. */
-        struct rb_node alloced_entry;   /* RB tree of fixed allocations. */
+        struct nvgpu_rbtree_node alloced_entry; /* RB tree of fixed allocations. */
 
         u64 start;                      /* Start of fixed block. */
         u64 end;                        /* End address. */
 };
 
+static inline struct nvgpu_fixed_alloc *
+nvgpu_fixed_alloc_from_rbtree_node(struct nvgpu_rbtree_node *node)
+{
+        return (struct nvgpu_fixed_alloc *)
+        ((uintptr_t)node - offsetof(struct nvgpu_fixed_alloc, alloced_entry));
+};
+
 /*
  * GPU buddy allocator for the various GPU address spaces. Each addressable unit
  * doesn't have to correspond to a byte. In some cases each unit is a more
@@ -130,8 +143,8 @@ struct nvgpu_buddy_allocator {
         u64 blks;                       /* Count of blks in the space. */
         u64 max_order;                  /* Specific maximum order. */
 
-        struct rb_root alloced_buddies; /* Outstanding allocations. */
-        struct rb_root fixed_allocs;    /* Outstanding fixed allocations. */
+        struct nvgpu_rbtree_node *alloced_buddies;      /* Outstanding allocations. */
+        struct nvgpu_rbtree_node *fixed_allocs; /* Outstanding fixed allocations. */
 
         struct nvgpu_list_node co_list;