41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From: Sathya Perla <sathya.perla@emulex.com>
|
|
Date: Thu, 10 Nov 2011 19:17:58 +0000
|
|
Subject: [PATCH 03/58] be2net: stop checking the UE registers after an EEH
|
|
error
|
|
|
|
commit 72f02485626b3e71955e54d227ede1b54021d571 upstream.
|
|
|
|
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/emulex/benet/be_main.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
|
|
index 83d971d..99da07f 100644
|
|
--- a/drivers/net/ethernet/emulex/benet/be_main.c
|
|
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
|
|
@@ -1978,6 +1978,9 @@ void be_detect_dump_ue(struct be_adapter *adapter)
|
|
u32 sliport_status = 0, sliport_err1 = 0, sliport_err2 = 0;
|
|
u32 i;
|
|
|
|
+ if (adapter->eeh_err || adapter->ue_detected)
|
|
+ return;
|
|
+
|
|
if (lancer_chip(adapter)) {
|
|
sliport_status = ioread32(adapter->db + SLIPORT_STATUS_OFFSET);
|
|
if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
|
|
@@ -2039,8 +2042,7 @@ static void be_worker(struct work_struct *work)
|
|
struct be_rx_obj *rxo;
|
|
int i;
|
|
|
|
- if (!adapter->ue_detected)
|
|
- be_detect_dump_ue(adapter);
|
|
+ be_detect_dump_ue(adapter);
|
|
|
|
/* when interrupts are not yet enabled, just reap any pending
|
|
* mcc completions */
|
|
--
|
|
1.7.10
|
|
|