| Message ID | 1412113785-21525-4-git-send-email-greg.bellows@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 30 September 2014 22:49, Greg Bellows <greg.bellows@linaro.org> wrote: > From: Sergey Fedorov <s.fedorov@samsung.com> > > ...from non-secure state. > > Signed-off-by: Sergey Fedorov <s.fedorov@samsung.com> > Signed-off-by: Fabian Aggeler <aggelerf@ethz.ch> > Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > Signed-off-by: Greg Bellows <greg.bellows@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> though as a style nit I would prefer the commit to read: === Subject: target-arm: reject switching to monitor mode if NS Reject switching to monitor mode from non-secure state. === since the oneline summary should stand on its own. PS: please drop Sergey's now-bouncing Samsung address from the CC list when you send v6 of this series :-) > --- > target-arm/helper.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/target-arm/helper.c b/target-arm/helper.c > index 2669e15..d6e3b52 100644 > --- a/target-arm/helper.c > +++ b/target-arm/helper.c > @@ -3531,6 +3531,8 @@ static int bad_mode_switch(CPUARMState *env, int mode) > 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.8.3.2 thanks -- PMM
diff --git a/target-arm/helper.c b/target-arm/helper.c index 2669e15..d6e3b52 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3531,6 +3531,8 @@ static int bad_mode_switch(CPUARMState *env, int mode) 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; }