diff options
author | Madhukar <madhukar.pappireddy@arm.com> | 2019-06-04 15:57:18 -0500 |
---|---|---|
committer | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2019-06-11 10:10:22 -0500 |
commit | 3fd90497faa87ef81b60aa685689bda015f2acb1 (patch) | |
tree | 24046b7a9287064cf03ee4d9e40be888367987f7 /plat | |
parent | c9ab1fd3b32cc3adce83b76a5a801ae492c175ff (diff) | |
download | tf-a-tests-3fd90497faa87ef81b60aa685689bda015f2acb1.tar.gz |
Support for FVP cluster with 8 CPUs.
Few Cortex FVPs have upto 8 CPUs in single clsuter. This patch solves
the issue reported in https://developer.trustedfirmware.org/T333
Change-Id: I14c36b0d643a85527b7122cee0f728fddb871ec7
Signed-off-by: Madhukar Pappireddy<madhukar.pappireddy@arm.com>
Diffstat (limited to 'plat')
-rw-r--r-- | plat/arm/fvp/fvp_def.h | 4 | ||||
-rw-r--r-- | plat/arm/fvp/fvp_topology.c | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/plat/arm/fvp/fvp_def.h b/plat/arm/fvp/fvp_def.h index 46323e4a8..abaa387d3 100644 --- a/plat/arm/fvp/fvp_def.h +++ b/plat/arm/fvp/fvp_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Arm Limited. All rights reserved. + * Copyright (c) 2018-2019, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -16,7 +16,7 @@ /******************************************************************************* * Cluster Topology definitions ******************************************************************************/ -#define FVP_MAX_CPUS_PER_CLUSTER 4 +#define FVP_MAX_CPUS_PER_CLUSTER 8 /* Currently the highest cluster count on the FVP is 4 (Quad cluster) */ #define FVP_CLUSTER_COUNT 4 /* Currently multi-threaded CPUs only have a single thread */ diff --git a/plat/arm/fvp/fvp_topology.c b/plat/arm/fvp/fvp_topology.c index 348f8efff..751a1b8b5 100644 --- a/plat/arm/fvp/fvp_topology.c +++ b/plat/arm/fvp/fvp_topology.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Arm Limited. All rights reserved. + * Copyright (c) 2018-2019, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -26,21 +26,37 @@ static const struct { { 0, 1 }, { 0, 2 }, { 0, 3 }, + { 0, 4 }, + { 0, 5 }, + { 0, 6 }, + { 0, 7 }, /* Cluster 1 */ { 1, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 }, + { 1, 4 }, + { 1, 5 }, + { 1, 6 }, + { 1, 7 }, /* Cluster 2 */ { 2, 0 }, { 2, 1 }, { 2, 2 }, { 2, 3 }, + { 2, 4 }, + { 2, 5 }, + { 2, 6 }, + { 2, 7 }, /* Cluster 3 */ { 3, 0 }, { 3, 1 }, { 3, 2 }, { 3, 3 }, + { 3, 4 }, + { 3, 5 }, + { 3, 6 }, + { 3, 7 }, }; /* |