From patchwork Mon Jun 10 19:32:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 166367 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1410357ilk; Mon, 10 Jun 2019 12:33:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqwivDs0ygwpDI+slQ51nxP68AtSbjvdAZlFEtEiqWRwARoFrEPtqbNrGQXDPwlPmNfeh8YY X-Received: by 2002:a6b:b256:: with SMTP id b83mr43439542iof.48.1560195234466; Mon, 10 Jun 2019 12:33:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560195234; cv=none; d=google.com; s=arc-20160816; b=aIKO0md9SPjLCzCDxy8FzxTbyaZhu3Kyf9CL+envFSETBO3Gz7EOALj6iKk33LhDc4 2NtJP9bhPdt0LQnvX3iKDSZH/veYNDS8dZfgMX/IGwBr/AQqdHAnm4UA061Th5MhENnt KUMiq2aiE225Qsgnzmv37qJzqa6PfdsQTPWvJ/ZAVzcTAKsKaP/mhi6+AEnE1fd/9Ivv +LrXSU6cr12ECpXTuc6LuVdwvFemIt4l26fvqmaNRKcrcBahHGNab9z8wug2rd3njdnA ApXJjvQbCiYKnd7G3vNn8zei4mlPytDM7sNVrP2FtYDL0wjV0yGvpA4yanW1frHSDnp/ sbPg== 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=Sv/6dSL98aVO1rByFdP3G6KIDgIf/H2L2u27iBAIPnc=; b=Zjq90g4nzDzxeiktCB9S7okPL22DtO26d4mNxk+4Q8w4VjAKyM1n3xKzYkyVAyUMsF 7pWmZCxkfLyFF6yOcpdlM7SagLT88BDIEncrtJOEWApG/17tLtVVqfaLhvTun48Y6TJZ 1CkFid8rXwxkQFQXPcU/uvex406r11BOBk08eelNZVuo8tgnjRHnxNP+TaXeMSNMFCgp 3im5+QfQwktNUTA2KcYoivD5QrCDWxJnzXHWMdU153LCBJzOBSpoVMY3JblT4hNSWMVI 2aJcWzE6/Zrp2MsCvfBzoq4LPmRVSYICbLKNsqK34yhi8vhefgto5gZY4JewE6ke70CX 1nwg== 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 y75si174273itc.128.2019.06.10.12.33.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Jun 2019 12:33:54 -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 1haQ1q-0007d1-I0; Mon, 10 Jun 2019 19:32:26 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1haQ1o-0007ck-Hi for xen-devel@lists.xenproject.org; Mon, 10 Jun 2019 19:32:24 +0000 X-Inumbo-ID: 78b1c5f8-8bb6-11e9-8980-bc764e045a96 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTP id 78b1c5f8-8bb6-11e9-8980-bc764e045a96; Mon, 10 Jun 2019 19:32:23 +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 746D3C15; Mon, 10 Jun 2019 12:32:23 -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 8C61F3F73C; Mon, 10 Jun 2019 12:32:22 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 10 Jun 2019 20:32:01 +0100 Message-Id: <20190610193215.23704-4-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 03/17] xen/arm64: head: Rework UART initialization on boot CPU 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" Anything executed after the label common_start can be executed on all CPUs. However most of the instructions executed between the label common_start and init_uart are not executed on the boot CPU. The only instructions executed are to lookup the CPUID so it can be printed on the console (if earlyprintk is enabled). Printing the CPUID is not entirely useful to have for the boot CPU and requires a conditional branch to bypass unused instructions. Furthermore, the function init_uart is only called for boot CPU requiring another conditional branch. This makes the code a bit tricky to follow. The UART initialization is now moved before the label common_start. This now requires to have a slightly altered print for the boot CPU and set the early UART base address in each the two path (boot CPU and secondary CPUs). This has the nice effect to remove a couple of conditional branch in the code. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/head.S | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index a5147c8d80..fd432ee15d 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -265,6 +265,12 @@ real_start_efi: load_paddr x21, _sdtb #endif + /* Initialize the UART if earlyprintk has been enabled. */ +#ifdef CONFIG_EARLY_PRINTK + bl init_uart +#endif + PRINT("- Boot CPU booting -\r\n") + mov x22, #0 /* x22 := is_secondary_cpu */ b common_start @@ -281,14 +287,11 @@ GLOBAL(init_secondary) /* Boot CPU already zero BSS so skip it on secondary CPUs. */ mov x26, #1 /* X26 := skip_zero_bss */ -common_start: mrs x0, mpidr_el1 ldr x13, =(~MPIDR_HWID_MASK) bic x24, x0, x13 /* Mask out flags to get CPU ID */ - /* Non-boot CPUs wait here until __cpu_up is ready for them */ - cbz x22, 1f - + /* Wait here until __cpu_up is ready to handle the CPU */ load_paddr x0, smp_up_cpu dsb sy 2: ldr x1, [x0] @@ -300,14 +303,14 @@ common_start: #ifdef CONFIG_EARLY_PRINTK ldr x23, =EARLY_UART_BASE_ADDRESS /* x23 := UART base address */ - cbnz x22, 1f - bl init_uart /* Boot CPU sets up the UART too */ -1: PRINT("- CPU ") + PRINT("- CPU ") mov x0, x24 bl putn PRINT(" booting -\r\n") #endif +common_start: + PRINT("- Current EL ") mrs x4, CurrentEL mov x0, x4 @@ -628,10 +631,16 @@ ENTRY(switch_ttbr) ret #ifdef CONFIG_EARLY_PRINTK -/* Bring up the UART. - * x23: Early UART base address - * Clobbers x0-x1 */ +/* + * Initialize the UART. Should only be called on the boot CPU. + * + * Ouput: + * x23: Early UART base physical address + * + * Clobbers x0 - x1 + */ init_uart: + ldr x23, =EARLY_UART_BASE_ADDRESS #ifdef EARLY_PRINTK_INIT_UART early_uart_init x23, 0 #endif