From patchwork Wed Jul 27 17:09:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 72905 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp424502qga; Wed, 27 Jul 2016 10:12:48 -0700 (PDT) X-Received: by 10.107.200.212 with SMTP id y203mr33883032iof.187.1469639565761; Wed, 27 Jul 2016 10:12:45 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id 68si8274118ios.147.2016.07.27.10.12.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jul 2016 10:12:45 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSSL6-0004I1-VE; Wed, 27 Jul 2016 17:09:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSSL5-0004Hb-U9 for xen-devel@lists.xen.org; Wed, 27 Jul 2016 17:09:48 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id C9/AC-01026-BDAE8975; Wed, 27 Jul 2016 17:09:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRWlGSWpSXmKPExsVysyfVTffWqxn hBndOm1os+biYxYHR4+ju30wBjFGsmXlJ+RUJrBlLL6UVPOCqeLm2m7GBcRJHFyMXh5DARkaJ 2xO2skA4pxkl/j28y9TFyMnBJqApcefzJzBbREBa4trny4wgRcwCbYwSa2dPZQRJCAuESEy49 ooNxGYRUJWYvHAtC4jNK+AscWd9EzuILSEgJ3Hy2GRWEJtTwEWi43ob2FAhoJo5e/exTmDkXs DIsIpRozi1qCy1SNfIQC+pKDM9oyQ3MTNH19DAVC83tbg4MT01JzGpWC85P3cTI9DD9QwMjDs YG2f7HWKU5GBSEuXlejYjXIgvKT+lMiOxOCO+qDQntfgQowwHh5IEb91LoJxgUWp6akVaZg4w 1GDSEhw8SiK8G0DSvMUFibnFmekQqVOMilLivFdBEgIgiYzSPLg2WHhfYpSVEuZlZGBgEOIpS C3KzSxBlX/FKM7BqCTMOx9kCk9mXgnc9FdAi5mAFhfHgi0uSURISTUwBqekC6o+b5f35nJXf7 E58M/Xs2G+yhX5ljrX7WRipnvPeBvx/NydfbP6j+nfqPr0wd3BJaNZPq9t6vc6zvuXMhz2W1f JHORi8DZ70zKzcsvvZ/cKL5yWqD+RtZr7/oet8zofRnl+ZQrikg3lnKbsyVD4bRnL9rqXBeaz 8pty+u2uPXSO492hxFKckWioxVxUnAgAeGKE6GoCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1469639386!51757569!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.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 53025 invoked from network); 27 Jul 2016 17:09:46 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-9.tower-206.messagelabs.com with SMTP; 27 Jul 2016 17:09:46 -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 80F242F; Wed, 27 Jul 2016 10:11:02 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.218.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0E87F3F213; Wed, 27 Jul 2016 10:09:44 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 27 Jul 2016 18:09:33 +0100 Message-Id: <1469639378-9244-2-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1469639378-9244-1-git-send-email-julien.grall@arm.com> References: <1469639378-9244-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 v2 1/6] xen/arm: traps: Simplify the switch in do_trap_*_abort_guest 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" The fault status we care are in the form BBBBxx where xx is the lookup level that gave the fault. We can simplify the code by masking the 2 least significant bits. Signed-off-by: Julien Grall --- The switch has not been replaced by a simple if because more case will be added in follow-up patches. Changes in v2: - Fix typoes in the commit message --- xen/arch/arm/traps.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 2d05936..b34c46f 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2387,9 +2387,9 @@ static void do_trap_instr_abort_guest(struct cpu_user_regs *regs, int rc; register_t gva = READ_SYSREG(FAR_EL2); - switch ( hsr.iabt.ifsc & 0x3f ) + switch ( hsr.iabt.ifsc & ~FSC_LL_MASK ) { - case FSC_FLT_PERM ... FSC_FLT_PERM + 3: + case FSC_FLT_PERM: { paddr_t gpa; const struct npfec npfec = { @@ -2450,9 +2450,9 @@ static void do_trap_data_abort_guest(struct cpu_user_regs *regs, return; /* Try again */ } - switch ( dabt.dfsc & 0x3f ) + switch ( dabt.dfsc & ~FSC_LL_MASK ) { - case FSC_FLT_PERM ... FSC_FLT_PERM + 3: + case FSC_FLT_PERM: { const struct npfec npfec = { .read_access = !dabt.write,