scsi: fnic: Enable fnic devcmd2 interface

This patch adds changes to check if fnic devcmd2 interface is exported by
the firmware. If devcmd2 interfaces is exported, driver starts using it
else falls back to fnic devcmd1 interface.

Signed-off-by: Satish Kharat <satishkh@cisco.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
index 1433ba94ea71df43113f058909b2f929498f460e..0f42114be2d1bdb1b0f346bed828c18f3508662f 100644 (file)
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -658,12 +658,20 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto err_out_iounmap;
        }
 
+       err = vnic_dev_cmd_init(fnic->vdev);
+       if (err) {
+               shost_printk(KERN_ERR, fnic->lport->host,
+                               "vnic_dev_cmd_init() returns %d, aborting\n",
+                               err);
+               goto err_out_vnic_unregister;
+       }
+
        err = fnic_dev_wait(fnic->vdev, vnic_dev_open,
                            vnic_dev_open_done, CMD_OPENF_RQ_ENABLE_THEN_POST);
        if (err) {
                shost_printk(KERN_ERR, fnic->lport->host,
                             "vNIC dev open failed, aborting.\n");
-               goto err_out_vnic_unregister;
+               goto err_out_dev_cmd_deinit;
        }
 
        err = vnic_dev_init(fnic->vdev, 0);
@@ -921,6 +929,7 @@ err_out_clear_intr:
        fnic_clear_intr_mode(fnic);
 err_out_dev_close:
        vnic_dev_close(fnic->vdev);
+err_out_dev_cmd_deinit:
 err_out_vnic_unregister:
        vnic_dev_unregister(fnic->vdev);
 err_out_iounmap:

diff --git a/drivers/scsi/fnic/vnic_dev.c b/drivers/scsi/fnic/vnic_dev.c
index 741bf6c1a2c22d53015ff2bb6f656cc9369109a1..78af9cc2009b7e5704d3980936a939d6daa89d2d 100644 (file)
--- a/drivers/scsi/fnic/vnic_dev.c
+++ b/drivers/scsi/fnic/vnic_dev.c
@@ -934,3 +934,20 @@ err_out:
        vnic_dev_unregister(vdev);
        return NULL;
 }
+
+int vnic_dev_cmd_init(struct vnic_dev *vdev)
+{
+       int err;
+       void *p;
+
+       p = vnic_dev_get_res(vdev, RES_TYPE_DEVCMD2, 0);
+       if (p) {
+               pr_err("fnic: DEVCMD2 resource found!\n");
+               err = vnic_dev_init_devcmd2(vdev);
+       } else {
+               pr_err("fnic: DEVCMD2 not found, fall back to Devcmd\n");
+               err = vnic_dev_init_devcmd1(vdev);
+       }
+
+       return err;
+}

diff --git a/drivers/scsi/fnic/vnic_dev.h b/drivers/scsi/fnic/vnic_dev.h
index 40d4195f562bad4f40d406d3e28e48a018b6c213..ef5309a5df5da4856b7f0b90287e70dab5f3d982 100644 (file)
--- a/drivers/scsi/fnic/vnic_dev.h
+++ b/drivers/scsi/fnic/vnic_dev.h
@@ -36,6 +36,7 @@
 #define vnic_dev_fw_info fnic_dev_fw_info
 #define vnic_dev_spec fnic_dev_spec
 #define vnic_dev_stats_clear fnic_dev_stats_clear
+#define vnic_dev_cmd_init fnic_dev_cmd_init
 #define vnic_dev_stats_dump fnic_dev_stats_dump
 #define vnic_dev_hang_notify fnic_dev_hang_notify
 #define vnic_dev_packet_filter fnic_dev_packet_filter
@@ -128,6 +129,7 @@ int vnic_dev_fw_info(struct vnic_dev *vdev,
 int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset,
                  unsigned int size, void *value);
 int vnic_dev_stats_clear(struct vnic_dev *vdev);
+int vnic_dev_cmd_init(struct vnic_dev *vdev);
 int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats);
 int vnic_dev_hang_notify(struct vnic_dev *vdev);
 void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,