Merge pull request #1353 from JiafeiPan/upstream-platform-psci-bug

layerscape: fix integer handling issues

Merge pull request #1353 from JiafeiPan/upstream-platform-psci-bug
layerscape: fix integer handling issues
aa2fcb43 · Dimitris Papastamos · GitHub · b47f941d · f7c5f307 · aa2fcb43
Unverified Commit aa2fcb43 authored 6 years ago by Dimitris Papastamos Committed by GitHub 6 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- a/plat/layerscape/board/ls1043/ls1043_psci.c
+++ b/plat/layerscape/board/ls1043/ls1043_psci.c
@@ -94,10 +94,10 @@ static void __dead2 ls1043_system_reset(void)
 static int ls1043_pwr_domain_on(u_register_t mpidr)
 {
 	int core_pos = plat_core_pos_by_mpidr(mpidr);
-	uint32_t core_mask = 1 << core_pos;
-	uint32_t brr;
+	uint32_t core_mask, brr;

 	assert(core_pos >= 0 && core_pos < PLATFORM_CORE_COUNT);
+	core_mask = 1 << core_pos;

 	/* set warm boot entry */
 	mmio_write_32(LS_SCFG_BASE + LS_SCFG_SCRATCHRW0_OFFSET,