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: Varun Wadekar <vwadekar@nvidia.com>

diff --git a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
index c72af1695396de0749d72aef55431163e9e4f570..18f33682dde9d24d6d8133b953f8353c6a8fbfb3 100644 (file)
--- a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
+++ b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
@@ -511,8 +511,10 @@ void tegra_memctrl_setup(void)
 
        INFO("Tegra Memory Controller (v2)\n");
 
+#if ENABLE_SMMU_DEVICE
        /* Program the SMMU pagesize */
        tegra_smmu_init();
+#endif
 
        /* Program all the Stream ID overrides */
        for (i = 0; i < num_overrides; i++)

diff --git a/plat/nvidia/tegra/soc/t186/plat_setup.c b/plat/nvidia/tegra/soc/t186/plat_setup.c
index c401b858f45afa7218f4c3eda1d589568824132a..71087231fdfd964e9fc6967b5e3fab9918aaed52 100644 (file)
--- a/plat/nvidia/tegra/soc/t186/plat_setup.c
+++ b/plat/nvidia/tegra/soc/t186/plat_setup.c
@@ -104,8 +104,10 @@ static const mmap_region_t tegra_mmap[] = {
                        MT_DEVICE | MT_RW | MT_SECURE),
        MAP_REGION_FLAT(TEGRA_ARM_ACTMON_CTR_BASE, 0x20000, /* 128KB - ARM/Denver */
                        MT_DEVICE | MT_RW | MT_SECURE),
+#if ENABLE_SMMU_DEVICE
        MAP_REGION_FLAT(TEGRA_SMMU_BASE, 0x1000000, /* 64KB */
                        MT_DEVICE | MT_RW | MT_SECURE),
+#endif
        {0}
 };
 

diff --git a/plat/nvidia/tegra/soc/t186/platform_t186.mk b/plat/nvidia/tegra/soc/t186/platform_t186.mk
index 0c2b0a4703fae8fe27ffcc9ac790fcf62919c6a3..bf76860c736ace84b9d4544adb76c80384a679b5 100644 (file)
--- a/plat/nvidia/tegra/soc/t186/platform_t186.mk
+++ b/plat/nvidia/tegra/soc/t186/platform_t186.mk
@@ -41,6 +41,9 @@ $(eval $(call add_define,RELOCATE_TO_BL31_BASE))
 ENABLE_CHIP_VERIFICATION_HARNESS       := 0
 $(eval $(call add_define,ENABLE_CHIP_VERIFICATION_HARNESS))
 
+ENABLE_SMMU_DEVICE                     := 1
+$(eval $(call add_define,ENABLE_SMMU_DEVICE))
+
 RESET_TO_BL31                          := 1
 
 PROGRAMMABLE_RESET_ADDRESS             := 1