From patchwork Mon Jun 30 23:09:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 32827 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DD3FA203C0 for ; Tue, 1 Jul 2014 00:35:07 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id rl12sf170950iec.9 for ; Mon, 30 Jun 2014 17:35:07 -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:cc: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=+TJQmoYwfrOaO86REjIYMaicca0dYU2w06gZHzlKmOk=; b=I2s5zRvXeiy0RKqOqvKWPGloNhITlg2eFXmQju0eHnYw7q7zf1Dy01336KYnwfBPhR Yrw1n5Yo5xTikFrPagOhnIf9picqz2l+EoiZdgxVmYYy5jJXwM/wgwB0QJhq4wu5J0kD tL09IMwsMtFBaeM7Ky4efnl7OuUtCfBD3F4eCRZMMH6XgmRZmtFjU7P6GGLMIjsHnSVD JwyT2xeCjjZy8dne0LNV0oGVVyMSp1eid/zYmqv/YoWlGyIIsVFRXMzogf2sJS2zyfQr 0XATAZjuIRwgX8GH0a8SulEkrAep4udNDKw3TMX1JN46gJHXDHRRcC9Jz+uJ34drj8cy sEEg== X-Gm-Message-State: ALoCoQlTOiE6r01PIoJ21w7eqWQP0fA2c/eGU6gJbpExlch0Z6iMFSTEYbMhu0GJrX5NSsNaXRvj X-Received: by 10.50.57.33 with SMTP id f1mr8291499igq.5.1404174907476; Mon, 30 Jun 2014 17:35:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.6 with SMTP id j6ls1935763qge.89.gmail; Mon, 30 Jun 2014 17:35:07 -0700 (PDT) X-Received: by 10.220.103.141 with SMTP id k13mr41085020vco.25.1404174907348; Mon, 30 Jun 2014 17:35:07 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id v14si2935714vem.37.2014.06.30.17.35.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 17:35:07 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id im17so8262278vcb.39 for ; Mon, 30 Jun 2014 17:35:07 -0700 (PDT) X-Received: by 10.220.174.137 with SMTP id t9mr41592967vcz.12.1404174907245; Mon, 30 Jun 2014 17:35:07 -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.221.37.5 with SMTP id tc5csp178515vcb; Mon, 30 Jun 2014 17:35:07 -0700 (PDT) X-Received: by 10.224.22.12 with SMTP id l12mr68031034qab.88.1404174906887; Mon, 30 Jun 2014 17:35:06 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h10si12930998qaf.54.2014.06.30.17.35.06 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 30 Jun 2014 17:35:06 -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]:37096 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kom-0003RZ-S8 for patch@linaro.org; Mon, 30 Jun 2014 19:17:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kit-0005ng-Mi for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:11:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1kio-0003LU-Lv for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:10:55 -0400 Received: from mail-oa0-f49.google.com ([209.85.219.49]:35619) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1kio-0003LK-Hp for qemu-devel@nongnu.org; Mon, 30 Jun 2014 19:10:50 -0400 Received: by mail-oa0-f49.google.com with SMTP id i7so9605816oag.36 for ; Mon, 30 Jun 2014 16:10:50 -0700 (PDT) X-Received: by 10.60.47.77 with SMTP id b13mr6157561oen.83.1404169850278; Mon, 30 Jun 2014 16:10:50 -0700 (PDT) Received: from gbellows-linaro.bellowshome.net (99-179-1-128.lightspeed.austtx.sbcglobal.net. [99.179.1.128]) by mx.google.com with ESMTPSA id cu7sm76370192oec.12.2014.06.30.16.10.48 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 16:10:49 -0700 (PDT) From: greg.bellows@linaro.org To: qemu-devel@nongnu.org Date: Mon, 30 Jun 2014 18:09:13 -0500 Message-Id: <1404169773-20264-14-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1404169773-20264-1-git-send-email-greg.bellows@linaro.org> References: <1404169773-20264-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.219.49 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, Sergey Fedorov , Fabian Aggeler , Greg Bellows , serge.fdrv@gmail.com, edgar.iglesias@gmail.com, christoffer.dall@linaro.org Subject: [Qemu-devel] [PATCH v4 13/33] target-arm: implement IRQ/FIQ routing to Monitor mode 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: greg.bellows@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.220.180 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: Fabian Aggeler SCR.{IRQ/FIQ} bits allow to route IRQ/FIQ exceptions to monitor CPU mode. When taking IRQ exception to monitor mode FIQ exception is additionally masked. Signed-off-by: Sergey Fedorov Signed-off-by: Fabian Aggeler Signed-off-by: Greg Bellows --- target-arm/helper.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index 456b7e7..7a878e9 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3720,12 +3720,21 @@ void arm_cpu_do_interrupt(CPUState *cs) /* Disable IRQ and imprecise data aborts. */ mask = CPSR_A | CPSR_I; offset = 4; + if (env->cp15.scr_el3 & SCR_IRQ) { + /* IRQ routed to monitor mode */ + new_mode = ARM_CPU_MODE_MON; + mask |= CPSR_F; + } break; case EXCP_FIQ: new_mode = ARM_CPU_MODE_FIQ; addr = 0x1c; /* Disable FIQ, IRQ and imprecise data aborts. */ mask = CPSR_A | CPSR_I | CPSR_F; + if (env->cp15.scr_el3 & SCR_FIQ) { + /* FIQ routed to monitor mode */ + new_mode = ARM_CPU_MODE_MON; + } offset = 4; break; case EXCP_SMC: