Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2366c7fd authored by Shannon Zhao's avatar Shannon Zhao Committed by Will Deacon
Browse files

ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI 



When it's a Xen domain0 booting with ACPI, it will supply a /chosen and
a /hypervisor node in DT. So check if it needs to enable ACPI.

Signed-off-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Tested-by: default avatarJulien Grall <julien.grall@arm.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent d8fc68a0

arch/arm64/kernel/acpi.c

+10 −4
Original line number Diff line number Diff line
@@ -67,10 +67,15 @@ static int __init dt_scan_depth1_nodes(unsigned long node, 
{

	/*

	 * Return 1 as soon as we encounter a node at depth 1 that is

	 * not the /chosen node.

	 * not the /chosen node, or /hypervisor node with compatible

	 * string "xen,xen".

	 */

	if (depth == 1 && (strcmp(uname, "chosen") != 0))

	if (depth == 1 && (strcmp(uname, "chosen") != 0)) {

		if (strcmp(uname, "hypervisor") != 0 ||

		    !of_flat_dt_is_compatible(node, "xen,xen"))

			return 1;

	}



	return 0;

}
@@ -184,7 +189,8 @@ void __init acpi_boot_table_init(void) 
	/*

	 * Enable ACPI instead of device tree unless

	 * - ACPI has been disabled explicitly (acpi=off), or

	 * - the device tree is not empty (it has more than just a /chosen node)

	 * - the device tree is not empty (it has more than just a /chosen node,

	 *   and a /hypervisor node when running on Xen)

	 *   and ACPI has not been force enabled (acpi=force)

	 */

	if (param_acpi_off ||