From nobody Tue Feb 10 22:18:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1615651599; cv=none; d=zohomail.com; s=zohoarc; b=ELkSPSIWMVF4BTUpcn7H17N1VxsSKQ0s6Oxf2k9frPYwArhCtfo0q0hDyiceQt81nTMJtHmdO99Z4jlztfeH0RHieYHQXrxo7qdeMwFjkrX4h+4PE9wtIyjZp5LKQto2pCNNdZy3dIHLbT5WTfH2nBWybsPpjeYszcNkf4JKVHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615651599; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=5eKYsHX9wrqCSkZwcu/9vG6xXkJ79FPbMIThxl+msro=; b=Jk6Oi9AzTWQJ/N+Fa3FEG5EGhlw9IxxmWlb1e3oTul91sIqfL0dX2k99lVPHtpgkHg2Ab+RxSSsT0zNxOJ8Vt9/eNFswp4o4XOqe10z7BpjIQPMdiuhObCfptbAh2PKIP4ZFFIKvUH09WBAPvMr64BiPgmz2aRt83FFHzBSjcrM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of 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.zohomail.com with SMTPS id 1615651599277699.3176601605535; Sat, 13 Mar 2021 08:06:39 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.97576.185330 (Exim 4.92) (envelope-from ) id 1lL6mQ-00054P-V9; Sat, 13 Mar 2021 16:06:18 +0000 Received: by outflank-mailman (output) from mailman id 97576.185330; Sat, 13 Mar 2021 16:06:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lL6mQ-00054I-Ra; Sat, 13 Mar 2021 16:06:18 +0000 Received: by outflank-mailman (input) for mailman id 97576; Sat, 13 Mar 2021 16:06:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lL6mO-00053G-QZ for xen-devel@lists.xenproject.org; Sat, 13 Mar 2021 16:06:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lL6mO-0006R1-EL; Sat, 13 Mar 2021 16:06:16 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lL6mO-0001Ff-4b; Sat, 13 Mar 2021 16:06:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=5eKYsHX9wrqCSkZwcu/9vG6xXkJ79FPbMIThxl+msro=; b=st4j9HlvdtT5VnQK/lrhM16Eo p+d+sZIXHQ7eilsMOFfj5Gx1B5ezrBR8/EeDq5uIJkon6iIbU+uWT8TTE3GDtaAGpiQfe1olQzPAs JWDPKX6WtlPcbtMmu7yrai6PISY7f5C3QiqLZ92QthO9O3YsbKuP7Fz13LPcBSqs83qwY=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: bertrand.marquis@arm.com, Julien Grall , Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH for-next v2 1/2] xen/arm: Include asm/asm-offsets.h and asm/macros.h on every assembly files Date: Sat, 13 Mar 2021 16:06:10 +0000 Message-Id: <20210313160611.18665-2-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210313160611.18665-1-julien@xen.org> References: <20210313160611.18665-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall In a follow-up patch we may want to automatically replace some mnemonics (such as ret) with a different sequence. To ensure all the assembly files will include asm/macros.h it is best to automatically include it on single assembly. This can be done via config.h. It was necessary to include a few more headers as dependency: - to define sizeof_* - which is already a latent issue given STACK_ORDER rely on PAGE_SIZE. Unfortunately the build system will use -D__ASSEMBLY__ when generating the linker script. A new option -D__LINKER__ is introduceed and used for the linker script to avoid including headers (such as asm/macros.h) that may not be compatible with the syntax. Lastly, take the opportunity to remove both asm/asm-offsets.h and asm/macros.h from the various assembly files as they are now automagically included. Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis --- xen/arch/arm/Makefile | 2 +- xen/arch/arm/arm32/entry.S | 1 - xen/arch/arm/arm32/head.S | 1 - xen/arch/arm/arm32/proc-v7.S | 1 - xen/arch/arm/arm64/debug-cadence.inc | 1 - xen/arch/arm/arm64/debug-pl011.inc | 2 -- xen/arch/arm/arm64/entry.S | 2 -- xen/arch/arm/arm64/head.S | 2 -- xen/arch/arm/arm64/smc.S | 3 --- xen/include/asm-arm/config.h | 6 ++++++ 10 files changed, 7 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 16e6523e2cc6..9ffc3f771c51 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -135,7 +135,7 @@ asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c $(CC) $(filter-out -flto,$(c_flags)) -S -o $@ $< =20 xen.lds: xen.lds.S - $(CPP) -P $(a_flags) -MQ $@ -o $@ $< + $(CPP) -P $(a_flags) -D__LINKER__ -MQ $@ -o $@ $< =20 dtb.o: $(CONFIG_DTB_FILE) =20 diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S index b228d44b190c..f2f1bc7a3158 100644 --- a/xen/arch/arm/arm32/entry.S +++ b/xen/arch/arm/arm32/entry.S @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index c404fa973e9b..9084023a6ed9 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -18,7 +18,6 @@ */ =20 #include -#include #include =20 #define ZIMAGE_MAGIC_NUMBER 0x016f2818 diff --git a/xen/arch/arm/arm32/proc-v7.S b/xen/arch/arm/arm32/proc-v7.S index 46bfc7a9074c..1efde2d72da0 100644 --- a/xen/arch/arm/arm32/proc-v7.S +++ b/xen/arch/arm/arm32/proc-v7.S @@ -17,7 +17,6 @@ * GNU General Public License for more details. */ =20 -#include #include #include =20 diff --git a/xen/arch/arm/arm64/debug-cadence.inc b/xen/arch/arm/arm64/debu= g-cadence.inc index 7df0abe4756f..0b6f2e094e18 100644 --- a/xen/arch/arm/arm64/debug-cadence.inc +++ b/xen/arch/arm/arm64/debug-cadence.inc @@ -17,7 +17,6 @@ * GNU General Public License for more details. */ =20 -#include #include =20 /* diff --git a/xen/arch/arm/arm64/debug-pl011.inc b/xen/arch/arm/arm64/debug-= pl011.inc index 385deff49b1b..1928a2e3ffbb 100644 --- a/xen/arch/arm/arm64/debug-pl011.inc +++ b/xen/arch/arm/arm64/debug-pl011.inc @@ -16,8 +16,6 @@ * GNU General Public License for more details. */ =20 -#include - /* * PL011 UART initialization * xb: register which containts the UART base address diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index 175ea2981e72..ab9a65fc1475 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -1,6 +1,4 @@ -#include #include -#include #include #include #include diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 5d44667bd89d..fa7a3ffd2926 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -21,11 +21,9 @@ */ =20 #include -#include #include #include #include -#include =20 #define PT_PT 0xf7f /* nG=3D1 AF=3D1 SH=3D11 AP=3D01 NS=3D1 ATTR=3D111= T=3D1 P=3D1 */ #define PT_MEM 0xf7d /* nG=3D1 AF=3D1 SH=3D11 AP=3D01 NS=3D1 ATTR=3D111= T=3D0 P=3D1 */ diff --git a/xen/arch/arm/arm64/smc.S b/xen/arch/arm/arm64/smc.S index b0752be57e8f..91bae62dd4d2 100644 --- a/xen/arch/arm/arm64/smc.S +++ b/xen/arch/arm/arm64/smc.S @@ -13,9 +13,6 @@ * GNU General Public License for more details. */ =20 -#include -#include - /* * void __arm_smccc_1_0_smc(register_t a0, register_t a1, register_t a2, * register_t a3, register_t a4, register_t a5, diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 5c10c755db46..51273b9db1fc 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -69,6 +69,7 @@ #endif =20 #include +#include =20 /* * Common ARM32 and ARM64 layout: @@ -190,6 +191,11 @@ extern unsigned long frametable_virt_end; #define watchdog_disable() ((void)0) #define watchdog_enable() ((void)0) =20 +#if defined(__ASSEMBLY__) && !defined(__LINKER__) +#include +#include +#endif + #endif /* __ARM_CONFIG_H__ */ /* * Local variables: --=20 2.17.1