lkml.org 
[lkml]   [2015]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 37/86] ACPI: Use correct IRQ when uninstalling ACPI interrupt handler
    Date
    3.13.11-ckt31 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chen Yu <yu.c.chen@intel.com>

    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.

    Acked-by: Lv Zheng <lv.zheng@intel.com>
    Signed-off-by: Chen Yu <yu.c.chen@intel.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    [ luis: backported to 3.16: adjusted context ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/acpi/osl.c | 9 ++++++---
    include/linux/acpi.h | 6 ++++++
    2 files changed, 12 insertions(+), 3 deletions(-)

    diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
    index bd2e23e..bd79c6e 100644
    --- a/drivers/acpi/osl.c
    +++ b/drivers/acpi/osl.c
    @@ -87,6 +87,7 @@ static void *acpi_irq_context;
    static struct workqueue_struct *kacpid_wq;
    static struct workqueue_struct *kacpi_notify_wq;
    static struct workqueue_struct *kacpi_hotplug_wq;
    +unsigned int acpi_sci_irq = INVALID_ACPI_IRQ;

    /*
    * This list of permanent mappings is for memory that may be accessed from
    @@ -818,17 +819,19 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,
    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;
    }
    diff --git a/include/linux/acpi.h b/include/linux/acpi.h
    index d9099b1..f264bca 100644
    --- a/include/linux/acpi.h
    +++ b/include/linux/acpi.h
    @@ -139,6 +139,12 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base);
    void 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;
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-12-03 00:41    [W:2.705 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site