Skip to content

Commit

Permalink
be2net: don't log more than one error on detecting EEH/UE errors
Browse files Browse the repository at this point in the history
Currently we're spamming error messages each time a FW cmd call is made
while in EEH/UE error state. One log msg on error detection is enough.

Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sathya Perla authored and David S. Miller committed Nov 12, 2011
1 parent 72f0248 commit 434b364
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
15 changes: 3 additions & 12 deletions drivers/net/ethernet/emulex/benet/be_cmds.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,8 @@ static void be_mcc_notify(struct be_adapter *adapter)
struct be_queue_info *mccq = &adapter->mcc_obj.q;
u32 val = 0;

if (adapter->eeh_err) {
dev_info(&adapter->pdev->dev,
"Error in Card Detected! Cannot issue commands\n");
if (adapter->eeh_err)
return;
}

val |= mccq->id & DB_MCCQ_RING_ID_MASK;
val |= 1 << DB_MCCQ_NUM_POSTED_SHIFT;
Expand Down Expand Up @@ -298,19 +295,13 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)
int msecs = 0;
u32 ready;

if (adapter->eeh_err) {
dev_err(&adapter->pdev->dev,
"Error detected in card.Cannot issue commands\n");
if (adapter->eeh_err)
return -EIO;
}

do {
ready = ioread32(db);
if (ready == 0xffffffff) {
dev_err(&adapter->pdev->dev,
"pci slot disconnected\n");
if (ready == 0xffffffff)
return -1;
}

ready &= MPU_MAILBOX_DB_RDY_MASK;
if (ready)
Expand Down
3 changes: 2 additions & 1 deletion drivers/net/ethernet/emulex/benet/be_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2007,7 +2007,8 @@ void be_detect_dump_ue(struct be_adapter *adapter)
sliport_status & SLIPORT_STATUS_ERR_MASK) {
adapter->ue_detected = true;
adapter->eeh_err = true;
dev_err(&adapter->pdev->dev, "UE Detected!!\n");
dev_err(&adapter->pdev->dev,
"Unrecoverable error in the card\n");
}

if (ue_lo) {
Expand Down

0 comments on commit 434b364

Please sign in to comment.