diff options
author | Al Stone <al.stone@linaro.org> | 2015-03-24 10:02:41 -0400 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2015-03-25 07:49:31 -0400 |
commit | b10d79f76085b577673395daf92d6208ae09196f (patch) | |
tree | f712d5dd353304d38211b07b7f0fc790a9bb2964 /arch/arm64/include | |
parent | a9cb97fe71d84df103994861f00112fe2cba91be (diff) |
ARM64 / ACPI: Introduce early_param "acpi=" to enable/disable ACPI
This implements the following policy to decide whether ACPI should
be used to boot the system:
- acpi=off: ACPI will not be used to boot the system, even if there is
no alternative available (e.g., device tree is empty)
- acpi=force: only ACPI will be used to boot the system; if that fails,
there will be no fallback to alternative methods (such as device tree)
- otherwise, ACPI will be used as a fallback if the device tree turns out
to lack a platform description; the heuristic to decide this is whether
/chosen is the only node present at depth 1
CC: Catalin Marinas <catalin.marinas@arm.com>
CC: Will Deacon <will.deacon@arm.com>
CC: Rafael J. Wysocki <rjw@rjwysocki.net>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: Grant Likely <grant.likely@linaro.org>
Tested-by: Timur Tabi <timur@codeaurora.org>
Signed-off-by: Al Stone <al.stone@linaro.org>
Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/include')
-rw-r--r-- | arch/arm64/include/asm/acpi.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 40e092483e96..c5a9b9741635 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h | |||
@@ -39,6 +39,13 @@ static inline void disable_acpi(void) | |||
39 | acpi_noirq = 1; | 39 | acpi_noirq = 1; |
40 | } | 40 | } |
41 | 41 | ||
42 | static inline void enable_acpi(void) | ||
43 | { | ||
44 | acpi_disabled = 0; | ||
45 | acpi_pci_disabled = 0; | ||
46 | acpi_noirq = 0; | ||
47 | } | ||
48 | |||
42 | /* | 49 | /* |
43 | * It's used from ACPI core in kdump to boot UP system with SMP kernel, | 50 | * It's used from ACPI core in kdump to boot UP system with SMP kernel, |
44 | * with this check the ACPI core will not override the CPU index | 51 | * with this check the ACPI core will not override the CPU index |