summaryrefslogtreecommitdiff
path: root/plat/nvidia
diff options
context:
space:
mode:
authorPritesh Raithatha <praithatha@nvidia.com>2017-03-01 16:55:16 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2017-04-13 12:35:27 -0700
commit95a7fae42c4a59b794bc959491e01ba0a76334d1 (patch)
tree1e3e97eed13b2dd29e00441faa0c83f97c782a7e /plat/nvidia
parent7b3052710b39829ff7e2cc73e65fc94e3fe7d0d6 (diff)
Tegra: memctrl_v2: MC transaction overrides for newer chips
This patch programs MC transaction overrides settings using mc_txn_override_cfgs array for all Tegra chips beyond Tegra186 rev. A01 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'plat/nvidia')
-rw-r--r--plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
index b8c0e03e..d3c3e873 100644
--- a/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
+++ b/plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
@@ -375,10 +375,14 @@ void tegra_memctrl_setup(void)
/*
* Set the MC_TXN_OVERRIDE registers for write clients.
*/
- if (!tegra_platform_is_silicon() ||
- (tegra_platform_is_silicon() && tegra_get_chipid_minor() == 1)) {
+ if ((tegra_get_chipid() == (uint32_t)TEGRA_CHIPID_TEGRA18) &&
+ (!tegra_platform_is_silicon() ||
+ (tegra_platform_is_silicon() && tegra_get_chipid_minor() == 1))) {
- /* GPU and NVENC settings for rev. A01 */
+ /*
+ * GPU and NVENC settings for Tegra186 simulation and
+ * Silicon rev. A01
+ */
val = tegra_mc_read_32(MC_TXN_OVERRIDE_CONFIG_GPUSWR);
val &= ~MC_TXN_OVERRIDE_CGID_TAG_MASK;
tegra_mc_write_32(MC_TXN_OVERRIDE_CONFIG_GPUSWR,
@@ -396,7 +400,9 @@ void tegra_memctrl_setup(void)
} else {
- /* settings for rev. A02 */
+ /*
+ * Settings for Tegra186 silicon rev. A02 and onwards.
+ */
for (i = 0; i < num_txn_override_cfgs; i++) {
val = tegra_mc_read_32(mc_txn_override_cfgs[i].offset);
val &= ~MC_TXN_OVERRIDE_CGID_TAG_MASK;