hisi_sas: Add cq structure initialization

Each completion queue has a structure. This is mainly for passing to irq
handler so we know which queue the irq occured on.

Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 2cd677170db5ee943717acab365c75e2e426e023..315fe4640d889d78625866aca6d75d2557c89670 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -45,6 +45,11 @@ struct hisi_sas_port {
        struct asd_sas_port     sas_port;
 };
 
+struct hisi_sas_cq {
+       struct hisi_hba *hisi_hba;
+       int     id;
+};
+
 struct hisi_sas_slot {
 };
 
@@ -73,6 +78,8 @@ struct hisi_hba {
        /* SCSI/SAS glue */
        struct sas_ha_struct sha;
        struct Scsi_Host *shost;
+
+       struct hisi_sas_cq cq[HISI_SAS_MAX_QUEUES];
        struct hisi_sas_phy phy[HISI_SAS_MAX_PHYS];
        struct hisi_sas_port port[HISI_SAS_MAX_PHYS];
 

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index d7e5b66e60779d8cd9c2d1ab1aef4b1b61142384..d10bf24ecebd1d5c750d6402f61541c8568c8b9f 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -58,6 +58,12 @@ static int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost)
        struct device *dev = &pdev->dev;
 
        for (i = 0; i < hisi_hba->queue_count; i++) {
+               struct hisi_sas_cq *cq = &hisi_hba->cq[i];
+
+               /* Completion queue structure */
+               cq->id = i;
+               cq->hisi_hba = hisi_hba;
+
                /* Delivery queue */
                s = sizeof(struct hisi_sas_cmd_hdr) * HISI_SAS_QUEUE_SLOTS;
                hisi_hba->cmd_hdr[i] = dma_alloc_coherent(dev, s,