From patchwork Tue Jun 17 08:45:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 360392 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 18325140098 for ; Tue, 17 Jun 2014 18:55:41 +1000 (EST) Received: from localhost ([::1]:48219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwpB5-0006Ry-48 for incoming@patchwork.ozlabs.org; Tue, 17 Jun 2014 04:55:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wwp9c-0004TN-Mp for qemu-devel@nongnu.org; Tue, 17 Jun 2014 04:54:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wwp9X-0005qu-UH for qemu-devel@nongnu.org; Tue, 17 Jun 2014 04:54:08 -0400 Received: from mail-pd0-x22a.google.com ([2607:f8b0:400e:c02::22a]:35687) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wwp9X-0005qp-Nq for qemu-devel@nongnu.org; Tue, 17 Jun 2014 04:54:03 -0400 Received: by mail-pd0-f170.google.com with SMTP id z10so3936071pdj.29 for ; Tue, 17 Jun 2014 01:54:02 -0700 (PDT) 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 :mime-version:content-type:content-transfer-encoding; bh=75fWizLVGHY3kjJvsNdiO2poylbtHqfV+oqrEYqMCrA=; b=l4GtUF0bNSmRt8Ic/asx03okW93bpYDjOzdbXNBi55NRFVid/UScLmnrGXH0WhI98g zMZ9RZHdDxAckIHWvOV4jSFs1xf21nCFrb6sPuqC8EHdKG8A1+lreN8/S20iU2/jQP21 8esDxusZMHVcjG0jQ9zHjXCuIvQiJWP/ObhDv9+FUs63TzLejSxy9gD1mZtNDXC+5gJX mC3jgLnvrvEeOwULkNYdBnA9qhmVSQFFaNbCkfpY+tgeeQg7Q+5uFqMGD/A3rfyCWtoS 7Nxz1/+dde8aY7AtEo45Qg8GUlJW4UjSUEBGHx+WdYEgeC8Hf/P06QoG1pREsjibHsMj 8elA== X-Received: by 10.68.135.195 with SMTP id pu3mr30658982pbb.10.1402995242743; Tue, 17 Jun 2014 01:54:02 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id fu12sm81830622pad.42.2014.06.17.01.53.54 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 17 Jun 2014 01:54:00 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 17 Jun 2014 18:45:41 +1000 Message-Id: <1402994746-8328-12-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402994746-8328-1-git-send-email-edgar.iglesias@gmail.com> References: <1402994746-8328-1-git-send-email-edgar.iglesias@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::22a Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, aggelerf@ethz.ch, agraf@suse.de, blauwirbel@gmail.com, john.williams@xilinx.com, greg.bellows@linaro.org, pbonzini@redhat.com, alex.bennee@linaro.org, christoffer.dall@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH v3 11/16] target-arm: Don't take interrupts targeting lower ELs 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 From: "Edgar E. Iglesias" Reviewed-by: Alex Bennée Reviewed-by: Greg Bellows Signed-off-by: Edgar E. Iglesias Reviewed-by: Peter Maydell --- target-arm/cpu.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 9d21361..4f273ac 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -1132,6 +1132,13 @@ bool write_cpustate_to_list(ARMCPU *cpu); static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx) { CPUARMState *env = cs->env_ptr; + unsigned int cur_el = arm_current_pl(env); + unsigned int target_el = arm_excp_target_el(cs, excp_idx); + + /* Don't take exceptions if they target a lower EL. */ + if (cur_el > target_el) { + return false; + } switch (excp_idx) { case EXCP_FIQ: