From a28417a457653db6a74260da2f0731b8c1382862 Mon Sep 17 00:00:00 2001 From: Krishna Reddy Date: Tue, 15 May 2012 19:54:50 -0700 Subject: arm: tegra: nvmap: remove nvmap.h from mach-tegra/include. It is moved to kernel/include. Bug 854182 Change-Id: I3fb729c88e29a9f213656fbf20810c10dfd9d7a6 Signed-off-by: Krishna Reddy Reviewed-on: http://git-master/r/102727 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Jon Mayo Reviewed-by: Bo Yan --- arch/arm/mach-tegra/include/mach/nvmap.h | 158 ------------------------------- 1 file changed, 158 deletions(-) delete mode 100644 arch/arm/mach-tegra/include/mach/nvmap.h (limited to 'arch') diff --git a/arch/arm/mach-tegra/include/mach/nvmap.h b/arch/arm/mach-tegra/include/mach/nvmap.h deleted file mode 100644 index d27cd90778ee..000000000000 --- a/arch/arm/mach-tegra/include/mach/nvmap.h +++ /dev/null @@ -1,158 +0,0 @@ -/* - * arch/arm/mach-tegra/include/linux/nvmap.h - * - * structure declarations for nvmem and nvmap user-space ioctls - * - * Copyright (c) 2009-2011, NVIDIA Corporation. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that 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, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include -#include -#include - -#if !defined(__KERNEL__) -#define __user -#endif - -#ifndef __NVMAP_H -#define __NVMAP_H - -#define NVMAP_HEAP_SYSMEM (1ul<<31) -#define NVMAP_HEAP_IOVMM (1ul<<30) - -/* common carveout heaps */ -#define NVMAP_HEAP_CARVEOUT_IRAM (1ul<<29) -#define NVMAP_HEAP_CARVEOUT_VPR (1ul<<28) -#define NVMAP_HEAP_CARVEOUT_GENERIC (1ul<<0) - -#define NVMAP_HEAP_CARVEOUT_MASK (NVMAP_HEAP_IOVMM - 1) - -/* allocation flags */ -#define NVMAP_HANDLE_UNCACHEABLE (0x0ul << 0) -#define NVMAP_HANDLE_WRITE_COMBINE (0x1ul << 0) -#define NVMAP_HANDLE_INNER_CACHEABLE (0x2ul << 0) -#define NVMAP_HANDLE_CACHEABLE (0x3ul << 0) -#define NVMAP_HANDLE_CACHE_FLAG (0x3ul << 0) - -#define NVMAP_HANDLE_SECURE (0x1ul << 2) - - -#if defined(__KERNEL__) - -#if defined(CONFIG_TEGRA_NVMAP) -struct nvmap_handle; -struct nvmap_client; -struct nvmap_device; -#define nvmap_ref_to_handle(_ref) (*(struct nvmap_handle **)(_ref)) -/* Convert User space handle to Kernel. */ -#define nvmap_convert_handle_u2k(h) (h) -#elif defined(CONFIG_ION_TEGRA) -/* For Ion Mem Manager support through nvmap_* API's. */ -#include "../../../../../drivers/gpu/ion/ion_priv.h" - -#define nvmap_client ion_client -#define nvmap_device ion_device -#define nvmap_handle ion_handle -#define nvmap_handle_ref ion_handle -#define nvmap_ref_to_handle(_ref) (struct ion_handle *)_ref -/* Convert User space handle to Kernel. */ -#define nvmap_convert_handle_u2k(h) ({ \ - if ((u32)h >= TASK_SIZE) { \ - pr_err("Invalid user space handle."); \ - BUG(); \ - } \ - (*((u32 *)h)); }) -#endif - -#define nvmap_id_to_handle(_id) ((struct nvmap_handle *)(_id)) - - -struct nvmap_pinarray_elem { - __u32 patch_mem; - __u32 patch_offset; - __u32 pin_mem; - __u32 pin_offset; - __u32 reloc_shift; -}; - -#if defined(CONFIG_TEGRA_NVMAP) -/* handle_ref objects are client-local references to an nvmap_handle; - * they are distinct objects so that handles can be unpinned and - * unreferenced the correct number of times when a client abnormally - * terminates */ -struct nvmap_handle_ref { - struct nvmap_handle *handle; - struct rb_node node; - atomic_t dupes; /* number of times to free on file close */ - atomic_t pin; /* number of times to unpin on free */ -}; -#endif - -struct nvmap_client *nvmap_create_client(struct nvmap_device *dev, - const char *name); - -struct nvmap_handle_ref *nvmap_alloc(struct nvmap_client *client, size_t size, - size_t align, unsigned int flags, - unsigned int heap_mask); - -void nvmap_free(struct nvmap_client *client, struct nvmap_handle_ref *r); - -void *nvmap_mmap(struct nvmap_handle_ref *r); - -void nvmap_munmap(struct nvmap_handle_ref *r, void *addr); - -struct nvmap_client *nvmap_client_get_file(int fd); - -struct nvmap_client *nvmap_client_get(struct nvmap_client *client); - -void nvmap_client_put(struct nvmap_client *c); - -phys_addr_t nvmap_pin(struct nvmap_client *c, struct nvmap_handle_ref *r); - -phys_addr_t nvmap_handle_address(struct nvmap_client *c, unsigned long id); - -void nvmap_unpin(struct nvmap_client *client, struct nvmap_handle_ref *r); - -int nvmap_pin_array(struct nvmap_client *client, struct nvmap_handle *gather, - const struct nvmap_pinarray_elem *arr, int nr, - struct nvmap_handle **unique); - -void nvmap_unpin_handles(struct nvmap_client *client, - struct nvmap_handle **h, int nr); - -int nvmap_patch_word(struct nvmap_client *client, - struct nvmap_handle *patch, - u32 patch_offset, u32 patch_value); - -struct nvmap_platform_carveout { - const char *name; - unsigned int usage_mask; - phys_addr_t base; - size_t size; - size_t buddy_size; -}; - -struct nvmap_platform_data { - const struct nvmap_platform_carveout *carveouts; - unsigned int nr_carveouts; -}; - -extern struct nvmap_device *nvmap_dev; - -#endif - -#endif -- cgit v1.2.3