summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/include/mach/iovmm.h
diff options
context:
space:
mode:
authorHiro Sugawara <hsugawara@nvidia.com>2011-03-17 13:58:13 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:42:38 -0800
commitc22db7786d08a6224be75b8e836c4547d4c696a8 (patch)
tree168617cde6967f6b341a01af3c6d1d248ec769aa /arch/arm/mach-tegra/include/mach/iovmm.h
parent25cfb3190055a3019bdfb663b99e4caa58d42ba1 (diff)
arm: tegra: nvmap: Forcing to convert CarveOut requests to IOVM
Adding a build time CONFIG option to enable forcing of conversion of non-IRAM CarveOut memory allocation requests to IOVM requests. Default is "y" to force the conversion. Each forced conversion is reported to console. Allocation alignments larger than page size for IOVM are enabled. Single page CarveOut allocations are converted to system memory. CarveOut memory reservation has been removed for aruba, cardhu, and enterprise. Original-Change-Id: I3a598431d15b92ce853b3bec97be4b583d021264 Reviewed-on: http://git-master/r/29849 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Rebase-Id: Reaf79d5ef57d3be8f2dc572de1919e854a117114
Diffstat (limited to 'arch/arm/mach-tegra/include/mach/iovmm.h')
-rw-r--r--arch/arm/mach-tegra/include/mach/iovmm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/include/mach/iovmm.h b/arch/arm/mach-tegra/include/mach/iovmm.h
index 77ec3875f9b5..7a653da57b0e 100644
--- a/arch/arm/mach-tegra/include/mach/iovmm.h
+++ b/arch/arm/mach-tegra/include/mach/iovmm.h
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-tegra/include/mach/iovmm.h
*
- * Copyright (c) 2010, NVIDIA Corporation.
+ * Copyright (c) 2010-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
@@ -85,7 +85,7 @@ struct tegra_iovmm_client {
struct tegra_iovmm_area {
struct tegra_iovmm_domain *domain;
tegra_iovmm_addr_t iovm_start;
- tegra_iovmm_addr_t iovm_length;
+ size_t iovm_length;
pgprot_t pgprot;
struct tegra_iovmm_area_ops *ops;
};
@@ -155,7 +155,7 @@ void tegra_iovmm_client_unlock(struct tegra_iovmm_client *client);
* respectively. VM operations may be called before this call returns */
struct tegra_iovmm_area *tegra_iovmm_create_vm(
struct tegra_iovmm_client *client, struct tegra_iovmm_area_ops *ops,
- unsigned long size, pgprot_t pgprot);
+ size_t size, size_t align, pgprot_t pgprot);
/* called by clients to "zap" an iovmm_area, and replace all mappings
* in it with invalid ones, without freeing the virtual address range */