[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / 3.2.24 / 0091-ACPI-Make-acpi_skip_timer_override-cover-all-source_.patch
1 From 16fe1810332abe3998fa2e0760af7f8ca5f701d6 Mon Sep 17 00:00:00 2001
2 From: Feng Tang <feng.tang@intel.com>
3 Date: Mon, 4 Jun 2012 15:00:04 +0800
4 Subject: [PATCH 091/109] ACPI: Make acpi_skip_timer_override cover all
5 source_irq==0 cases
7 commit ae10ccdc3093486f8c2369d227583f9d79f628e5 upstream.
9 Currently when acpi_skip_timer_override is set, it only cover the
10 (source_irq == 0 && global_irq == 2) cases. While there is also
11 platform which need use this option and its global_irq is not 2.
12 This patch will extend acpi_skip_timer_override to cover all
13 timer overriding cases as long as the source irq is 0.
15 This is the first part of a fix to kernel bug bugzilla 40002:
16 "IRQ 0 assigned to VGA"
17 https://bugzilla.kernel.org/show_bug.cgi?id=40002
19 Reported-and-tested-by: Szymon Kowalczyk <fazerxlo@o2.pl>
20 Signed-off-by: Feng Tang <feng.tang@intel.com>
21 Signed-off-by: Len Brown <len.brown@intel.com>
22 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
23 ---
24 arch/x86/kernel/acpi/boot.c | 14 ++++++++------
25 1 files changed, 8 insertions(+), 6 deletions(-)
27 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
28 index 4558f0d..a94dc95 100644
29 --- a/arch/x86/kernel/acpi/boot.c
30 +++ b/arch/x86/kernel/acpi/boot.c
31 @@ -416,12 +416,14 @@ acpi_parse_int_src_ovr(struct acpi_subtable_header * header,
32 return 0;
33 }
35 - if (intsrc->source_irq == 0 && intsrc->global_irq == 2) {
36 + if (intsrc->source_irq == 0) {
37 if (acpi_skip_timer_override) {
38 - printk(PREFIX "BIOS IRQ0 pin2 override ignored.\n");
39 + printk(PREFIX "BIOS IRQ0 override ignored.\n");
40 return 0;
41 }
42 - if (acpi_fix_pin2_polarity && (intsrc->inti_flags & ACPI_MADT_POLARITY_MASK)) {
43 +
44 + if ((intsrc->global_irq == 2) && acpi_fix_pin2_polarity
45 + && (intsrc->inti_flags & ACPI_MADT_POLARITY_MASK)) {
46 intsrc->inti_flags &= ~ACPI_MADT_POLARITY_MASK;
47 printk(PREFIX "BIOS IRQ0 pin2 override: forcing polarity to high active.\n");
48 }
49 @@ -1327,7 +1329,7 @@ static int __init dmi_disable_acpi(const struct dmi_system_id *d)
50 }
52 /*
53 - * Force ignoring BIOS IRQ0 pin2 override
54 + * Force ignoring BIOS IRQ0 override
55 */
56 static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
57 {
58 @@ -1337,7 +1339,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
59 */
60 if (!acpi_skip_timer_override) {
61 WARN(1, KERN_ERR "ati_ixp4x0 quirk not complete.\n");
62 - pr_notice("%s detected: Ignoring BIOS IRQ0 pin2 override\n",
63 + pr_notice("%s detected: Ignoring BIOS IRQ0 override\n",
64 d->ident);
65 acpi_skip_timer_override = 1;
66 }
67 @@ -1431,7 +1433,7 @@ static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
68 * is enabled. This input is incorrectly designated the
69 * ISA IRQ 0 via an interrupt source override even though
70 * it is wired to the output of the master 8259A and INTIN0
71 - * is not connected at all. Force ignoring BIOS IRQ0 pin2
72 + * is not connected at all. Force ignoring BIOS IRQ0
73 * override in that cases.
74 */
75 {
76 --
77 1.7.7.6