From nobody Fri Oct 31 18:09:25 2025 Delivered-To: importer@patchew.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=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748945060; cv=pass; d=zohomail.com; s=zohoarc; b=kzgo0e6yTjhLgdoax5quONfnL1nrGyKcsSnzCVwn15/LfiEdljZ8NtQrkONjsQk4lN1YsAK6B/GrQGJebdHQ8zrhq0HgluKSAeEwXQ2LZJfu3yRVRhM059lutqloli0X+lP1wZmQ1dLjwLno59CsuAORf54HAeXnHvZnSaewWHQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748945060; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Qr9xf2waTk4UgPXWOt3Ocr7pR0T3lTFOlQg+2lK/858=; b=ZZrcynocvCaqAedj3QDL1VRlTiHC4TcTHN5goIUkuL9HS+KFHwgbSxSLAvHBH+JpeXuTQ0uu0x26ZZtxB/pIfHLKzE6QltAwX8O4pdDZ4TgvaREyUuHW6+AZvW57cT/j7zdPoghDvDwFeQTlTZQG6O9PpIGw/y9npV5NKtm/oP0= ARC-Authentication-Results: i=2; 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=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748945060290449.6990146514505; Tue, 3 Jun 2025 03:04:20 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1004152.1383834 (Exim 4.92) (envelope-from ) id 1uMOUt-0003PE-8T; Tue, 03 Jun 2025 10:03:55 +0000 Received: by outflank-mailman (output) from mailman id 1004152.1383834; Tue, 03 Jun 2025 10:03: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 1uMOUt-0003P1-4n; Tue, 03 Jun 2025 10:03:55 +0000 Received: by outflank-mailman (input) for mailman id 1004152; Tue, 03 Jun 2025 10:03:54 +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 1uMOUr-00037b-Vm for xen-devel@lists.xenproject.org; Tue, 03 Jun 2025 10:03:53 +0000 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20605.outbound.protection.outlook.com [2a01:111:f403:200a::605]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 0a2ed149-4062-11f0-b894-0df219b8e170; Tue, 03 Jun 2025 12:03:48 +0200 (CEST) Received: from DM6PR11CA0044.namprd11.prod.outlook.com (2603:10b6:5:14c::21) by CH3PR12MB8584.namprd12.prod.outlook.com (2603:10b6:610:164::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.31; Tue, 3 Jun 2025 10:03:44 +0000 Received: from CH3PEPF00000014.namprd21.prod.outlook.com (2603:10b6:5:14c:cafe::cc) by DM6PR11CA0044.outlook.office365.com (2603:10b6:5:14c::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.30 via Frontend Transport; Tue, 3 Jun 2025 10:03:44 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CH3PEPF00000014.mail.protection.outlook.com (10.167.244.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8835.2 via Frontend Transport; Tue, 3 Jun 2025 10:03:44 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 3 Jun 2025 05:03:43 -0500 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Tue, 3 Jun 2025 05:03:41 -0500 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" X-Inumbo-ID: 0a2ed149-4062-11f0-b894-0df219b8e170 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=M1B6PPTuxZx6h1pqtMImihxFsGAAos8WkJX1PXw8rND5XkQTKFsT3VL16kQXBf8Io5uQ3atnztoyk2o51PpXjzWRevirbqUTourMeeY4bkwzQq6ECXbxTWFv5PVjwoivwV0e8A+PQBFIBjhLyaIEtmh3TOvPhDZJ7SqVzpqpoF8JFVwB310S7SA1PNEe2xH7i0w/LITy45UOe824LftQqqtwSuW/YGD/ZvjUaTB3ETplek2rl9kdzgsnWrrUeFxF8RiuP2XvbNANzVNM7in8ROyx3tWwryZhnG2phrrYmNyIsX6qL8smNP/eSFtp3QzwxEAB7Ve1z44oT+MXZnGRcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Qr9xf2waTk4UgPXWOt3Ocr7pR0T3lTFOlQg+2lK/858=; b=LF34vAqrpTyC7UcbamVAVk+S7dM1KazfnNYjpbotztqsTbBTP2195fmP/mSljCcTAk8bqwmdqgZ99SJdPhGPmnKXQmXM0LJ6F/Gu7Ee5gdgAXzQsIktfWYj66iT380E4LU61zZegijonXZ4eR/cvCLac/WEufj224uJq/LfI+FZ6p18LVGtjnpgmxnDNYcDmOX8f3bIyoXeba6OrVtcU9BL1QcQtGWddvtXvl0ZrGU6NsGnSu26G62Uyc5a5Vjy9f7NEdfanY2tV1ZrwKbZohicHtYCyf7vkOX1VYVsZQ2+k3HFndZyAzCiHcomCCpLlwKV41uQEWP6EQPYWz+JvGQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Qr9xf2waTk4UgPXWOt3Ocr7pR0T3lTFOlQg+2lK/858=; b=APm4K0G/JabpAbtn9nWLSIbddAcPWnFGi+uCi0sW62eTZDwYzPl0DojJAAFo+0k2/uK09JxDwRaYQByckOKDjEy6btjvylN0PPPWzj46B0Et8goEnCBOJgYnHOdla5YSkEXVtR6OI8MynEMrlqpLy2cc12TkeNijkp4MbCv6HmY= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Michal Orzel To: CC: Michal Orzel , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk , Andrew Cooper , Anthony PERARD , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH 3/4] device-tree: Move Arm's static-memory feature to common Date: Tue, 3 Jun 2025 12:03:28 +0200 Message-ID: <20250603100329.149851-4-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250603100329.149851-1-michal.orzel@amd.com> References: <20250603100329.149851-1-michal.orzel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB04.amd.com: michal.orzel@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF00000014:EE_|CH3PR12MB8584:EE_ X-MS-Office365-Filtering-Correlation-Id: e5f549d9-e491-4339-647a-08dda285ec9f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?WnL9fqsvmOUmEJc6smW8JvEYGkmu+qOzO8F3pDzxyZYN1j1FywuuKz9HEXG9?= =?us-ascii?Q?/nDk7XP//Aof8W85jwKEdUfOe+MEVXN2+mdVUD1yBq1IZgL9Yo9WZscp/cy5?= =?us-ascii?Q?Q8moduzL46DOGWf0G2u7luAI9c9DpXW0VKqWi096yJsXvExwEGjfYzBe9/BA?= =?us-ascii?Q?y3H1NxetFXc40FjaJWbyR/hTM3layw8JvGIuvvQ67KevnVvpJXkylwhYk+cV?= =?us-ascii?Q?EzOIeMVUI58oojV+38en1u05O+HujCBssKxqZUwQx8V3vJHfzDszPPhIe0nN?= =?us-ascii?Q?TkzCSBYXHaGmmfol991ihcBz9WyncwWGOvvLibL2i2U31AqQlukK9NZg8if7?= =?us-ascii?Q?ByuNjKv2moU6okMvvqYFsOH+WScRwlgfDxvAwD9y+2urkP3rThnnF52Q4Dm2?= =?us-ascii?Q?Qx70RxUFm+26M65AfnlWTEUwthBPcRhjQp0tbHLPfJS4PwKuG4WmL+euWTiz?= =?us-ascii?Q?/PI1tijH+FqXI1ul6QzIy9dnigwsQDesGAO+MJqmBS1Nj7AOux+5n4SKT3LK?= =?us-ascii?Q?LCni2p4tQRm2GzPfS2+2/8W0kwzs6uEfiom7EssfS7C2OWSvHrKKd6Cf4Xpc?= =?us-ascii?Q?e+QC3PFoz0X7djt9V7K9f1bXDQq4hww6AcL11LFs6HC/PV0kRwZqfROv1gci?= =?us-ascii?Q?HmRRzKO6wFG+lUkmiy1nF9Fv//mb57guXhL9qMPZll5SEHBbtveRiJilVjby?= =?us-ascii?Q?HPEsWhGZAp+xkd9nG1XjM5RCgGNxUb5fxNPxWMVT6LGcvP3jhRHbzmK4MHHJ?= =?us-ascii?Q?2WvtDRQdWA1xMadI8/N7n0vx82+6bgR2AOznI2WjqaK59EIKX5TxVxTiozKc?= =?us-ascii?Q?DkIW+nypnxxgZlX7NaVve4Myr6DcvhX1dfNu6iyjt+65dOPtEm5BpPd8dj8B?= =?us-ascii?Q?dNDEuU3RLgI30LUQ1u/PA5PTLqkT8nf4Fl+smmojlgSokKuf4rYYmbnD+BDK?= =?us-ascii?Q?0Iz/EAffxwE4e1/tRbgT6kDcEUNOnkBhTA48PSt6KqsUQGBZjyx0OGM/Uylb?= =?us-ascii?Q?rRRcM5u4AxU8HaUylCwqGJ28CRD1ypUk1fdSZVZkChW7WjorBLCf9zjE4np9?= =?us-ascii?Q?ymCC2SVKS/wGPe8KcJQ/+2TaQ/G7hqkpTHSUAxGosnp5KJDwAaD4u/whCSRA?= =?us-ascii?Q?9dl3V5R6WftMhSyMtIhhmeGeBoPAks9NV6Y1+dD69QbJAe9+HFsZOYC5kgtm?= =?us-ascii?Q?AhxhwVaTm2KGuZNAXr47zZpY8g912FKgCzDQ91faHe0Xhne5rL66J0SGqQhR?= =?us-ascii?Q?vnoJnw0FtTW+ZObmB+bedVWFpfsBS75HYedd4QE1CbGChmkOza7xczLCAMuH?= =?us-ascii?Q?7Er3CuBuDGbFhYIgwJ2KvgZIDu6flV7M4yZK3iXtNAjTz0aYJMMahqoE7LT6?= =?us-ascii?Q?UQ9DHKq6Sy2dD+faLdheIoD15gfL2XpSIBpraG6HRdExOZxTunsDcXMHlF82?= =?us-ascii?Q?V6V3TejFyLz3h6pRqemJ18TUI8/BuocmZYdJPCC/zjfvMwLJdo2PIpLNsD/Z?= =?us-ascii?Q?85txE83EicVZ3fUhFKhe3Kpcx+hLbgoX0l5c?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2025 10:03:44.0149 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e5f549d9-e491-4339-647a-08dda285ec9f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH3PEPF00000014.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8584 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748945060892116600 Content-Type: text/plain; charset="utf-8" This feature is arch agnostic, thus move it to common. Signed-off-by: Michal Orzel Acked-by: Julien Grall --- xen/arch/arm/Makefile | 1 - xen/arch/arm/arm32/mmu/mm.c | 2 +- xen/arch/arm/arm64/mmu/mm.c | 2 +- xen/arch/arm/dom0less-build.c | 2 +- xen/arch/arm/static-shmem.c | 2 +- xen/common/device-tree/Makefile | 1 + xen/common/device-tree/dom0less-build.c | 6 +----- xen/{arch/arm =3D> common/device-tree}/static-memory.c | 2 +- .../arm/include/asm =3D> include/xen}/static-memory.h | 9 +++++---- 9 files changed, 12 insertions(+), 15 deletions(-) rename xen/{arch/arm =3D> common/device-tree}/static-memory.c (99%) rename xen/{arch/arm/include/asm =3D> include/xen}/static-memory.h (93%) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index eeeac4e653ec..4f080145478d 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -51,7 +51,6 @@ obj-y +=3D setup.o obj-y +=3D shutdown.o obj-y +=3D smp.o obj-y +=3D smpboot.o -obj-$(CONFIG_STATIC_MEMORY) +=3D static-memory.init.o obj-$(CONFIG_STATIC_SHM) +=3D static-shmem.init.o obj-y +=3D sysctl.o obj-y +=3D time.o diff --git a/xen/arch/arm/arm32/mmu/mm.c b/xen/arch/arm/arm32/mmu/mm.c index 956693232a1b..f3305e28e9df 100644 --- a/xen/arch/arm/arm32/mmu/mm.c +++ b/xen/arch/arm/arm32/mmu/mm.c @@ -6,9 +6,9 @@ #include #include #include +#include #include #include -#include #include =20 static unsigned long opt_xenheap_megabytes __initdata; diff --git a/xen/arch/arm/arm64/mmu/mm.c b/xen/arch/arm/arm64/mmu/mm.c index c1efa1348aee..cded8f2787f9 100644 --- a/xen/arch/arm/arm64/mmu/mm.c +++ b/xen/arch/arm/arm64/mmu/mm.c @@ -4,9 +4,9 @@ #include #include #include +#include =20 #include -#include #include =20 /* Override macros from asm/page.h to make them work with mfn_t */ diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index a49764f0add9..bcfd686a8b7f 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -12,6 +12,7 @@ #include #include #include +#include #include =20 #include @@ -22,7 +23,6 @@ #include #include #include -#include #include =20 #ifdef CONFIG_VGICV2 diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 21fd2c3cd4fd..2055b7be0f3f 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -5,9 +5,9 @@ #include #include #include +#include =20 #include -#include #include =20 typedef struct { diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makef= ile index 57b9e6ca008f..ed11f2c3b42c 100644 --- a/xen/common/device-tree/Makefile +++ b/xen/common/device-tree/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_OVERLAY_DTB) +=3D dt-overlay.o obj-y +=3D intc.o obj-$(CONFIG_DOMAIN_BUILD_HELPERS) +=3D kernel.o obj-$(CONFIG_STATIC_EVTCHN) +=3D static-evtchn.init.o +obj-$(CONFIG_STATIC_MEMORY) +=3D static-memory.init.o diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tr= ee/dom0less-build.c index 39cb2cd5c70e..c8c5a04f24cb 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -28,9 +28,7 @@ #include #include =20 -#if __has_include() -# include -#endif +#include =20 #if __has_include() # include @@ -799,12 +797,10 @@ static int __init construct_domU(struct domain *d, { if ( !dt_find_property(node, "xen,static-mem", NULL) ) allocate_memory(d, &kinfo); -#ifdef CONFIG_STATIC_MEMORY else if ( !is_domain_direct_mapped(d) ) allocate_static_memory(d, &kinfo, node); else assign_static_memory_11(d, &kinfo, node); -#endif =20 #ifdef CONFIG_STATIC_SHM rc =3D process_shm(d, &kinfo, node); diff --git a/xen/arch/arm/static-memory.c b/xen/common/device-tree/static-m= emory.c similarity index 99% rename from xen/arch/arm/static-memory.c rename to xen/common/device-tree/static-memory.c index e0f76afcd8eb..0774d0680604 100644 --- a/xen/arch/arm/static-memory.c +++ b/xen/common/device-tree/static-memory.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ =20 #include +#include =20 #include -#include =20 static bool __init append_static_memory_to_bank(struct domain *d, struct membank *bank, diff --git a/xen/arch/arm/include/asm/static-memory.h b/xen/include/xen/sta= tic-memory.h similarity index 93% rename from xen/arch/arm/include/asm/static-memory.h rename to xen/include/xen/static-memory.h index a32a3c6553bc..e445aa80578c 100644 --- a/xen/arch/arm/include/asm/static-memory.h +++ b/xen/include/xen/static-memory.h @@ -1,13 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0-only */ =20 -#ifndef __ASM_STATIC_MEMORY_H_ -#define __ASM_STATIC_MEMORY_H_ +#ifndef XEN_STATIC_MEMORY_H +#define XEN_STATIC_MEMORY_H =20 #include -#include =20 #ifdef CONFIG_STATIC_MEMORY =20 +#include + static inline void init_staticmem_bank(const struct membank *bank) { mfn_t bank_start =3D _mfn(PFN_UP(bank->start)); @@ -46,7 +47,7 @@ static inline void init_staticmem_pages(void) {}; =20 #endif /* CONFIG_STATIC_MEMORY */ =20 -#endif /* __ASM_STATIC_MEMORY_H_ */ +#endif /* XEN_STATIC_MEMORY_H */ =20 /* * Local variables: --=20 2.25.1