diff options
| author | Ajit Khaparde <ajit.khaparde@emulex.com> | 2011-02-11 13:38:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-11 21:14:48 -0800 |
| commit | 7acc2087fa204461871eccfdc913eef15ffd5c8f (patch) | |
| tree | 1b8f189ee3936ecfaa6260bd51544f8fd8be0190 /drivers/net/benet | |
| parent | a4ca055fc3124e1b6aee6b491a157cd242ee5226 (diff) | |
| download | linux-3.10-7acc2087fa204461871eccfdc913eef15ffd5c8f.tar.gz linux-3.10-7acc2087fa204461871eccfdc913eef15ffd5c8f.tar.bz2 linux-3.10-7acc2087fa204461871eccfdc913eef15ffd5c8f.zip | |
be2net: gracefully handle situations when UE is detected
Avoid accessing the hardware when UE is detected.
Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet')
| -rw-r--r-- | drivers/net/benet/be_cmds.c | 15 | ||||
| -rw-r--r-- | drivers/net/benet/be_main.c | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c index 8fa9a709d9f..619ebc24602 100644 --- a/drivers/net/benet/be_cmds.c +++ b/drivers/net/benet/be_cmds.c @@ -23,6 +23,12 @@ 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"); + return; + } + val |= mccq->id & DB_MCCQ_RING_ID_MASK; val |= 1 << DB_MCCQ_NUM_POSTED_SHIFT; @@ -217,6 +223,9 @@ static int be_mcc_wait_compl(struct be_adapter *adapter) int i, num, status = 0; struct be_mcc_obj *mcc_obj = &adapter->mcc_obj; + if (adapter->eeh_err) + return -EIO; + for (i = 0; i < mcc_timeout; i++) { num = be_process_mcc(adapter, &status); if (num) @@ -246,6 +255,12 @@ 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"); + return -EIO; + } + do { ready = ioread32(db); if (ready == 0xffffffff) { diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 7e83c06f913..1f5e342dd88 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -1827,6 +1827,7 @@ void be_detect_dump_ue(struct be_adapter *adapter) if (ue_status_lo || ue_status_hi) { adapter->ue_detected = true; + adapter->eeh_err = true; dev_err(&adapter->pdev->dev, "UE Detected!!\n"); } |