From: Greg Kroah-Hartman Date: Thu, 12 Jul 2012 16:04:06 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.0.37~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=caac1d27a050752cf69b4cb8a2bd7f68551ecaed;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: acpi-make-acpi_skip_timer_override-cover-all-source_irq-0-cases.patch acpi-remove-one-board-specific-warn-when-ignoring-timer-overriding.patch --- diff --git a/queue-3.0/acpi-make-acpi_skip_timer_override-cover-all-source_irq-0-cases.patch b/queue-3.0/acpi-make-acpi_skip_timer_override-cover-all-source_irq-0-cases.patch new file mode 100644 index 00000000000..4543820a2b9 --- /dev/null +++ b/queue-3.0/acpi-make-acpi_skip_timer_override-cover-all-source_irq-0-cases.patch @@ -0,0 +1,75 @@ +From ae10ccdc3093486f8c2369d227583f9d79f628e5 Mon Sep 17 00:00:00 2001 +From: Feng Tang +Date: Mon, 4 Jun 2012 15:00:04 +0800 +Subject: ACPI: Make acpi_skip_timer_override cover all source_irq==0 cases + +From: Feng Tang + +commit ae10ccdc3093486f8c2369d227583f9d79f628e5 upstream. + +Currently when acpi_skip_timer_override is set, it only cover the +(source_irq == 0 && global_irq == 2) cases. While there is also +platform which need use this option and its global_irq is not 2. +This patch will extend acpi_skip_timer_override to cover all +timer overriding cases as long as the source irq is 0. + +This is the first part of a fix to kernel bug bugzilla 40002: + "IRQ 0 assigned to VGA" +https://bugzilla.kernel.org/show_bug.cgi?id=40002 + +Reported-and-tested-by: Szymon Kowalczyk +Signed-off-by: Feng Tang +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/acpi/boot.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +--- a/arch/x86/kernel/acpi/boot.c ++++ b/arch/x86/kernel/acpi/boot.c +@@ -416,12 +416,14 @@ acpi_parse_int_src_ovr(struct acpi_subta + return 0; + } + +- if (intsrc->source_irq == 0 && intsrc->global_irq == 2) { ++ if (intsrc->source_irq == 0) { + if (acpi_skip_timer_override) { +- printk(PREFIX "BIOS IRQ0 pin2 override ignored.\n"); ++ printk(PREFIX "BIOS IRQ0 override ignored.\n"); + return 0; + } +- if (acpi_fix_pin2_polarity && (intsrc->inti_flags & ACPI_MADT_POLARITY_MASK)) { ++ ++ if ((intsrc->global_irq == 2) && acpi_fix_pin2_polarity ++ && (intsrc->inti_flags & ACPI_MADT_POLARITY_MASK)) { + intsrc->inti_flags &= ~ACPI_MADT_POLARITY_MASK; + printk(PREFIX "BIOS IRQ0 pin2 override: forcing polarity to high active.\n"); + } +@@ -1327,7 +1329,7 @@ static int __init dmi_disable_acpi(const + } + + /* +- * Force ignoring BIOS IRQ0 pin2 override ++ * Force ignoring BIOS IRQ0 override + */ + static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d) + { +@@ -1337,7 +1339,7 @@ static int __init dmi_ignore_irq0_timer_ + */ + if (!acpi_skip_timer_override) { + WARN(1, KERN_ERR "ati_ixp4x0 quirk not complete.\n"); +- pr_notice("%s detected: Ignoring BIOS IRQ0 pin2 override\n", ++ pr_notice("%s detected: Ignoring BIOS IRQ0 override\n", + d->ident); + acpi_skip_timer_override = 1; + } +@@ -1431,7 +1433,7 @@ static struct dmi_system_id __initdata a + * is enabled. This input is incorrectly designated the + * ISA IRQ 0 via an interrupt source override even though + * it is wired to the output of the master 8259A and INTIN0 +- * is not connected at all. Force ignoring BIOS IRQ0 pin2 ++ * is not connected at all. Force ignoring BIOS IRQ0 + * override in that cases. + */ + { diff --git a/queue-3.0/acpi-remove-one-board-specific-warn-when-ignoring-timer-overriding.patch b/queue-3.0/acpi-remove-one-board-specific-warn-when-ignoring-timer-overriding.patch new file mode 100644 index 00000000000..da72c6dffa8 --- /dev/null +++ b/queue-3.0/acpi-remove-one-board-specific-warn-when-ignoring-timer-overriding.patch @@ -0,0 +1,36 @@ +From 7f68b4c2e158019c2ec494b5cfbd9c83b4e5b253 Mon Sep 17 00:00:00 2001 +From: Feng Tang +Date: Mon, 4 Jun 2012 15:00:05 +0800 +Subject: ACPI: Remove one board specific WARN when ignoring timer overriding + +From: Feng Tang + +commit 7f68b4c2e158019c2ec494b5cfbd9c83b4e5b253 upstream. + +Current WARN msg is only for the ati_ixp4x0 board, while this function +is used by mulitple platforms. So this one board specific warning +is not appropriate any more. + +Signed-off-by: Feng Tang +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/acpi/boot.c | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/arch/x86/kernel/acpi/boot.c ++++ b/arch/x86/kernel/acpi/boot.c +@@ -1333,12 +1333,7 @@ static int __init dmi_disable_acpi(const + */ + static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d) + { +- /* +- * The ati_ixp4x0_rev() early PCI quirk should have set +- * the acpi_skip_timer_override flag already: +- */ + if (!acpi_skip_timer_override) { +- WARN(1, KERN_ERR "ati_ixp4x0 quirk not complete.\n"); + pr_notice("%s detected: Ignoring BIOS IRQ0 override\n", + d->ident); + acpi_skip_timer_override = 1; diff --git a/queue-3.0/series b/queue-3.0/series index d4a413a9501..0b7ee7d103c 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -64,3 +64,5 @@ drivers-rtc-rtc-mxc.c-fix-irq-enabled-interrupts-warning.patch mm-thp-abort-compaction-if-migration-page-cannot-be-charged-to-memcg.patch fs-ramfs-file-nommu-add-setpageuptodate.patch 3.0-mm-Hold-a-file-reference-in-madvise_remove.patch +acpi-make-acpi_skip_timer_override-cover-all-source_irq-0-cases.patch +acpi-remove-one-board-specific-warn-when-ignoring-timer-overriding.patch