linux-kernel - [PATCH] riscv: acpi: chose to boot from acpi then disable FDT

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250910112401.552987-1-rabenda.cn@gmail.com>
Date: Wed, 10 Sep 2025 19:24:01 +0800
From: Han Gao <rabenda.cn@...il.com>
To: linux-riscv@...ts.infradead.org,
	Paul Walmsley <paul.walmsley@...ive.com>,
	Palmer Dabbelt <palmer@...belt.com>,
	Albert Ou <aou@...s.berkeley.edu>,
	Alexandre Ghiti <alex@...ti.fr>,
	Andrew Morton <akpm@...ux-foundation.org>,
	"Mike Rapoport (Microsoft)" <rppt@...nel.org>,
	Andy Chiu <andybnac@...il.com>,
	Han Gao <rabenda.cn@...il.com>,
	Guo Weikang <guoweikang.kernel@...il.com>,
	Kuan-Wei Chiu <visitorckw@...il.com>,
	Björn Töpel <bjorn@...osinc.com>,
	Zixian Zeng <sycamoremoon376@...il.com>,
	Usama Arif <usamaarif642@...il.com>,
	Yong-Xuan Wang <yongxuan.wang@...ive.com>
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] riscv: acpi: chose to boot from acpi then disable FDT

avoid errors caused by repeated driver initialization.

commit 3505f30fb6a9 ("ARM64 / ACPI: If we chose to boot from acpi then disable FDT")

Signed-off-by: Han Gao <rabenda.cn@...il.com>
---
 arch/riscv/kernel/setup.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index f90cce7a3ace..d7ee62837aa4 100644
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -330,11 +330,14 @@ void __init setup_arch(char **cmdline_p)
 	/* Parse the ACPI tables for possible boot-time configuration */
 	acpi_boot_table_init();
 
+	if (acpi_disabled) {
 #if IS_ENABLED(CONFIG_BUILTIN_DTB)
-	unflatten_and_copy_device_tree();
+		unflatten_and_copy_device_tree();
 #else
-	unflatten_device_tree();
+		unflatten_device_tree();
 #endif
+	}
+
 	misc_mem_init();
 
 	init_resources();
-- 
2.47.3