lpfc 8.3.9: SLI enhancments to support new hardware.
Subsystems (2)
PATCH 3/6 lpfc 8.3.9: SLI enhancments to support new hardware.
- Add support for the INTF (Interface) PCI register.
- Add support for greater than 2 page SGLs.
- Add support for up to 32 bit BDE lengths.
- Implement the Port Capabilities Mailbox command.
- Stop checking the Minor Code in the EQE structure.
Signed-off-by James Smart <[email protected]>
---
lpfc_crtn.h | 3 lpfc_hw4.h | 242 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- lpfc_init.c | 189 ++++++++++++++++++++++++++++++++++++---------- lpfc_mbox.c | 38 +++++++++ lpfc_scsi.c | 9 -- lpfc_sli.c | 27 ++---- lpfc_sli4.h | 45 ++++++++++- 7 files changed, 452 insertions(+), 101 deletions(-)
drivers/scsi/lpfc/lpfc_crtn.h +3 -0
@@ -49,6 +49,9 @@ void lpfc_register_new_vport(struct lpfcvoid lpfc_unreg_vpi (struct lpfc_hba *,uint16_t ,LPFC_MBOXQ_t *);void lpfc_init_link (struct lpfc_hba *,LPFC_MBOXQ_t *,uint32_t ,uint32_t );void lpfc_request_features (struct lpfc_hba *,struct lpfcMboxq *); +void lpfc_supported_pages (struct lpfcMboxq *); +void lpfc_sli4_params (struct lpfcMboxq *); +int lpfc_pc_sli4_params_get (struct lpfc_hba *,LPFC_MBOXQ_t *);struct lpfc_vport *lpfc_find_vport_by_did (struct lpfc_hba *,uint32_t );void lpfc_cleanup_rcv_buffers (struct lpfc_vport *);
drivers/scsi/lpfc/lpfc_hw4.h +204 -38
287 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_init.c +149 -40
247 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_mbox.c +38 -0
@@ -2052,3 +2052,41 @@ lpfc_resume_rpi(struct lpfcMboxq *mbox,bf_set (lpfc_resume_rpi_ii, resume_rpi,RESUME_INDEX_RPI ); resume_rpi->event_tag = ndlp->phba->fc_eventTag; } + +/** +* lpfc_supported_pages - Initialize the PORT_CAPABILITIES supported pages +* mailbox command. +* @mbox: pointer to lpfc mbox command to initialize. +* +* The PORT_CAPABILITIES supported pages mailbox command is issued to +* retrieve the particular feature pages supported by the port. +**/ +void +lpfc_supported_pages (struct lpfcMboxq *mbox) +{ +struct lpfc_mbx_supp_pages *supp_pages; + +memset (mbox,0 ,sizeof (*mbox)); + supp_pages = &mbox->u.mqe.un.supp_pages; +bf_set (lpfc_mqe_command, &mbox->u.mqe,MBX_PORT_CAPABILITIES ); +bf_set (cpn, supp_pages,LPFC_SUPP_PAGES ); +} + +/** +* lpfc_sli4_params - Initialize the PORT_CAPABILITIES SLI4 Params +* mailbox command. +* @mbox: pointer to lpfc mbox command to initialize. +* +* The PORT_CAPABILITIES SLI4 parameters mailbox command is issued to +* retrieve the particular SLI4 features supported by the port. +**/ +void +lpfc_sli4_params (struct lpfcMboxq *mbox) +{ +struct lpfc_mbx_sli4_params *sli4_params; + +memset (mbox,0 ,sizeof (*mbox)); + sli4_params = &mbox->u.mqe.un.sli4_params; +bf_set (lpfc_mqe_command, &mbox->u.mqe,MBX_PORT_CAPABILITIES ); +bf_set (cpn, sli4_params,LPFC_SLI4_PARAMETERS ); +}
drivers/scsi/lpfc/lpfc_scsi.c +3 -6
@@ -798,19 +798,17 @@ lpfc_new_scsi_buf_s4(struct lpfc_vport **/ sgl->addr_hi =cpu_to_le32 (putPaddrHigh (pdma_phys_fcp_cmd)); sgl->addr_lo =cpu_to_le32 (putPaddrLow (pdma_phys_fcp_cmd)); -bf_set (lpfc_sli4_sge_len, sgl,sizeof (struct fcp_cmnd ));bf_set (lpfc_sli4_sge_last, sgl,0 ); sgl->word2 =cpu_to_le32 (sgl->word2); - sgl->word3 =cpu_to_le32 (sgl->word3); + sgl->sge_len =cpu_to_le32 (sizeof (struct fcp_cmnd )); sgl++;/* Setup the physical region for the FCP RSP */ sgl->addr_hi =cpu_to_le32 (putPaddrHigh (pdma_phys_fcp_rsp)); sgl->addr_lo =cpu_to_le32 (putPaddrLow (pdma_phys_fcp_rsp)); -bf_set (lpfc_sli4_sge_len, sgl,sizeof (struct fcp_rsp ));bf_set (lpfc_sli4_sge_last, sgl,1 ); sgl->word2 =cpu_to_le32 (sgl->word2); - sgl->word3 =cpu_to_le32 (sgl->word3); + sgl->sge_len =cpu_to_le32 (sizeof (struct fcp_rsp ));/* * Since the IOCB for the FCP I/O is built into this
@@ -1872,7 +1870,6 @@ lpfc_scsi_prep_dma_buf_s4(struct lpfc_hbscsi_for_each_sg (scsi_cmnd, sgel, nseg, num_bde) { physaddr =sg_dma_address (sgel); dma_len =sg_dma_len (sgel); -bf_set (lpfc_sli4_sge_len, sgl,sg_dma_len (sgel)); sgl->addr_lo =cpu_to_le32 (putPaddrLow (physaddr)); sgl->addr_hi =cpu_to_le32 (putPaddrHigh (physaddr));if ((num_bde +1 ) == nseg)
@@ -1881,7 +1878,7 @@ lpfc_scsi_prep_dma_buf_s4(struct lpfc_hbbf_set (lpfc_sli4_sge_last, sgl,0 );bf_set (lpfc_sli4_sge_offset, sgl, dma_offset); sgl->word2 =cpu_to_le32 (sgl->word2); - sgl->word3 =cpu_to_le32 (sgl->word3); + sgl->sge_len =cpu_to_le32 (dma_len); dma_offset += dma_len; sgl++; }
drivers/scsi/lpfc/lpfc_sli4.h +43 -2
69 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli.c +12 -15
@@ -5739,19 +5739,19 @@ lpfc_sli4_bpl2sgl(struct lpfc_hba *phba,for (i =0 ; i < numBdes; i++) {/* Should already be byte swapped. */ - sgl->addr_hi = bpl->addrHigh; - sgl->addr_lo = bpl->addrLow; -/* swap the size field back to the cpu so we -* can assign it to the sgl. -*/ - bde.tus.w =le32_to_cpu (bpl->tus.w); -bf_set (lpfc_sli4_sge_len, sgl, bde.tus.f.bdeSize); + sgl->addr_hi = bpl->addrHigh; + sgl->addr_lo = bpl->addrLow; +if ((i+1 ) == numBdes)bf_set (lpfc_sli4_sge_last, sgl,1 );else bf_set (lpfc_sli4_sge_last, sgl,0 ); sgl->word2 =cpu_to_le32 (sgl->word2); - sgl->word3 =cpu_to_le32 (sgl->word3); +/* swap the size field back to the cpu so we +* can assign it to the sgl. +*/ + bde.tus.w =le32_to_cpu (bpl->tus.w); + sgl->sge_len =cpu_to_le32 (bde.tus.f.bdeSize); bpl++; sgl++; }
@@ -5764,11 +5764,10 @@ lpfc_sli4_bpl2sgl(struct lpfc_hba *phba,cpu_to_le32 (icmd->un.genreq64.bdl.addrHigh); sgl->addr_lo =cpu_to_le32 (icmd->un.genreq64.bdl.addrLow); -bf_set (lpfc_sli4_sge_len, sgl, - icmd->un.genreq64.bdl.bdeSize);bf_set (lpfc_sli4_sge_last, sgl,1 ); sgl->word2 =cpu_to_le32 (sgl->word2); - sgl->word3 =cpu_to_le32 (sgl->word3); + sgl->sge_len = +cpu_to_le32 (icmd->un.genreq64.bdl.bdeSize); }return sglq->sli4_xritag; }
@@ -8934,8 +8933,7 @@ lpfc_sli4_sp_handle_eqe(struct lpfc_hbaint ecount =0 ;uint16_t cqid; -if (bf_get (lpfc_eqe_major_code, eqe) !=0 || -bf_get (lpfc_eqe_minor_code, eqe) !=0 ) { +if (bf_get (lpfc_eqe_major_code, eqe) !=0 ) { lpfc_printf_log(phba, KERN_ERR, LOG_SLI, "0359 Not a valid slow-path completion " "event: majorcode=x%x, minorcode=x%x\n",
@@ -9167,8 +9165,7 @@ lpfc_sli4_fp_handle_eqe(struct lpfc_hbauint16_t cqid;int ecount =0 ; -if (unlikely (bf_get (lpfc_eqe_major_code, eqe) !=0 ) || -unlikely (bf_get (lpfc_eqe_minor_code, eqe) !=0 )) { +if (unlikely (bf_get (lpfc_eqe_major_code, eqe) !=0 )) { lpfc_printf_log(phba, KERN_ERR, LOG_SLI, "0366 Not a valid fast-path completion " "event: majorcode=x%x, minorcode=x%x\n",