From patchwork Fri May 29 13:10:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 49200 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C0F4F218E7 for ; Fri, 29 May 2015 13:25:06 +0000 (UTC) Received: by laat2 with SMTP id t2sf20624764laa.2 for ; Fri, 29 May 2015 06:25:05 -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=MTHTvEcSdAG7gghdu0s1OFuNmAaq1Nz0sX1HMb39HaQ=; b=crBlOELZhfvegxIk3Hu1dwZNm4hHsxKIT7RBjPnFE+UedGA9bGOH1aKmwa4JpanHky jUvRUPt8VOgHiw5D5HmBEheJrpy1DJrGCWFiFdcCpNUu0zhu80f/AgYFjmFyHlzlM5J2 IWt4VNjfu+9pCFSjtJYfeyBjP4XhnO4VNNC9lDP2QRFVyiqKcd+PALgVi7mr0qxlsYcV gWy+H11hnBlsSa9APeGmY7j0uyZXiCxOcbgJU03tVbeFLy3cyWrFayLtyrOFAThKKs6w m0/TcNQDoG3VJIyhDjTBu6bzSzVyFhHQOCFbWIWg2PYW6zva+E1zT97pl3J1JXfDMUiF w9Gw== X-Gm-Message-State: ALoCoQnj5txq/DA1bKaI/LdkF1XGgAm4g6I/qDnPVTVSR0agM6f/fX4wFASlwLJCLmnnWY1z+90D X-Received: by 10.180.85.137 with SMTP id h9mr2925816wiz.7.1432905905646; Fri, 29 May 2015 06:25:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.65 with SMTP id r1ls101165lag.61.gmail; Fri, 29 May 2015 06:25:05 -0700 (PDT) X-Received: by 10.112.42.16 with SMTP id j16mr7765042lbl.98.1432905905479; Fri, 29 May 2015 06:25:05 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id n14si4689172laa.83.2015.05.29.06.25.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 May 2015 06:25:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbbqq2 with SMTP id qq2so48359795lbb.3 for ; Fri, 29 May 2015 06:25:05 -0700 (PDT) X-Received: by 10.112.204.72 with SMTP id kw8mr7963437lbc.88.1432905905218; Fri, 29 May 2015 06:25:05 -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.108.230 with SMTP id hn6csp331637lbb; Fri, 29 May 2015 06:25:04 -0700 (PDT) X-Received: by 10.140.148.135 with SMTP id 129mr10057848qhu.24.1432905903448; Fri, 29 May 2015 06:25:03 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p6si3631480qgp.114.2015.05.29.06.25.02 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 29 May 2015 06:25:03 -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]:35879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyKHW-0004kI-F7 for patch@linaro.org; Fri, 29 May 2015 09:25:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyK41-00040t-SI for qemu-devel@nongnu.org; Fri, 29 May 2015 09:11:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyK3z-0003d5-O0 for qemu-devel@nongnu.org; Fri, 29 May 2015 09:11:05 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34304) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyK3z-0003US-FS for qemu-devel@nongnu.org; Fri, 29 May 2015 09:11:03 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1YyK3h-0005lv-Be for qemu-devel@nongnu.org; Fri, 29 May 2015 14:10:45 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 29 May 2015 14:10:11 +0100 Message-Id: <1432905045-22138-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1432905045-22138-1-git-send-email-peter.maydell@linaro.org> References: <1432905045-22138-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 05/39] target-arm: Set exception target EL in tlb_fill 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.217.177 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 Set the exception target EL for MMU faults in tlb_fill. Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias --- target-arm/op_helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index c9f5821..9ab7c61 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -110,6 +110,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx, } env->exception.syndrome = syn; + env->exception.target_el = exception_target_el(env); env->exception.vaddress = addr; env->exception.fsr = ret; raise_exception(env, exc);