From patchwork Mon Nov 17 16:47:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 40960 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A9EF024035 for ; Mon, 17 Nov 2014 16:58:05 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id r20sf1205612wiv.9 for ; Mon, 17 Nov 2014 08:58:05 -0800 (PST) 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=St7gsJPjhDikW71zWM3iZQ0pTecD8uIgQvKbn9GrZzE=; b=HbRuNqNw9yLDOqQBtBbjx1EgjKg7KxHle/Df1Kl3taApy3fmK6o+XwPyJlTiOBVEKW DxDPUel8dZJUiovpba5hdm7LAZVdr3nuLsli/GuW83xDOWssL00hgqq6SnLKwieQ0t8y RTcAEbPsvq+rbieZir+30gzCrJnCj7QIn8oPt3+Inhf4fWaxU3zdoZCeGCbjQxRi4OgD Y33MNrAdioXjKlvgp151tN9rDU587Ox7C+urL4KmkZ7ABvGNXQSh12xdHLzmIb+H/6xV Dd53fB1FPJBj+3TMmnm67QbPLNoOm6sRt/l4yVuLmYKOijJiSOlHAxQ1bMZJAIJk3xSa 3XVA== X-Gm-Message-State: ALoCoQn1tyDm6lt9zP1yn4fEtZ6RF25+7rQaH8XmI4EvTEppbqc4Wt9jg+MIr8H4k7FjwDqMyBaB X-Received: by 10.181.13.147 with SMTP id ey19mr2761929wid.2.1416243485008; Mon, 17 Nov 2014 08:58:05 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.170.133 with SMTP id am5ls1285315lac.54.gmail; Mon, 17 Nov 2014 08:58:04 -0800 (PST) X-Received: by 10.152.203.164 with SMTP id kr4mr29006214lac.31.1416243484804; Mon, 17 Nov 2014 08:58:04 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id bn10si52514954lbc.108.2014.11.17.08.58.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 08:58:04 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id mc6so1399309lab.24 for ; Mon, 17 Nov 2014 08:58:04 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr29054732lbc.34.1416243484650; Mon, 17 Nov 2014 08:58:04 -0800 (PST) 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.184.201 with SMTP id ew9csp1188523lbc; Mon, 17 Nov 2014 08:58:03 -0800 (PST) X-Received: by 10.140.42.135 with SMTP id c7mr35034743qga.7.1416243483169; Mon, 17 Nov 2014 08:58:03 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r8si64619823qaj.16.2014.11.17.08.58.02 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 17 Nov 2014 08:58:02 -0800 (PST) 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]:48910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPcn-0001IR-Pj for patch@linaro.org; Mon, 17 Nov 2014 11:58:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPTX-0001V4-UT for qemu-devel@nongnu.org; Mon, 17 Nov 2014 11:48:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqPTT-0007BB-67 for qemu-devel@nongnu.org; Mon, 17 Nov 2014 11:48:27 -0500 Received: from mail-pd0-f176.google.com ([209.85.192.176]:61505) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPTT-0007B5-1f for qemu-devel@nongnu.org; Mon, 17 Nov 2014 11:48:23 -0500 Received: by mail-pd0-f176.google.com with SMTP id y10so2173797pdj.21 for ; Mon, 17 Nov 2014 08:48:22 -0800 (PST) X-Received: by 10.68.68.164 with SMTP id x4mr31049578pbt.104.1416242902518; Mon, 17 Nov 2014 08:48:22 -0800 (PST) Received: from gbellows-linaro.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com. [67.52.129.61]) by mx.google.com with ESMTPSA id r2sm18499056pdi.60.2014.11.17.08.48.20 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 08:48:21 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch, peter.maydell@linaro.org Date: Mon, 17 Nov 2014 10:47:41 -0600 Message-Id: <1416242878-876-10-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1416242878-876-1-git-send-email-greg.bellows@linaro.org> References: <1416242878-876-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.192.176 Cc: greg.bellows@linaro.org Subject: [Qemu-devel] [PATCH v11 09/26] 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.215.51 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 Reviewed-by: Peter Maydell --- target-arm/helper.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index 6c4b467..8651bbc 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -4233,12 +4233,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: