arm64: reduce el2_setup branching
authorMark Rutland <mark.rutland@arm.com>
Wed, 15 Feb 2017 14:54:16 +0000 (14:54 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 22 Mar 2017 17:21:38 +0000 (17:21 +0000)
commit3ad47d055aa88d9f4189253f5b5c485f4c4626b2
tree8d95b998d14573b420e12260506ead55162f9fa0
parentfda89d9efcabaafcbbb189e969d46dc634574b67
arm64: reduce el2_setup branching

The early el2_setup code is a little convoluted, with two branches where
one would do. This makes the code more painful to read than is
necessary.

We can remove a branch and simplify the logic by moving the early return
in the booted-at-EL1 case earlier in the function. This separates it
from all the setup logic that only makes sense for EL2.

Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/kernel/head.S