On Tue, Apr 25, 2017 at 5:07 AM, Peter Maydell <peter.mayd...@linaro.org> wrote:
> Fix the handling of QOM properties for PMSA CPUs with no MPU:
>
> Allow no-MPU to be specified by either:
> * has-mpu = false
> * pmsav7_dregion = 0
> and make setting one imply the other. Don't clear the PMSA
> feature bit in this situation.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
Thanks,
Alistair
> ---
> target/arm/cpu.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index f17e279..8e57498 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -757,8 +757,14 @@ static void arm_cpu_realizefn(DeviceState *dev, Error
> **errp)
> cpu->id_pfr1 &= ~0xf000;
> }
>
> + /* MPU can be configured out of a PMSA CPU either by setting has-mpu
> + * to false or by setting pmsav7-dregion to 0.
> + */
> if (!cpu->has_mpu) {
> - unset_feature(ARM_FEATURE_PMSA);
> + cpu->pmsav7_dregion = 0;
> + }
> + if (cpu->pmsav7_dregion == 0) {
> + cpu->has_mpu = false;
> }
>
> if (arm_feature(env, ARM_FEATURE_PMSA) &&
> --
> 2.7.4
>
>
