From patchwork Wed Jun 22 13:21:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9192765 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BFCB26075A for ; Wed, 22 Jun 2016 13:23:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B164A283F7 for ; Wed, 22 Jun 2016 13:23:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A662828408; Wed, 22 Jun 2016 13:23:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 64876283F7 for ; Wed, 22 Jun 2016 13:23:30 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFi5t-00018P-Th; Wed, 22 Jun 2016 13:21:25 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFi5t-00017k-1j for xen-devel@lists.xen.org; Wed, 22 Jun 2016 13:21:25 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id D1/91-09256-4D09A675; Wed, 22 Jun 2016 13:21:24 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsVysyfVTffyhKx wg86NFhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa0b7vAb2gmlsFTNmzWZtYGxg7WLk4hAS2MQo 0T3vDROEc5pR4s2EJSxdjJwcbAKaEnc+f2ICsUUEpCWufb7MCFLELNDGKLF29lRGkISwgIdE+ +k57CA2i4CqxNcXzWDNvAIuEr/n/wGLSwjISZw8NpkVxOYUcJX4f74JzBYCqln3+TzrBEbuBY wMqxjVi1OLylKLdI31kooy0zNKchMzc3QNDcz0clOLixPTU3MSk4r1kvNzNzECPcwABDsYO/4 5HWKU5GBSEuWVV84KF+JLyk+pzEgszogvKs1JLT7EKMPBoSTB69oPlBMsSk1PrUjLzAGGGkxa goNHSYQ3EiTNW1yQmFucmQ6ROsWoy7Hgx+21TEIsefl5qVLivDUgRQIgRRmleXAjYGF/iVFWS piXEegoIZ6C1KLczBJU+VeM4hyMSsK8CiBTeDLzSuA2vQI6ggnoiGX96SBHlCQipKQaGDWjqr /deDnjyq6VUnV2gg8WSPc0cGgJ/Fj49fz8mdUrhBTOPWBJFGA6HOAfsTJWdkOv0qM3UqyF99I MVKX/3Utk6g/9tioq3tjsu+te/e/P7LckPxT4bCt/Wbesb86M3Vv2BPQuu/ssM8LRUp/N5hb/ PYXvmy62zLqyN0Ci6qTkwtOs8TKNPUosxRmJhlrMRcWJAKoUmu52AgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1466601683!6353330!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51398 invoked from network); 22 Jun 2016 13:21:23 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-2.tower-21.messagelabs.com with SMTP; 22 Jun 2016 13:21:23 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3E693440; Wed, 22 Jun 2016 06:22:09 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.215.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CC9153F21A; Wed, 22 Jun 2016 06:21:20 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 22 Jun 2016 14:21:03 +0100 Message-Id: <1466601669-25398-4-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466601669-25398-1-git-send-email-julien.grall@arm.com> References: <1466601669-25398-1-git-send-email-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org, steve.capper@arm.com, wei.chen@linaro.org Subject: [Xen-devel] [PATCH 3/9] xen/arm: traps: Data Abort are always unconditional X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The HSR encoding for an exception from a data abort does not contain a conditional code (see G6-4264 in ARM DDI 0487A.i) because they are always conditional. So drop the pointless condition check. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/arch/arm/traps.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 742f7d3..2e84b5a 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2435,12 +2435,6 @@ static void do_trap_data_abort_guest(struct cpu_user_regs *regs, int rc; mmio_info_t info; - if ( !check_conditional_instr(regs, hsr) ) - { - advance_pc(regs, hsr); - return; - } - info.dabt = dabt; #ifdef CONFIG_ARM_32 info.gva = READ_CP32(HDFAR);