[SCSI] be2iscsi: Fix doorbell format for EQ/CQ/RQ s per SLI spec.

The doorbel format has been updated to support additonal functionalities
of SKH-R adapter. These changes are made such that older FW also works fine.

Signed-off-by: John Soni Jose <sony.john-n@emulex.com>
Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/be2iscsi/be_cmds.c b/drivers/scsi/be2iscsi/be_cmds.c
index b14949a71eda3da4df089eb8e1c6c4de8d55f2a7..86d91f31a6a32284dde6a6b3d9f22ef34de6ab5f 100644 (file)
--- a/drivers/scsi/be2iscsi/be_cmds.c
+++ b/drivers/scsi/be2iscsi/be_cmds.c
@@ -432,18 +432,6 @@ void beiscsi_async_link_state_process(struct beiscsi_hba *phba,
        }
 }
 
-static void beiscsi_cq_notify(struct beiscsi_hba *phba, u16 qid, bool arm,
-                      u16 num_popped)
-{
-       u32 val = 0;
-       val |= qid & DB_CQ_RING_ID_MASK;
-       if (arm)
-               val |= 1 << DB_CQ_REARM_SHIFT;
-       val |= num_popped << DB_CQ_NUM_POPPED_SHIFT;
-       iowrite32(val, phba->db_va + DB_CQ_OFFSET);
-}
-
-
 int beiscsi_process_mcc(struct beiscsi_hba *phba)
 {
        struct be_mcc_compl *compl;
@@ -474,7 +462,7 @@ int beiscsi_process_mcc(struct beiscsi_hba *phba)
        }
 
        if (num)
-               beiscsi_cq_notify(phba, phba->ctrl.mcc_obj.cq.id, true, num);
+               hwi_ring_cq_db(phba, phba->ctrl.mcc_obj.cq.id, num, 1, 0);
 
        spin_unlock_bh(&phba->ctrl.mcc_cq_lock);
        return status;

diff --git a/drivers/scsi/be2iscsi/be_cmds.h b/drivers/scsi/be2iscsi/be_cmds.h
index 770b6c8bcad864d77bd6e54b11e6d743a24491c5..14c51e6f2445b79f969ecc6c9643cf02b40be42e 100644 (file)
--- a/drivers/scsi/be2iscsi/be_cmds.h
+++ b/drivers/scsi/be2iscsi/be_cmds.h
@@ -103,7 +103,7 @@ struct be_mcc_compl {
 
 /********** MCC door bell ************/
 #define DB_MCCQ_OFFSET 0x140
-#define DB_MCCQ_RING_ID_MASK 0x7FF             /* bits 0 - 10 */
+#define DB_MCCQ_RING_ID_MASK 0xFFFF            /* bits 0 - 15 */
 /* Number of entries posted */
 #define DB_MCCQ_NUM_POSTED_SHIFT 16            /* bits 16 - 29 */
 
@@ -1018,8 +1018,8 @@ struct be_mcc_wrb_context {
        int *users_final_status;
 } __packed;
 
-#define DB_DEF_PDU_RING_ID_MASK                0x3FF   /* bits 0 - 9 */
-#define DB_DEF_PDU_CQPROC_MASK         0x3FFF  /* bits 0 - 9 */
+#define DB_DEF_PDU_RING_ID_MASK        0x3FFF  /* bits 0 - 13 */
+#define DB_DEF_PDU_CQPROC_MASK         0x3FFF  /* bits 16 - 29 */
 #define DB_DEF_PDU_REARM_SHIFT         14
 #define DB_DEF_PDU_EVENT_SHIFT         15
 #define DB_DEF_PDU_CQPROC_SHIFT                16

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index c8f90cef728d458d8dc5798ec1c7bcada9a43246..89c95f1537e8a32a550884ee9c1e80d9de6386f7 100644 (file)
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -809,14 +809,23 @@ static void hwi_ring_eq_db(struct beiscsi_hba *phba,
                           unsigned char rearm, unsigned char event)
 {
        u32 val = 0;
-       val |= id & DB_EQ_RING_ID_MASK;
+
        if (rearm)
                val |= 1 << DB_EQ_REARM_SHIFT;
        if (clr_interrupt)
                val |= 1 << DB_EQ_CLR_SHIFT;
        if (event)
                val |= 1 << DB_EQ_EVNT_SHIFT;
+
        val |= num_processed << DB_EQ_NUM_POPPED_SHIFT;
+       /* Setting lower order EQ_ID Bits */
+       val |= (id & DB_EQ_RING_ID_LOW_MASK);
+
+       /* Setting Higher order EQ_ID Bits */
+       val |= (((id >> DB_EQ_HIGH_FEILD_SHIFT) &
+                 DB_EQ_RING_ID_HIGH_MASK)
+                 << DB_EQ_HIGH_SET_SHIFT);
+
        iowrite32(val, phba->db_va + DB_EQ_OFFSET);
 }
 
@@ -1098,15 +1107,25 @@ free_msix_irqs:
        return ret;
 }
 
