summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-aruba.c
diff options
context:
space:
mode:
authorHiro Sugawara <hsugawara@nvidia.com>2011-03-17 13:58:13 -0700
committerVarun Colbert <vcolbert@nvidia.com>2011-05-13 19:05:53 -0700
commitb17e8de9d5641edf76e3b6046a273d2a4a261e0a (patch)
tree18e7a9261b8b6eb1692acefb739b385451c6e9f1 /arch/arm/mach-tegra/board-aruba.c
parent30582abff8f85b56bafb86d0bc05db25257bf456 (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. Change-Id: I3a598431d15b92ce853b3bec97be4b583d021264 Reviewed-on: http://git-master/r/29849 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-aruba.c')
-rw-r--r--arch/arm/mach-tegra/board-aruba.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-aruba.c b/arch/arm/mach-tegra/board-aruba.c
index 81ab9bf2150d..290a4124ac22 100644
--- a/arch/arm/mach-tegra/board-aruba.c
+++ b/arch/arm/mach-tegra/board-aruba.c
@@ -564,7 +564,11 @@ static void __init tegra_aruba_init(void)
static void __init tegra_aruba_reserve(void)
{
+#if defined(CONFIG_NVMAP_CONVERT_CARVEOUT_TO_IOVMM)
+ tegra_reserve(0, SZ_4M, 0);
+#else
tegra_reserve(SZ_32M, SZ_4M, 0);
+#endif
}
MACHINE_START(ARUBA, "aruba")