From patchwork Tue Jun 12 11:36:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 138324 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5234938lji; Tue, 12 Jun 2018 04:39:30 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJBTbsgvnrUEwPGN+ClHIAbIpnEcGNhvu8laOqx0sN2qIXd2AwY1ryNx8r8+eT1TfpC9zLI X-Received: by 2002:a24:d105:: with SMTP id w5-v6mr13194itg.64.1528803569971; Tue, 12 Jun 2018 04:39:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528803569; cv=none; d=google.com; s=arc-20160816; b=tebvdlujOoVKmXKbG8Qtb+TdrFIJVfRmmR5bKd6VjE/rFXpeDblgZ+uEq+RgyimoyZ eYzlEHKyG4iN9DaO5TuKXhK9L8ci8iBneyBI96OFIRlnMy8nBjscj927vAU+qGlE97QD mZkXMoagA1AirslfVTpWBm7O/NuOFzotMthC0EjFmjH/WuoclH9D48jbbZmrbewG8UWR kt/xBxJyvmABV//X5ZFWK/fxIL0gCNA2hIl2dxD7OHycKKmA37DozWada0P0zS3yM7/2 ISqb1HsAHwqHGUaNP7ly0z8dbM4aHQl7vkZO+L6P6wgFxHQhoWT3GDF6CDWan7rxBUJ0 kTEQ== 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=Fxa+kXEmk4az94pHPhbvYCdcgdNXelYaOFTEHWMD0lU=; b=nW+hpfcU1gc7cpx3Q4Vc5BKGTtyi+uf+H3rzmnHCu94In5q5EnxhXoLpgX5HceOaSV Pi8StLlsYKn+3vEyChrmwM3z5kYtJn2AjFlCaGyDeuVpvvRsQDP8y1EeNaGt8e6hIhNk rYlaq159WpxMFqfcy2wSEtHom83+t4YfyidY2bbCkHkvU07Hp07iGSIlufxIV0P4Aa12 DANv29NdTYrdMpA3uahB/2HEhnzREK2Pcx85J4TVypsN2TMiwb0O3mhabLru4be5FbDn WVdA9jfhv56kj0uh94dTiAnH9U1hYdCVoO9+D1l0MZ4TGFHvCtSrt/smF5QSqpHOhS6A YIZA== 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 f25-v6si654003iog.231.2018.06.12.04.39.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Jun 2018 04:39:29 -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 1fShbb-0000ok-3r; Tue, 12 Jun 2018 11:36:55 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fShbZ-0000o8-1H for xen-devel@lists.xenproject.org; Tue, 12 Jun 2018 11:36:53 +0000 X-Inumbo-ID: e99ef133-6e34-11e8-bc1d-65256ead4e3a Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id e99ef133-6e34-11e8-bc1d-65256ead4e3a; Tue, 12 Jun 2018 11:36:57 +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 5811F1435; Tue, 12 Jun 2018 04:36:52 -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 6E0073F318; Tue, 12 Jun 2018 04:36:51 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 12 Jun 2018 12:36:32 +0100 Message-Id: <20180612113643.32020-3-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180612113643.32020-1-julien.grall@arm.com> References: <20180612113643.32020-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH v3 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 --- Changes in v2: - Add Stefano's reviewed-by --- 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.