From 6df3992b60959d32c7113cb77e131a2547174f3a Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Tue, 20 Dec 2016 13:55:48 -0800 Subject: gpu: nvgpu: Move allocators to common/mm/ Move the GPU allocators to common/mm/ since the allocators are common code across all GPUs. Also rename the allocator code to move away from gk20a_ prefixed structs and functions. This caused one issue with the nvgpu_alloc() and nvgpu_free() functions. There was a function for allocating either with kmalloc() or vmalloc() depending on the size of the allocation. Those have now been renamed to nvgpu_kalloc() and nvgpu_kfree(). Bug 1799159 Change-Id: Iddda92c013612bcb209847084ec85b8953002fa5 Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1274400 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/buddy_allocator_priv.h | 192 ------------------------- 1 file changed, 192 deletions(-) delete mode 100644 drivers/gpu/nvgpu/gk20a/buddy_allocator_priv.h (limited to 'drivers/gpu/nvgpu/gk20a/buddy_allocator_priv.h') diff --git a/drivers/gpu/nvgpu/gk20a/buddy_allocator_priv.h b/drivers/gpu/nvgpu/gk20a/buddy_allocator_priv.h deleted file mode 100644 index bb8b307b..00000000 --- a/drivers/gpu/nvgpu/gk20a/buddy_allocator_priv.h +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright (c) 2016, 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef BUDDY_ALLOCATOR_PRIV_H -#define BUDDY_ALLOCATOR_PRIV_H - -#include -#include - -struct gk20a_allocator; -struct vm_gk20a; - -/* - * Each buddy is an element in a binary tree. - */ -struct gk20a_buddy { - struct gk20a_buddy *parent; /* Parent node. */ - struct gk20a_buddy *buddy; /* This node's buddy. */ - struct gk20a_buddy *left; /* Lower address sub-node. */ - struct gk20a_buddy *right; /* Higher address sub-node. */ - - struct list_head buddy_entry; /* List entry for various lists. */ - struct rb_node alloced_entry; /* RB tree of allocations. */ - - u64 start; /* Start address of this buddy. */ - u64 end; /* End address of this buddy. */ - u64 order; /* Buddy order. */ - -#define BALLOC_BUDDY_ALLOCED 0x1 -#define BALLOC_BUDDY_SPLIT 0x2 -#define BALLOC_BUDDY_IN_LIST 0x4 - int flags; /* List of associated flags. */ - - /* - * Size of the PDE this buddy is using. This allows for grouping like - * sized allocations into the same PDE. This uses the gmmu_pgsz_gk20a - * enum except for the BALLOC_PTE_SIZE_ANY specifier. - */ -#define BALLOC_PTE_SIZE_ANY -1 - int pte_size; -}; - -#define __buddy_flag_ops(flag, flag_up) \ - static inline int buddy_is_ ## flag(struct gk20a_buddy *b) \ - { \ - return b->flags & BALLOC_BUDDY_ ## flag_up; \ - } \ - static inline void buddy_set_ ## flag(struct gk20a_buddy *b) \ - { \ - b->flags |= BALLOC_BUDDY_ ## flag_up; \ - } \ - static inline void buddy_clr_ ## flag(struct gk20a_buddy *b) \ - { \ - b->flags &= ~BALLOC_BUDDY_ ## flag_up; \ - } - -/* - * int buddy_is_alloced(struct gk20a_buddy *b); - * void buddy_set_alloced(struct gk20a_buddy *b); - * void buddy_clr_alloced(struct gk20a_buddy *b); - * - * int buddy_is_split(struct gk20a_buddy *b); - * void buddy_set_split(struct gk20a_buddy *b); - * void buddy_clr_split(struct gk20a_buddy *b); - * - * int buddy_is_in_list(struct gk20a_buddy *b); - * void buddy_set_in_list(struct gk20a_buddy *b); - * void buddy_clr_in_list(struct gk20a_buddy *b); - */ -__buddy_flag_ops(alloced, ALLOCED); -__buddy_flag_ops(split, SPLIT); -__buddy_flag_ops(in_list, IN_LIST); - -/* - * Keeps info for a fixed allocation. - */ -struct gk20a_fixed_alloc { - struct list_head buddies; /* List of buddies. */ - struct rb_node alloced_entry; /* RB tree of fixed allocations. */ - - u64 start; /* Start of fixed block. */ - u64 end; /* End address. */ -}; - -/* - * 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 - * complex object such as a comp_tag line or the like. - * - * The max order is computed based on the size of the minimum order and the size - * of the address space. - * - * order_size is the size of an order 0 buddy. - */ -struct gk20a_buddy_allocator { - struct gk20a_allocator *owner; /* Owner of this buddy allocator. */ - struct vm_gk20a *vm; /* Parent VM - can be NULL. */ - - u64 base; /* Base address of the space. */ - u64 length; /* Length of the space. */ - u64 blk_size; /* Size of order 0 allocation. */ - u64 blk_shift; /* Shift to divide by blk_size. */ - - /* Internal stuff. */ - u64 start; /* Real start (aligned to blk_size). */ - u64 end; /* Real end, trimmed if needed. */ - u64 count; /* Count of objects in space. */ - 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 list_head co_list; - - /* - * Impose an upper bound on the maximum order. - */ -#define GPU_BALLOC_ORDER_LIST_LEN (GPU_BALLOC_MAX_ORDER + 1) - - struct list_head buddy_list[GPU_BALLOC_ORDER_LIST_LEN]; - u64 buddy_list_len[GPU_BALLOC_ORDER_LIST_LEN]; - u64 buddy_list_split[GPU_BALLOC_ORDER_LIST_LEN]; - u64 buddy_list_alloced[GPU_BALLOC_ORDER_LIST_LEN]; - - /* - * This is for when the allocator is managing a GVA space (the - * GPU_ALLOC_GVA_SPACE bit is set in @flags). This requires - * that we group like sized allocations into PDE blocks. - */ - u64 pte_blk_order; - - int initialized; - int alloc_made; /* True after the first alloc. */ - - u64 flags; - - u64 bytes_alloced; - u64 bytes_alloced_real; - u64 bytes_freed; -}; - -static inline struct gk20a_buddy_allocator *buddy_allocator( - struct gk20a_allocator *a) -{ - return (struct gk20a_buddy_allocator *)(a)->priv; -} - -static inline struct list_head *balloc_get_order_list( - struct gk20a_buddy_allocator *a, int order) -{ - return &a->buddy_list[order]; -} - -static inline u64 balloc_order_to_len(struct gk20a_buddy_allocator *a, - int order) -{ - return (1 << order) * a->blk_size; -} - -static inline u64 balloc_base_shift(struct gk20a_buddy_allocator *a, - u64 base) -{ - return base - a->start; -} - -static inline u64 balloc_base_unshift(struct gk20a_buddy_allocator *a, - u64 base) -{ - return base + a->start; -} - -static inline struct gk20a_allocator *balloc_owner( - struct gk20a_buddy_allocator *a) -{ - return a->owner; -} - -#endif -- cgit v1.2.2