diff options
author | Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com> | 2018-03-29 11:06:55 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-04-27 10:44:29 -0400 |
commit | f79b1c573cb4dc551919f81ed5797419f6fc1f3a (patch) | |
tree | 03e8a7b088a7dc53a45914228eecd5d81ed29f4d | |
parent | 0644f186fc9d77bb5bd198369e59fb28927a3692 (diff) |
x86/i8237: Register device based on FADT legacy boot flag
From Skylake onwards, the platform controller hub (Sunrisepoint PCH) does
not support legacy DMA operations to IO ports 81h-83h, 87h, 89h-8Bh, 8Fh.
Currently this driver registers as syscore ops and its resume function is
called on every resume from S3. On Skylake and Kabylake, this causes a
resume delay of around 100ms due to port IO operations, which is a problem.
This change allows to load the driver only when the platform bios
explicitly supports such devices or has a cut-off date earlier than 2017
due to the following reasons:
- The platforms released before year 2017 have support for the 8237.
(except Sunrisepoint PCH e.g. Skylake)
- Some of the BIOS that were released for platforms (Skylake, Kabylake)
during 2016-17 are buggy. These BIOS do not set/unset the
ACPI_FADT_LEGACY_DEVICES field in FADT table properly based on the
presence or absence of the DMA device.
Very recently, open source system firmware like coreboot started unsetting
ACPI_FADT_LEGACY_DEVICES field in FADT table if the 8237 DMA device is not
present on the PCH.
Please refer to chapter 21 of 6th Generation Intel® Core™ Processor
Platform Controller Hub Family: BIOS Specification.
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: rjw@rjwysocki.net
Cc: hpa@zytor.com
Cc: Alan Cox <alan@linux.intel.com>
Link: https://lkml.kernel.org/r/1522336015-22994-1-git-send-email-anshuman.gupta@intel.com
-rw-r--r-- | arch/x86/include/asm/x86_init.h | 1 | ||||
-rw-r--r-- | arch/x86/kernel/i8237.c | 25 | ||||
-rw-r--r-- | arch/x86/kernel/platform-quirks.c | 7 |
3 files changed, 32 insertions, 1 deletions
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index ce8b4da07e35..db98e3ab3295 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h | |||
@@ -301,5 +301,6 @@ extern struct x86_apic_ops x86_apic_ops; | |||
301 | extern void x86_early_init_platform_quirks(void); | 301 | extern void x86_early_init_platform_quirks(void); |
302 | extern void x86_init_noop(void); | 302 | extern void x86_init_noop(void); |
303 | extern void x86_init_uint_noop(unsigned int unused); | 303 | extern void x86_init_uint_noop(unsigned int unused); |
304 | extern bool x86_pnpbios_disabled(void); | ||
304 | 305 | ||
305 | #endif | 306 | #endif |
diff --git a/arch/x86/kernel/i8237.c b/arch/x86/kernel/i8237.c index 8eeaa81de066..0a3e70fd00d6 100644 --- a/arch/x86/kernel/i8237.c +++ b/arch/x86/kernel/i8237.c | |||
@@ -9,10 +9,12 @@ | |||
9 | * your option) any later version. | 9 | * your option) any later version. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/dmi.h> | ||
12 | #include <linux/init.h> | 13 | #include <linux/init.h> |
13 | #include <linux/syscore_ops.h> | 14 | #include <linux/syscore_ops.h> |
14 | 15 | ||
15 | #include <asm/dma.h> | 16 | #include <asm/dma.h> |
17 | #include <asm/x86_init.h> | ||
16 | 18 | ||
17 | /* | 19 | /* |
18 | * This module just handles suspend/resume issues with the | 20 | * This module just handles suspend/resume issues with the |
@@ -49,6 +51,29 @@ static struct syscore_ops i8237_syscore_ops = { | |||
49 | 51 | ||
50 | static int __init i8237A_init_ops(void) | 52 | static int __init i8237A_init_ops(void) |
51 | { | 53 | { |
54 | /* | ||
55 | * From SKL PCH onwards, the legacy DMA device is removed in which the | ||
56 | * I/O ports (81h-83h, 87h, 89h-8Bh, 8Fh) related to it are removed | ||
57 | * as well. All removed ports must return 0xff for a inb() request. | ||
58 | * | ||
59 | * Note: DMA_PAGE_2 (port 0x81) should not be checked for detecting | ||
60 | * the presence of DMA device since it may be used by BIOS to decode | ||
61 | * LPC traffic for POST codes. Original LPC only decodes one byte of | ||
62 | * port 0x80 but some BIOS may choose to enhance PCH LPC port 0x8x | ||
63 | * decoding. | ||
64 | */ | ||
65 | if (dma_inb(DMA_PAGE_0) == 0xFF) | ||
66 | return -ENODEV; | ||
67 | |||
68 | /* | ||
69 | * It is not required to load this driver as newer SoC may not | ||
70 | * support 8237 DMA or bus mastering from LPC. Platform firmware | ||
71 | * must announce the support for such legacy devices via | ||
72 | * ACPI_FADT_LEGACY_DEVICES field in FADT table. | ||
73 | */ | ||
74 | if (x86_pnpbios_disabled() && dmi_get_bios_year() >= 2017) | ||
75 | return -ENODEV; | ||
76 | |||
52 | register_syscore_ops(&i8237_syscore_ops); | 77 | register_syscore_ops(&i8237_syscore_ops); |
53 | return 0; | 78 | return 0; |
54 | } | 79 | } |
diff --git a/arch/x86/kernel/platform-quirks.c b/arch/x86/kernel/platform-quirks.c index 235fe6008ac8..b348a672f71d 100644 --- a/arch/x86/kernel/platform-quirks.c +++ b/arch/x86/kernel/platform-quirks.c | |||
@@ -33,9 +33,14 @@ void __init x86_early_init_platform_quirks(void) | |||
33 | x86_platform.set_legacy_features(); | 33 | x86_platform.set_legacy_features(); |
34 | } | 34 | } |
35 | 35 | ||
36 | bool __init x86_pnpbios_disabled(void) | ||
37 | { | ||
38 | return x86_platform.legacy.devices.pnpbios == 0; | ||
39 | } | ||
40 | |||
36 | #if defined(CONFIG_PNPBIOS) | 41 | #if defined(CONFIG_PNPBIOS) |
37 | bool __init arch_pnpbios_disabled(void) | 42 | bool __init arch_pnpbios_disabled(void) |
38 | { | 43 | { |
39 | return x86_platform.legacy.devices.pnpbios == 0; | 44 | return x86_pnpbios_disabled(); |
40 | } | 45 | } |
41 | #endif | 46 | #endif |