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
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:45:27 -0800
commit27ed1c24a401e55ec19a0562c06234521cf3ecc3 (patch)
treecd1ddfe5032e72ab5a9788d9eef543e88b4e1d53 /arch/arm/mach-tegra/board-aruba.c
parent9a0b5ee395940f875b34cf7cb3c64ca345a6890a (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: Rad46b28fc58eb2e33225e11832ca46a87e63e5c3
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 947c3f3249d1..7223fd04e1b8 100644
--- a/arch/arm/mach-tegra/board-aruba.c
+++ b/arch/arm/mach-tegra/board-aruba.c
@@ -520,7 +520,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")