[SCSI] qla2xxx: add support for multi-queue adapter

Following changes have been made.
1. qla_hw_data structure holds an array for request queue pointers,
and an array for response queue pointers.
2. The base request and response queues are created by default.
3. Additional request and response queues are created at the time of vport
creation. If queue resources are exhausted during vport creation, newly
created vports use the default queue.
4. Requests are sent to the request queue that the vport was assigned
in the beginning.
5. Responses are completed on the response queue with which the request queue
is associated with.

[fixup memcpy argument reversal spotted by davej@redhat.com]
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 29 insertions, 1 deletions

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index b22384229378..cd53627cc761 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1143,8 +1143,11 @@ static int
 qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
 {
         int     ret = 0;
+        int     cnt = 0;
+        uint8_t qos = QLA_DEFAULT_QUE_QOS;
         scsi_qla_host_t *base_vha = shost_priv(fc_vport->shost);
         scsi_qla_host_t *vha = NULL;
+        struct qla_hw_data *ha = base_vha->hw;
 
         ret = qla24xx_vport_create_req_sanity_check(fc_vport);
         if (ret) {
@@ -1200,6 +1203,22 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
 
         qla24xx_vport_disable(fc_vport, disable);
 
+        /* Create a queue pair for the vport */
+        if (ha->mqenable) {
+                if (ha->npiv_info) {
+                        for (; cnt < ha->nvram_npiv_size; cnt++) {
+                                if (ha->npiv_info[cnt].port_name ==
+                                        vha->port_name &&
+                                        ha->npiv_info[cnt].node_name ==
+                                        vha->node_name) {
+                                        qos = ha->npiv_info[cnt].q_qos;
+                                        break;
+                                }
+                        }
+                }
+                qla25xx_create_queues(vha, qos);
+        }
+
         return 0;
 vport_create_failed_2:
         qla24xx_disable_vp(vha);
@@ -1213,11 +1232,20 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
 {
         scsi_qla_host_t *vha = fc_vport->dd_data;
         fc_port_t *fcport, *tfcport;
+        struct qla_hw_data *ha = vha->hw;
+        uint16_t id = vha->vp_idx;
 
         while (test_bit(LOOP_RESYNC_ACTIVE, &vha->dpc_flags) ||
             test_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags))
                 msleep(1000);
 
+        if (ha->mqenable) {
+                if (qla25xx_delete_queues(vha, 0) != QLA_SUCCESS)
+                        qla_printk(KERN_WARNING, ha,
+                                "Queue delete failed.\n");
+                vha->req_ques[0] = ha->req_q_map[0]->id;
+        }
+
         qla24xx_disable_vp(vha);
 
         fc_remove_host(vha->host);
@@ -1240,7 +1268,7 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
         }
 
         scsi_host_put(vha->host);
-
+        qla_printk(KERN_INFO, ha, "vport %d deleted\n", id);
         return 0;
 }