Merge changes from topic "gic_update"
* changes:
Max SPI INTID is 1019
Switch AARCH32/AARCH64 to __aarch64__
diff --git a/plat/arm/fvp/fvp_topology.c b/plat/arm/fvp/fvp_topology.c
index dddd25b..e13e801 100644
--- a/plat/arm/fvp/fvp_topology.c
+++ b/plat/arm/fvp/fvp_topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -69,13 +69,13 @@
/* Number of cluster nodes */
FVP_CLUSTER_COUNT,
/* Number of children for the first node */
- FVP_MAX_CPUS_PER_CLUSTER,
+ FVP_MAX_CPUS_PER_CLUSTER * FVP_MAX_PE_PER_CPU,
/* Number of children for the second node */
- FVP_MAX_CPUS_PER_CLUSTER,
+ FVP_MAX_CPUS_PER_CLUSTER * FVP_MAX_PE_PER_CPU,
/* Number of children for the third node */
- FVP_MAX_CPUS_PER_CLUSTER,
+ FVP_MAX_CPUS_PER_CLUSTER * FVP_MAX_PE_PER_CPU,
/* Number of children for the fourth node */
- FVP_MAX_CPUS_PER_CLUSTER
+ FVP_MAX_CPUS_PER_CLUSTER * FVP_MAX_PE_PER_CPU
};
const unsigned char *tftf_plat_get_pwr_domain_tree_desc(void)
diff --git a/plat/arm/fvp/include/platform_def.h b/plat/arm/fvp/include/platform_def.h
index 27f4851..d5dc818 100644
--- a/plat/arm/fvp/include/platform_def.h
+++ b/plat/arm/fvp/include/platform_def.h
@@ -129,7 +129,8 @@
#endif
#define PLATFORM_CORE_COUNT (FVP_CLUSTER_COUNT * \
- FVP_MAX_CPUS_PER_CLUSTER)
+ FVP_MAX_CPUS_PER_CLUSTER * \
+ FVP_MAX_PE_PER_CPU)
#define PLATFORM_NUM_AFFS (1 + FVP_CLUSTER_COUNT + \
PLATFORM_CORE_COUNT)
#define PLATFORM_MAX_AFFLVL MPIDR_AFFLVL2
diff --git a/plat/arm/juno/juno64_tests_to_skip.txt b/plat/arm/juno/juno64_tests_to_skip.txt
index 9ce8cce..8fdb3ec 100644
--- a/plat/arm/juno/juno64_tests_to_skip.txt
+++ b/plat/arm/juno/juno64_tests_to_skip.txt
@@ -1,8 +1,12 @@
#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
# The multicore spurious interrupt test is known to cause problems on Juno
IRQ support in TSP/Multicore spurious interrupt test
+
+# The NODE_HW_STATE tests seem to hang on Juno. See GENFW-3574.
+# Disabling them in the meantime.
+PSCI NODE_HW_STATE
diff --git a/tools/generate_test_list/generate_test_list.pl b/tools/generate_test_list/generate_test_list.pl
index bcfdaff..d00d37b 100755
--- a/tools/generate_test_list/generate_test_list.pl
+++ b/tools/generate_test_list/generate_test_list.pl
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
#
-# Copyright (c) 2018, Arm Limited. All rights reserved.
+# Copyright (c) 2018-2020, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -35,7 +35,7 @@
my $failure_elem;
if (-e $XML_TEST_FILENAME) {
- my $parser = XML::LibXML->new();
+ my $parser = XML::LibXML->new(expand_entities => 1);
$doc = $parser->parse_file($XML_TEST_FILENAME);
} else {
exit 1