diff options
Diffstat (limited to 'framework/main.c')
| -rw-r--r-- | framework/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/main.c b/framework/main.c index 580d2f3..ea69192 100644 --- a/framework/main.c +++ b/framework/main.c @@ -1,6 +1,6 @@ /** @file * -* Copyright (c) 2013-2016, ARM Limited. All rights reserved. +* Copyright (c) 2013-2018, ARM Limited. All rights reserved. * * This program and the accompanying materials * are licensed and made available under the terms and conditions of the BSD License @@ -314,7 +314,7 @@ static unsigned int close_test(void) static void __dead2 hand_over_to_lead_cpu(void) { int ret; - unsigned int mpid = read_mpidr_el1() & 0xFFFFFF; + unsigned int mpid = read_mpidr_el1() & MPID_MASK; unsigned int core_pos = platform_get_core_pos(mpid); VERBOSE("CPU%u: Hand over to lead CPU%u\n", core_pos, @@ -348,7 +348,7 @@ static void __dead2 hand_over_to_lead_cpu(void) void __dead2 run_tests(void) { - unsigned int mpid = read_mpidr_el1() & 0xFFFFFF; + unsigned int mpid = read_mpidr_el1() & MPID_MASK; unsigned int core_pos = platform_get_core_pos(mpid); unsigned int test_session_finished; unsigned int cpus_cnt; @@ -581,7 +581,7 @@ void __dead2 tftf_cold_boot_main(void) * Each test should be able to specify its lead CPU in the tests.xml * file. For now, hard-code the lead CPU to always be the primary core. */ - lead_cpu_mpid = read_mpidr_el1() & 0xFFFFFF; + lead_cpu_mpid = read_mpidr_el1() & MPID_MASK; /* * Hand over to lead CPU if required. @@ -589,7 +589,7 @@ void __dead2 tftf_cold_boot_main(void) * 1) Power on the lead CPU * 2) Power down the primary CPU */ - if ((read_mpidr_el1() & MPIDR_AFFINITY_MASK) != lead_cpu_mpid) { + if ((read_mpidr_el1() & MPID_MASK) != lead_cpu_mpid) { hand_over_to_lead_cpu(); bug_unreachable(); } |