Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e89900c9 authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

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: default avatarJiang Liu <jiang.liu@linux.intel.com>
Acked-by: default avatarPavel 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent 15516a3b

arch/x86/include/asm/io_apic.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

arch/x86/kernel/acpi/boot.c

+22 −0
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/apic/io_apic.c

+11 −0
Original line number Diff line number Diff line
@@ -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)

{

include/linux/acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -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;