From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqVJU-0005zr-My for qemu-devel@nongnu.org; Tue, 10 Dec 2013 16:58:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VqVJM-0006zN-95 for qemu-devel@nongnu.org; Tue, 10 Dec 2013 16:57:56 -0500 Received: from mail-la0-x230.google.com ([2a00:1450:4010:c03::230]:62888) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqVJM-0006zI-0u for qemu-devel@nongnu.org; Tue, 10 Dec 2013 16:57:48 -0500 Received: by mail-la0-f48.google.com with SMTP id n7so3138682lam.21 for ; Tue, 10 Dec 2013 13:57:46 -0800 (PST) From: Antony Pavlov Date: Wed, 11 Dec 2013 02:05:02 +0400 Message-Id: <1386713103-24385-2-git-send-email-antonynpavlov@gmail.com> In-Reply-To: <1386713103-24385-1-git-send-email-antonynpavlov@gmail.com> References: <1386713103-24385-1-git-send-email-antonynpavlov@gmail.com> Subject: [Qemu-devel] [RFC v2 1/2] ARM: cpu: add "reset_hivecs" property (high vectors on reset) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Peter Crosthwaite , Antony Pavlov Signed-off-by: Antony Pavlov --- target-arm/cpu-qom.h | 1 + target-arm/cpu.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/target-arm/cpu-qom.h b/target-arm/cpu-qom.h index b55306a..116320c 100644 --- a/target-arm/cpu-qom.h +++ b/target-arm/cpu-qom.h @@ -128,6 +128,7 @@ typedef struct ARMCPU { uint32_t ccsidr[16]; uint32_t reset_cbar; uint32_t reset_auxcr; + bool reset_hivecs; } ARMCPU; #define TYPE_AARCH64_CPU "aarch64-cpu" diff --git a/target-arm/cpu.c b/target-arm/cpu.c index cbe108b..b60e3fc 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -224,6 +224,20 @@ static void arm_cpu_initfn(Object *obj) } } +static bool reset_hivecs_get(Object *obj, Error **err) +{ + ARMCPU *cpu = ARM_CPU(obj); + + return cpu->reset_hivecs; +} + +static void reset_hivecs_set(Object *obj, bool value, Error **err) +{ + ARMCPU *cpu = ARM_CPU(obj); + + cpu->reset_hivecs = value; +} + static void arm_cpu_post_init(Object *obj) { ARMCPU *cpu = ARM_CPU(obj); @@ -234,6 +248,12 @@ static void arm_cpu_post_init(Object *obj) &err); assert_no_error(err); } + + if (!arm_feature(&cpu->env, ARM_FEATURE_M)) { + object_property_add_bool(obj, "reset-hivecs", + reset_hivecs_get, reset_hivecs_set, &err); + assert_no_error(err); + } } static void arm_cpu_finalizefn(Object *obj) @@ -295,6 +315,10 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) set_feature(env, ARM_FEATURE_PXN); } + if (cpu->reset_hivecs) { + cpu->reset_sctlr |= (1 << 13); + } + register_cp_regs_for_features(cpu); arm_cpu_register_gdb_regs_for_features(cpu); -- 1.8.5