From patchwork Tue Dec 10 22:05:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antony Pavlov X-Patchwork-Id: 299540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B915A2C00A6 for ; Wed, 11 Dec 2013 09:51:12 +1100 (EST) Received: from localhost ([::1]:51441 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqVK1-00064T-Ee for incoming@patchwork.ozlabs.org; Tue, 10 Dec 2013 16:58:29 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OQHbCzrmPzpHsy5ixZIBLOIrwJm722j/+yNKr/V4dDE=; b=W3Oa16nagmuqRyyUQ079IH1zEE2TpY8zqZvkKeK6DTaO7QjGjnOB7qedgbW0rMzepG XwC+aNuFRyrnp5rvXR+kyQWn3H/ve3wO8JfMsjKbWwcgR12OHiIFVZKPcZ4EVdJ1oAYr yuZs1Gucn205xsH5aiDT3evIorNeby6V1TblhWP79Yz+3KWE62XAppmhqrD60//lnAq0 F+3FHEvW0LKo9aDryRCaxK6B8GUBXQhEj0DDC/xhOOMKhi6EnD5nxp+SFYJ8P07YmquF zGoNNHT2xIx9EocqLt1Rhc5d+AnNcqv9eIiZvOrWtCdLxsv3/GcCLukvfqDKP/C9Wk3d uWtQ== X-Received: by 10.152.29.130 with SMTP id k2mr42115lah.84.1386712666867; Tue, 10 Dec 2013 13:57:46 -0800 (PST) Received: from flare.example.org (ppp37-190-57-6.pppoe.spdop.ru. [37.190.57.6]) by mx.google.com with ESMTPSA id c8sm24415880lag.3.2013.12.10.13.57.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Dec 2013 13:57:45 -0800 (PST) From: Antony Pavlov To: qemu-devel@nongnu.org Date: Wed, 11 Dec 2013 02:05:02 +0400 Message-Id: <1386713103-24385-2-git-send-email-antonynpavlov@gmail.com> X-Mailer: git-send-email 1.8.5 In-Reply-To: <1386713103-24385-1-git-send-email-antonynpavlov@gmail.com> References: <1386713103-24385-1-git-send-email-antonynpavlov@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::230 Cc: Peter Maydell , Peter Crosthwaite , Antony Pavlov Subject: [Qemu-devel] [RFC v2 1/2] ARM: cpu: add "reset_hivecs" property (high vectors on reset) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);