From patchwork Mon Jun 10 19:32:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 166362 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1410228ilk; Mon, 10 Jun 2019 12:33:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqwyscwllANrV28J70GCu8/lFcmeXP98hPhXcyKgNrbos8X5LX/6vAOeqShY32DRCkaHMEkF X-Received: by 2002:a5e:db02:: with SMTP id q2mr21402595iop.306.1560195228546; Mon, 10 Jun 2019 12:33:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560195228; cv=none; d=google.com; s=arc-20160816; b=Y5ew1q6sVS/iW0TiBWfQODjKfBwK/XW1wWHqSiRnBTYdJqHXjo6MczBvovreBj0TWV 2cYePDb6xwmvcPj7RjBhr5RJphCliDsbHrJ88lzQ8jpYBoPiN1G5JE+Hrke/QRA+5zaQ NRXA8CSLLBUrf9uKaNYjVq+06nHlTL8ahpeDByFo1TwKI/bHXzkhSC3IwDE/iNUs9b/m 0Hn7WEvLj0eCyU8ziAfgoKj23lraEsH9X8JX4qnli7QhdZCe3bGaDo7LTQpQRAJSjAc8 TpHgDUCRI5CHLqqIvV0aADepdiR6jdjpOyGyVvBmBYbcuQurSKOLfcKDkIXaXOxIU7Yj loJg== 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=+GBwWnKF4fPfhll9nS/XOtNFk6tne1Lb1DuPUIdv5fo=; b=L/veDIzJqERQkl5P5uGaHsqTDPrKeNnLGfDH8jpua/EPa0Q6XthaUwPB2FI6gFPWQf fUlkVqpkOiYcGb+vUHS7E/KEmln75CklY+84sXaGsDOtTuCapE0wbFJljRyLHkQngNs6 QHQe3gTLjxBmKIuGXvaV813s+0XOGgBeIEJtSn/GogEExJmec7Eth9Sswqjl7y6oGxHS wASHtyKk0bJ6+tmN8mYVZ/yYYRhPLkSzZfTZta9oP6XRlmJZBd/tnTJDnCDoSt6ZjSqJ 1/4mZipm1g/PLBwDa0xzbR0QY6w2p8FcfA5TNfVzXgvTMXva56BgKfUPxQv8k0b3N1bQ aMIw== 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 k17si6503234iok.52.2019.06.10.12.33.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Jun 2019 12:33:48 -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 1haQ1n-0007ce-U4; Mon, 10 Jun 2019 19:32:23 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1haQ1n-0007cO-8a for xen-devel@lists.xenproject.org; Mon, 10 Jun 2019 19:32:23 +0000 X-Inumbo-ID: 780e1bbf-8bb6-11e9-8980-bc764e045a96 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTP id 780e1bbf-8bb6-11e9-8980-bc764e045a96; Mon, 10 Jun 2019 19:32:22 +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 5892BC0A; Mon, 10 Jun 2019 12:32:22 -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 708313F73C; Mon, 10 Jun 2019 12:32:21 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 10 Jun 2019 20:32:00 +0100 Message-Id: <20190610193215.23704-3-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190610193215.23704-1-julien.grall@arm.com> References: <20190610193215.23704-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH 02/17] xen/arm64: head: Don't clobber x30/lr in the macro PRINT 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 , Stefano Stabellini , andrii_anisov@epam.com, Oleksandr_Tyshchenko@epam.com MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The current implementation of the macro PRINT will clobber x30/lr. This means the user should save lr if it cares about it. Follow-up patches will introduce more use of PRINT in place where lr should be preserved. Rather than requiring all the users to preserve lr, the macro PRINT is modified to save and restore it. While the comment state x3 will be clobbered, this is not the case. So PRINT will use x3 to preserve lr. Lastly, take the opportunity to move the comment on top of PRINT and use PRINT in init_uart. Both changes will be helpful in a follow-up patch. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/head.S | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index c8bbdf05a6..a5147c8d80 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -78,12 +78,17 @@ * x30 - lr */ -/* Macro to print a string to the UART, if there is one. - * Clobbers x0-x3. */ #ifdef CONFIG_EARLY_PRINTK +/* + * Macro to print a string to the UART, if there is one. + * + * Clobbers x0 - x3 + */ #define PRINT(_s) \ + mov x3, lr ; \ adr x0, 98f ; \ bl puts ; \ + mov lr, x3 ; \ RODATA_STR(98, _s) #else /* CONFIG_EARLY_PRINTK */ #define PRINT(s) @@ -630,9 +635,8 @@ init_uart: #ifdef EARLY_PRINTK_INIT_UART early_uart_init x23, 0 #endif - adr x0, 1f - b puts -RODATA_STR(1, "- UART enabled -\r\n") + PRINT("- UART enabled -\r\n") + ret /* Print early debug messages. * x0: Nul-terminated string to print.