diff options
author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-02-18 08:23:38 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-02-18 08:23:38 +0000 |
commit | 61b35a57c19f3e7c90b220aaad207fff9104b7d1 (patch) | |
tree | b9874ae8652d8814cc3695e0a0a6f86508cd71f1 | |
parent | c82069c7899e27ed94efa41cce0c53ff33d3848b (diff) | |
parent | 8da87adf06022f5566a999ae33c4eef1588e3272 (diff) | |
download | tf-a-tests-61b35a57c19f3e7c90b220aaad207fff9104b7d1.tar.gz |
Merge "Multiply with FVP_MAX_PE_PER_CPU in power topology"
-rw-r--r-- | plat/arm/fvp/fvp_topology.c | 10 | ||||
-rw-r--r-- | plat/arm/fvp/include/platform_def.h | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/plat/arm/fvp/fvp_topology.c b/plat/arm/fvp/fvp_topology.c index dddd25bf8..e13e80144 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 @@ static const unsigned char fvp_power_domain_tree_desc[] = { /* 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 4f64079f1..b6c926bc7 100644 --- a/plat/arm/fvp/include/platform_def.h +++ b/plat/arm/fvp/include/platform_def.h @@ -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 */ @@ -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 |