Commit 28db3e96 authored by Andreas Färber's avatar Andreas Färber
Browse files

tegra: Fix mmap_region_t struct mismatch

Commit fdb1964c

 ("xlat: Introduce
MAP_REGION2() macro") added a granularity field to mmap_region_t.

Tegra platforms were using the v2 xlat_tables implementation in
common/tegra_common.mk, but v1 xlat_tables.h headers in soc/*/plat_setup.c
where arrays are being defined. This caused the next physical address to
be read as granularity, causing EINVAL error and triggering an assert.

Consistently use xlat_tables_v2.h header to avoid this.

Fixes ARM-software/tf-issues#548.
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 885b7c85
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <arch.h> #include <arch.h>
#include <platform_def.h> #include <platform_def.h>
#include <psci.h> #include <psci.h>
#include <xlat_tables.h> #include <xlat_tables_v2.h>
/******************************************************************************* /*******************************************************************************
* Tegra DRAM memory base address * Tegra DRAM memory base address
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <bl_common.h> #include <bl_common.h>
#include <tegra_def.h> #include <tegra_def.h>
#include <tegra_private.h> #include <tegra_private.h>
#include <xlat_tables.h> #include <xlat_tables_v2.h>
/******************************************************************************* /*******************************************************************************
* The Tegra power domain tree has a single system level power domain i.e. a * The Tegra power domain tree has a single system level power domain i.e. a
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <tegra_def.h> #include <tegra_def.h>
#include <tegra_platform.h> #include <tegra_platform.h>
#include <tegra_private.h> #include <tegra_private.h>
#include <xlat_tables.h> #include <xlat_tables_v2.h>
DEFINE_RENAME_SYSREG_RW_FUNCS(l2ctlr_el1, CORTEX_A57_L2CTLR_EL1) DEFINE_RENAME_SYSREG_RW_FUNCS(l2ctlr_el1, CORTEX_A57_L2CTLR_EL1)
extern uint64_t tegra_enable_l2_ecc_parity_prot; extern uint64_t tegra_enable_l2_ecc_parity_prot;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <console.h> #include <console.h>
#include <tegra_def.h> #include <tegra_def.h>
#include <tegra_private.h> #include <tegra_private.h>
#include <xlat_tables.h> #include <xlat_tables_v2.h>
/******************************************************************************* /*******************************************************************************
* The Tegra power domain tree has a single system level power domain i.e. a * The Tegra power domain tree has a single system level power domain i.e. a
......
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