[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] xen/arm: Don't call process_shm_chosen() during ACPI boot
- To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Michal Orzel <michal.orzel@xxxxxxx>
- Date: Wed, 2 Apr 2025 10:42:32 +0200
- 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)
- 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=qt9owdaK4rx3uvVkne5yzswFleGRsEogC1xMHaEwPi0=; b=uy+IFskTmkSHfmWh8ZhH3d+z45YE2kMcb0hLIZgr0kIr/B7sE6l3FYJHExA7y4zLbfaYcbPIWKvYMbgMo5SeVPgMclUL0XxrYMH+gub+JOit6ZAoZ+4PhTpTEepHo2LoU7pa7h9AFlbLFi+awZ4/zDdm8B3G7yP6L7M+eAbCfpIl1I2DvooaRVICzp9blxYNAuZTtaHlX9tbLhDrATtjEpU00XojP7jIgmC0yErKTNcytOthjHzmcp16TpEX2gYCbrmLt0J6YbqJB4xk9pQtOm4G2cgK2PuGbxWu6rDeTKAsZorFwlHp/ZZQuvVDh439RLEnyRtWyXkrV7CZi66neA==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xMnn8nk28POYOKQmlAt9Tfpj1cDe4RYw+WuEsItd2fo1QOA1JHr4KJ/i/nlUKvNkMoHLnLADXtqyr8iT7X2cxV3daYweQNNyWIwo/kF2Y1aMRCvVxkksdCg+WYD55N3KpzPC3Shh8LIvgely+cVH7GapcwV2WqZNfvXBolu0gCl6s3ro1GKRYuM3MNLwiq/tFnaa9diI3JU2LayAq+t8BiJ4Wyhk1RMZLYNC3pCwyvD/zwxpEH2zpDmlPKSV/9fQg9xWURaQSpSh2dsrLNrO78J/4Z9/cTulqCun+c2WNtOmCxf5890eUVzamei4N2K7RQC6DJbkZI9S/7yQG64LxA==
- Cc: Michal Orzel <michal.orzel@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Bertrand Marquis <bertrand.marquis@xxxxxxx>, Volodymyr Babchuk <Volodymyr_Babchuk@xxxxxxxx>
- Delivery-date: Wed, 02 Apr 2025 08:43:00 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Static shared memory requires device-tree boot. At the moment, booting
with ACPI enabled and CONFIG_STATIC_SHM=y results in a data abort when
dereferencing node in process_shm() because dt_host is always NULL.
Fixes: 09c0a8976acf ("xen/arm: enable statically shared memory on Dom0")
Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx>
---
xen/arch/arm/domain_build.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 2b5b4331834f..85f423214a44 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -2325,9 +2325,12 @@ int __init construct_hwdom(struct kernel_info *kinfo)
else
allocate_memory(d, kinfo);
- rc = process_shm_chosen(d, kinfo);
- if ( rc < 0 )
- return rc;
+ if ( acpi_disabled )
+ {
+ rc = process_shm_chosen(d, kinfo);
+ if ( rc < 0 )
+ return rc;
+ }
/* Map extra GIC MMIO, irqs and other hw stuffs to dom0. */
rc = gic_map_hwdom_extra_mappings(d);
--
2.25.1
|
