]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
remove pci patch that had already been applied
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 Apr 2014 16:50:45 +0000 (09:50 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 Apr 2014 16:50:45 +0000 (09:50 -0700)
queue-3.10/pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch [deleted file]
queue-3.10/series
queue-3.13/pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch [deleted file]
queue-3.13/series
queue-3.14/pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch [deleted file]
queue-3.14/series

diff --git a/queue-3.10/pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch b/queue-3.10/pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch
deleted file mode 100644 (file)
index 6a5dfc9..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 866d54177b4e671cd52bed1fb487d140d7b691f5 Mon Sep 17 00:00:00 2001
-From: Bjorn Helgaas <bhelgaas@google.com>
-Date: Fri, 7 Mar 2014 16:06:05 -0700
-Subject: PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
-
-From: Bjorn Helgaas <bhelgaas@google.com>
-
-commit 866d54177b4e671cd52bed1fb487d140d7b691f5 upstream.
-
-Andreas reported that after 1f42db786b14 ("PCI: Enable INTx if BIOS left
-them disabled"), pciehp surprise removal stopped working.
-
-This happens because pci_reenable_device() on the hotplug bridge (used in
-the pciehp_configure_device() path) clears the Interrupt Disable bit, which
-apparently breaks the bridge's MSI hotplug event reporting.
-
-Previously we cleared the Interrupt Disable bit in do_pci_enable_device(),
-which is used by both pci_enable_device() and pci_reenable_device().  But
-we use pci_reenable_device() after the driver may have enabled MSI or
-MSI-X, and we *set* Interrupt Disable as part of enabling MSI/MSI-X.
-
-This patch clears Interrupt Disable only when MSI/MSI-X has not been
-enabled.
-
-Fixes: 1f42db786b14 PCI: Enable INTx if BIOS left them disabled
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=71691
-Reported-and-tested-by: Andreas Noever <andreas.noever@gmail.com>
-Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-CC: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/pci/pci.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/pci/pci.c
-+++ b/drivers/pci/pci.c
-@@ -1133,6 +1133,9 @@ static int do_pci_enable_device(struct p
-       if (dev->msi_enabled || dev->msix_enabled)
-               return 0;
-+      if (dev->msi_enabled || dev->msix_enabled)
-+              return 0;
-+
-       pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
-       if (pin) {
-               pci_read_config_word(dev, PCI_COMMAND, &cmd);
index 0dda3311b5f6429081b503d493ccebe91cfa8799..f9da2f44ac7004d0d4055d12561d708ed1187fe9 100644 (file)
@@ -1,7 +1,6 @@
 user-namespace-fix-incorrect-memory-barriers.patch
 char-ipmi_bt_sm-fix-infinite-loop.patch
 x86-adjust-irq-remapping-quirk-for-older-revisions-of-5500-5520-chipsets.patch
-pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch
 staging-comedi-8255_pci-initialize-mite-data-window.patch
 tty-set-correct-tty-name-in-active-sysfs-attribute.patch
 pid_namespace-pidns_get-should-check-task_active_pid_ns-null.patch
diff --git a/queue-3.13/pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch b/queue-3.13/pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch
deleted file mode 100644 (file)
index 347487a..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 866d54177b4e671cd52bed1fb487d140d7b691f5 Mon Sep 17 00:00:00 2001
-From: Bjorn Helgaas <bhelgaas@google.com>
-Date: Fri, 7 Mar 2014 16:06:05 -0700
-Subject: PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
-
-From: Bjorn Helgaas <bhelgaas@google.com>
-
-commit 866d54177b4e671cd52bed1fb487d140d7b691f5 upstream.
-
-Andreas reported that after 1f42db786b14 ("PCI: Enable INTx if BIOS left
-them disabled"), pciehp surprise removal stopped working.
-
-This happens because pci_reenable_device() on the hotplug bridge (used in
-the pciehp_configure_device() path) clears the Interrupt Disable bit, which
-apparently breaks the bridge's MSI hotplug event reporting.
-
-Previously we cleared the Interrupt Disable bit in do_pci_enable_device(),
-which is used by both pci_enable_device() and pci_reenable_device().  But
-we use pci_reenable_device() after the driver may have enabled MSI or
-MSI-X, and we *set* Interrupt Disable as part of enabling MSI/MSI-X.
-
-This patch clears Interrupt Disable only when MSI/MSI-X has not been
-enabled.
-
-Fixes: 1f42db786b14 PCI: Enable INTx if BIOS left them disabled
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=71691
-Reported-and-tested-by: Andreas Noever <andreas.noever@gmail.com>
-Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-CC: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/pci/pci.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/pci/pci.c
-+++ b/drivers/pci/pci.c
-@@ -1134,6 +1134,9 @@ static int do_pci_enable_device(struct p
-       if (dev->msi_enabled || dev->msix_enabled)
-               return 0;
-+      if (dev->msi_enabled || dev->msix_enabled)
-+              return 0;
-+
-       pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
-       if (pin) {
-               pci_read_config_word(dev, PCI_COMMAND, &cmd);
index 66de797573f285a316ce829de5a77e0e07a54a54..9fc271d152b1a500fcd80f4253acf0ddf27f6f9d 100644 (file)
@@ -5,7 +5,6 @@ x86-adjust-irq-remapping-quirk-for-older-revisions-of-5500-5520-chipsets.patch
 pci-designware-fix-rc-bar-to-be-single-64-bit-non-prefetchable-memory-bar.patch
 pci-designware-fix-iatu-programming-for-cfg1-io-and-mem-viewport.patch
 acpi-button-add-acpi-button-event-via-netlink-routine.patch
-pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch
 staging-comedi-8255_pci-initialize-mite-data-window.patch
 tty-set-correct-tty-name-in-active-sysfs-attribute.patch
 tty-fix-low_latency-bug.patch
diff --git a/queue-3.14/pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch b/queue-3.14/pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch
deleted file mode 100644 (file)
index f822709..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 866d54177b4e671cd52bed1fb487d140d7b691f5 Mon Sep 17 00:00:00 2001
-From: Bjorn Helgaas <bhelgaas@google.com>
-Date: Fri, 7 Mar 2014 16:06:05 -0700
-Subject: PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled
-
-From: Bjorn Helgaas <bhelgaas@google.com>
-
-commit 866d54177b4e671cd52bed1fb487d140d7b691f5 upstream.
-
-Andreas reported that after 1f42db786b14 ("PCI: Enable INTx if BIOS left
-them disabled"), pciehp surprise removal stopped working.
-
-This happens because pci_reenable_device() on the hotplug bridge (used in
-the pciehp_configure_device() path) clears the Interrupt Disable bit, which
-apparently breaks the bridge's MSI hotplug event reporting.
-
-Previously we cleared the Interrupt Disable bit in do_pci_enable_device(),
-which is used by both pci_enable_device() and pci_reenable_device().  But
-we use pci_reenable_device() after the driver may have enabled MSI or
-MSI-X, and we *set* Interrupt Disable as part of enabling MSI/MSI-X.
-
-This patch clears Interrupt Disable only when MSI/MSI-X has not been
-enabled.
-
-Fixes: 1f42db786b14 PCI: Enable INTx if BIOS left them disabled
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=71691
-Reported-and-tested-by: Andreas Noever <andreas.noever@gmail.com>
-Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-CC: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/pci/pci.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/pci/pci.c
-+++ b/drivers/pci/pci.c
-@@ -1195,6 +1195,9 @@ static int do_pci_enable_device(struct p
-       if (dev->msi_enabled || dev->msix_enabled)
-               return 0;
-+      if (dev->msi_enabled || dev->msix_enabled)
-+              return 0;
-+
-       pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
-       if (pin) {
-               pci_read_config_word(dev, PCI_COMMAND, &cmd);
index 8d8bb3cbca5bf29ee91ef7949bb560eb046c3425..e9486feac2d38a4b1e9d25af2bcff928490a5f27 100644 (file)
@@ -5,7 +5,6 @@ x86-adjust-irq-remapping-quirk-for-older-revisions-of-5500-5520-chipsets.patch
 pci-designware-fix-rc-bar-to-be-single-64-bit-non-prefetchable-memory-bar.patch
 pci-designware-fix-iatu-programming-for-cfg1-io-and-mem-viewport.patch
 acpi-button-add-acpi-button-event-via-netlink-routine.patch
-pci-enable-intx-in-pci_reenable_device-only-when-msi-msi-x-not-enabled.patch
 staging-comedi-8255_pci-initialize-mite-data-window.patch
 staging-comedi-fix-circular-locking-dependency-in-comedi_mmap.patch
 kernfs-fix-off-by-one-error.patch