p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Hanjun Guo <hanjun.guo@linaro.org>
Tested-by: Julien Grall <julien.grall@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Shannon Zhao 2016-04-07 20:03:29 +08:00 committed by Will Deacon
parent d8fc68a04d
commit 2366c7fdb5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm64/kernel/acpi.c
View File

@ -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))
return 1;
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 ||