Commit-ID: 2c0a6894df19515baf9d2bf0076a2b57c8b51efb Gitweb: http://git.kernel.org/tip/2c0a6894df19515baf9d2bf0076a2b57c8b51efb Author: Jiang Liu <jiang....@linux.intel.com> AuthorDate: Tue, 10 Jun 2014 14:11:23 +0800 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Sat, 21 Jun 2014 23:05:40 +0200
x86, ACPI, irq: Enhance error handling in function acpi_register_gsi() Function mp_register_gsi() may return error code when failed to look up or program corresponding IOAPIC pin for GSI, so enhance acpi_register_gsi() to handle possible error cases. Signed-off-by: Jiang Liu <jiang....@linux.intel.com> Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> Cc: Tony Luck <tony.l...@intel.com> Cc: Joerg Roedel <j...@8bytes.org> Cc: Paul Gortmaker <paul.gortma...@windriver.com> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org> Cc: Grant Likely <grant.lik...@linaro.org> Cc: Rafael J. Wysocki <r...@rjwysocki.net> Cc: Bjorn Helgaas <bhelg...@google.com> Cc: Randy Dunlap <rdun...@infradead.org> Cc: Yinghai Lu <ying...@kernel.org> Cc: Len Brown <len.br...@intel.com> Cc: Pavel Machek <pa...@ucw.cz> Link: http://lkml.kernel.org/r/1402380683-32345-1-git-send-email-jiang....@linux.intel.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- arch/x86/kernel/acpi/boot.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 392360c..298f796 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -97,6 +97,8 @@ static u32 isa_irq_to_gsi[NR_IRQS_LEGACY] __read_mostly = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; +#define ACPI_INVALID_GSI INT_MIN + static unsigned int gsi_to_irq(unsigned int gsi) { unsigned int irq = gsi + NR_IRQS_LEGACY; @@ -441,7 +443,7 @@ static int mp_register_gsi(struct device *dev, u32 gsi, int trigger, polarity == ACPI_ACTIVE_HIGH ? 0 : 1); ret = io_apic_set_pci_routing(dev, gsi_to_irq(gsi), &irq_attr); if (ret < 0) - gsi = INT_MIN; + gsi = ACPI_INVALID_GSI; return gsi; } @@ -666,13 +668,13 @@ int (*acpi_suspend_lowlevel)(void); */ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) { - unsigned int irq; - unsigned int plat_gsi = gsi; + unsigned int plat_gsi; - plat_gsi = (*__acpi_register_gsi)(dev, gsi, trigger, polarity); - irq = gsi_to_irq(plat_gsi); + plat_gsi = __acpi_register_gsi(dev, gsi, trigger, polarity); + if (plat_gsi != ACPI_INVALID_GSI) + return gsi_to_irq(plat_gsi); - return irq; + return -1; } EXPORT_SYMBOL_GPL(acpi_register_gsi); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
