On Tue, Dec 3, 2013 at 6:48 PM, Sergey Fedorov <s.fedo...@samsung.com> wrote: > > Signed-off-by: Sergey Fedorov <s.fedo...@samsung.com> > --- > target-arm/helper.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/target-arm/helper.c b/target-arm/helper.c > index d4407cf..e406ec9 100644 > --- a/target-arm/helper.c > +++ b/target-arm/helper.c > @@ -2018,12 +2018,13 @@ static int bad_mode_switch(CPUARMState *env, int mode) > case ARM_CPU_MODE_USR: > case ARM_CPU_MODE_SYS: > case ARM_CPU_MODE_SVC: > - case ARM_CPU_MODE_MON:
You added this in the last patch to delete it now. I dont think you need it in prev patch for bisectability as your TZ functionality isn't online at this stage of the series, I would just revert both the addition and subtraction of this line in prev and this patches respectively. Regards, Peter > case ARM_CPU_MODE_ABT: > case ARM_CPU_MODE_UND: > case ARM_CPU_MODE_IRQ: > case ARM_CPU_MODE_FIQ: > return 0; > + case ARM_CPU_MODE_MON: > + return !arm_is_secure(env); > default: > return 1; > } > -- > 1.7.9.5 > >
