Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code »

Commit 58557add70dcae1dd7df1d039c99f27edc7f4ece

Authored by Jiang Liu
Committed by Greg Kroah-Hartman
1 parent 2f455ae129

x86/irq: Fix regression caused by commit b568b8601f05 

commit 1ea76fbadd667b19c4fa4466f3a3b55a505e83d9 upstream.

Commit b568b8601f05 ("Treat SCI interrupt as normal GSI interrupt")
accidently removes support of legacy PIC interrupt when fixing a
regression for Xen, which causes a nasty regression on HP/Compaq
nc6000 where we fail to register the ACPI interrupt, and thus
lose eg. thermal notifications leading a potentially overheated
machine.

So reintroduce support of legacy PIC based ACPI SCI interrupt.

Reported-by: Ville Syrjälä <syrjala@sci.fi>
Tested-by: Ville Syrjälä <syrjala@sci.fi>
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Sander Eikelenboom <linux@eikelenboom.it>
Cc: linux-pm@vger.kernel.org
Link: http://lkml.kernel.org/r/1424052673-22974-1-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 5 additions and 0 deletions Side-by-side Diff

arch/x86/kernel/acpi/boot.c
Diff comments   View file @ 58557ad
... ... @@ -613,6 +613,11 @@
613 613 {
614 614 int rc, irq, trigger, polarity;
615 615  
  616 + if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
  617 + *irqp = gsi;
  618 + return 0;
  619 + }
  620 +
616 621 rc = acpi_get_override_irq(gsi, &trigger, &polarity);
617 622 if (rc == 0) {
618 623 trigger = trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE;