From patchwork Tue Jun 5 15:22:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 137760 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1098922lji; Tue, 5 Jun 2018 08:26:05 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLcYCPTgUnSJ8HT004E1yoSNOWopNk+MB1SaD1wWgF+o+httIUKAaHuxTzfR1Iu11gorgMI X-Received: by 2002:a6b:1902:: with SMTP id 2-v6mr17894862ioz.304.1528212365140; Tue, 05 Jun 2018 08:26:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528212365; cv=none; d=google.com; s=arc-20160816; b=oQBVYME6X1xd4R3MLRupl1gjsxHVWNEK6eS9aw+UqtimyEo/VoxfEcwTYa+PSrwI5/ qYp4Y6YxkUa1rlYjJwqLbxTirpeRQU+4J0ujuz8rqkHpm/WB74QYjrI0Vakh9oF2xlzZ Z7BZfNrjwoVKgbh5t1zOw/ST6OelKnghFtT5m35wLNlsdn8LGxHLNnkOa8K0hlbz7sVA dyX9tbEeGzj8JbQnRFsO9SW0JDUUxjycpPzGfB8CEVgZTNZeUbAddhZEv+V3ffTEbMQo VgtHG+b/wLY8kuDR6lAROunXxfbdXDYPJIIonxEWaCVlTBpYpGcuM1hxa/lzT2H1KXi2 rTyA== 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=vFQYfzQpgTaI/I+HtAczJ/lGgRnmgKPK1/gvoZPz3txyvS8wniVObDS1hzBjy60TB6 J50HMv6vlVJHZO3pVdXs3gCkI0T4yYsxtg+QQsCUY9TRmrSNvACg6FV1WMI2A3dn/Ew4 ABCB2CAimAUisaX9kO7VOl5MRnPD8DLJ0RCAE2wbzJBp2LxIS3XIxGJj9/LCrnJj0MR9 6N3aH+rLxSJtq9+Hi8hn8R3dCPTh3yWXAFcN+qGrh9NXs1mgVXdKUcWB1ydYH14LiJGG i1/e1/6Rbjj2TPCJEAxD/VDNQs5slfz8dRcDYQC6TGx3WoN564YUVEUFfoUolxMswgbc jpcA== 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 y1-v6si1760813iti.13.2018.06.05.08.26.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 08:26:05 -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 1fQDnu-0005Av-NQ; Tue, 05 Jun 2018 15:23:22 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fQDnt-0005AZ-75 for xen-devel@lists.xenproject.org; Tue, 05 Jun 2018 15:23:21 +0000 X-Inumbo-ID: 10d7a885-68d4-11e8-9728-bc764e045a96 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTP id 10d7a885-68d4-11e8-9728-bc764e045a96; Tue, 05 Jun 2018 17:21:06 +0200 (CEST) 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 6C8851596; Tue, 5 Jun 2018 08:23:20 -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 81A823F557; Tue, 5 Jun 2018 08:23:19 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 5 Jun 2018 16:22:52 +0100 Message-Id: <20180605152303.14450-3-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605152303.14450-1-julien.grall@arm.com> References: <20180605152303.14450-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH v1 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.