lkml.org 
[lkml]   [2014]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/apic] x86, irq: Introduce helper to check whether an IOAPIC has been registered
    Commit-ID:  e89900c9ad75a1b80e1f1f46ce9c9bb0e7ea1d96
    Gitweb: http://git.kernel.org/tip/e89900c9ad75a1b80e1f1f46ce9c9bb0e7ea1d96
    Author: Jiang Liu <jiang.liu@linux.intel.com>
    AuthorDate: Mon, 27 Oct 2014 13:21:47 +0800
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Tue, 16 Dec 2014 14:08:15 +0100

    x86, irq: Introduce helper to check whether an IOAPIC has been registered

    Introduce acpi_ioapic_registered() to check whether an IOAPIC has already
    been registered, it will be used when enabling IOAPIC hotplug.

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    Acked-by: Pavel Machek <pavel@ucw.cz>
    Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Joerg Roedel <joro@8bytes.org>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
    Cc: Bjorn Helgaas <bhelgaas@google.com>
    Cc: Randy Dunlap <rdunlap@infradead.org>
    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Len Brown <len.brown@intel.com>
    Cc: Grant Likely <grant.likely@linaro.org>
    Cc: Prarit Bhargava <prarit@redhat.com>
    Link: http://lkml.kernel.org/r/1414387308-27148-18-git-send-email-jiang.liu@linux.intel.com
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

    ---
    arch/x86/include/asm/io_apic.h | 1 +
    arch/x86/kernel/acpi/boot.c | 22 ++++++++++++++++++++++
    arch/x86/kernel/apic/io_apic.c | 11 +++++++++++
    include/linux/acpi.h | 1 +
    4 files changed, 35 insertions(+)

    diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
    index ce63cf3..0db2b70 100644
    --- a/arch/x86/include/asm/io_apic.h
    +++ b/arch/x86/include/asm/io_apic.h
    @@ -191,6 +191,7 @@ extern void mp_unmap_irq(int irq);
    extern int mp_register_ioapic(int id, u32 address, u32 gsi_base,
    struct ioapic_domain_cfg *cfg);
    extern int mp_unregister_ioapic(u32 gsi_base);
    +extern int mp_ioapic_registered(u32 gsi_base);
    extern int mp_irqdomain_map(struct irq_domain *domain, unsigned int virq,
    irq_hw_number_t hwirq);
    extern void mp_irqdomain_unmap(struct irq_domain *domain, unsigned int virq);
    diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
    index 5427d9b..ddddaed 100644
    --- a/arch/x86/kernel/acpi/boot.c
    +++ b/arch/x86/kernel/acpi/boot.c
    @@ -826,6 +826,28 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base)
    }
    EXPORT_SYMBOL(acpi_unregister_ioapic);

    +/**
    + * acpi_ioapic_registered - Check whether IOAPIC assoicatied with @gsi_base
    + * has been registered
    + * @handle: ACPI handle of the IOAPIC deivce
    + * @gsi_base: GSI base associated with the IOAPIC
    + *
    + * Assume caller holds some type of lock to serialize acpi_ioapic_registered()
    + * with acpi_register_ioapic()/acpi_unregister_ioapic().
    + */
    +int acpi_ioapic_registered(acpi_handle handle, u32 gsi_base)
    +{
    + int ret = 0;
    +
    +#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
    + mutex_lock(&acpi_ioapic_lock);
    + ret = mp_ioapic_registered(gsi_base);
    + mutex_unlock(&acpi_ioapic_lock);
    +#endif
    +
    + return ret;
    +}
    +
    static int __init acpi_parse_sbf(struct acpi_table_header *table)
    {
    struct acpi_table_boot *sb;
    diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
    index 06a0a6c..1cedf41 100644
    --- a/arch/x86/kernel/apic/io_apic.c
    +++ b/arch/x86/kernel/apic/io_apic.c
    @@ -4026,6 +4026,17 @@ int mp_unregister_ioapic(u32 gsi_base)
    return 0;
    }

    +int mp_ioapic_registered(u32 gsi_base)
    +{
    + int ioapic;
    +
    + for_each_ioapic(ioapic)
    + if (ioapics[ioapic].gsi_config.gsi_base == gsi_base)
    + return 1;
    +
    + return 0;
    +}
    +
    int mp_irqdomain_map(struct irq_domain *domain, unsigned int virq,
    irq_hw_number_t hwirq)
    {
    diff --git a/include/linux/acpi.h b/include/linux/acpi.h
    index 407a12f..a81dd43 100644
    --- a/include/linux/acpi.h
    +++ b/include/linux/acpi.h
    @@ -148,6 +148,7 @@ int acpi_unmap_lsapic(int cpu);

    int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base);
    int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base);
    +int acpi_ioapic_registered(acpi_handle handle, u32 gsi_base);
    void acpi_irq_stats_init(void);
    extern u32 acpi_irq_handled;
    extern u32 acpi_irq_not_handled;

    \
     
     \ /
      Last update: 2014-12-19 15:41    [W:3.020 / U:0.324 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site