linux-kernel - [tip:x86/urgent] ACPI: pci: Do not clear pci_dev-> irq in acpi_pci_irq

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-9889eaeb7c999cae64006bb98c47f40f412ec875@git.kernel.org>
Date:	Tue, 20 Jan 2015 02:49:44 -0800
From:	tip-bot for Jiang Liu <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	david.vrabel@...rix.com, hpa@...or.com, linux@...elenboom.it,
	tony.luck@...el.com, jiang.liu@...ux.intel.com, mingo@...nel.org,
	tglx@...utronix.de, lenb@...nel.org, konrad.wilk@...cle.com,
	rjw@...ysocki.net, linux-kernel@...r.kernel.org
Subject: [tip:x86/urgent] ACPI: pci: Do not clear pci_dev->
 irq in acpi_pci_irq_disable()

Commit-ID:  9889eaeb7c999cae64006bb98c47f40f412ec875
Gitweb:     http://git.kernel.org/tip/9889eaeb7c999cae64006bb98c47f40f412ec875
Author:     Jiang Liu <jiang.liu@...ux.intel.com>
AuthorDate: Tue, 20 Jan 2015 10:21:06 +0800
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Tue, 20 Jan 2015 11:44:40 +0100

ACPI: pci: Do not clear pci_dev->irq in acpi_pci_irq_disable()

Xen pciback driver assumes that pci_dev->irq won't change after calling
pci_disable_device(). But commit cffe0a2b5a34c95a4dadc9ec7132690a5b0f6687
("x86, irq: Keep balance of IOAPIC pin reference count") frees irq
resources and resets pci_dev->irq to zero when pci_disable_device() is
called.

So this is a hotfix for 3.19 to avoid resetting pci_dev->irq, and
another proper fix will be prepared for next merging window.

Signed-off-by: Jiang Liu <jiang.liu@...ux.intel.com>
Tested-by: Sander Eikelenboom <linux@...elenboom.it>
Cc: Tony Luck <tony.luck@...el.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc: David Vrabel <david.vrabel@...rix.com>
Cc: Rafael J. Wysocki <rjw@...ysocki.net>
Cc: Len Brown <lenb@...nel.org>
Link: http://lkml.kernel.org/r/1421720467-7709-3-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
 drivers/acpi/pci_irq.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 5277a0e..b1def41 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -512,7 +512,6 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
 	dev_dbg(&dev->dev, "PCI INT %c disabled\n", pin_name(pin));
 	if (gsi >= 0) {
 		acpi_unregister_gsi(gsi);
-		dev->irq = 0;
 		dev->irq_managed = 0;
 	}
 }
--
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/