1311c1311,1312
< isHyp = tranType & HypMode;
---
> isHyp = aarch64EL == EL2;
> isHyp |= tranType & HypMode;