1 files changed, 45 insertions, 30 deletions

diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 171a08caf2be..0c7811faf72c 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -467,7 +467,8 @@ int be_cmd_fw_init(struct be_adapter *adapter)
         u8 *wrb;
         int status;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = (u8 *)wrb_from_mbox(adapter);
         *wrb++ = 0xFF;
@@ -481,7 +482,7 @@ int be_cmd_fw_init(struct be_adapter *adapter)
 
         status = be_mbox_notify_wait(adapter);
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
         return status;
 }
 
@@ -496,7 +497,8 @@ int be_cmd_fw_clean(struct be_adapter *adapter)
         if (adapter->eeh_err)
                 return -EIO;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = (u8 *)wrb_from_mbox(adapter);
         *wrb++ = 0xFF;
@@ -510,7 +512,7 @@ int be_cmd_fw_clean(struct be_adapter *adapter)
 
         status = be_mbox_notify_wait(adapter);
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
         return status;
 }
 int be_cmd_eq_create(struct be_adapter *adapter,
@@ -521,7 +523,8 @@ int be_cmd_eq_create(struct be_adapter *adapter,
         struct be_dma_mem *q_mem = &eq->dma_mem;
         int status;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -551,7 +554,7 @@ int be_cmd_eq_create(struct be_adapter *adapter,
                 eq->created = true;
         }
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
         return status;
 }
 
@@ -563,7 +566,8 @@ int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
         struct be_cmd_req_mac_query *req;
         int status;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -588,7 +592,7 @@ int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
                 memcpy(mac_addr, resp->mac.addr, ETH_ALEN);
         }
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
         return status;
 }
 
@@ -672,7 +676,8 @@ int be_cmd_cq_create(struct be_adapter *adapter,
         void *ctxt;
         int status;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -726,7 +731,7 @@ int be_cmd_cq_create(struct be_adapter *adapter,
                 cq->created = true;
         }
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
 
         return status;
 }
@@ -749,7 +754,8 @@ int be_cmd_mccq_create(struct be_adapter *adapter,
         void *ctxt;
         int status;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -793,7 +799,7 @@ int be_cmd_mccq_create(struct be_adapter *adapter,
                 mccq->id = le16_to_cpu(resp->id);
                 mccq->created = true;
         }
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
 
         return status;
 }
@@ -808,7 +814,8 @@ int be_cmd_txq_create(struct be_adapter *adapter,
         void *ctxt;
         int status;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -840,7 +847,7 @@ int be_cmd_txq_create(struct be_adapter *adapter,
                 txq->created = true;
         }
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
 
         return status;
 }
@@ -855,7 +862,8 @@ int be_cmd_rxq_create(struct be_adapter *adapter,
         struct be_dma_mem *q_mem = &rxq->dma_mem;
         int status;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -882,7 +890,7 @@ int be_cmd_rxq_create(struct be_adapter *adapter,
                 *rss_id = resp->rss_id;
         }
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
 
         return status;
 }
@@ -901,7 +909,8 @@ int be_cmd_q_destroy(struct be_adapter *adapter, struct be_queue_info *q,
         if (adapter->eeh_err)
                 return -EIO;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -938,7 +947,7 @@ int be_cmd_q_destroy(struct be_adapter *adapter, struct be_queue_info *q,
 
         status = be_mbox_notify_wait(adapter);
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
 
         return status;
 }
@@ -954,7 +963,8 @@ int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
         struct be_cmd_req_if_create *req;
         int status;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -980,7 +990,7 @@ int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
                         *pmac_id = le32_to_cpu(resp->pmac_id);
         }
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
         return status;
 }
 
@@ -994,7 +1004,8 @@ int be_cmd_if_destroy(struct be_adapter *adapter, u32 interface_id)
         if (adapter->eeh_err)
                 return -EIO;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -1009,7 +1020,7 @@ int be_cmd_if_destroy(struct be_adapter *adapter, u32 interface_id)
 
         status = be_mbox_notify_wait(adapter);
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
 
         return status;
 }
@@ -1099,7 +1110,8 @@ int be_cmd_get_fw_ver(struct be_adapter *adapter, char *fw_ver)
         struct be_cmd_req_get_fw_version *req;
         int status;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -1116,7 +1128,7 @@ int be_cmd_get_fw_ver(struct be_adapter *adapter, char *fw_ver)
                 strncpy(fw_ver, resp->firmware_version_string, FW_VER_LEN);
         }
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
         return status;
 }
 
@@ -1361,7 +1373,8 @@ int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num,
         struct be_cmd_req_query_fw_cfg *req;
         int status;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -1380,7 +1393,7 @@ int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num,
                 *caps = le32_to_cpu(resp->function_caps);
         }
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
         return status;
 }
 
@@ -1391,7 +1404,8 @@ int be_cmd_reset_function(struct be_adapter *adapter)
         struct be_cmd_req_hdr *req;
         int status;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -1404,7 +1418,7 @@ int be_cmd_reset_function(struct be_adapter *adapter)
 
         status = be_mbox_notify_wait(adapter);
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
         return status;
 }
 
@@ -1415,7 +1429,8 @@ int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable, u16 table_size)
         u32 myhash[10];
         int status;
 
-        spin_lock(&adapter->mbox_lock);
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
 
         wrb = wrb_from_mbox(adapter);
         req = embedded_payload(wrb);
@@ -1435,7 +1450,7 @@ int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable, u16 table_size)
 
         status = be_mbox_notify_wait(adapter);
 
-        spin_unlock(&adapter->mbox_lock);
+        mutex_unlock(&adapter->mbox_lock);
         return status;
 }