From patchwork Mon Jul 22 21:39:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 169450 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8012528ilk; Mon, 22 Jul 2019 14:41:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqxS5n0P4LzB+/JJBjOC4nQ7qp0LwSSo0/vE70huv+RtoXlXC/J8r6Z9xyLPnQTW6tcFOMvz X-Received: by 2002:a5d:8447:: with SMTP id w7mr70416848ior.197.1563831694318; Mon, 22 Jul 2019 14:41:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563831694; cv=none; d=google.com; s=arc-20160816; b=MdEq4nUB20wDpNLnqImJCvnjXWNoQ+e7M18PoEOQ7IomFD/oLo8VoeW1Va3KkSKu11 MwznPrH/1XJ+G//+5Ex9Y2ARspO0mNpRYAm47WTeaoN4AVis5m9uKZaH7xlnObyE6sxp kljfyoR3KntE1Dn5NloF+Q8Twink8GwoE1ToD/hZXIbY3WOfW1pvHyMZO2+ncxgsxKCm a27oZlZzZIDul0eaGDKKqQLvVQgev9Yuuv7FNCIfNLy8127aCiaNMDKi7AuJ/ogsWbgS JhsHtE0FBD6fdi5AI6x4lC1gNNW4L2l9eDVKuMykNQgLd+b2pDasaFuUhgGG1o9o9K8T Eczw== 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; bh=mAgloyQJo26Ncqb7KJsFgSWM8G1t1QUHFm0BNDrt4YE=; b=jZUju7ThLTIlbw12geOPDdKbKrvsKJzq1TBqUpXoKPb7itKoG7OeiDNrK0mxsWJ8G2 ajAHdF/imTKA5NYppRMSAwZHCAtlSdTGQdCDk5VouObEpx8eYE2g08+4KCdjtxDg7fhS 88/djK/AIeaG1SfqW7FK1Scimj11/u7ea3ifAErCSOkyrMTZqYx7wIhDifRkOsU2kMcG PiwH9K8CNUzNUgkC/0KjU3j5BipVwSeaMHYFyRjwoTBYUlRmKKrO0IBuhzYXhR8bvB1g 1hPIJRmPAwtKiwcu2g1tNP0WzL/AbUMOt3EbNiTCuUll99la9r3awsCzlt8/MBhURvtI 416g== 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 f43si33033493jaa.34.2019.07.22.14.41.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Jul 2019 14:41:34 -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 1hpg2Y-0002TJ-O3; Mon, 22 Jul 2019 21:40:14 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hpg2W-0002Rj-FM for xen-devel@lists.xenproject.org; Mon, 22 Jul 2019 21:40:12 +0000 X-Inumbo-ID: 47ca57b2-acc9-11e9-9a00-33efccef8bfa Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 47ca57b2-acc9-11e9-9a00-33efccef8bfa; Mon, 22 Jul 2019 21:40:10 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 363241509; Mon, 22 Jul 2019 14:40:10 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 83E673F71F; Mon, 22 Jul 2019 14:40:09 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 22 Jul 2019 22:39:28 +0100 Message-Id: <20190722213958.5761-6-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190722213958.5761-1-julien.grall@arm.com> References: <20190722213958.5761-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH v2 05/35] xen/arm64: head: Introduce print_reg 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: Julien Grall , Stefano Stabellini , Volodymyr Babchuk MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" At the moment, the user should save x30/lr if it cares about it. Follow-up patches will introduce more use of putn in place where lr should be preserved. Furthermore, any user of putn should also move the value to register x0 if it was stored in a different register. For convenience, a new macro is introduced to print a given register. The macro will take care for us to move the value to x0 and also preserve lr. Lastly the new macro is used to replace all the callsite of putn. This will simplify rework/review later on. Note that CurrentEL is now stored in x5 instead of x4 because the latter will be clobbered by the macro print_reg. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- Changes in v2: - Re-order the instructions to avoid cloberring x4 early. This allows to print content of x4. --- xen/arch/arm/arm64/head.S | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index b684091aac..63d63bc8ec 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -90,8 +90,25 @@ bl puts ; \ mov lr, x3 ; \ RODATA_STR(98, _s) + +/* + * Macro to print the value of register \xb + * + * Clobbers x0 - x4 + */ +.macro print_reg xb + mov x0, \xb + mov x4, lr + bl putn + mov lr, x4 +.endm + #else /* CONFIG_EARLY_PRINTK */ #define PRINT(s) + +.macro print_reg xb +.endm + #endif /* !CONFIG_EARLY_PRINTK */ /* Load the physical address of a symbol into xb */ @@ -304,22 +321,20 @@ GLOBAL(init_secondary) #ifdef CONFIG_EARLY_PRINTK ldr x23, =EARLY_UART_BASE_ADDRESS /* x23 := UART base address */ PRINT("- CPU ") - mov x0, x24 - bl putn + print_reg x24 PRINT(" booting -\r\n") #endif common_start: PRINT("- Current EL ") - mrs x4, CurrentEL - mov x0, x4 - bl putn + mrs x5, CurrentEL + print_reg x5 PRINT(" -\r\n") /* Are we in EL2 */ - cmp x4, #PSR_MODE_EL2t - ccmp x4, #PSR_MODE_EL2h, #0x4, ne + cmp x5, #PSR_MODE_EL2t + ccmp x5, #PSR_MODE_EL2h, #0x4, ne b.eq el2 /* Yes */ /* OK, we're boned. */