From patchwork Fri Sep 26 08:08:28 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: 393561 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 F0AE4140142 for ; Fri, 26 Sep 2014 18:19:25 +1000 (EST) Received: from localhost ([::1]:45423 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXQkN-0000UR-Sn for incoming@patchwork.ozlabs.org; Fri, 26 Sep 2014 04:19:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXQhZ-0003qM-Du for qemu-devel@nongnu.org; Fri, 26 Sep 2014 04:16:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XXQhU-0004vu-6r for qemu-devel@nongnu.org; Fri, 26 Sep 2014 04:16:29 -0400 Received: from mail-yk0-x233.google.com ([2607:f8b0:4002:c07::233]:52111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXQhT-0004uW-Su for qemu-devel@nongnu.org; Fri, 26 Sep 2014 04:16:24 -0400 Received: by mail-yk0-f179.google.com with SMTP id 142so3675412ykq.24 for ; Fri, 26 Sep 2014 01:16:18 -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=1u4yANcy2lHjATf7hLyFjviyzwbe7k9jTFIlvULW+ZE=; b=K4gHHob4sXAkFFXCxwvD/EO2VGXw7rYtrfh+cKcgIqGxl2pq07Ee/wLVQKRW04LsAZ zD41SmbsegXbmU44EyjCv0u5ZWXNh5LOtOlcGGLqVWwPHcg3o5Nyu4Ac3HYSKa0vEGwn kr+0bZsImdWC07Wz5EG2LDugIoPOyYES/eMN2dXHHEkHddc+n9a+ERlsdhkVmbrD4K+J wgeKMqnoxUUvC9kJaqrWxIATnlu7Y/UoOfDflcNjiRvmJ+KX2qpJbkW8Q96LFn9QVqll 1EqcIgXBBrZSOYQwb9qe6rEbsq5g9S4UTkQWOTLFzA/GuZzH4qNK+DoDtmpKkUZdj7bl u3IQ== X-Received: by 10.236.230.70 with SMTP id i66mr23973396yhq.26.1411719378603; Fri, 26 Sep 2014 01:16:18 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id h92sm2183504yhq.21.2014.09.26.01.16.16 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 26 Sep 2014 01:16:17 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Fri, 26 Sep 2014 18:08:28 +1000 Message-Id: <1411718914-6608-6-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1411718914-6608-1-git-send-email-edgar.iglesias@gmail.com> References: <1411718914-6608-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:4002:c07::233 Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, aggelerf@ethz.ch, serge.fdrv@gmail.com, agraf@suse.de, greg.bellows@linaro.org, pbonzini@redhat.com, alex.bennee@linaro.org, christoffer.dall@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH v7 05/11] 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 Reviewed-by: Peter Maydell Signed-off-by: Edgar E. Iglesias --- target-arm/cpu.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index a5e8e0d..7f8a410 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -1174,6 +1174,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: