aboutsummaryrefslogtreecommitdiff
path: root/tftf
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2020-10-29 16:08:33 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-10-29 16:08:33 +0000
commitb90571b4113cd4a6d5e505c0c39c4d50e1ff141b (patch)
tree5b8a15f8ad7535b46bfcd5a3c55459bb8034e76d /tftf
parent9527c57946cb7029b772a4512591a35262983f9f (diff)
parentaa676da37a98a1ceae90a2726991304ef0a61c0e (diff)
downloadtf-a-tests-b90571b4113cd4a6d5e505c0c39c4d50e1ff141b.tar.gz
Merge changes from topic "tests-from-downstream-10082020"
* changes: plat: tegra: include standard and validation tests Tegra210: introduce platform support Tegra: timer: define RTC irq number in each platform aarch64: enable SError aborts Tegra186: introduce platform support
Diffstat (limited to 'tftf')
-rw-r--r--tftf/framework/aarch64/arch.c4
-rw-r--r--tftf/tests/tests-tegra194.mk3
-rw-r--r--tftf/tests/tests-tegra194.xml27
3 files changed, 22 insertions, 12 deletions
diff --git a/tftf/framework/aarch64/arch.c b/tftf/framework/aarch64/arch.c
index c3f57b8c..56369ae8 100644
--- a/tftf/framework/aarch64/arch.c
+++ b/tftf/framework/aarch64/arch.c
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2020, NVIDIA Corporation. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -10,6 +11,9 @@ void tftf_arch_setup(void)
{
/* Do not try to configure EL2 if TFTF is running at NS-EL1 */
if (IS_IN_EL2()) {
+ /* Enable asynchronous SError aborts to EL2 */
+ enable_serror();
+
/*
* Route physical interrupts to EL2 regardless of the value of
* the IMO/FMO bits. Without this, interrupts would not be taken
diff --git a/tftf/tests/tests-tegra194.mk b/tftf/tests/tests-tegra194.mk
index a8674125..ef6d8487 100644
--- a/tftf/tests/tests-tegra194.mk
+++ b/tftf/tests/tests-tegra194.mk
@@ -13,3 +13,6 @@ TESTS_SOURCES += $(addprefix tftf/tests/plat/nvidia/tegra194/, \
test_ras_uncorrectable.c \
serror_handler.S \
)
+
+include tftf/tests/tests-standard.mk
+TESTS_SOURCES += $(sort ${TESTS_SOURCES})
diff --git a/tftf/tests/tests-tegra194.xml b/tftf/tests/tests-tegra194.xml
index 173d3642..d07e411b 100644
--- a/tftf/tests/tests-tegra194.xml
+++ b/tftf/tests/tests-tegra194.xml
@@ -6,15 +6,18 @@
SPDX-License-Identifier: BSD-3-Clause
-->
-<testsuites>
- <testsuite name="Tegra SiP tests" description="SiP tests for Tegra platforms">
- <testcase name="Video Memory Configuration test" function="test_sip_videomem_incorrect_inputs" />
- <testcase name="Video Memory Resize test" function="test_sip_videomem_resize" />
- <testcase name="Read SMMU_PER register contents test" function="test_get_smmu_per" />
- </testsuite>
- <testsuite name="Tegra194 platform tests" description="Tests for Tegra194 platforms">
- <testcase name="RAS corrected error test" function="test_ras_corrected" />
- <testcase name="RAS uncorrectable error test" function="test_ras_uncorrectable" />
- </testsuite>
-
-</testsuites>
+<document>
+ <!-- External reference to standard tests files. -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tests-standard.xml" />
+ <testsuites>
+ <testsuite name="Tegra SiP tests" description="SiP tests for Tegra platforms">
+ <testcase name="Video Memory Configuration test" function="test_sip_videomem_incorrect_inputs" />
+ <testcase name="Video Memory Resize test" function="test_sip_videomem_resize" />
+ <testcase name="Read SMMU_PER register contents test" function="test_get_smmu_per" />
+ </testsuite>
+ <testsuite name="Tegra194 platform tests" description="Tests for Tegra194 platforms">
+ <testcase name="RAS corrected error test" function="test_ras_corrected" />
+ <testcase name="RAS uncorrectable error test" function="test_ras_uncorrectable" />
+ </testsuite>
+ </testsuites>
+</document>