[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-6d7305254ea947d575a066711c3349fafbebaffa@git.kernel.org>
Date: Fri, 10 Nov 2017 01:42:43 -0800
From: tip-bot for Juergen Gross <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: torvalds@...ux-foundation.org, hpa@...or.com, peterz@...radead.org,
tglx@...utronix.de, jgross@...e.com, mingo@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip:x86/platform] x86/virt, x86/acpi: Add test for
ACPI_FADT_NO_VGA
Commit-ID: 6d7305254ea947d575a066711c3349fafbebaffa
Gitweb: https://git.kernel.org/tip/6d7305254ea947d575a066711c3349fafbebaffa
Author: Juergen Gross <jgross@...e.com>
AuthorDate: Thu, 9 Nov 2017 14:27:37 +0100
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Fri, 10 Nov 2017 10:03:13 +0100
x86/virt, x86/acpi: Add test for ACPI_FADT_NO_VGA
Add a test for ACPI_FADT_NO_VGA when scanning the FADT and set the new
flag x86_platform.legacy.no_vga accordingly.
Signed-off-by: Juergen Gross <jgross@...e.com>
Acked-by: Thomas Gleixner <tglx@...utronix.de>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: len.brown@...el.com
Cc: linux-pm@...r.kernel.org
Cc: pavel@....cz
Cc: rjw@...ysocki.net
Link: http://lkml.kernel.org/r/20171109132739.23465-4-jgross@suse.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/include/asm/x86_init.h | 1 +
arch/x86/kernel/acpi/boot.c | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index ad15a0f..260e9a8 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -208,6 +208,7 @@ enum x86_legacy_i8042_state {
struct x86_legacy_features {
enum x86_legacy_i8042_state i8042;
int rtc;
+ int no_vga;
int reserve_bios_regions;
struct x86_legacy_devices devices;
};
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 079535e..ef9e02e 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -961,6 +961,11 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
x86_platform.legacy.rtc = 0;
}
+ if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_VGA) {
+ pr_debug("ACPI: probing for VGA not safe\n");
+ x86_platform.legacy.no_vga = 1;
+ }
+
#ifdef CONFIG_X86_PM_TIMER
/* detect the location of the ACPI PM Timer */
if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) {
Powered by blists - more mailing lists