lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 19 Dec 2014 06:05:47 -0800 From: tip-bot for Jiang Liu <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: tglx@...utronix.de, gregkh@...uxfoundation.org, rjw@...ysocki.net, bhelgaas@...gle.com, len.brown@...el.com, konrad.wilk@...cle.com, hpa@...or.com, rdunlap@...radead.org, linux-kernel@...r.kernel.org, joro@...tes.org, yinghai@...nel.org, tony.luck@...el.com, mingo@...nel.org, bp@...en8.de, pavel@....cz, jiang.liu@...ux.intel.com, benh@...nel.crashing.org Subject: [tip:x86/apic] x86, irq, acpi: Get rid of special handling of GSI for ACPI SCI Commit-ID: cd68f6bd53cf89d1d5ed889b8af65e9c3574a079 Gitweb: http://git.kernel.org/tip/cd68f6bd53cf89d1d5ed889b8af65e9c3574a079 Author: Jiang Liu <jiang.liu@...ux.intel.com> AuthorDate: Mon, 27 Oct 2014 16:11:52 +0800 Committer: Thomas Gleixner <tglx@...utronix.de> CommitDate: Tue, 16 Dec 2014 14:08:16 +0100 x86, irq, acpi: Get rid of special handling of GSI for ACPI SCI The IOAPIC has logic to track IOAPIC pin status, so there's no need for special treatment for GSI used by ACPI SCI in function mp_register_gsi() and mp_unregister_gsi(). Signed-off-by: Jiang Liu <jiang.liu@...ux.intel.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com> Cc: Tony Luck <tony.luck@...el.com> Cc: Joerg Roedel <joro@...tes.org> Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org> Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org> Cc: Rafael J. Wysocki <rjw@...ysocki.net> Cc: Bjorn Helgaas <bhelgaas@...gle.com> Cc: Randy Dunlap <rdunlap@...radead.org> Cc: Yinghai Lu <yinghai@...nel.org> Cc: Borislav Petkov <bp@...en8.de> Cc: Len Brown <len.brown@...el.com> Cc: Pavel Machek <pavel@....cz> Link: http://lkml.kernel.org/r/1414397531-28254-2-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner <tglx@...utronix.de> --- arch/x86/kernel/acpi/boot.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index ddddaed..4433a4b 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -408,10 +408,6 @@ static int mp_register_gsi(struct device *dev, u32 gsi, int trigger, if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC) return gsi; - /* Don't set up the ACPI SCI because it's already set up */ - if (acpi_gbl_FADT.sci_interrupt == gsi) - return mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC); - trigger = trigger == ACPI_EDGE_SENSITIVE ? 0 : 1; polarity = polarity == ACPI_ACTIVE_HIGH ? 0 : 1; node = dev ? dev_to_node(dev) : NUMA_NO_NODE; @@ -424,7 +420,8 @@ static int mp_register_gsi(struct device *dev, u32 gsi, int trigger, if (irq < 0) return irq; - if (enable_update_mptable) + /* Don't set up the ACPI SCI because it's already set up */ + if (enable_update_mptable && acpi_gbl_FADT.sci_interrupt != gsi) mp_config_acpi_gsi(dev, gsi, trigger, polarity); return irq; @@ -437,9 +434,6 @@ static void mp_unregister_gsi(u32 gsi) if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC) return; - if (acpi_gbl_FADT.sci_interrupt == gsi) - return; - irq = mp_map_gsi_to_irq(gsi, 0); if (irq > 0) mp_unmap_irq(irq); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists