Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82f0fd06 authored Jul 31, 2017 by Varun Prakash Committed by Martin K. Petersen Aug 16, 2017

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



Fail probe if FCoE capability is not enabled in the firmware.

Signed-off-by: Varun Prakash <varun@chelsio.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 61f0c3c7

drivers/scsi/csiostor/csio_hw.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -3845,8 +3845,10 @@ csio_hw_start(struct csio_hw *hw)

		if (csio_is_hw_ready(hw))
		return 0;
		else
		else if (csio_match_state(hw, csio_hws_uninit))
		return -EINVAL;
		else
		return -ENODEV;
		}

		int

drivers/scsi/csiostor/csio_init.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -969,11 +969,15 @@ static int csio_probe_one(struct pci_dev pdev, const struct pci_device_id id)

		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,
		"Failed to start FW, continuing in debug mode.\n");
		return 0;
		}
		goto err_lnode_exit;
		}

		sprintf(hw->fwrev_str, "%u.%u.%u.%u\n",
		FW_HDR_FW_VER_MAJOR_G(hw->fwrev),