From patchwork Mon Jun 10 19:32:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 166368 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1410376ilk; Mon, 10 Jun 2019 12:33:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqxTwGDH8V5VXQl4F2UP32Af4YVBFnEveEDwqR1wnal3rRkSM/JntZFoDy9xQmeC/ZK2aE8W X-Received: by 2002:a24:b8c2:: with SMTP id m185mr14806458ite.0.1560195235913; Mon, 10 Jun 2019 12:33:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560195235; cv=none; d=google.com; s=arc-20160816; b=MfNfOTP0vwxfeYmTxtuBzLtjfY/y97ZNssVL/voV3jTj7k4EmLKzs6pNPDxJdZzI9a kb60MFOo3r2br4Xhwl6ngYQDwfbIzsOuVnHFA0luvOAISPP6/1/MkoYfheul0L/nlV1k rh8uzpZK84qxE1uIyGULmzqXOegzjcNb4k0jyOwBZKylBOAV0f0DaCRyDy9PPbyRPlv3 /6mIlvu3Dx1HFu8VgngtS0oEN9CvxHMlVogLTH5XioePrg4MnqkWBrz/JHjFIit3+OUM efYxlLrSQbwb+4h8DGDL+nKMqwzCl8OLSXdVdjW6NyjJekmJWcKTo/Da/LNIyOirrjYM 6REw== 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=N4oJNDunGDa/Td/RLdifXCu+8Y6Q5w+eLQjyw2EDgkk=; b=ocfeCUa05N6+XGcb22CJPfCnlj/HQuI1iBqtPbAu0v9p7WwGZ/Y2cJgpp16zZgvZ5H 8MyoN29xQ0vkj5zgr9mONG4OQpEIU5tZGpToPXJYHsdGFQV8iA1S09hkDpvMmcoRb4mu Oy393Q2wRR0EMOxxzBMitEag63A92gsQH8qrpKwgJvSvdZ3l9JALASTl5N97Omp3MxUZ 8DNNL1t6UitYnuLjYSfBIB+jrlPnY6glk3NKKF6cS/c1oUNH3/DH7JKlKb6uoGTvieGC XUCvv5EYS8rvDmkl95+fxA/Xe4kbs5l71Tr+18t5fn7gwCLseEb8RTlgJVk5KOJsySg0 6Oiw== 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 m15si6468147ioo.117.2019.06.10.12.33.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Jun 2019 12:33:55 -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 1haQ1r-0007dR-Ts; Mon, 10 Jun 2019 19:32:27 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1haQ1r-0007dH-AH for xen-devel@lists.xenproject.org; Mon, 10 Jun 2019 19:32:27 +0000 X-Inumbo-ID: 79f136ad-8bb6-11e9-8980-bc764e045a96 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTP id 79f136ad-8bb6-11e9-8980-bc764e045a96; Mon, 10 Jun 2019 19:32:25 +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 ACA74346; Mon, 10 Jun 2019 12:32:25 -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 C49683F73C; Mon, 10 Jun 2019 12:32:24 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 10 Jun 2019 20:32:03 +0100 Message-Id: <20190610193215.23704-6-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 05/17] 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: 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" 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 --- 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 84e26582c4..9142b4a774 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 x4, lr + mov x0, \xb + 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. */