evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

be2net: don't log more than one error on detecting EEH/UE errors

Browse source 
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>
This commit is contained in:
Sathya Perla 2011-11-10 19:17:59 +00:00 • committed by David S. Miller
parent 72f0248562
commit 434b3648e9
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/ethernet/emulex/benet/be_cmds.c
View file

@ -31,11 +31,8 @@ static void be_mcc_notify(struct be_adapter *adapter)
struct be_queue_info *mccq = &adapter->mcc_obj.q; struct be_queue_info *mccq = &adapter->mcc_obj.q;
u32 val = 0; u32 val = 0;
if (adapter->eeh_err) { if (adapter->eeh_err)
dev_info(&adapter->pdev->dev,
"Error in Card Detected! Cannot issue commands\n");
return; return;
}
val |= mccq->id & DB_MCCQ_RING_ID_MASK; val |= mccq->id & DB_MCCQ_RING_ID_MASK;
val |= 1 << DB_MCCQ_NUM_POSTED_SHIFT; val |= 1 << DB_MCCQ_NUM_POSTED_SHIFT;
@ -298,19 +295,13 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)
int msecs = 0; int msecs = 0;
u32 ready; u32 ready;
if (adapter->eeh_err) { if (adapter->eeh_err)
dev_err(&adapter->pdev->dev,
"Error detected in card.Cannot issue commands\n");
return -EIO; return -EIO;
}
do { do {
ready = ioread32(db); ready = ioread32(db);
if (ready == 0xffffffff) { if (ready == 0xffffffff)
dev_err(&adapter->pdev->dev,
"pci slot disconnected\n");
return -1; return -1;
}
ready &= MPU_MAILBOX_DB_RDY_MASK; ready &= MPU_MAILBOX_DB_RDY_MASK;
if (ready) if (ready)

3
drivers/net/ethernet/emulex/benet/be_main.c
View file

@ -2007,7 +2007,8 @@ void be_detect_dump_ue(struct be_adapter *adapter)
sliport_status & SLIPORT_STATUS_ERR_MASK) { sliport_status & SLIPORT_STATUS_ERR_MASK) {
adapter->ue_detected = true; adapter->ue_detected = true;
adapter->eeh_err = 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) { if (ue_lo) {