delete rt2800pci-handle-spurious-interrupts.patch and rt2x00-handle-spurious-pci...

Removed them from 3.0 and 3.1 trees

diff --git a/queue-3.0/rt2800pci-handle-spurious-interrupts.patch b/queue-3.0/rt2800pci-handle-spurious-interrupts.patch
deleted file mode 100644 (file)
index 8fb7457..0000000
--- a/queue-3.0/rt2800pci-handle-spurious-interrupts.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 4ba7d9997869d25bd223dea7536fc1ce9fab3b3b Mon Sep 17 00:00:00 2001
-From: Stanislaw Gruszka <sgruszka@redhat.com>
-Date: Wed, 16 Nov 2011 11:09:17 +0100
-Subject: rt2800pci: handle spurious interrupts
-
-From: Stanislaw Gruszka <sgruszka@redhat.com>
-
-commit 4ba7d9997869d25bd223dea7536fc1ce9fab3b3b upstream.
-
-Some devices may generate spurious interrupts, we have to handle them
-otherwise interrupt line will be disabled with below message and driver
-will not work:
-
-[ 2052.114334] irq 17: nobody cared (try booting with the "irqpoll" option)
-[ 2052.114339] Pid: 0, comm: swapper Tainted: P           2.6.35.6-48.fc14.x86_64 #1
-[ 2052.114341] Call Trace:
-[ 2052.114342]  <IRQ>  [<ffffffff810a6e2b>] __report_bad_irq.clone.1+0x3d/0x8b
-[ 2052.114349]  [<ffffffff810a6f93>] note_interrupt+0x11a/0x17f
-[ 2052.114352]  [<ffffffff810a7a73>] handle_fasteoi_irq+0xa8/0xce
-[ 2052.114355]  [<ffffffff8100c2ea>] handle_irq+0x88/0x90
-[ 2052.114357]  [<ffffffff8146f034>] do_IRQ+0x5c/0xb4
-[ 2052.114360]  [<ffffffff81469593>] ret_from_intr+0x0/0x11
-[ 2052.114361]  <EOI>  [<ffffffff8102b7f9>] ? native_safe_halt+0xb/0xd
-[ 2052.114366]  [<ffffffff81010f03>] ? need_resched+0x23/0x2d
-[ 2052.114367]  [<ffffffff8101102a>] default_idle+0x34/0x4f
-[ 2052.114370]  [<ffffffff81008325>] cpu_idle+0xaa/0xcc
-[ 2052.114373]  [<ffffffff81461f2a>] start_secondary+0x24d/0x28e
-[ 2052.114374] handlers:
-[ 2052.114375] [<ffffffff81332944>] (usb_hcd_irq+0x0/0x7c)
-[ 2052.114378] [<ffffffffa00697da>] (rt2800pci_interrupt+0x0/0x18d [rt2800pci])
-[ 2052.114384] Disabling IRQ #17
-
-Resolve:
-https://bugzilla.redhat.com/show_bug.cgi?id=658451
-
-Reported-and-tested-by: Amir Hedayaty <hedayaty@gmail.com>
-Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
-Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/net/wireless/rt2x00/rt2800pci.c |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -886,8 +886,13 @@ static irqreturn_t rt2800pci_interrupt(i
-       rt2x00pci_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
-       rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
- 
-+      /*
-+       * Some devices can generate interrupts with empty CSR register, we
-+       * "handle" such irq's to prevent interrupt controller treat them as
-+       * spurious interrupts and disable irq line.
-+       */
-       if (!reg)
--              return IRQ_NONE;
-+              return IRQ_HANDLED;
- 
-       if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
-               return IRQ_HANDLED;

diff --git a/queue-3.0/rt2x00-handle-spurious-pci-interrupts.patch b/queue-3.0/rt2x00-handle-spurious-pci-interrupts.patch
deleted file mode 100644 (file)
index da7077e..0000000
--- a/queue-3.0/rt2x00-handle-spurious-pci-interrupts.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 23085d5796561625db4143a671f1de081f66ef08 Mon Sep 17 00:00:00 2001
-From: Stanislaw Gruszka <sgruszka@redhat.com>
-Date: Wed, 16 Nov 2011 13:58:42 +0100
-Subject: rt2x00: handle spurious pci interrupts
-
-From: Stanislaw Gruszka <sgruszka@redhat.com>
-
-commit 23085d5796561625db4143a671f1de081f66ef08 upstream.
-
-We have documented case of very bad performance issue on rt2800pci
-device, because it generate spurious interrupt, what cause irq line
-is disabled: https://bugzilla.redhat.com/show_bug.cgi?id=658451
-
-We already address that problem in separate patch by returning
-IRQ_HANDLED from interrupt handler. We think similar fix is needed for
-other rt2x00 PCI devices, because users report performance problems on
-these devices too.
-
-Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
-Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/net/wireless/rt2x00/rt2400pci.c |    2 +-
- drivers/net/wireless/rt2x00/rt2500pci.c |    2 +-
- drivers/net/wireless/rt2x00/rt61pci.c   |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/rt2400pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
-@@ -1387,7 +1387,7 @@ static irqreturn_t rt2400pci_interrupt(i
-       rt2x00pci_register_write(rt2x00dev, CSR7, reg);
- 
-       if (!reg)
--              return IRQ_NONE;
-+              return IRQ_HANDLED;
- 
-       if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
-               return IRQ_HANDLED;
---- a/drivers/net/wireless/rt2x00/rt2500pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
-@@ -1519,7 +1519,7 @@ static irqreturn_t rt2500pci_interrupt(i
-       rt2x00pci_register_write(rt2x00dev, CSR7, reg);
- 
-       if (!reg)
--              return IRQ_NONE;
-+              return IRQ_HANDLED;
- 
-       if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
-               return IRQ_HANDLED;
---- a/drivers/net/wireless/rt2x00/rt61pci.c
-+++ b/drivers/net/wireless/rt2x00/rt61pci.c
-@@ -2345,7 +2345,7 @@ static irqreturn_t rt61pci_interrupt(int
-       rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
- 
-       if (!reg && !reg_mcu)
--              return IRQ_NONE;
-+              return IRQ_HANDLED;
- 
-       if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
-               return IRQ_HANDLED;

diff --git a/queue-3.0/series b/queue-3.0/series
index f846f0fa59e183a28c34d51369da4dc6d3717d20..1c81b5c1922587d57a4d760080b37ad8584b0672 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -28,8 +28,6 @@ timekeeping-add-arch_offset-hook-to-ktime_get-functions.patch
 hrtimer-fix-extra-wakeups-from-__remove_hrtimer.patch
 p54spi-add-missing-spin_lock_init.patch
 p54spi-fix-workqueue-deadlock.patch
-rt2800pci-handle-spurious-interrupts.patch
-rt2x00-handle-spurious-pci-interrupts.patch
 rt2x00-fix-efuse-eeprom-reading-on-ppc32.patch
 nl80211-fix-mac-address-validation.patch
 cfg80211-fix-regulatory-null-dereference.patch

diff --git a/queue-3.1/rt2800pci-handle-spurious-interrupts.patch b/queue-3.1/rt2800pci-handle-spurious-interrupts.patch
deleted file mode 100644 (file)
index 3f1ce59..0000000
--- a/queue-3.1/rt2800pci-handle-spurious-interrupts.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 4ba7d9997869d25bd223dea7536fc1ce9fab3b3b Mon Sep 17 00:00:00 2001
-From: Stanislaw Gruszka <sgruszka@redhat.com>
-Date: Wed, 16 Nov 2011 11:09:17 +0100
-Subject: rt2800pci: handle spurious interrupts
-
-From: Stanislaw Gruszka <sgruszka@redhat.com>
-
-commit 4ba7d9997869d25bd223dea7536fc1ce9fab3b3b upstream.
-
-Some devices may generate spurious interrupts, we have to handle them
-otherwise interrupt line will be disabled with below message and driver
-will not work:
-
-[ 2052.114334] irq 17: nobody cared (try booting with the "irqpoll" option)
-[ 2052.114339] Pid: 0, comm: swapper Tainted: P           2.6.35.6-48.fc14.x86_64 #1
-[ 2052.114341] Call Trace:
-[ 2052.114342]  <IRQ>  [<ffffffff810a6e2b>] __report_bad_irq.clone.1+0x3d/0x8b
-[ 2052.114349]  [<ffffffff810a6f93>] note_interrupt+0x11a/0x17f
-[ 2052.114352]  [<ffffffff810a7a73>] handle_fasteoi_irq+0xa8/0xce
-[ 2052.114355]  [<ffffffff8100c2ea>] handle_irq+0x88/0x90
-[ 2052.114357]  [<ffffffff8146f034>] do_IRQ+0x5c/0xb4
-[ 2052.114360]  [<ffffffff81469593>] ret_from_intr+0x0/0x11
-[ 2052.114361]  <EOI>  [<ffffffff8102b7f9>] ? native_safe_halt+0xb/0xd
-[ 2052.114366]  [<ffffffff81010f03>] ? need_resched+0x23/0x2d
-[ 2052.114367]  [<ffffffff8101102a>] default_idle+0x34/0x4f
-[ 2052.114370]  [<ffffffff81008325>] cpu_idle+0xaa/0xcc
-[ 2052.114373]  [<ffffffff81461f2a>] start_secondary+0x24d/0x28e
-[ 2052.114374] handlers:
-[ 2052.114375] [<ffffffff81332944>] (usb_hcd_irq+0x0/0x7c)
-[ 2052.114378] [<ffffffffa00697da>] (rt2800pci_interrupt+0x0/0x18d [rt2800pci])
-[ 2052.114384] Disabling IRQ #17
-
-Resolve:
-https://bugzilla.redhat.com/show_bug.cgi?id=658451
-
-Reported-and-tested-by: Amir Hedayaty <hedayaty@gmail.com>
-Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
-Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/net/wireless/rt2x00/rt2800pci.c |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -888,8 +888,13 @@ static irqreturn_t rt2800pci_interrupt(i
-       rt2x00pci_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
-       rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
- 
-+      /*
-+       * Some devices can generate interrupts with empty CSR register, we
-+       * "handle" such irq's to prevent interrupt controller treat them as
-+       * spurious interrupts and disable irq line.
-+       */
-       if (!reg)
--              return IRQ_NONE;
-+              return IRQ_HANDLED;
- 
-       if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
-               return IRQ_HANDLED;

diff --git a/queue-3.1/rt2x00-handle-spurious-pci-interrupts.patch b/queue-3.1/rt2x00-handle-spurious-pci-interrupts.patch
deleted file mode 100644 (file)
index da7077e..0000000
--- a/queue-3.1/rt2x00-handle-spurious-pci-interrupts.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 23085d5796561625db4143a671f1de081f66ef08 Mon Sep 17 00:00:00 2001
-From: Stanislaw Gruszka <sgruszka@redhat.com>
-Date: Wed, 16 Nov 2011 13:58:42 +0100
-Subject: rt2x00: handle spurious pci interrupts
-
-From: Stanislaw Gruszka <sgruszka@redhat.com>
-
-commit 23085d5796561625db4143a671f1de081f66ef08 upstream.
-
-We have documented case of very bad performance issue on rt2800pci
-device, because it generate spurious interrupt, what cause irq line
-is disabled: https://bugzilla.redhat.com/show_bug.cgi?id=658451
-
-We already address that problem in separate patch by returning
-IRQ_HANDLED from interrupt handler. We think similar fix is needed for
-other rt2x00 PCI devices, because users report performance problems on
-these devices too.
-
-Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
-Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/net/wireless/rt2x00/rt2400pci.c |    2 +-
- drivers/net/wireless/rt2x00/rt2500pci.c |    2 +-
- drivers/net/wireless/rt2x00/rt61pci.c   |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/rt2400pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
-@@ -1387,7 +1387,7 @@ static irqreturn_t rt2400pci_interrupt(i
-       rt2x00pci_register_write(rt2x00dev, CSR7, reg);
- 
-       if (!reg)
--              return IRQ_NONE;
-+              return IRQ_HANDLED;
- 
-       if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
-               return IRQ_HANDLED;
---- a/drivers/net/wireless/rt2x00/rt2500pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
-@@ -1519,7 +1519,7 @@ static irqreturn_t rt2500pci_interrupt(i
-       rt2x00pci_register_write(rt2x00dev, CSR7, reg);
- 
-       if (!reg)
--              return IRQ_NONE;
-+              return IRQ_HANDLED;
- 
-       if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
-               return IRQ_HANDLED;
---- a/drivers/net/wireless/rt2x00/rt61pci.c
-+++ b/drivers/net/wireless/rt2x00/rt61pci.c
-@@ -2345,7 +2345,7 @@ static irqreturn_t rt61pci_interrupt(int
-       rt2x00pci_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
- 
-       if (!reg && !reg_mcu)
--              return IRQ_NONE;
-+              return IRQ_HANDLED;
- 
-       if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
-               return IRQ_HANDLED;

diff --git a/queue-3.1/series b/queue-3.1/series
index 3e8fcf61adfde35a9618c9f8c837a822cbdf7d83..ee85ecccd182514a9dad9d3d6940f3194a748075 100644 (file)
--- a/queue-3.1/series
+++ b/queue-3.1/series
@@ -38,8 +38,6 @@ hrtimer-fix-extra-wakeups-from-__remove_hrtimer.patch
 clocksource-avoid-selecting-mult-values-that-might-overflow-when-adjusted.patch
 p54spi-add-missing-spin_lock_init.patch
 p54spi-fix-workqueue-deadlock.patch
-rt2800pci-handle-spurious-interrupts.patch
-rt2x00-handle-spurious-pci-interrupts.patch
 rt2x00-fix-efuse-eeprom-reading-on-ppc32.patch
 nl80211-fix-mac-address-validation.patch
 cfg80211-fix-regulatory-null-dereference.patch
@@ -54,3 +52,4 @@ xfs-use-doalloc-flag-in-xfs_qm_dqattach_one.patch
 scsi-silencing-killing-requests-for-dead-queue.patch
 hugetlb-release-pages-in-the-error-path-of-hugetlb_cow.patch
 bridge-correct-ipv6-checksum-after-pull.patch
+iwlwifi-allow-pci_enable_msi-fail.patch