UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

qlcnic: Enhance semaphore lock access failure error message 

Signed-off-by: Harish Patil <harish.patil@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Harish Patil 2014-02-21 13:20:14 -05:00 committed by David S. Miller
parent cecd59d84d
commit 1a51042bb8
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
View File

@ -317,9 +317,7 @@ static void qlcnic_write_window_reg(u32 addr, void __iomem *bar0, u32 data)
int int
qlcnic_pcie_sem_lock(struct qlcnic_adapter *adapter, int sem, u32 id_reg) qlcnic_pcie_sem_lock(struct qlcnic_adapter *adapter, int sem, u32 id_reg)
{ {
int timeout = 0; int timeout = 0, err = 0, done = 0;
int err = 0;
u32 done = 0;
while (!done) { while (!done) {
done = QLCRD32(adapter, QLCNIC_PCIE_REG(PCIE_SEM_LOCK(sem)), done = QLCRD32(adapter, QLCNIC_PCIE_REG(PCIE_SEM_LOCK(sem)),
@ -327,10 +325,20 @@ qlcnic_pcie_sem_lock(struct qlcnic_adapter *adapter, int sem, u32 id_reg)
if (done == 1) if (done == 1)
break; break;
if (++timeout >= QLCNIC_PCIE_SEM_TIMEOUT) { if (++timeout >= QLCNIC_PCIE_SEM_TIMEOUT) {
if (id_reg) {
done = QLCRD32(adapter, id_reg, &err);
if (done != -1)
dev_err(&adapter->pdev->dev, dev_err(&adapter->pdev->dev,
"Failed to acquire sem=%d lock; holdby=%d\n", "Failed to acquire sem=%d lock held by=%d\n",
sem, sem, done);
id_reg ? QLCRD32(adapter, id_reg, &err) : -1); else
dev_err(&adapter->pdev->dev,
"Failed to acquire sem=%d lock",
sem);
} else {
dev_err(&adapter->pdev->dev,
"Failed to acquire sem=%d lock", sem);
}
return -EIO; return -EIO;
} }
msleep(1); msleep(1);