[PATCH 01/13] ibmvfc: add vhost fields and defaults for MQ enablement

[Tyrel Datwyler]

Introduce several new vhost fields for managing MQ state of the adapter
as well as initial defaults for MQ enablement.

Signed-off-by: Tyrel Datwyler <tyr...@linux.ibm.com>
---
 drivers/scsi/ibmvscsi/ibmvfc.c | 7 +++++++
 drivers/scsi/ibmvscsi/ibmvfc.h | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 42e4d35e0d35..cd609d19e6a1 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -5167,6 +5167,7 @@ static int ibmvfc_probe(struct vio_dev *vdev, const 
struct vio_device_id *id)
        shost->max_sectors = IBMVFC_MAX_SECTORS;
        shost->max_cmd_len = IBMVFC_MAX_CDB_LEN;
        shost->unique_id = shost->host_no;
+       shost->nr_hw_queues = IBMVFC_SCSI_HW_QUEUES;
 
        vhost = shost_priv(shost);
        INIT_LIST_HEAD(&vhost->sent);
@@ -5178,6 +5179,12 @@ static int ibmvfc_probe(struct vio_dev *vdev, const 
struct vio_device_id *id)
        vhost->partition_number = -1;
        vhost->log_level = log_level;
        vhost->task_set = 1;
+
+       vhost->mq_enabled = IBMVFC_MQ;
+       vhost->client_scsi_channels = IBMVFC_SCSI_CHANNELS;
+       vhost->using_channels = 0;
+       vhost->do_enquiry = 1;
+
        strcpy(vhost->partition_name, "UNKNOWN");
        init_waitqueue_head(&vhost->work_wait_q);
        init_waitqueue_head(&vhost->init_wait_q);
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index 9d58cfd774d3..8225bdbb127e 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -41,6 +41,11 @@
 #define IBMVFC_DEFAULT_LOG_LEVEL       2
 #define IBMVFC_MAX_CDB_LEN             16
 #define IBMVFC_CLS3_ERROR              0
+#define IBMVFC_MQ                      0
+#define IBMVFC_SCSI_CHANNELS           0
+#define IBMVFC_SCSI_HW_QUEUES          1
+#define IBMVFC_MIG_NO_SUB_TO_CRQ       0
+#define IBMVFC_MIG_NO_N_TO_M           0
 
 /*
  * Ensure we have resources for ERP and initialization:
@@ -826,6 +831,10 @@ struct ibmvfc_host {
        int delay_init;
        int scan_complete;
        int logged_in;
+       int mq_enabled;
+       int using_channels;
+       int do_enquiry;
+       int client_scsi_channels;
        int aborting_passthru;
        int events_to_log;
 #define IBMVFC_AE_LINKUP       0x0001
-- 
2.27.0