From patchwork Sat May 4 11:55:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13664405 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7CD71C04FFE for ; Tue, 14 May 2024 20:17:53 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.721728.1125331 (Exim 4.92) (envelope-from ) id 1s6yag-0002pu-Mu; Tue, 14 May 2024 20:17:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 721728.1125331; Tue, 14 May 2024 20:17:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yag-0002pn-KQ; Tue, 14 May 2024 20:17:38 +0000 Received: by outflank-mailman (input) for mailman id 721728; Tue, 14 May 2024 20:17:37 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yaf-0002pc-8D for xen-devel@lists.xenproject.org; Tue, 14 May 2024 20:17:37 +0000 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [2a00:1450:4864:20::32b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 00f8c882-122f-11ef-909d-e314d9c70b13; Tue, 14 May 2024 22:17:36 +0200 (CEST) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-420180b5897so18164075e9.3 for ; Tue, 14 May 2024 13:17:36 -0700 (PDT) Received: from gmail.com ([213.0.35.158]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4201916e7c6sm67810195e9.12.2024.05.14.13.17.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 13:17:33 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 00f8c882-122f-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715717855; x=1716322655; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IBvV5FEc3tf5GrjG7+ucFNGYNubjsh1/ytD3egjnMDA=; b=PGrWGMrq9cZeLegpKs950NrAoyrbMKVZkeeY8nnEXyXLJ7v7TJXXYet0J+yleHFLtW V5xjvHllX/hx2wO7XkwZ5xgDXuDXM+n8wRzq+2cdosr0KmQQ7fnFcx4g7HOYfJBy/sdx Ii4vXQ+8vg1k+JXVgR6AetcXJEabFHgXQ1cQqQp/XTWyid8aI7YyKgxKRhcyU0604DW/ oloRY0hIwV7ym7Jl88IOT8KnM0rw3Jrn7OszHucmyUp5cKLribtAfBEdlhjksgms/58M lUyQqhzfAgt8bSdfCzFAEaKmckFflYD/Zffm0FzrPduU7zmBJVWgrBktmPrZ9BNOyTJj 0nOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715717855; x=1716322655; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IBvV5FEc3tf5GrjG7+ucFNGYNubjsh1/ytD3egjnMDA=; b=XXpaQ/rIqcB5+rIm3LowxC7iMuWvmGusvieHsqhmBkLjay6XvaOlSUItnp7UZKR7lg b6c8dKVFcgmiGVtYLm/OvrOJXVLQPGq9EEdrzxpFoUMZ2cwFGOcUt7y6OIHCwNQ5PhPp a/FzGTHon1zlO2RYJod/+Lvvy0lLHssnhyoh4YfMIL66x3J3lQyMvPkj/hhD0tQ6Gx6H MZJirvK5h9miN5Wn0rxPV182MctwCgIijNCaBTJL9B1B0+W+B0QDp1QoYkSaLZbuwpU0 wAZmCcndMJz9P2scrkS3uoPGBS9Q02T1Hh4QsmSmBNs1kLVffjTYzghKxJr8tmwxikM6 mhJw== X-Gm-Message-State: AOJu0Yyjj55/k4+yMA5kn0YthViTOqHwNI8XfD9RdTkVV2ErrZ1ksq7g hgfUREMvRpja+EdPmgHyePpaJDfzjLrmn9RGXnM9K29tvfaNyM7RhCj0MTt/1zo= X-Google-Smtp-Source: AGHT+IH8vPyrmb3cb5pvK75gMbwQemgCC+qqFqAZgZmOp97aqUU6jUfk3YlvyfSC4IedujUNhly3yQ== X-Received: by 2002:a1c:4c03:0:b0:41c:5eb:4f8f with SMTP id 5b1f17b1804b1-41feaa38a6bmr103679465e9.15.1715717854695; Tue, 14 May 2024 13:17:34 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, bertrand.marquis@arm.com, michal.orzel@amd.com, Volodymyr_Babchuk@epam.com, jbeulich@suse.com, andrew.cooper3@citrix.com, edgar.iglesias@amd.com Subject: [PATCH v4 1/9] xen/arm64: entry: Add missing code symbol annotations Date: Sat, 4 May 2024 13:55:06 +0200 Message-Id: <20240504115514.1063509-2-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240504115514.1063509-1-edgar.iglesias@gmail.com> References: <20240504115514.1063509-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/entry.S | 78 ++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 28 deletions(-) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index f963c923bb..6251135ebd 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -289,21 +289,25 @@ b do_bad_mode .endm -hyp_sync_invalid: +FUNC_LOCAL(hyp_sync_invalid) entry hyp=1 invalid BAD_SYNC +END(hyp_sync_invalid) -hyp_irq_invalid: +FUNC_LOCAL(hyp_irq_invalid) entry hyp=1 invalid BAD_IRQ +END(hyp_irq_invalid) -hyp_fiq_invalid: +FUNC_LOCAL(hyp_fiq_invalid) entry hyp=1 invalid BAD_FIQ +END(hyp_fiq_invalid) -hyp_error_invalid: +FUNC_LOCAL(hyp_error_invalid) entry hyp=1 invalid BAD_ERROR +END(hyp_error_invalid) /* * SError received while running in the hypervisor mode. @@ -313,11 +317,12 @@ hyp_error_invalid: * simplicity, as SError should be rare and potentially fatal, * all interrupts are kept masked. */ -hyp_error: +FUNC_LOCAL(hyp_error) entry hyp=1 mov x0, sp bl do_trap_hyp_serror exit hyp=1 +END(hyp_error) /* * Synchronous exception received while running in the hypervisor mode. @@ -327,7 +332,7 @@ hyp_error: * some of them. So we want to inherit the state from the interrupted * context. */ -hyp_sync: +FUNC_LOCAL(hyp_sync) entry hyp=1 /* Inherit interrupts */ @@ -338,6 +343,7 @@ hyp_sync: mov x0, sp bl do_trap_hyp_sync exit hyp=1 +END(hyp_sync) /* * IRQ received while running in the hypervisor mode. @@ -352,7 +358,7 @@ hyp_sync: * would require some rework in some paths (e.g. panic, livepatch) to * ensure the ordering is enforced everywhere. */ -hyp_irq: +FUNC_LOCAL(hyp_irq) entry hyp=1 /* Inherit D, A, F interrupts and keep I masked */ @@ -365,8 +371,9 @@ hyp_irq: mov x0, sp bl do_trap_irq exit hyp=1 +END(hyp_irq) -guest_sync: +FUNC_LOCAL(guest_sync) /* * Save x0, x1 in advance */ @@ -413,8 +420,9 @@ fastpath_out_workaround: mov x1, xzr eret sb +END(guest_sync) -wa2_ssbd: +FUNC_LOCAL(wa2_ssbd) #ifdef CONFIG_ARM_SSBD alternative_cb arm_enable_wa2_handling b wa2_end @@ -450,42 +458,55 @@ wa2_end: mov x0, xzr eret sb -guest_sync_slowpath: +END(wa2_ssbd) + +FUNC_LOCAL(guest_sync_slowpath) /* * x0/x1 may have been scratch by the fast path above, so avoid * to save them. */ guest_vector compat=0, iflags=IFLAGS__AI_, trap=guest_sync, save_x0_x1=0 +END(guest_sync_slowpath) -guest_irq: +FUNC_LOCAL(guest_irq) guest_vector compat=0, iflags=IFLAGS__A__, trap=irq +END(guest_irq) -guest_fiq_invalid: +FUNC_LOCAL(guest_fiq_invalid) entry hyp=0, compat=0 invalid BAD_FIQ +END(guest_fiq_invalid) -guest_error: +FUNC_LOCAL(guest_error) guest_vector compat=0, iflags=IFLAGS__AI_, trap=guest_serror +END(guest_error) -guest_sync_compat: +FUNC_LOCAL(guest_sync_compat) guest_vector compat=1, iflags=IFLAGS__AI_, trap=guest_sync +END(guest_sync_compat) -guest_irq_compat: +FUNC_LOCAL(guest_irq_compat) guest_vector compat=1, iflags=IFLAGS__A__, trap=irq +END(guest_irq_compat) -guest_fiq_invalid_compat: +FUNC_LOCAL(guest_fiq_invalid_compat) entry hyp=0, compat=1 invalid BAD_FIQ +END(guest_fiq_invalid_compat) -guest_error_compat: +FUNC_LOCAL(guest_error_compat) guest_vector compat=1, iflags=IFLAGS__AI_, trap=guest_serror +END(guest_error_compat) -ENTRY(return_to_new_vcpu32) +FUNC(return_to_new_vcpu32) exit hyp=0, compat=1 -ENTRY(return_to_new_vcpu64) +END(return_to_new_vcpu32) + +FUNC(return_to_new_vcpu64) exit hyp=0, compat=0 +END(return_to_new_vcpu64) -return_from_trap: +FUNC_LOCAL(return_from_trap) msr daifset, #IFLAGS___I_ /* Mask interrupts */ ldr x21, [sp, #UREGS_PC] /* load ELR */ @@ -524,6 +545,7 @@ return_from_trap: eret sb +END(return_from_trap) /* * Consume pending SError generated by the guest if any. @@ -536,7 +558,7 @@ return_from_trap: * it. So the function will unmask SError exception for a small window and * then mask it again. */ -check_pending_guest_serror: +FUNC_LOCAL(check_pending_guest_serror) /* * Save elr_el2 to check whether the pending SError exception takes * place while we are doing this sync exception. @@ -562,13 +584,11 @@ check_pending_guest_serror: * exception handler, and the elr_el2 will be set to * abort_guest_exit_start or abort_guest_exit_end. */ - .global abort_guest_exit_start -abort_guest_exit_start: +LABEL(abort_guest_exit_start) isb - .global abort_guest_exit_end -abort_guest_exit_end: +LABEL(abort_guest_exit_end) /* Mask PSTATE asynchronous abort bit, close the checking window. */ msr daifset, #IFLAGS__A__ @@ -586,7 +606,7 @@ abort_guest_exit_end: cset x19, ne ret -ENDPROC(check_pending_guest_serror) +END(check_pending_guest_serror) /* * Exception vectors. @@ -597,7 +617,7 @@ ENDPROC(check_pending_guest_serror) .endm .align 11 -ENTRY(hyp_traps_vector) +FUNC(hyp_traps_vector) ventry hyp_sync_invalid /* Synchronous EL2t */ ventry hyp_irq_invalid /* IRQ EL2t */ ventry hyp_fiq_invalid /* FIQ EL2t */ @@ -617,6 +637,7 @@ ENTRY(hyp_traps_vector) ventry guest_irq_compat /* IRQ 32-bit EL0/EL1 */ ventry guest_fiq_invalid_compat /* FIQ 32-bit EL0/EL1 */ ventry guest_error_compat /* Error 32-bit EL0/EL1 */ +END(hyp_traps_vector) /* * struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next) @@ -626,7 +647,7 @@ ENTRY(hyp_traps_vector) * * Returns prev in x0 */ -ENTRY(__context_switch) +FUNC(__context_switch) add x8, x0, #VCPU_arch_saved_context mov x9, sp stp x19, x20, [x8], #16 /* store callee-saved registers */ @@ -647,6 +668,7 @@ ENTRY(__context_switch) ldr lr, [x8] mov sp, x9 ret +END(__context_switch) /* * Local variables: From patchwork Sat May 4 11:55:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13664404 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 49BCFC25B7D for ; Tue, 14 May 2024 20:17:53 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.721730.1125352 (Exim 4.92) (envelope-from ) id 1s6yai-0003Ib-Bs; Tue, 14 May 2024 20:17:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 721730.1125352; Tue, 14 May 2024 20:17:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yai-0003IS-96; Tue, 14 May 2024 20:17:40 +0000 Received: by outflank-mailman (input) for mailman id 721730; Tue, 14 May 2024 20:17:38 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yag-0002pc-OM for xen-devel@lists.xenproject.org; Tue, 14 May 2024 20:17:38 +0000 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [2a00:1450:4864:20::42e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 022e98eb-122f-11ef-909d-e314d9c70b13; Tue, 14 May 2024 22:17:38 +0200 (CEST) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-34db6a29998so4736553f8f.0 for ; Tue, 14 May 2024 13:17:38 -0700 (PDT) Received: from gmail.com ([213.0.35.158]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502baacfdesm14649479f8f.73.2024.05.14.13.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 13:17:35 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 022e98eb-122f-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715717857; x=1716322657; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QODbdNtYx//N7B7NxU/Urb2ggSQNvaYVgLtnma262hw=; b=b2WRmEMnJ5/HYPe/Vsnn8Cv6P4ryc4vRfepLZBSToq5QtgBHliENdzTiEmFF5dMfB4 hxNT1JZB4w6OFiV48WZegb7CpSoLlXx6r4WiVKmaud5XRYt+tPsP2nm4a1FtMTY9AYRd 1wXFa3/6fivvuzmA7UJUbJ97wlKzCAuv1JIvkZwkLouq0AK/ZbZRGfekM+GeYbQxwK2D tq3/W6Ly2ctc1SDYqDD6boePr7rMLy/xsjbHAIi3U8sztKJMnyVZFYL8j/3diN5QxSJ5 mIkPmrtbAyKcIGsvGbz45+cAYsX0bwT4ZpyumqHKf9VXWyHmGUlHFi5VAdxYtyHjgMUa t0sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715717857; x=1716322657; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QODbdNtYx//N7B7NxU/Urb2ggSQNvaYVgLtnma262hw=; b=wbu74hm/zIy4SOlhGW5mTzqiBCwskaejVyvrp3YAjPhrK/dfj74bOZpgjqdDZwjKHN LRDuisvGVN8sWFsvVjwevHq3tqv79Rn6CbpvLFSXxEi+6spqKGuwDQFPXEtRXWLxadwl IKyc/ILX5CCdolzow/RrTx+wi2tOJiDLkSIHOpCIEIkDYFyQsyY/sZhHPeL8TEp5idUq mFSovniqwQ1VIxB4JGO8JkUon9D8o1+ZZwGlvifpDqqNh7GakXicTTIDY0TaeQEZ4JJK AHAZpmLM99AsrOw+xC6BzIQDy0tdMwHC8fXXNaesyVelYnaW4o7YXcZdTTsvJZeLp1Qp 9ZBw== X-Gm-Message-State: AOJu0YxeRBLwApF6CvqmPQNUMdsDSS00fWMP47ACO4VxcrO2HfpQ3sju jJlPbedZlXkvVY/1uXPsYEohtZqnEynia3xkWA21YoW5VzcL6jQz7INpDUAy2dE= X-Google-Smtp-Source: AGHT+IHpd7msz+LqA1MbybkOFxoKsVL/RYXHvO49nMw1p4/Qd434paujy0JPmUhMPHj+Sv1rXxQIhg== X-Received: by 2002:a5d:58ce:0:b0:343:dc46:bb4b with SMTP id ffacd0b85a97d-3504aa62e41mr9383601f8f.59.1715717856670; Tue, 14 May 2024 13:17:36 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, bertrand.marquis@arm.com, michal.orzel@amd.com, Volodymyr_Babchuk@epam.com, jbeulich@suse.com, andrew.cooper3@citrix.com, edgar.iglesias@amd.com Subject: [PATCH v4 2/9] xen/arm64: smc: Add missing code symbol annotations Date: Sat, 4 May 2024 13:55:07 +0200 Message-Id: <20240504115514.1063509-3-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240504115514.1063509-1-edgar.iglesias@gmail.com> References: <20240504115514.1063509-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/smc.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/smc.S b/xen/arch/arm/arm64/smc.S index fc6b676e2e..68b05e8ddd 100644 --- a/xen/arch/arm/arm64/smc.S +++ b/xen/arch/arm/arm64/smc.S @@ -19,7 +19,7 @@ * register_t a6, register_t a7, * struct arm_smccc_res *res) */ -ENTRY(__arm_smccc_1_0_smc) +FUNC(__arm_smccc_1_0_smc) smc #0 ldr x4, [sp] cbz x4, 1f /* No need to store the result */ @@ -27,12 +27,13 @@ ENTRY(__arm_smccc_1_0_smc) stp x2, x3, [x4, #SMCCC_RES_a2] 1: ret +END(__arm_smccc_1_0_smc) /* * void arm_smccc_1_2_smc(const struct arm_smccc_1_2_regs *args, * struct arm_smccc_1_2_regs *res) */ -ENTRY(arm_smccc_1_2_smc) +FUNC(arm_smccc_1_2_smc) /* Save `res` and free a GPR that won't be clobbered by SMC call */ stp x1, x19, [sp, #-16]! @@ -69,3 +70,4 @@ ENTRY(arm_smccc_1_2_smc) /* Restore original x19 */ ldp xzr, x19, [sp], #16 ret +END(arm_smccc_1_2_smc) From patchwork Sat May 4 11:55:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13664400 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 44454C04FFE for ; Tue, 14 May 2024 20:17:51 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.721731.1125362 (Exim 4.92) (envelope-from ) id 1s6yaj-0003XQ-Ip; Tue, 14 May 2024 20:17:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 721731.1125362; Tue, 14 May 2024 20:17:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yaj-0003XE-FX; Tue, 14 May 2024 20:17:41 +0000 Received: by outflank-mailman (input) for mailman id 721731; Tue, 14 May 2024 20:17:40 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yai-0002pc-L0 for xen-devel@lists.xenproject.org; Tue, 14 May 2024 20:17:40 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 03386757-122f-11ef-909d-e314d9c70b13; Tue, 14 May 2024 22:17:40 +0200 (CEST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4200ee78f35so26599295e9.1 for ; Tue, 14 May 2024 13:17:40 -0700 (PDT) Received: from gmail.com ([213.0.35.158]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fccee9292sm206161835e9.37.2024.05.14.13.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 13:17:37 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 03386757-122f-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715717858; x=1716322658; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6Lep3NQhPdutZe5qkYH7KS+rz9lJgEOzrCQ4vbmoNE8=; b=mgGIAupxBcVatInfvQ4BxfHwEEm9p8qdNGVhaXkuJYzCdkbOkH5RG64+bZ0hWuM73H 7b0XOuUt5ZlmSVdGiu4iVwe40k+EdyUbrwZnmCFU9VuN4rbfCv+mz4js1RkQS5NrkgsK K/F/I3qO+3SjjGxtLmZY5q8nyE/AF730eAtfy7XJkbUaURhkN5nMj5yY5YdIuzBrNXYf 5WIkL4FZgYfUSMcf81Y2xPnYLEdnZs7MWPboi2PDw2VVrVfXt9L7xSwlTiVn5lObthAP fmVviM6Jd1pzq/OFaso5mXH3jJjpRYKRAI4QD4WPE8iMXy1Ir2yP0QiDiCOiCz1KFwGw 59uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715717858; x=1716322658; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6Lep3NQhPdutZe5qkYH7KS+rz9lJgEOzrCQ4vbmoNE8=; b=I8bdI+sB7EH7FN6JjnGlwRGZ7JmjBDjwe6ZnarCQmgr7i2CdjHO0op4DU1yywq2EqY wyQyCzh5veEdsYJDDU24dkXoHuCEdyGdaYkXwIoKAzucQmL6vumlMRDIKD6iBPLI1HDW oiggX6zMKkSRfFRI0tVJWA4k2Qu1ODHEw7dd+CJzl0q2nk9CHBo2IJp7OtHieTKcPs6J Qi0l2d7SMOtjle5X0+iypEOUnXbEM+tjVVSyBgxvybgsLBTZhiT09nOgCmGRTKXS8o0w Yrwf739U0FD9DMSNMdmVOX2Mqo+C6pLSZ9FI7B3zkbUqQ35UqmSagXQnKDq0JCpGFBOu 5uAQ== X-Gm-Message-State: AOJu0YzfnWiAP24TVSeZyeMEGM7LTOhGHGCArmh2IXzIgZKlboACzsLf 4YthWo2mBvcxU5+nHJ/5nJ8RcQ5C/Qp9XLxjCVpFrqYehX1+dhEZANCzCJAjtCI= X-Google-Smtp-Source: AGHT+IG+uxGLVFCc15wbWYAuKJA+85Tw6jQmsZx4mBC2o//DARBcPQ+DWDRVLezNMadyokMM4wsJ5w== X-Received: by 2002:a05:600c:4f4e:b0:418:a985:3ca with SMTP id 5b1f17b1804b1-41feac556e3mr162350105e9.31.1715717858610; Tue, 14 May 2024 13:17:38 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, bertrand.marquis@arm.com, michal.orzel@amd.com, Volodymyr_Babchuk@epam.com, jbeulich@suse.com, andrew.cooper3@citrix.com, edgar.iglesias@amd.com Subject: [PATCH v4 3/9] xen/arm64: sve: Add missing code symbol annotations Date: Sat, 4 May 2024 13:55:08 +0200 Message-Id: <20240504115514.1063509-4-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240504115514.1063509-1-edgar.iglesias@gmail.com> References: <20240504115514.1063509-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/sve-asm.S | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/arm64/sve-asm.S b/xen/arch/arm/arm64/sve-asm.S index 59dbefbbb2..2d8b895f07 100644 --- a/xen/arch/arm/arm64/sve-asm.S +++ b/xen/arch/arm/arm64/sve-asm.S @@ -161,9 +161,10 @@ .endm /* Gets the current vector register size in bytes */ -GLOBAL(sve_get_hw_vl) +FUNC(sve_get_hw_vl) _sve_rdvl 0, 1 ret +END(sve_get_hw_vl) /* * Save the SVE context @@ -172,9 +173,10 @@ GLOBAL(sve_get_hw_vl) * x1 - pointer to buffer for P0-15 * x2 - Save FFR if non-zero */ -GLOBAL(sve_save_ctx) +FUNC(sve_save_ctx) sve_save 0, 1, x2 ret +END(sve_save_ctx) /* * Load the SVE context @@ -183,9 +185,10 @@ GLOBAL(sve_save_ctx) * x1 - pointer to buffer for P0-15 * x2 - Restore FFR if non-zero */ -GLOBAL(sve_load_ctx) +FUNC(sve_load_ctx) sve_load 0, 1, x2 ret +END(sve_load_ctx) /* * Local variables: From patchwork Sat May 4 11:55:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13664401 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D10E6C25B75 for ; Tue, 14 May 2024 20:17:51 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.721732.1125372 (Exim 4.92) (envelope-from ) id 1s6yal-0003oP-RU; Tue, 14 May 2024 20:17:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 721732.1125372; Tue, 14 May 2024 20:17:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yal-0003oI-N0; Tue, 14 May 2024 20:17:43 +0000 Received: by outflank-mailman (input) for mailman id 721732; Tue, 14 May 2024 20:17:42 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yak-0002pc-Hm for xen-devel@lists.xenproject.org; Tue, 14 May 2024 20:17:42 +0000 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [2a00:1450:4864:20::336]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 045ad2f8-122f-11ef-909d-e314d9c70b13; Tue, 14 May 2024 22:17:41 +0200 (CEST) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-420180b5898so16412385e9.2 for ; Tue, 14 May 2024 13:17:41 -0700 (PDT) Received: from gmail.com ([213.0.35.158]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41f87c235b4sm239768445e9.11.2024.05.14.13.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 13:17:39 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 045ad2f8-122f-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715717860; x=1716322660; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oZl/wuDBhCq4h/1HN03exKmz7nONAZ/OXRP84qtToi4=; b=cUS6RI2fYIZoQzTxdL7pMcZeVMHv4yIkCUY/C+c0V1w8Qdbb7PozFLnJSVls0ib+fS Zz5/BWgHFLjCVewOI9uVhyeJG4DRUBv2QiGplGCO6sHC4k9pV4Er8zPH5f2ozjbO1CnW TDBZJWoy8CzcQledsNpH76vbk8kKzTiDNyWyTTSXp6kG8t2TlMGAQH+UjZiCAKRPWNSf 0VbTIACuZHUMWh3o1edmvMv4SJOCwg8wDnFZpSiTblfxOBdLxtkLrChwNEc8SxUExq6l doNdE7XbmrAR77RYKyx6MUGuq/B9zOSUpObjQ3D1Vj8RaI+GPoPHwFw5Ip8b74Is2RdZ o7bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715717860; x=1716322660; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oZl/wuDBhCq4h/1HN03exKmz7nONAZ/OXRP84qtToi4=; b=Jn4Uv/v1vb4aCro1cpE2iCkFXpTcQoRJu3FJiXuiANePyI0nLvZZVanuhk7C/6l2Oy VPoRRfIAJc5JyoCjipqY1FSCArpclpytCzPn/LP/sXTmjzu19QJryPTMwNaJLRbqUgTu kZIQXKhotVKSEWGKZUA8P3QnvilWUJogCtavFPd7g8R5wSensyRmEkgNQBhoXugWQLKf UZHgsg1sUydKuw4U78VrqJnNFHhekBeNrV2kDC00KJXbWxTmY0l5bUC8vwpOo5205zer WRkE8HFDlnBxjbIITmcznhSnVOh+BEPJ/hwgvK0dAAUAvEiE8FxrhsT6OQm6SZnlPWTf nYPg== X-Gm-Message-State: AOJu0YwlA1cCYUCGZy2a4jkhgw2Jj8/Pn4kXqKRy5gNWs4vNKLKlDbTO bxdYVmw2Cr7paYNo8QmFRgWYi7spKqnwj5oEETg5w/C9mOPr5p6q/OZsVyH9z+k= X-Google-Smtp-Source: AGHT+IFuSD60ZS4xJWrTf447rZXLlq7kk0j0gxhUPXxjzw8P3vbS1Ckr0YK/AKTwAQytA3rbxmA0RA== X-Received: by 2002:a05:600c:4513:b0:41f:df08:5ef7 with SMTP id 5b1f17b1804b1-41feac5a4a7mr100198425e9.28.1715717860424; Tue, 14 May 2024 13:17:40 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, bertrand.marquis@arm.com, michal.orzel@amd.com, Volodymyr_Babchuk@epam.com, jbeulich@suse.com, andrew.cooper3@citrix.com, edgar.iglesias@amd.com Subject: [PATCH v4 4/9] xen/arm64: head: Add missing code symbol annotations Date: Sat, 4 May 2024 13:55:09 +0200 Message-Id: <20240504115514.1063509-5-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240504115514.1063509-1-edgar.iglesias@gmail.com> References: <20240504115514.1063509-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/head.S | 51 +++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index fb297e9eb5..2fa07dc3a0 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -90,7 +90,7 @@ * 4K-aligned address. */ -GLOBAL(start) +FUNC(start) /* * DO NOT MODIFY. Image header expected by Linux boot-loaders. */ @@ -102,6 +102,7 @@ efi_head: */ add x13, x18, #0x16 b real_start /* branch to kernel start */ +END(start) .quad 0 /* Image load offset from start of RAM */ .quad _end - start /* Effective size of kernel image, little-endian */ .quad __HEAD_FLAGS /* Informative flags, little-endian */ @@ -223,7 +224,7 @@ section_table: .align 5 #endif /* CONFIG_ARM_EFI */ -real_start: +FUNC_LOCAL(real_start) /* BSS should be zeroed when booting without EFI */ mov x26, #0 /* x26 := skip_zero_bss */ @@ -263,9 +264,9 @@ primary_switched: mov x1, x21 /* x1 := paddr(FDT) */ ldr x2, =start_xen b launch -ENDPROC(real_start) +END(real_start) -GLOBAL(init_secondary) +FUNC(init_secondary) msr DAIFSet, 0xf /* Disable all interrupts */ /* Find out where we are */ @@ -304,7 +305,7 @@ secondary_switched: /* Jump to C world */ ldr x2, =start_secondary b launch -ENDPROC(init_secondary) +END(init_secondary) /* * Check if the CPU has been booted in Hypervisor mode. @@ -313,7 +314,7 @@ ENDPROC(init_secondary) * * Clobbers x0 - x5 */ -check_cpu_mode: +FUNC_LOCAL(check_cpu_mode) PRINT_ID("- Current EL ") mrs x5, CurrentEL print_reg x5 @@ -329,7 +330,7 @@ check_cpu_mode: PRINT_ID("- Xen must be entered in NS EL2 mode -\r\n") PRINT_ID("- Please update the bootloader -\r\n") b fail -ENDPROC(check_cpu_mode) +END(check_cpu_mode) /* * Zero BSS @@ -339,7 +340,7 @@ ENDPROC(check_cpu_mode) * * Clobbers x0 - x3 */ -zero_bss: +FUNC_LOCAL(zero_bss) /* Zero BSS only when requested */ cbnz x26, skip_bss @@ -353,14 +354,14 @@ zero_bss: skip_bss: ret -ENDPROC(zero_bss) +END(zero_bss) /* * Initialize the processor for turning the MMU on. * * Clobbers x0 - x3 */ -cpu_init: +FUNC_LOCAL(cpu_init) PRINT_ID("- Initialize CPU -\r\n") /* Set up memory attribute type tables */ @@ -399,7 +400,7 @@ cpu_init: */ msr spsel, #1 ret -ENDPROC(cpu_init) +END(cpu_init) /* * Setup the initial stack and jump to the C world @@ -411,7 +412,7 @@ ENDPROC(cpu_init) * * Clobbers x3 */ -launch: +FUNC_LOCAL(launch) ldr x3, =init_data add x3, x3, #INITINFO_stack /* Find the boot-time stack */ ldr x3, [x3] @@ -421,13 +422,14 @@ launch: /* Jump to C world */ br x2 -ENDPROC(launch) +END(launch) /* Fail-stop */ -fail: PRINT_ID("- Boot failed -\r\n") +FUNC_LOCAL(fail) + PRINT_ID("- Boot failed -\r\n") 1: wfe b 1b -ENDPROC(fail) +END(fail) #ifdef CONFIG_EARLY_PRINTK /* @@ -438,14 +440,14 @@ ENDPROC(fail) * * Clobbers x0 - x1 */ -init_uart: +FUNC_LOCAL(init_uart) ldr x23, =CONFIG_EARLY_UART_BASE_ADDRESS #ifdef CONFIG_EARLY_UART_INIT early_uart_init x23, 0 #endif PRINT("- UART enabled -\r\n") ret -ENDPROC(init_uart) +END(init_uart) /* * Print early debug messages. @@ -454,7 +456,7 @@ ENDPROC(init_uart) * x23: Early UART base address * Clobbers x0-x1 */ -ENTRY(asm_puts) +FUNC(asm_puts) early_uart_ready x23, 1 ldrb w1, [x0], #1 /* Load next char */ cbz w1, 1f /* Exit on nul */ @@ -462,7 +464,7 @@ ENTRY(asm_puts) b asm_puts 1: ret -ENDPROC(asm_puts) +END(asm_puts) /* * Print a 64-bit number in hex. @@ -471,7 +473,7 @@ ENDPROC(asm_puts) * x23: Early UART base address * Clobbers x0-x3 */ -ENTRY(asm_putn) +FUNC(asm_putn) adr_l x1, hex mov x3, #16 1: @@ -484,7 +486,7 @@ ENTRY(asm_putn) subs x3, x3, #1 b.ne 1b ret -ENDPROC(asm_putn) +END(asm_putn) RODATA_SECT(.rodata.idmap, hex, "0123456789abcdef") @@ -493,16 +495,17 @@ RODATA_SECT(.rodata.idmap, hex, "0123456789abcdef") /* This provides a C-API version of __lookup_processor_type * TODO: For now, the implementation return NULL every time */ -ENTRY(lookup_processor_type) +FUNC(lookup_processor_type) mov x0, #0 ret +END(lookup_processor_type) #ifdef CONFIG_ARM_EFI /* * Function to transition from EFI loader in C, to Xen entry point. * void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); */ -ENTRY(efi_xen_start) +FUNC(efi_xen_start) /* * Preserve x0 (fdt pointer) across call to __flush_dcache_area, * restore for entry into Xen. @@ -554,7 +557,7 @@ ENTRY(efi_xen_start) mov x26, #1 /* x26 := skip_zero_bss */ b real_start_efi -ENDPROC(efi_xen_start) +END(efi_xen_start) #endif /* CONFIG_ARM_EFI */ From patchwork Sat May 4 11:55:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13664402 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 01576C25B7A for ; Tue, 14 May 2024 20:17:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.721733.1125383 (Exim 4.92) (envelope-from ) id 1s6yao-00046s-4t; Tue, 14 May 2024 20:17:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 721733.1125383; Tue, 14 May 2024 20:17:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yao-00046j-0M; Tue, 14 May 2024 20:17:46 +0000 Received: by outflank-mailman (input) for mailman id 721733; Tue, 14 May 2024 20:17:45 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yan-0002pZ-2K for xen-devel@lists.xenproject.org; Tue, 14 May 2024 20:17:45 +0000 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [2a00:1450:4864:20::333]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 05323461-122f-11ef-b4bb-af5377834399; Tue, 14 May 2024 22:17:43 +0200 (CEST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-41fd5dc0480so38210245e9.1 for ; Tue, 14 May 2024 13:17:43 -0700 (PDT) Received: from gmail.com ([213.0.35.158]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fe9599294sm69564455e9.1.2024.05.14.13.17.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 13:17:40 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 05323461-122f-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715717862; x=1716322662; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iiprdCUaZ8IPJ2HAIHBPs+piSKbOcZYN0PLf+5sc450=; b=k9unhmmTPO3p28/dnEDtn1vC/ltlQJxpdKiYl7iY4uz4VG7mJp/icIuwcK0JxNEz4w yqxUsGiQj5CmX8nnWrNGioYdYfeIR5nIB7r1Vlu0sjVihXeu2xgv3xxqzlD/xODuk31Y L3QXA0vjvc1fc3TLhL9F1wVMc4WJ0A7eyQmvJcIoJOYQI3SqG92iUknKBc0DX1HIIwmD p6kRkSCIGqesR+Q/TR4zQeVFuNMsQ6L475jTvT2KkumAjJ1CnNlC35PhgoWld1g1Ly9y GLlYK8BsivE1CkLsgcgftEHwbDBP8cwHcaRGjEftGfZHZN1adVssMFZOOA7/wGerXFBf 7cWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715717862; x=1716322662; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iiprdCUaZ8IPJ2HAIHBPs+piSKbOcZYN0PLf+5sc450=; b=ByzVUxFsNqGd1I6fRAP4946mEr9LdA2f7SzE9PZ19CXWRyblylf1AVMVABFjTVTqq+ RWyYUxpGsCvZQQ9aptHjmZnZ9FT0m7BL1kv0OiaODkXtM6vUhfO3z+qzbWk2YAwdiiN2 dnV0N5lTwmCPwi+ANXd5UIeeYfzFBdeLgMKnDXvHtWNxYglsIXs9DrZ7h5H7RDHHkHCF ik4YrUJsTuPmaMTBhB0fUS+r7k8R3D5Vbw6I3eeorczCzf1DvW4BtP2nk7ZJJl+RLDqL xU9Sj5cCpPMe4ThzOqZhUsFUY0d6epfpyLqy4geSA4jB4n2FKufPmfNAHaT1p/fr+Tjn 5+bw== X-Gm-Message-State: AOJu0Yw9PmcsxfEvewpVufibMeWBu9nQDlZOI5pQSat8nXOKwEcQ25Rv iMcw67YEqr7bJrYC2j03Ro3O2lIJ76lxRf1ASaZ6ol1fZyeDa5Ep5gxI3mdhu1g= X-Google-Smtp-Source: AGHT+IEgatADuwMOnHbGVnd50bJVk3aJQ122Wq/nW+vPJftub6+X/YV1Ttxp9uUzAs9H5gXfHezQ9w== X-Received: by 2002:a05:600c:3548:b0:41a:9a6a:41e1 with SMTP id 5b1f17b1804b1-41feac5a3c3mr88789995e9.29.1715717862394; Tue, 14 May 2024 13:17:42 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, bertrand.marquis@arm.com, michal.orzel@amd.com, Volodymyr_Babchuk@epam.com, jbeulich@suse.com, andrew.cooper3@citrix.com, edgar.iglesias@amd.com Subject: [PATCH v4 5/9] xen/arm64: debug: Add missing code symbol annotations Date: Sat, 4 May 2024 13:55:10 +0200 Message-Id: <20240504115514.1063509-6-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240504115514.1063509-1-edgar.iglesias@gmail.com> References: <20240504115514.1063509-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/debug.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/debug.S b/xen/arch/arm/arm64/debug.S index 71cad9d762..c3d02c33d7 100644 --- a/xen/arch/arm/arm64/debug.S +++ b/xen/arch/arm/arm64/debug.S @@ -27,17 +27,19 @@ * Print a character on the UART - this function is called by C * x0: character to print */ -GLOBAL(early_putch) +FUNC(early_putch) ldr x15, =EARLY_UART_VIRTUAL_ADDRESS early_uart_ready x15, 1 early_uart_transmit x15, w0 ret +END(early_putch) /* Flush the UART - this function is called by C */ -GLOBAL(early_flush) +FUNC(early_flush) ldr x15, =EARLY_UART_VIRTUAL_ADDRESS /* x15 := VA UART base address */ early_uart_ready x15, 1 ret +END(early_flush) /* * Local variables: From patchwork Sat May 4 11:55:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13664406 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4AA2BC04FFE for ; Tue, 14 May 2024 20:17:57 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.721734.1125392 (Exim 4.92) (envelope-from ) id 1s6yar-0004Sh-F8; Tue, 14 May 2024 20:17:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 721734.1125392; Tue, 14 May 2024 20:17:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yar-0004SQ-BX; Tue, 14 May 2024 20:17:49 +0000 Received: by outflank-mailman (input) for mailman id 721734; Tue, 14 May 2024 20:17:48 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yaq-0002pc-2i for xen-devel@lists.xenproject.org; Tue, 14 May 2024 20:17:48 +0000 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [2a00:1450:4864:20::32f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 07be9db2-122f-11ef-909d-e314d9c70b13; Tue, 14 May 2024 22:17:47 +0200 (CEST) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-420116a6652so23635155e9.2 for ; Tue, 14 May 2024 13:17:47 -0700 (PDT) Received: from gmail.com ([213.0.35.158]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42013bf1a5dsm100159525e9.30.2024.05.14.13.17.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 13:17:43 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 07be9db2-122f-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715717867; x=1716322667; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1717D7j7Li0LpnJckxTcnvPunZIbhAasL7O0x4ESCyw=; b=k1QEDIxWIsN/Y5whsuTQFD0jUS/JyoVIouGDI8MpJ++ebF9RW2Puo/OU875R4Kp/bM W7pQwqoiKbIDz7Mbf/lzzJ3iRBhKFHDq33FzStFgET3nTNmZWlgJs+OQVub8NsO98FQP rXs085R87JgUCJoAS4HsmpK23A5vQl/xVNH7A9s1Trppm1t/ydFsPjPXl+peCFkMHAEf PBaQLfO7P3Lh2Wd2XkItUIGwIL1+NGJfbofLCdkA/G1CYTKPUOYn9SNjdYAj8lusIK5j /B69xk5FyHQq3SorjZEPf5+yCrP/es9cOEauUjk5AeYFF7n9t7Yzr4MjmocXpRRuNuz7 pYow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715717867; x=1716322667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1717D7j7Li0LpnJckxTcnvPunZIbhAasL7O0x4ESCyw=; b=t2VDvpm7Rvv9uEjGhPjJXTkBkExBB6KYU1UDwvMm6HhXcCVxCQEwBVpFMw4A0ntClB NRxdrKG9cy0aoH/QGzjuYh1d/ijwNi05U1/Tgvl066YSS9mAlEQP3FvAH3XDmSLgBfwo peH//LfCdpWPO4TtYsOBK7Mm2jas+fnf8h730/ahj/jx2DsFGRiyWL4NQd6zgLHDubGU JHVd77QcHPRs/AXL8QtP4mux/koqn7Pbqnik/bMsFpsw6JxOGmJiwzowtWok7RL8aWng vYEa+uYIRz24i7Sc4JeZohcjlTq9L0c9y1RyFr9MZW2r1n/cHnxxRehxEm+5fy500s88 y7Kg== X-Gm-Message-State: AOJu0YzT98Kh84YJk1TS4eN1hCRMl0CXT8aue+UiXFwKfRtqRl6TCSnO /B/Nu5w3zhlEMWm88jyhyiApUHVsuNTxCkxIWq3zOG8Ww2GRwtBVLJydoAdWdqQ= X-Google-Smtp-Source: AGHT+IGRh/W5Wv2GrhvlWrUjkBkCL2R4hNYgf3565GfKmcqojKnIg9g6JVwPHXk2eVzSaWDGoc/4jQ== X-Received: by 2002:a05:600c:4f92:b0:420:177f:c2a6 with SMTP id 5b1f17b1804b1-420177fc636mr46639105e9.10.1715717866670; Tue, 14 May 2024 13:17:46 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, bertrand.marquis@arm.com, michal.orzel@amd.com, Volodymyr_Babchuk@epam.com, jbeulich@suse.com, andrew.cooper3@citrix.com, edgar.iglesias@amd.com Subject: [PATCH v4 6/9] xen/arm64: bpi: Add missing code symbol annotations Date: Sat, 4 May 2024 13:55:11 +0200 Message-Id: <20240504115514.1063509-7-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240504115514.1063509-1-edgar.iglesias@gmail.com> References: <20240504115514.1063509-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/bpi.S | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/arm64/bpi.S b/xen/arch/arm/arm64/bpi.S index 4e63825220..d6b8defb80 100644 --- a/xen/arch/arm/arm64/bpi.S +++ b/xen/arch/arm/arm64/bpi.S @@ -52,14 +52,15 @@ * micro-architectures in a system. */ .align 11 -ENTRY(__bp_harden_hyp_vecs_start) +FUNC(__bp_harden_hyp_vecs_start) .rept 4 vectors hyp_traps_vector .endr -ENTRY(__bp_harden_hyp_vecs_end) +LABEL(__bp_harden_hyp_vecs_end) +END(__bp_harden_hyp_vecs_start) .macro mitigate_spectre_bhb_loop count -ENTRY(__mitigate_spectre_bhb_loop_start_\count) +FUNC(__mitigate_spectre_bhb_loop_start_\count) stp x0, x1, [sp, #-16]! mov x0, \count .Lspectre_bhb_loop\@: @@ -68,11 +69,12 @@ ENTRY(__mitigate_spectre_bhb_loop_start_\count) b.ne .Lspectre_bhb_loop\@ sb ldp x0, x1, [sp], #16 -ENTRY(__mitigate_spectre_bhb_loop_end_\count) +LABEL(__mitigate_spectre_bhb_loop_end_\count) +END(__mitigate_spectre_bhb_loop_start_\count) .endm .macro smccc_workaround num smcc_id -ENTRY(__smccc_workaround_smc_start_\num) +FUNC(__smccc_workaround_smc_start_\num) sub sp, sp, #(8 * 4) stp x0, x1, [sp, #(8 * 2)] stp x2, x3, [sp, #(8 * 0)] @@ -81,13 +83,15 @@ ENTRY(__smccc_workaround_smc_start_\num) ldp x2, x3, [sp, #(8 * 0)] ldp x0, x1, [sp, #(8 * 2)] add sp, sp, #(8 * 4) -ENTRY(__smccc_workaround_smc_end_\num) +LABEL(__smccc_workaround_smc_end_\num) +END(__smccc_workaround_smc_start_\num) .endm -ENTRY(__mitigate_spectre_bhb_clear_insn_start) +FUNC(__mitigate_spectre_bhb_clear_insn_start) clearbhb isb -ENTRY(__mitigate_spectre_bhb_clear_insn_end) +LABEL(__mitigate_spectre_bhb_clear_insn_end) +END(__mitigate_spectre_bhb_clear_insn_start) mitigate_spectre_bhb_loop 8 mitigate_spectre_bhb_loop 24 From patchwork Sat May 4 11:55:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13664407 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5D798C04FFE for ; Tue, 14 May 2024 20:18:00 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.721735.1125402 (Exim 4.92) (envelope-from ) id 1s6yas-0004jB-Ou; Tue, 14 May 2024 20:17:50 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 721735.1125402; Tue, 14 May 2024 20:17:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yas-0004ie-Kp; Tue, 14 May 2024 20:17:50 +0000 Received: by outflank-mailman (input) for mailman id 721735; Tue, 14 May 2024 20:17:49 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yar-0002pc-MN for xen-devel@lists.xenproject.org; Tue, 14 May 2024 20:17:49 +0000 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [2a00:1450:4864:20::433]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 08a85208-122f-11ef-909d-e314d9c70b13; Tue, 14 May 2024 22:17:49 +0200 (CEST) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-351ae94323aso2848538f8f.0 for ; Tue, 14 May 2024 13:17:49 -0700 (PDT) Received: from gmail.com ([213.0.35.158]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502bbc56b7sm14402146f8f.114.2024.05.14.13.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 13:17:47 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 08a85208-122f-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715717868; x=1716322668; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G6nqh6fc2e8at7xBm6/0+3HSkQQZqnB7HPpzJ3rGv88=; b=igu+TTA351Gf6tHAdpHS/PegK1OViJ4NGxAzPqJBbMYgByE758pwNRc7tE0gPXUEWf Q5tO0511s8KcR0y4PS4wv6d5p6b/LuG9lKRhKc+8x0agV+jG/OGPHih5aa85mpMeKPS+ OGntoqb23pEXnfHB/fJmBdAsQrbR6otM/A4nAFhVJYCbRte0Ax+bLd1i8qe0BaCXv0TC Dubl+1ABy3L7FODWdBFvsRWcqC3LEebpWPz3cxioS485d/vCuUYkfhM5oF/2a0piidDw BLgVy4iulo2I2nMd3ygyf9VwlSPe/oBWvAn8F2a4ihLew6Hv2jiSVv1cHRZfHei55cEk qQ9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715717868; x=1716322668; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G6nqh6fc2e8at7xBm6/0+3HSkQQZqnB7HPpzJ3rGv88=; b=q/Mx6Yj9gBCLd9nVUumilm5GWMCW3gUb5WbsYJ969Gu2xsNiSjK1XD04l2bERxWbmz tt1R8UXkWXUAKbsjzMHibLPlKVXfD8lXtNm4tXPvjAG7axku+WoPaaf2Lay//i1/SnrE iSgRmCcC3zPv9GtlCN2ObpwAmRXUnE4RLiSJVEhcttiXbzAdW07OFbx6rCNbQfglvE/Q LhYRFu3JomLgTZ6VnGHnfxBjoBj5RQg48uutjGA2KKtPsEttbEbMROOky/aEEZAWt4o+ xO9rcfPloh8xi93d6fAHeRvq25Yxp1QvRbRC41sw52QmI+Nx8ifb5rf9+QjUuYNlzFvA YTTA== X-Gm-Message-State: AOJu0YxXlZKoNycCUnmXLqiu0i70I4IbQomGIhgFy066GJQInbxOoVq6 +MlNqWilUBMYH0Se3FdhlfpxqD/im39K+TlI0Gud7vEykclaGrankEqR4QPH1GM= X-Google-Smtp-Source: AGHT+IHdh4XOg68Cp20JCc05AVisIn5+J16veP2rN6473ADgexjnvxIX4EWyaFtMQdkflILXmib/Zg== X-Received: by 2002:adf:f10e:0:b0:350:484f:fe1a with SMTP id ffacd0b85a97d-3504a61c512mr10328931f8f.11.1715717867981; Tue, 14 May 2024 13:17:47 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, bertrand.marquis@arm.com, michal.orzel@amd.com, Volodymyr_Babchuk@epam.com, jbeulich@suse.com, andrew.cooper3@citrix.com, edgar.iglesias@amd.com Subject: [PATCH v4 7/9] xen/arm64: mmu/head: Add missing code symbol annotations Date: Sat, 4 May 2024 13:55:12 +0200 Message-Id: <20240504115514.1063509-8-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240504115514.1063509-1-edgar.iglesias@gmail.com> References: <20240504115514.1063509-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Use the generic xen/linkage.h macros to annotate code symbols and add missing annotations. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/mmu/head.S | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/arm64/mmu/head.S b/xen/arch/arm/arm64/mmu/head.S index fa40b696dd..665a51a337 100644 --- a/xen/arch/arm/arm64/mmu/head.S +++ b/xen/arch/arm/arm64/mmu/head.S @@ -138,7 +138,7 @@ * * Clobbers x0 - x4 */ -create_page_tables: +FUNC_LOCAL(create_page_tables) /* Prepare the page-tables for mapping Xen */ ldr x0, =XEN_VIRT_START create_table_entry boot_pgtable, boot_first, x0, 0, x1, x2, x3 @@ -260,7 +260,7 @@ virtphys_clash: /* Identity map clashes with boot_third, which we cannot handle yet */ PRINT("- Unable to build boot page tables - virt and phys addresses clash. -\r\n") b fail -ENDPROC(create_page_tables) +END(create_page_tables) /* * Turn on the Data Cache and the MMU. The function will return on the 1:1 @@ -273,7 +273,7 @@ ENDPROC(create_page_tables) * * Clobbers x0 - x5 */ -enable_mmu: +FUNC_LOCAL(enable_mmu) mov x4, x0 mov x5, x1 PRINT_ID("- Turning on paging -\r\n") @@ -304,7 +304,7 @@ enable_mmu: PRINT_ID("- Paging turned on -\r\n") ret -ENDPROC(enable_mmu) +END(enable_mmu) /* * Enable mm (turn on the data cache and the MMU) for secondary CPUs. @@ -316,7 +316,7 @@ ENDPROC(enable_mmu) * * Clobbers x0 - x6 */ -ENTRY(enable_secondary_cpu_mm) +FUNC(enable_secondary_cpu_mm) mov x6, lr load_paddr x0, init_ttbr @@ -328,7 +328,7 @@ ENTRY(enable_secondary_cpu_mm) /* Return to the virtual address requested by the caller. */ ret -ENDPROC(enable_secondary_cpu_mm) +END(enable_secondary_cpu_mm) /* * Enable mm (turn on the data cache and the MMU) for the boot CPU. @@ -340,7 +340,7 @@ ENDPROC(enable_secondary_cpu_mm) * * Clobbers x0 - x6 */ -ENTRY(enable_boot_cpu_mm) +FUNC(enable_boot_cpu_mm) mov x6, lr bl create_page_tables @@ -365,7 +365,7 @@ ENTRY(enable_boot_cpu_mm) * by the caller. */ b remove_identity_mapping -ENDPROC(enable_boot_cpu_mm) +END(enable_boot_cpu_mm) /* * Remove the 1:1 map from the page-tables. It is not easy to keep track @@ -377,7 +377,7 @@ ENDPROC(enable_boot_cpu_mm) * * Clobbers x0 - x1 */ -remove_identity_mapping: +FUNC_LOCAL(remove_identity_mapping) /* * Find the zeroeth slot used. Remove the entry from zeroeth * table if the slot is not XEN_ZEROETH_SLOT. @@ -419,20 +419,21 @@ identity_mapping_removed: flush_xen_tlb_local ret -ENDPROC(remove_identity_mapping) +END(remove_identity_mapping) /* Fail-stop */ -fail: PRINT("- Boot failed -\r\n") +FUNC_LOCAL(fail) + PRINT("- Boot failed -\r\n") 1: wfe b 1b -ENDPROC(fail) +END(fail) /* * Switch TTBR * * x0 ttbr */ -ENTRY(switch_ttbr_id) +FUNC(switch_ttbr_id) /* 1) Ensure any previous read/write have completed */ dsb ish isb @@ -464,7 +465,7 @@ ENTRY(switch_ttbr_id) isb ret -ENDPROC(switch_ttbr_id) +END(switch_ttbr_id) /* * Local variables: From patchwork Sat May 4 11:55:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13664408 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BF86AC25B75 for ; Tue, 14 May 2024 20:18:00 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.721736.1125412 (Exim 4.92) (envelope-from ) id 1s6yav-00056D-4W; Tue, 14 May 2024 20:17:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 721736.1125412; Tue, 14 May 2024 20:17:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yau-00055t-W3; Tue, 14 May 2024 20:17:52 +0000 Received: by outflank-mailman (input) for mailman id 721736; Tue, 14 May 2024 20:17:52 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yau-0002pZ-0F for xen-devel@lists.xenproject.org; Tue, 14 May 2024 20:17:52 +0000 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [2a00:1450:4864:20::42b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 09685cae-122f-11ef-b4bb-af5377834399; Tue, 14 May 2024 22:17:50 +0200 (CEST) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3504ad82a64so906570f8f.3 for ; Tue, 14 May 2024 13:17:50 -0700 (PDT) Received: from gmail.com ([213.0.35.158]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502b8a781asm14391479f8f.60.2024.05.14.13.17.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 13:17:48 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 09685cae-122f-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715717869; x=1716322669; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UTCkkC5/83lm5FIVPOAdJc+T+IQBpLJenacee+31hfg=; b=S++4pqcCdiEzDfsoMSHYyD8QEbUgxmtIvG7lKcDzRD79pKr6MSTQhVmJg7tluOfW5h PZ6GMPSWT2fTsFFoXiALOMUzf/fejz0C7CgCIIl1lxqdWgXtOW3XUULOH4+vtcWnjVQp o6WyPz/jqV7WTg3PTnr4AP/aYL9hrfNo2cV2WB+1GEUaPvCjbu9Kcr2tYKpMVzdxuFgO DlVrD0QPx5aV5RjYeAW2JheSeOGslY9NZDU56EayCaAQezVewjk41Ueyiy8rWU2ZOw9s PpMaWOUOWwIrJAUEdtyRZr0WwcnCVA9Nxk5xcltiZlS0+aqcqEW16u917KyFRBbCIs+P xH8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715717869; x=1716322669; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UTCkkC5/83lm5FIVPOAdJc+T+IQBpLJenacee+31hfg=; b=AM5adtUd8IilJIsjb7w19YyCNGpPjq6LjNAjsRneNBgj4FT3gawT8F36NGcd/xOHag Dr1Zgh6lelcklJtHUcHydX94kA/CWEIdpwOCke7HR+RtmWi6KGg8xPBjYv86TNZydlw1 i3huyk7P7Si0iGwQ9uJKk/B2nNuIaALqRZLx/WnnAYgpLysJ/ZLq4pvXeW35KoeIChWS PjqLH0DZcAunCUzB5XVWgCWFHx9bcicQKFOjuRkopoYF4/bc61OmHPnRipYrwViPZWqu 9eMdTF8G2xQw9G9SmPXqRMNP8V/kKsesE09z6QGwL8TXH/6CTfLXvEaN3sONcQR7wFp4 CtJA== X-Gm-Message-State: AOJu0YxKJt1jhGg8iDbVBdbnPzCO32Q2C1SZwL/r/ZslKVHh3f9qRTzM /35333NzRhwSVa3ZcXYxahL3cu5AKDHwto3FNyOJ7WA6IUqDolDchaIg7XDbqSo= X-Google-Smtp-Source: AGHT+IF20G/v0oHsqh6yp0IUZm9ugRLi2VmhlB17neNBBFPDQMOljh8mtnwhP0tivXMW3PxJx7mSxw== X-Received: by 2002:adf:f788:0:b0:349:eeaf:3a01 with SMTP id ffacd0b85a97d-3504a632de1mr8881343f8f.22.1715717869448; Tue, 14 May 2024 13:17:49 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, bertrand.marquis@arm.com, michal.orzel@amd.com, Volodymyr_Babchuk@epam.com, jbeulich@suse.com, andrew.cooper3@citrix.com, edgar.iglesias@amd.com Subject: [PATCH v4 8/9] xen/arm64: cache: Use the generic xen/linkage.h macros Date: Sat, 4 May 2024 13:55:13 +0200 Message-Id: <20240504115514.1063509-9-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240504115514.1063509-1-edgar.iglesias@gmail.com> References: <20240504115514.1063509-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Use the generic xen/linkage.h macros to annotate code symbols. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/cache.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/cache.S b/xen/arch/arm/arm64/cache.S index 9a88a2b497..66ed85f735 100644 --- a/xen/arch/arm/arm64/cache.S +++ b/xen/arch/arm/arm64/cache.S @@ -40,7 +40,7 @@ * - kaddr - kernel address * - size - size in question */ -ENTRY(__flush_dcache_area) +FUNC(__flush_dcache_area) dcache_line_size x2, x3 add x1, x0, x1 sub x3, x2, #1 @@ -51,4 +51,4 @@ ENTRY(__flush_dcache_area) b.lo 1b dsb sy ret -ENDPROC(__flush_dcache_area) +END(__flush_dcache_area) From patchwork Sat May 4 11:55:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13664409 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A4B26C04FFE for ; Tue, 14 May 2024 20:18:03 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.721737.1125421 (Exim 4.92) (envelope-from ) id 1s6yax-0005Uv-HH; Tue, 14 May 2024 20:17:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 721737.1125421; Tue, 14 May 2024 20:17:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yax-0005Uj-Cv; Tue, 14 May 2024 20:17:55 +0000 Received: by outflank-mailman (input) for mailman id 721737; Tue, 14 May 2024 20:17:53 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s6yav-0002pZ-SY for xen-devel@lists.xenproject.org; Tue, 14 May 2024 20:17:53 +0000 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [2a00:1450:4864:20::42a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 0a60cb18-122f-11ef-b4bb-af5377834399; Tue, 14 May 2024 22:17:52 +0200 (CEST) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-34da35cd01cso5610277f8f.2 for ; Tue, 14 May 2024 13:17:52 -0700 (PDT) Received: from gmail.com ([213.0.35.158]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502b8a77easm14449404f8f.53.2024.05.14.13.17.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 13:17:49 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 0a60cb18-122f-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715717871; x=1716322671; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JCSDJt2hMmc69IRlsT9xTwbRCbI4uAHpKe8NaeMrf5E=; b=npiz4V1TpPyr1NaX5wz9BTV8T9pLHHjIfnAH2dKAwKcNqlSZrxA3D6ZCCM3FGITpVU slb0f/EA5qyiW2lj99fX7DcTanYkUnkYsbzVe1eoHNDrI0W9DHQprj6arqFK3/bXigw4 QiDQ2ihN1AV9DG6F5PF5BHNo+rBXKteVcRFUtRSvdkzHYjP1ea3dE+sOxiS7a138aW0h ssvGPeDGA9hrwCcHThy37Xc3r3I3/W3aP5bfONZNzhe1JlHoCkltUJQdHiY1LZ/Qw0Ob Qbhq7jiQQKvNaQjZtYcDDz9kw4c0w+o3NJsI7ZdvhleofMMRbPnObKu5QWD9pX2HOZFm FfNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715717871; x=1716322671; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JCSDJt2hMmc69IRlsT9xTwbRCbI4uAHpKe8NaeMrf5E=; b=eWHRYPmYD+lEj3DNGuLLo3VedDAKehUKU6eZFRYQrp+lTtcsf1RqZY9xGEFc7WMKkI HzDVvlTVjwS9+RrB0QwY98SPr/2mPuBHcprlfc2td0frnRCBdnyLQ7pyMea0LyQowkbl JcpxCQT5qZo5IHgEHxTMD0FtK6cFzYrzjsEBqrYW17eoP9DOAOHE2dUB12kLHyo9328b Dh76LqvoJLqXOkUZ0UT9Y4NZ1fGaAXl4O7bLpxCbBMJ6gi0oh0fUZin814t9fckJcQrV YFNOO4YF0vx6/IaifskKvL//P65S8qPLfGsc/Qru+y94l8TB7O6F3K/1NkAB8PkamYxK uveg== X-Gm-Message-State: AOJu0YwC5w3Ga9MGDOpkp85sr3FAZ6utBQ1OaO7aovpv4Rk5qp5zTbVQ Hr3l+127ZIShBCJNu6dNwCgUxqpVdHeT5DuLow8yKY8/WgAuGWsd6aZ97M9+8rg= X-Google-Smtp-Source: AGHT+IEuJF3MSyUJ1H11afBcmSASfkLnxpTxrxB73BUnHkVzyKDDCPRiRj69qmBLVG/4AN8MGtvEBQ== X-Received: by 2002:a5d:5908:0:b0:34e:93c1:7979 with SMTP id ffacd0b85a97d-3504a73e607mr10716553f8f.38.1715717870752; Tue, 14 May 2024 13:17:50 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, julien@xen.org, bertrand.marquis@arm.com, michal.orzel@amd.com, Volodymyr_Babchuk@epam.com, jbeulich@suse.com, andrew.cooper3@citrix.com, edgar.iglesias@amd.com Subject: [PATCH v4 9/9] xen/arm64: lib: Use the generic xen/linkage.h macros Date: Sat, 4 May 2024 13:55:14 +0200 Message-Id: <20240504115514.1063509-10-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240504115514.1063509-1-edgar.iglesias@gmail.com> References: <20240504115514.1063509-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Use the generic xen/linkage.h macros to annotate code symbols. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- xen/arch/arm/arm64/lib/memchr.S | 4 ++-- xen/arch/arm/arm64/lib/memcmp.S | 4 ++-- xen/arch/arm/arm64/lib/memcpy.S | 4 ++-- xen/arch/arm/arm64/lib/memmove.S | 4 ++-- xen/arch/arm/arm64/lib/memset.S | 4 ++-- xen/arch/arm/arm64/lib/strchr.S | 4 ++-- xen/arch/arm/arm64/lib/strcmp.S | 4 ++-- xen/arch/arm/arm64/lib/strlen.S | 4 ++-- xen/arch/arm/arm64/lib/strncmp.S | 4 ++-- xen/arch/arm/arm64/lib/strnlen.S | 4 ++-- xen/arch/arm/arm64/lib/strrchr.S | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/xen/arch/arm/arm64/lib/memchr.S b/xen/arch/arm/arm64/lib/memchr.S index 81f113bb1c..3d8aeca3ca 100644 --- a/xen/arch/arm/arm64/lib/memchr.S +++ b/xen/arch/arm/arm64/lib/memchr.S @@ -29,7 +29,7 @@ * Returns: * x0 - address of first occurrence of 'c' or 0 */ -ENTRY(memchr) +FUNC(memchr) and w1, w1, #0xff 1: subs x2, x2, #1 b.mi 2f @@ -40,4 +40,4 @@ ENTRY(memchr) ret 2: mov x0, #0 ret -ENDPROC(memchr) +END(memchr) diff --git a/xen/arch/arm/arm64/lib/memcmp.S b/xen/arch/arm/arm64/lib/memcmp.S index 87c2537ffe..d77dd4ce52 100644 --- a/xen/arch/arm/arm64/lib/memcmp.S +++ b/xen/arch/arm/arm64/lib/memcmp.S @@ -57,7 +57,7 @@ pos .req x11 limit_wd .req x12 mask .req x13 -ENTRY(memcmp) +FUNC(memcmp) cbz limit, .Lret0 eor tmp1, src1, src2 tst tmp1, #7 @@ -254,4 +254,4 @@ CPU_LE( rev data2, data2 ) .Lret0: mov result, #0 ret -ENDPROC(memcmp) +END(memcmp) diff --git a/xen/arch/arm/arm64/lib/memcpy.S b/xen/arch/arm/arm64/lib/memcpy.S index d90d20ef3e..1e04b79010 100644 --- a/xen/arch/arm/arm64/lib/memcpy.S +++ b/xen/arch/arm/arm64/lib/memcpy.S @@ -55,7 +55,7 @@ C_h .req x12 D_l .req x13 D_h .req x14 -ENTRY(memcpy) +FUNC(memcpy) mov dst, dstin cmp count, #16 /*When memory length is less than 16, the accessed are not aligned.*/ @@ -197,4 +197,4 @@ ENTRY(memcpy) tst count, #0x3f b.ne .Ltail63 ret -ENDPROC(memcpy) +END(memcpy) diff --git a/xen/arch/arm/arm64/lib/memmove.S b/xen/arch/arm/arm64/lib/memmove.S index a49de845d0..14438dbe9c 100644 --- a/xen/arch/arm/arm64/lib/memmove.S +++ b/xen/arch/arm/arm64/lib/memmove.S @@ -56,7 +56,7 @@ C_h .req x12 D_l .req x13 D_h .req x14 -ENTRY(memmove) +FUNC(memmove) cmp dstin, src b.lo memcpy add tmp1, src, count @@ -193,4 +193,4 @@ ENTRY(memmove) tst count, #0x3f b.ne .Ltail63 ret -ENDPROC(memmove) +END(memmove) diff --git a/xen/arch/arm/arm64/lib/memset.S b/xen/arch/arm/arm64/lib/memset.S index 5bf751521b..367fa60175 100644 --- a/xen/arch/arm/arm64/lib/memset.S +++ b/xen/arch/arm/arm64/lib/memset.S @@ -53,7 +53,7 @@ dst .req x8 tmp3w .req w9 tmp3 .req x9 -ENTRY(memset) +FUNC(memset) mov dst, dstin /* Preserve return value. */ and A_lw, val, #255 orr A_lw, A_lw, A_lw, lsl #8 @@ -212,4 +212,4 @@ ENTRY(memset) ands count, count, zva_bits_x b.ne .Ltail_maybe_long ret -ENDPROC(memset) +END(memset) diff --git a/xen/arch/arm/arm64/lib/strchr.S b/xen/arch/arm/arm64/lib/strchr.S index 0506b0ff7f..83fd81e8ef 100644 --- a/xen/arch/arm/arm64/lib/strchr.S +++ b/xen/arch/arm/arm64/lib/strchr.S @@ -27,7 +27,7 @@ * Returns: * x0 - address of first occurrence of 'c' or 0 */ -ENTRY(strchr) +FUNC(strchr) and w1, w1, #0xff 1: ldrb w2, [x0], #1 cmp w2, w1 @@ -37,4 +37,4 @@ ENTRY(strchr) cmp w2, w1 csel x0, x0, xzr, eq ret -ENDPROC(strchr) +END(strchr) diff --git a/xen/arch/arm/arm64/lib/strcmp.S b/xen/arch/arm/arm64/lib/strcmp.S index c6f42dd255..7677108e26 100644 --- a/xen/arch/arm/arm64/lib/strcmp.S +++ b/xen/arch/arm/arm64/lib/strcmp.S @@ -59,7 +59,7 @@ tmp3 .req x9 zeroones .req x10 pos .req x11 -ENTRY(strcmp) +FUNC(strcmp) eor tmp1, src1, src2 mov zeroones, #REP8_01 tst tmp1, #7 @@ -230,4 +230,4 @@ CPU_BE( orr syndrome, diff, has_nul ) lsr data1, data1, #56 sub result, data1, data2, lsr #56 ret -ENDPROC(strcmp) +END(strcmp) diff --git a/xen/arch/arm/arm64/lib/strlen.S b/xen/arch/arm/arm64/lib/strlen.S index fb6aaf1a6a..10feedaf81 100644 --- a/xen/arch/arm/arm64/lib/strlen.S +++ b/xen/arch/arm/arm64/lib/strlen.S @@ -56,7 +56,7 @@ pos .req x12 #define REP8_7f 0x7f7f7f7f7f7f7f7f #define REP8_80 0x8080808080808080 -ENTRY(strlen) +FUNC(strlen) mov zeroones, #REP8_01 bic src, srcin, #15 ands tmp1, srcin, #15 @@ -123,4 +123,4 @@ CPU_LE( lsr tmp2, tmp2, tmp1 ) /* Shift (tmp1 & 63). */ csinv data1, data1, xzr, le csel data2, data2, data2a, le b .Lrealigned -ENDPROC(strlen) +END(strlen) diff --git a/xen/arch/arm/arm64/lib/strncmp.S b/xen/arch/arm/arm64/lib/strncmp.S index a4a0f779f5..c00a641fc7 100644 --- a/xen/arch/arm/arm64/lib/strncmp.S +++ b/xen/arch/arm/arm64/lib/strncmp.S @@ -64,7 +64,7 @@ limit_wd .req x13 mask .req x14 endloop .req x15 -ENTRY(strncmp) +FUNC(strncmp) cbz limit, .Lret0 eor tmp1, src1, src2 mov zeroones, #REP8_01 @@ -307,4 +307,4 @@ CPU_BE( orr syndrome, diff, has_nul ) .Lret0: mov result, #0 ret -ENDPROC(strncmp) +END(strncmp) diff --git a/xen/arch/arm/arm64/lib/strnlen.S b/xen/arch/arm/arm64/lib/strnlen.S index 81c8e8b54e..2059ba782c 100644 --- a/xen/arch/arm/arm64/lib/strnlen.S +++ b/xen/arch/arm/arm64/lib/strnlen.S @@ -59,7 +59,7 @@ limit_wd .req x14 #define REP8_7f 0x7f7f7f7f7f7f7f7f #define REP8_80 0x8080808080808080 -ENTRY(strnlen) +FUNC(strnlen) cbz limit, .Lhit_limit mov zeroones, #REP8_01 bic src, srcin, #15 @@ -168,4 +168,4 @@ CPU_LE( lsr tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */ .Lhit_limit: mov len, limit ret -ENDPROC(strnlen) +END(strnlen) diff --git a/xen/arch/arm/arm64/lib/strrchr.S b/xen/arch/arm/arm64/lib/strrchr.S index 07059983f8..81033c0822 100644 --- a/xen/arch/arm/arm64/lib/strrchr.S +++ b/xen/arch/arm/arm64/lib/strrchr.S @@ -26,7 +26,7 @@ * Returns: * x0 - address of last occurrence of 'c' or 0 */ -ENTRY(strrchr) +FUNC(strrchr) mov x3, #0 and w1, w1, #0xff 1: ldrb w2, [x0], #1 @@ -37,4 +37,4 @@ ENTRY(strrchr) b 1b 2: mov x0, x3 ret -ENDPROC(strrchr) +END(strrchr)