From patchwork Tue May 22 17:42:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 136592 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1929496lji; Tue, 22 May 2018 10:45:46 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqg+2+xJmWqH6Te1zBZ9tc8jhAoTRaUBcztmAoSAXNXO5I+xreaCb6tg0VLytdx5CcYX3Zl X-Received: by 2002:a6b:c585:: with SMTP id v127-v6mr28033350iof.85.1527011145994; Tue, 22 May 2018 10:45:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527011145; cv=none; d=google.com; s=arc-20160816; b=zKJ7MBE4Fcb3nV0jSAKONi/A1Cb2PoiGN0CGBIvVj2QXKpRbPFs7jh9sXbAnpHJL7O ScveATMNVCsTGJO900lYpy8V3dSvoSibH1QLiI7wMG/PnhBwObfYsAQmb0oSm19X7747 VA6yNUFZSxWX7hHQM5Aqq0hO44sVYsFsxGB2lTLNfxEbszGnUKAYYs+0M9NV0LuMw2Bi xjoQnS8R4jjXA9g6x8QL9T2lJ6hFczGGXu5urDASJnVbgV1W0SNOwfy/5yb4NE8pAGqw cLuWF0PNLff6A21v3c2wL56w4RMIh/3AFA80HVGOvwiAZeiQXXe6F21Uog//s8IkvGyM A9TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from :arc-authentication-results; bh=kPglRxYHDMHX+ZvRqr/PziPeSz4arrRkTivUItO4f7E=; b=c7VKebPGOtJ3iS9ls11aiMZE2FjGkd/kYppo4sdL0kCcSwZOpSfMDbqg6crohA1r1F KTw+hbOlKcJg5lZyDR0VB8oU/sPAJKfiAi6KJUZSEfZF2s+hK7WDn0B8/USdY4ygTpSl BZfKwOjnkP2TDR6fC2qsXf4A31M6G+UR6OrzZcvbDczjVpWUvpgD/Iib21fDJ6yMc6qY CD4IlwLctIjTDN0OrYq59m+2Ts6e22rCUvwcqmR4TAqoEoXDF/YtrFvvvejaxTmiply5 yXAZOAn5f4D2OEddkTRnmqO2CB2lT/Er3hH2uQ5jTKuMhmD6zaQJ+ZG5IF+bZkuNVsZc aCOQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id z66-v6si15192392ioe.93.2018.05.22.10.45.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 May 2018 10:45:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fLBJV-00029p-2W; Tue, 22 May 2018 17:43:09 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fLBJT-00029N-Kp for xen-devel@lists.xenproject.org; Tue, 22 May 2018 17:43:07 +0000 X-Inumbo-ID: 154e8215-5de8-11e8-8249-2fda3a446a53 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 154e8215-5de8-11e8-8249-2fda3a446a53; Tue, 22 May 2018 17:46:40 +0000 (UTC) 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 2F72B1435; Tue, 22 May 2018 10:43:06 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 453773F589; Tue, 22 May 2018 10:43:05 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 22 May 2018 18:42:43 +0100 Message-Id: <20180522174254.27551-3-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180522174254.27551-1-julien.grall@arm.com> References: <20180522174254.27551-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH 02/13] xen/arm64: entry: Use named label in guest_sync X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This will improve readability for future changes. This is part of XSA-263. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/entry.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index ffa9a1c492..e2344e565f 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -226,11 +226,11 @@ guest_sync: mrs x1, esr_el2 lsr x1, x1, #HSR_EC_SHIFT /* x1 = ESR_EL2.EC */ cmp x1, #HSR_EC_HVC64 - b.ne 1f /* Not a HVC skip fastpath. */ + b.ne guest_sync_slowpath /* Not a HVC skip fastpath. */ mrs x1, esr_el2 and x1, x1, #0xffff /* Check the immediate [0:16] */ - cbnz x1, 1f /* should be 0 for HVC #0 */ + cbnz x1, guest_sync_slowpath /* should be 0 for HVC #0 */ /* * Fastest path possible for ARM_SMCCC_ARCH_WORKAROUND_1. @@ -241,7 +241,7 @@ guest_sync: * be encoded as an immediate for cmp. */ eor w0, w0, #ARM_SMCCC_ARCH_WORKAROUND_1_FID - cbnz w0, 1f + cbnz w0, guest_sync_slowpath /* * Clobber both x0 and x1 to prevent leakage. Note that thanks @@ -250,7 +250,7 @@ guest_sync: mov x1, xzr eret -1: +guest_sync_slowpath: /* * x0/x1 may have been scratch by the fast path above, so avoid * to save them.