Commit 69a8b62a authored by Han Gao's avatar Han Gao Committed by Paul Walmsley
Browse files

riscv: acpi: avoid errors caused by probing DT devices when ACPI is used 



Similar to the ARM64 commit 3505f30fb6a9s ("ARM64 / ACPI: If we chose
to boot from acpi then disable FDT"), let's not do DT hardware probing
if ACPI is enabled in early boot.  This avoids errors caused by
repeated driver probing.

Signed-off-by: default avatarHan Gao <rabenda.cn@gmail.com>
Link: https://lore.kernel.org/r/20250910112401.552987-1-rabenda.cn@gmail.com


[pjw@kernel.org: cleaned up patch description and subject]
Signed-off-by: default avatarPaul Walmsley <pjw@kernel.org>
parent 9e68bd80

arch/riscv/kernel/setup.c

+5 −2
Original line number Diff line number Diff line
@@ -331,11 +331,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();

#else

		unflatten_device_tree();

#endif

	}



	misc_mem_init();



	init_resources();