From: tip-bot for Juergen Gross <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: torvalds@linux-foundation.org, hpa@zytor.com,
peterz@infradead.org, tglx@linutronix.de, jgross@suse.com,
mingo@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip:x86/platform] x86/virt, x86/acpi: Add test for ACPI_FADT_NO_VGA
Date: Fri, 10 Nov 2017 01:42:43 -0800 [thread overview]
Message-ID: <tip-6d7305254ea947d575a066711c3349fafbebaffa@git.kernel.org> (raw)
In-Reply-To: <20171109132739.23465-4-jgross@suse.com>
Commit-ID: 6d7305254ea947d575a066711c3349fafbebaffa
Gitweb: https://git.kernel.org/tip/6d7305254ea947d575a066711c3349fafbebaffa
Author: Juergen Gross <jgross@suse.com>
AuthorDate: Thu, 9 Nov 2017 14:27:37 +0100
Committer: Ingo Molnar <mingo@kernel.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@suse.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: len.brown@intel.com
Cc: linux-pm@vger.kernel.org
Cc: pavel@ucw.cz
Cc: rjw@rjwysocki.net
Link: http://lkml.kernel.org/r/20171109132739.23465-4-jgross@suse.com
Signed-off-by: Ingo Molnar <mingo@kernel.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) {
next prev parent reply other threads:[~2017-11-10 9:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-09 13:27 [PATCH v2 0/5] x86/xen: support booting PVH guest via standard boot path Juergen Gross
2017-11-09 13:27 ` [PATCH v2 1/5] x86: merge x86_hyper into x86_platform and x86_init Juergen Gross
2017-11-10 9:41 ` [tip:x86/platform] x86/virt, x86/platform: Merge 'struct x86_hyper' into 'struct x86_platform' and 'struct x86_init' tip-bot for Juergen Gross
2017-11-09 13:27 ` [PATCH v2 2/5] x86: add enum for hypervisors to replace x86_hyper Juergen Gross
2017-11-09 17:57 ` Xavier Deguillard
2017-11-10 9:42 ` [tip:x86/platform] x86/virt: Add " tip-bot for Juergen Gross
2017-11-10 18:26 ` [PATCH v2 2/5] x86: add " Dmitry Torokhov
2017-11-10 20:39 ` KY Srinivasan
2017-11-09 13:27 ` [PATCH v2 3/5] x86/acpi: add test for ACPI_FADT_NO_VGA Juergen Gross
2017-11-10 9:42 ` tip-bot for Juergen Gross [this message]
2017-11-09 13:27 ` [PATCH v2 4/5] x86: add guest_late_init hook to hypervisor_x86 structure Juergen Gross
2017-11-10 9:43 ` [tip:x86/platform] x86/virt, x86/platform: Add ->guest_late_init() callback " tip-bot for Juergen Gross
2017-11-09 13:27 ` [PATCH v2 5/5] x86/xen: use guest_late_init to detect Xen PVH guest Juergen Gross
2017-11-10 9:43 ` [tip:x86/platform] x86/virt/xen: Use " tip-bot for Juergen Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-6d7305254ea947d575a066711c3349fafbebaffa@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).