Tegra186: memctrl_v2: restore video memory settings
The memory controller loses its settings when the device enters system
suspend state.
This patch adds a handler to restore the Video Memory settings in the
memory controller, which would be called after exiting the system suspend
state.
Change-Id: I1ac12426d7290ac1452983d3c9e05fabbf3327fa
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 4d8d307..e11b8ad 100644
--- a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
+++ b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
@@ -35,6 +35,7 @@
#include <memctrl.h>
#include <memctrl_v2.h>
#include <mmio.h>
+#include <smmu.h>
#include <string.h>
#include <tegra_def.h>
#include <xlat_tables.h>
@@ -234,7 +235,7 @@
};
/*
- * Init SMMU.
+ * Init Memory controller during boot.
*/
void tegra_memctrl_setup(void)
{
@@ -248,9 +249,7 @@
INFO("Tegra Memory Controller (v2)\n");
/* Program the SMMU pagesize */
- val = tegra_smmu_read_32(ARM_SMMU_GSR0_SECURE_ACR);
- val |= ARM_SMMU_GSR0_PGSIZE_64K;
- tegra_smmu_write_32(ARM_SMMU_GSR0_SECURE_ACR, val);
+ tegra_smmu_init();
/* Program all the Stream ID overrides */
for (i = 0; i < num_overrides; i++)
@@ -316,7 +315,13 @@
}
}
+}
+/*
+ * Restore Memory Controller settings after "System Suspend"
+ */
+void tegra_memctrl_restore_settings(void)
+{
/* video memory carveout region */
if (video_mem_base) {
tegra_mc_write_32(MC_VIDEO_PROTECT_BASE_LO,
diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v2.h b/plat/nvidia/tegra/include/drivers/memctrl_v2.h
index c1061fe..9623e25 100644
--- a/plat/nvidia/tegra/include/drivers/memctrl_v2.h
+++ b/plat/nvidia/tegra/include/drivers/memctrl_v2.h
@@ -309,14 +309,6 @@
}
/*******************************************************************************
- * Memory Controller SMMU Global Secure Aux. Configuration Register
- ******************************************************************************/
-#define ARM_SMMU_GSR0_SECURE_ACR 0x10
-#define ARM_SMMU_GSR0_PGSIZE_SHIFT 16
-#define ARM_SMMU_GSR0_PGSIZE_4K (0 << ARM_SMMU_GSR0_PGSIZE_SHIFT)
-#define ARM_SMMU_GSR0_PGSIZE_64K (1 << ARM_SMMU_GSR0_PGSIZE_SHIFT)
-
-/*******************************************************************************
* Structure to hold the Stream ID to use to override client inputs
******************************************************************************/
typedef struct mc_streamid_override_cfg {
@@ -396,14 +388,4 @@
mmio_write_32(TEGRA_MC_STREAMID_BASE + off, val);
}
-static inline uint32_t tegra_smmu_read_32(uint32_t off)
-{
- return mmio_read_32(TEGRA_SMMU_BASE + off);
-}
-
-static inline void tegra_smmu_write_32(uint32_t off, uint32_t val)
-{
- mmio_write_32(TEGRA_SMMU_BASE + off, val);
-}
-
#endif /* __MEMCTRLV2_H__ */