The patch titled
s2io: don't run MSI handlers if device is offline.
has been removed from the -mm tree. Its filename was
s2io-dont-run-msi-handlers-if-device-is-offline.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: s2io: don't run MSI handlers if device is offline.
From: Linas Vepstas [mailto:linas@xxxxxxxxxxxxxx]
Don't run any of the MSI handlers if the channel is off; also don't gather
device statatistics. Also, netif_wake not needed, per suggestions from
Sivakumar Subramani <sivakumar.subramani@xxxxxxxxxxxx>.
Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Cc: Ramkrishna Vepa <Ramkrishna.Vepa@xxxxxxxxxxxx>
Acked-by: Sivakumar Subramani <sivakumar.subramani@xxxxxxxxxxxx>
Cc: Sreenivasa Honnur <sreenivasa.honnur@xxxxxxxxxxxx>
Cc: Rastapur Santosh <santosh.rastapur@xxxxxxxxxxxx>
Cc: Wen Xiong <wenxiong@xxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/s2io.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff -puN drivers/net/s2io.c~s2io-dont-run-msi-handlers-if-device-is-offline drivers/net/s2io.c
--- a/drivers/net/s2io.c~s2io-dont-run-msi-handlers-if-device-is-offline
+++ a/drivers/net/s2io.c
@@ -4202,6 +4202,9 @@ static irqreturn_t s2io_msi_handle(int i
struct mac_info *mac_control;
struct config_param *config;
+ if (pci_channel_offline(sp->pdev))
+ return IRQ_NONE;
+
atomic_inc(&sp->isr_cnt);
mac_control = &sp->mac_control;
config = &sp->config;
@@ -4232,6 +4235,9 @@ static irqreturn_t s2io_msix_ring_handle
struct ring_info *ring = (struct ring_info *)dev_id;
struct s2io_nic *sp = ring->nic;
+ if (pci_channel_offline(sp->pdev))
+ return IRQ_NONE;
+
atomic_inc(&sp->isr_cnt);
rx_intr_handler(ring);
@@ -4246,6 +4252,9 @@ static irqreturn_t s2io_msix_fifo_handle
struct fifo_info *fifo = (struct fifo_info *)dev_id;
struct s2io_nic *sp = fifo->nic;
+ if (pci_channel_offline(sp->pdev))
+ return IRQ_NONE;
+
atomic_inc(&sp->isr_cnt);
tx_intr_handler(fifo);
atomic_dec(&sp->isr_cnt);
@@ -4428,6 +4437,9 @@ static void s2io_updt_stats(struct s2io_
u64 val64;
int cnt = 0;
+ if (pci_channel_offline(sp->pdev))
+ return;
+
if (atomic_read(&sp->card_state) == CARD_UP) {
/* Apprx 30us on a 133 MHz bus */
val64 = SET_UPDT_CLICKS(10) |
@@ -8122,5 +8134,4 @@ static void s2io_io_resume(struct pci_de
}
netif_device_attach(netdev);
- netif_wake_queue(netdev);
}
_
Patches currently in -mm which might be from sivakumar.subramani@xxxxxxxxxxxx are
s2io-dont-run-msi-handlers-if-device-is-offline.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
