Commit 16c7cd01 authored by Varun Wadekar's avatar Varun Wadekar
Browse files

Tegra: memctrl_v2: config to enable SMMU device



This patch adds a config to the memory controller driver to enable SMMU
device init during boot. Tegra186 platforms keeps it enabled by default,
but future platforms might not support it.

Change-Id: Iebe1c60a25fc1cfb4c97a507e121d6685a49cb83
Signed-off-by: default avatarVarun Wadekar <vwadekar@nvidia.com>
parent 691bc22d
...@@ -511,8 +511,10 @@ void tegra_memctrl_setup(void) ...@@ -511,8 +511,10 @@ void tegra_memctrl_setup(void)
INFO("Tegra Memory Controller (v2)\n"); INFO("Tegra Memory Controller (v2)\n");
#if ENABLE_SMMU_DEVICE
/* Program the SMMU pagesize */ /* Program the SMMU pagesize */
tegra_smmu_init(); tegra_smmu_init();
#endif
/* Program all the Stream ID overrides */ /* Program all the Stream ID overrides */
for (i = 0; i < num_overrides; i++) for (i = 0; i < num_overrides; i++)
......
...@@ -104,8 +104,10 @@ static const mmap_region_t tegra_mmap[] = { ...@@ -104,8 +104,10 @@ static const mmap_region_t tegra_mmap[] = {
MT_DEVICE | MT_RW | MT_SECURE), MT_DEVICE | MT_RW | MT_SECURE),
MAP_REGION_FLAT(TEGRA_ARM_ACTMON_CTR_BASE, 0x20000, /* 128KB - ARM/Denver */ MAP_REGION_FLAT(TEGRA_ARM_ACTMON_CTR_BASE, 0x20000, /* 128KB - ARM/Denver */
MT_DEVICE | MT_RW | MT_SECURE), MT_DEVICE | MT_RW | MT_SECURE),
#if ENABLE_SMMU_DEVICE
MAP_REGION_FLAT(TEGRA_SMMU_BASE, 0x1000000, /* 64KB */ MAP_REGION_FLAT(TEGRA_SMMU_BASE, 0x1000000, /* 64KB */
MT_DEVICE | MT_RW | MT_SECURE), MT_DEVICE | MT_RW | MT_SECURE),
#endif
{0} {0}
}; };
......
...@@ -41,6 +41,9 @@ $(eval $(call add_define,RELOCATE_TO_BL31_BASE)) ...@@ -41,6 +41,9 @@ $(eval $(call add_define,RELOCATE_TO_BL31_BASE))
ENABLE_CHIP_VERIFICATION_HARNESS := 0 ENABLE_CHIP_VERIFICATION_HARNESS := 0
$(eval $(call add_define,ENABLE_CHIP_VERIFICATION_HARNESS)) $(eval $(call add_define,ENABLE_CHIP_VERIFICATION_HARNESS))
ENABLE_SMMU_DEVICE := 1
$(eval $(call add_define,ENABLE_SMMU_DEVICE))
RESET_TO_BL31 := 1 RESET_TO_BL31 := 1
PROGRAMMABLE_RESET_ADDRESS := 1 PROGRAMMABLE_RESET_ADDRESS := 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment