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: 411732 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 693551401EB for ; Tue, 18 Nov 2014 03:57:37 +1100 (AEDT) Received: from localhost ([::1]:48910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqPcN-0001IR-Mb for incoming@patchwork.ozlabs.org; Mon, 17 Nov 2014 11:57:35 -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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=St7gsJPjhDikW71zWM3iZQ0pTecD8uIgQvKbn9GrZzE=; b=cccyRFBmzhfvctaU4fS+SxIfZ4yDn00yVExDlsnilCSrT9a+KyIp5/Ke0gl0g+9qya HwKHRJ9xIPOr2r9uVCl5iFz/5bS+BTMEhiqMpYXSftoimr/f1hyGV6JZSY2yUbNE/j1O 32pLeKpYrygKLhQxU+I2MC0WSmrEVsMBL6OspajjXUfwRfY6EzucI9wj3i0KnKe88OIv Svnu9Gcuka5jsxIeh2FrzPBhn5yQoTVHB3IIhTHJ8rY8B+ZQlRNqoydXY/pJsQ1FQ9UL cUc9Q0WUrpFbiAlSA5eKaqmq1K+fEHUyNQeShlbtPD/Pn6gE/HxHR8/XNtKcNjIWa1w8 rDqA== X-Gm-Message-State: ALoCoQn/6/ZowgIp/38TSGqiraQYAY2E5/NaLaITb6gMNhWU/RGaSx6GBh/w0DRGYRNoxmEErrHa 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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: