Patch "ACPI: Use correct IRQ when uninstalling ACPI interrupt handler" has been added to the 4.3-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
ACPI: Use correct IRQ when uninstalling ACPI interrupt handler
to the 4.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
acpi-use-correct-irq-when-uninstalling-acpi-interrupt-handler.patch
and it can be found in the queue-4.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
49e4b84333f338d4f183f28f1f3c1131b9fb2b5aMon Sep 17 00:00:00 2001
From: Chen Yu <[email protected]>
Date: Sun, 25 Oct 2015 01:02:19 +0800
Subject: ACPI: Use correct IRQ when uninstalling ACPI interrupt handler
From: Chen Yu <[email protected]>
commit 49e4b84333f338d4f183f28f1f3c1131b9fb2b5a upstream.
Currently when the system is trying to uninstall the ACPI interrupt handler, it uses acpi_gbl_FADT.sci_interrupt as the IRQ number. However, the IRQ number that the ACPI interrupt handled is installed for comes from acpi_gsi_to_irq() and that is the number that should be used for the handler removal.
Fix this problem by using the mapped IRQ returned from acpi_gsi_to_irq() as appropriate.
--- drivers/acpi/osl.c | 9 ++++++--- include/linux/acpi.h | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-)
drivers/acpi/osl.c +6 -3
@@ -81,6 +81,7 @@ static struct workqueue_struct *kacpid_wstatic struct workqueue_struct *kacpi_notify_wq;static struct workqueue_struct *kacpi_hotplug_wq;static bool acpi_os_initialized; +unsigned int acpi_sci_irq =INVALID_ACPI_IRQ ;/* * This list of permanent mappings is for memory that may be accessed from
@@ -856,17 +857,19 @@ acpi_os_install_interrupt_handler(u32 gs acpi_irq_handler =NULL ;return AE_NOT_ACQUIRED ; } + acpi_sci_irq = irq;return AE_OK ; } -acpi_status acpi_os_remove_interrupt_handler (u32 irq,acpi_osd_handler handler) +acpi_status acpi_os_remove_interrupt_handler (u32 gsi,acpi_osd_handler handler) { -if (irq != acpi_gbl_FADT.sci_interrupt) +if (gsi != acpi_gbl_FADT.sci_interrupt || !acpi_sci_irq_valid ())return AE_BAD_PARAMETER ; -free_irq (irq, acpi_irq); +free_irq (acpi_sci_irq, acpi_irq); acpi_irq_handler =NULL ; + acpi_sci_irq =INVALID_ACPI_IRQ ;return AE_OK ; }
include/linux/acpi.h +6 -0
@@ -193,6 +193,12 @@ int acpi_ioapic_registered(acpi_handle hvoid acpi_irq_stats_init (void );extern u32 acpi_irq_handled;extern u32 acpi_irq_not_handled; +extern unsigned int acpi_sci_irq; +#define INVALID_ACPI_IRQ ((unsigned)-1) +static inline bool acpi_sci_irq_valid (void ) +{ +return acpi_sci_irq !=INVALID_ACPI_IRQ ; +}extern int sbf_port;extern unsigned long acpi_realmode_flags;
Patches currently in stable-queue which might be from [email protected] are
queue-4.3/acpi-using-correct-irq-when-waiting-for-events.patch queue-4.3/acpi-pm-fix-incorrect-wakeup-irq-setting-during-suspend-to-idle.patch queue-4.3/acpi-use-correct-irq-when-uninstalling-acpi-interrupt-handler.patch