diff options
| author | David Cunado <david.cunado@arm.com> | 2018-04-05 17:40:13 +0100 |
|---|---|---|
| committer | David Cunado <david.cunado@arm.com> | 2018-04-06 18:07:12 +0100 |
| commit | 468bea41283206f1976292bb49cfcd9f5767e152 (patch) | |
| tree | 9215d673e3d5ea68694b6b48fb0cd345624f5a52 /plat | |
| parent | 93883a293145f6c85b3fc8c219f400e28b7d1491 (diff) | |
| download | platform_external_arm-trusted-firmware-468bea41283206f1976292bb49cfcd9f5767e152.tar.gz platform_external_arm-trusted-firmware-468bea41283206f1976292bb49cfcd9f5767e152.tar.bz2 platform_external_arm-trusted-firmware-468bea41283206f1976292bb49cfcd9f5767e152.zip | |
FVP: Fix function for translating MPIDR to linear index
The current AArch32 version of plat_arm_calc_core_pos uses an incorrect
algorithm to calculate the linear position of a core / PE from its
MPIDR.
This patch corrects the algorithm to:
(ClusterId * FVP_MAX_CPUS_PER_CLUSTER) * FVP_MAX_PE_PER_CPU
+ (CPUId * FVP_MAX_PE_PER_CPU)
+ ThreadId
which supports cores where there are more than 1 PE per CPU.
NOTE: the AArch64 version was fixed in 39b21d1
Change-Id: I72aea89d8f72f8b1fef54e2177a0fa6fef0f5513
Signed-off-by: David Cunado <david.cunado@arm.com>
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/arm/board/fvp/aarch32/fvp_helpers.S | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/plat/arm/board/fvp/aarch32/fvp_helpers.S b/plat/arm/board/fvp/aarch32/fvp_helpers.S index 143972d26..5d8854698 100644 --- a/plat/arm/board/fvp/aarch32/fvp_helpers.S +++ b/plat/arm/board/fvp/aarch32/fvp_helpers.S @@ -104,15 +104,20 @@ func plat_is_my_cpu_primary bx lr endfunc plat_is_my_cpu_primary - /* ----------------------------------------------------- + /* --------------------------------------------------------------------- * unsigned int plat_arm_calc_core_pos(u_register_t mpidr) * * Function to calculate the core position on FVP. * - * (ClusterId * FVP_MAX_CPUS_PER_CLUSTER) + + * (ClusterId * FVP_MAX_CPUS_PER_CLUSTER * FVP_MAX_PE_PER_CPU) + * (CPUId * FVP_MAX_PE_PER_CPU) + * ThreadId - * ----------------------------------------------------- + * + * which can be simplified as: + * + * ((ClusterId * FVP_MAX_CPUS_PER_CLUSTER + CPUId) * FVP_MAX_PE_PER_CPU) + * + ThreadId + * --------------------------------------------------------------------- */ func plat_arm_calc_core_pos mov r3, r0 @@ -125,14 +130,15 @@ func plat_arm_calc_core_pos lsleq r3, r0, #MPIDR_AFFINITY_BITS /* Extract individual affinity fields from MPIDR */ - mov r2, #FVP_MAX_PE_PER_CPU ubfx r0, r3, #MPIDR_AFF0_SHIFT, #MPIDR_AFFINITY_BITS ubfx r1, r3, #MPIDR_AFF1_SHIFT, #MPIDR_AFFINITY_BITS - mla r0, r1, r2, r0 - - mov r1, #FVP_MAX_CPUS_PER_CLUSTER ubfx r2, r3, #MPIDR_AFF2_SHIFT, #MPIDR_AFFINITY_BITS - mla r0, r1, r2, r0 + + /* Compute linear position */ + mov r3, #FVP_MAX_CPUS_PER_CLUSTER + mla r1, r2, r3, r1 + mov r3, #FVP_MAX_PE_PER_CPU + mla r0, r1, r3, r0 bx lr endfunc plat_arm_calc_core_pos |