Commit 82f0fd06 authored by Varun Prakash's avatar Varun Prakash Committed by Martin K. Petersen

scsi: csiostor: fail probe if fw does not support FCoE

Fail probe if FCoE capability is not enabled in the firmware.
Signed-off-by: default avatarVarun Prakash <varun@chelsio.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 61f0c3c7
...@@ -3845,8 +3845,10 @@ csio_hw_start(struct csio_hw *hw) ...@@ -3845,8 +3845,10 @@ csio_hw_start(struct csio_hw *hw)
if (csio_is_hw_ready(hw)) if (csio_is_hw_ready(hw))
return 0; return 0;
else else if (csio_match_state(hw, csio_hws_uninit))
return -EINVAL; return -EINVAL;
else
return -ENODEV;
} }
int int
......
...@@ -969,11 +969,15 @@ static int csio_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -969,11 +969,15 @@ static int csio_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
pci_set_drvdata(pdev, hw); pci_set_drvdata(pdev, hw);
if (csio_hw_start(hw) != 0) { rv = csio_hw_start(hw);
if (rv) {
if (rv == -EINVAL) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Failed to start FW, continuing in debug mode.\n"); "Failed to start FW, continuing in debug mode.\n");
return 0; return 0;
} }
goto err_lnode_exit;
}
sprintf(hw->fwrev_str, "%u.%u.%u.%u\n", sprintf(hw->fwrev_str, "%u.%u.%u.%u\n",
FW_HDR_FW_VER_MAJOR_G(hw->fwrev), FW_HDR_FW_VER_MAJOR_G(hw->fwrev),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment