diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-07-26 09:26:14 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-07-26 09:26:14 +0000 |
| commit | 4129340717c215f3cc3841e32ed0b6cd5baf7ffb (patch) | |
| tree | dcf0d8c9fac1ecfead38e02ec8d6539a5a5c9647 /plat/marvell | |
| parent | df7a906f8803640b23294a4e41ef177a1e6607b3 (diff) | |
| parent | 3c7dcdac5c50c45cb35111a01ecdd7fb93654cb3 (diff) | |
Merge changes from topic "advk-serror" into integration
* changes:
marvell/a3700: Prevent SError accessing PCIe link while it is down
marvell: Switch to xlat_tables_v2
Diffstat (limited to 'plat/marvell')
| -rw-r--r-- | plat/marvell/a3700/common/a3700_common.mk | 2 | ||||
| -rw-r--r-- | plat/marvell/a3700/common/a3700_ea.c | 23 | ||||
| -rw-r--r-- | plat/marvell/common/aarch64/marvell_common.c | 2 | ||||
| -rw-r--r-- | plat/marvell/common/marvell_common.mk | 5 |
4 files changed, 29 insertions, 3 deletions
diff --git a/plat/marvell/a3700/common/a3700_common.mk b/plat/marvell/a3700/common/a3700_common.mk index 64cd4334..1e275673 100644 --- a/plat/marvell/a3700/common/a3700_common.mk +++ b/plat/marvell/a3700/common/a3700_common.mk @@ -13,6 +13,7 @@ PLAT_INCLUDE_BASE := $(MARVELL_PLAT_INCLUDE_BASE)/$(PLAT_FAMILY) PLAT_COMMON_BASE := $(PLAT_FAMILY_BASE)/common MARVELL_DRV_BASE := drivers/marvell MARVELL_COMMON_BASE := $(MARVELL_PLAT_BASE)/common +HANDLE_EA_EL3_FIRST := 1 include $(MARVELL_PLAT_BASE)/marvell.mk @@ -107,6 +108,7 @@ BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \ $(PLAT_COMMON_BASE)/dram_win.c \ $(PLAT_COMMON_BASE)/io_addr_dec.c \ $(PLAT_COMMON_BASE)/marvell_plat_config.c \ + $(PLAT_COMMON_BASE)/a3700_ea.c \ $(PLAT_FAMILY_BASE)/$(PLAT)/plat_bl31_setup.c \ $(MARVELL_COMMON_BASE)/marvell_ddr_info.c \ $(MARVELL_COMMON_BASE)/marvell_gicv3.c \ diff --git a/plat/marvell/a3700/common/a3700_ea.c b/plat/marvell/a3700/common/a3700_ea.c new file mode 100644 index 00000000..dd46beb5 --- /dev/null +++ b/plat/marvell/a3700/common/a3700_ea.c @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2019 Repk repk@triplefau.lt + * + * SPDX-License-Identifier: BSD-3-Clause + * https://spdx.org/licenses + */ +#include <common/bl_common.h> +#include <common/debug.h> +#include <arch_helpers.h> + +#define ADVK_SERROR_SYNDROME 0xbf000002 + +void plat_ea_handler(unsigned int ea_reason, uint64_t syndrome, void *cookie, + void *handle, uint64_t flags) +{ + if (syndrome != ADVK_SERROR_SYNDROME) { + ERROR("Unhandled External Abort received on 0x%lx at EL3!\n", + read_mpidr_el1()); + ERROR(" exception reason=%u syndrome=0x%llx\n", ea_reason, + syndrome); + panic(); + } +} diff --git a/plat/marvell/common/aarch64/marvell_common.c b/plat/marvell/common/aarch64/marvell_common.c index ea0902cc..21a62d48 100644 --- a/plat/marvell/common/aarch64/marvell_common.c +++ b/plat/marvell/common/aarch64/marvell_common.c @@ -13,7 +13,7 @@ #include <arch_helpers.h> #include <common/debug.h> #include <lib/mmio.h> -#include <lib/xlat_tables/xlat_tables.h> +#include <lib/xlat_tables/xlat_tables_v2.h> #include <plat_marvell.h> diff --git a/plat/marvell/common/marvell_common.mk b/plat/marvell/common/marvell_common.mk index 5c8e804f..f41d7a47 100644 --- a/plat/marvell/common/marvell_common.mk +++ b/plat/marvell/common/marvell_common.mk @@ -20,12 +20,13 @@ $(eval $(call add_define,ARO_ENABLE)) LLC_ENABLE := 1 $(eval $(call add_define,LLC_ENABLE)) +include lib/xlat_tables_v2/xlat_tables.mk + PLAT_INCLUDES += -I$(MARVELL_PLAT_INCLUDE_BASE)/common \ -I$(MARVELL_PLAT_INCLUDE_BASE)/common/aarch64 -PLAT_BL_COMMON_SOURCES += lib/xlat_tables/xlat_tables_common.c \ - lib/xlat_tables/aarch64/xlat_tables.c \ +PLAT_BL_COMMON_SOURCES += ${XLAT_TABLES_LIB_SRCS} \ $(MARVELL_PLAT_BASE)/common/aarch64/marvell_common.c \ $(MARVELL_PLAT_BASE)/common/aarch64/marvell_helpers.S \ $(MARVELL_COMMON_BASE)/marvell_console.c |