andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #323 from athoelke/at/fix-aff-inst-overflow 

Fix integer extension in mpidr_set_aff_inst()
This commit is contained in:
danh-arm 2015-06-19 14:16:40 +01:00
parent 649591bbab 9b89613eeb
commit 08b337f50d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/std_svc/psci/psci_common.c
View File

@ -185,8 +185,8 @@ unsigned long mpidr_set_aff_inst(unsigned long mpidr,
aff_shift = get_afflvl_shift(aff_lvl);
/* Clear the existing affinity instance & set the new one*/
mpidr &= ~(MPIDR_AFFLVL_MASK << aff_shift);
mpidr |= aff_inst << aff_shift;
mpidr &= ~(((unsigned long)MPIDR_AFFLVL_MASK) << aff_shift);
mpidr |= ((unsigned long)aff_inst) << aff_shift;
return mpidr;
}