-static void hwi_ring_cq_db(struct beiscsi_hba *phba,
+void hwi_ring_cq_db(struct beiscsi_hba *phba,
                           unsigned int id, unsigned int num_processed,
                           unsigned char rearm, unsigned char event)
 {
        u32 val = 0;
-       val |= id & DB_CQ_RING_ID_MASK;
+
        if (rearm)
                val |= 1 << DB_CQ_REARM_SHIFT;
+
        val |= num_processed << DB_CQ_NUM_POPPED_SHIFT;
+
+       /* Setting lower order CQ_ID Bits */
+       val |= (id & DB_CQ_RING_ID_LOW_MASK);
+
+       /* Setting Higher order CQ_ID Bits */
+       val |= (((id >> DB_CQ_HIGH_FEILD_SHIFT) &
+                 DB_CQ_RING_ID_HIGH_MASK)
+                 << DB_CQ_HIGH_SET_SHIFT);
+
        iowrite32(val, phba->db_va + DB_CQ_OFFSET);
 }
 

diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h
index 31fa27b4a9b225a340ee1ce44445a9a09bd73575..e02e14cedd5da1c071224477994a9ba18e504423 100644 (file)
--- a/drivers/scsi/be2iscsi/be_main.h
+++ b/drivers/scsi/be2iscsi/be_main.h
@@ -135,11 +135,15 @@
 #define DB_RXULP0_OFFSET 0xA0
 /********* Event Q door bell *************/
 #define DB_EQ_OFFSET                   DB_CQ_OFFSET
-#define DB_EQ_RING_ID_MASK             0x1FF   /* bits 0 - 8 */
+#define DB_EQ_RING_ID_LOW_MASK         0x1FF   /* bits 0 - 8 */
 /* Clear the interrupt for this eq */
 #define DB_EQ_CLR_SHIFT                        (9)     /* bit 9 */
 /* Must be 1 */
 #define DB_EQ_EVNT_SHIFT               (10)    /* bit 10 */
+/* Higher Order EQ_ID bit */
+#define DB_EQ_RING_ID_HIGH_MASK        0x1F /* bits 11 - 15 */
+#define DB_EQ_HIGH_SET_SHIFT   11
+#define DB_EQ_HIGH_FEILD_SHIFT 9
 /* Number of event entries processed */
 #define DB_EQ_NUM_POPPED_SHIFT         (16)    /* bits 16 - 28 */
 /* Rearm bit */
@@ -147,7 +151,12 @@
 
 /********* Compl Q door bell *************/
 #define DB_CQ_OFFSET                   0x120
-#define DB_CQ_RING_ID_MASK             0x3FF   /* bits 0 - 9 */
+#define DB_CQ_RING_ID_LOW_MASK         0x3FF   /* bits 0 - 9 */
+/* Higher Order CQ_ID bit */
+#define DB_CQ_RING_ID_HIGH_MASK        0x1F /* bits 11 - 15 */
+#define DB_CQ_HIGH_SET_SHIFT   11
+#define DB_CQ_HIGH_FEILD_SHIFT 10
+
 /* Number of event entries processed */
 #define DB_CQ_NUM_POPPED_SHIFT         (16)    /* bits 16 - 28 */
 /* Rearm bit */
@@ -821,6 +830,9 @@ void beiscsi_process_all_cqs(struct work_struct *work);
 void beiscsi_free_mgmt_task_handles(struct beiscsi_conn *beiscsi_conn,
                                     struct iscsi_task *task);
 
+void hwi_ring_cq_db(struct beiscsi_hba *phba,
+                    unsigned int id, unsigned int num_processed,
+                    unsigned char rearm, unsigned char event);
 static inline bool beiscsi_error(struct beiscsi_hba *phba)
 {
        return phba->ue_detected || phba->fw_timeout;