From patchwork Mon Sep 29 18:26:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 38094 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6DC9D201F1 for ; Mon, 29 Sep 2014 18:30:23 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id a1sf600028wgh.0 for ; Mon, 29 Sep 2014 11:30:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=0nk5HnnL9pvm+9XJGhEokOkWGo5W+LZHvlPAxLRk6FE=; b=WvtAeaslDADm+Wg/moG93Kwp5Bk0PVRvP7CKLYGrwR0IYfbBHH17KfOzQgb3cSzLeC f0ccY7IErKm1O1olxfnDvjVzPmnv0L9w0L8e+7r7IZa2PeEHiYoUZoEaMl5nEsL9HW/B 5Rl+SwFV+NFMP+lQV2CCzjxAfpW/LJxYUkCQbQwwqt8DFi0ZgjCGf6/Booi7PreAjS5k x4A0o2gTqPfjyC6o+8YpcosKKL+Qe4pyf7Cl9Lh4X0LfuQbTsKG7WKlHgyCSqLWaqe5P eWdtVRhFXFDPG0/HhV4i69jFjMhirpYxnHE7Wt+WUZ07hjpWgsUtRPmZWa37NXDIaoOx ZHcA== X-Gm-Message-State: ALoCoQl/MNMTQvr11AXcPYVYOgH/b1tG8442Zpj+FeJCNSxS2HryoPBsK5bsbRaZpxTPcJRG/3+m X-Received: by 10.194.170.167 with SMTP id an7mr729883wjc.4.1412015422575; Mon, 29 Sep 2014 11:30:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.6.2 with SMTP id cq2ls640010lad.102.gmail; Mon, 29 Sep 2014 11:30:22 -0700 (PDT) X-Received: by 10.152.8.168 with SMTP id s8mr19715077laa.3.1412015422294; Mon, 29 Sep 2014 11:30:22 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) by mx.google.com with ESMTPS id mt6si19302671lbb.137.2014.09.29.11.30.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Sep 2014 11:30:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id s18so3162641lam.9 for ; Mon, 29 Sep 2014 11:30:22 -0700 (PDT) X-Received: by 10.152.5.168 with SMTP id t8mr40981567lat.67.1412015422025; Mon, 29 Sep 2014 11:30:22 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp224857lbb; Mon, 29 Sep 2014 11:30:21 -0700 (PDT) X-Received: by 10.140.97.247 with SMTP id m110mr12537448qge.80.1412015419964; Mon, 29 Sep 2014 11:30:19 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n5si14346691qat.86.2014.09.29.11.30.19 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 29 Sep 2014 11:30:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:38325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYfiF-0004YH-1k for patch@linaro.org; Mon, 29 Sep 2014 14:30:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYffA-0008DS-Bp for qemu-devel@nongnu.org; Mon, 29 Sep 2014 14:27:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XYff9-0007Vg-GR for qemu-devel@nongnu.org; Mon, 29 Sep 2014 14:27:08 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:54082) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYff9-0007L2-3J for qemu-devel@nongnu.org; Mon, 29 Sep 2014 14:27:07 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XYfew-0005ou-In for qemu-devel@nongnu.org; Mon, 29 Sep 2014 19:26:54 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 29 Sep 2014 19:26:50 +0100 Message-Id: <1412015213-22268-17-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1412015213-22268-1-git-send-email-peter.maydell@linaro.org> References: <1412015213-22268-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 16/19] target-arm: Add a Hypervisor Trap exception type 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias Message-id: 1411718914-6608-9-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- target-arm/cpu.h | 1 + target-arm/helper-a64.c | 1 + target-arm/helper.c | 1 + target-arm/internals.h | 1 + 4 files changed, 4 insertions(+) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index e13b6d4..98610f0 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -52,6 +52,7 @@ #define EXCP_KERNEL_TRAP 9 /* Jumped to kernel code page. */ #define EXCP_STREX 10 #define EXCP_HVC 11 /* HyperVisor Call */ +#define EXCP_HYP_TRAP 12 #define ARMV7M_EXCP_RESET 1 #define ARMV7M_EXCP_NMI 2 diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index 4e6ca26..0a7c155 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -477,6 +477,7 @@ void aarch64_cpu_do_interrupt(CPUState *cs) case EXCP_UDEF: case EXCP_SWI: case EXCP_HVC: + case EXCP_HYP_TRAP: env->cp15.esr_el[new_el] = env->exception.syndrome; break; case EXCP_IRQ: diff --git a/target-arm/helper.c b/target-arm/helper.c index 4d5a653..48f549a 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3781,6 +3781,7 @@ unsigned int arm_excp_target_el(CPUState *cs, unsigned int excp_idx) switch (excp_idx) { case EXCP_HVC: + case EXCP_HYP_TRAP: target_el = 2; break; default: diff --git a/target-arm/internals.h b/target-arm/internals.h index 25c5ec3..203c423 100644 --- a/target-arm/internals.h +++ b/target-arm/internals.h @@ -54,6 +54,7 @@ static const char * const excnames[] = { [EXCP_KERNEL_TRAP] = "QEMU intercept of kernel commpage", [EXCP_STREX] = "QEMU intercept of STREX", [EXCP_HVC] = "Hypervisor Call", + [EXCP_HYP_TRAP] = "Hypervisor Trap", }; static inline void arm_log_exception(int idx)