| Message ID | 1604895845-2587-16-git-send-email-muneendra.kumar@broadcom.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v4,01/19] cgroup: Added cgroup_get_from_kernfs_id | expand |
On 11/9/20 5:24 AM, Muneendra wrote: > From: Gaurav Srivastava <gaurav.srivastava@broadcom.com> > > This patch adds the vmid in wqe before sending out the request. > The type of vmid depends on the configured type and is checked before > being appended. > > Signed-off-by: Gaurav Srivastava <gaurav.srivastava@broadcom.com> > Signed-off-by: James Smart <jsmart2021@gmail.com> > > --- > v4: > No change > > v3: > No change > > v2: > Ported the patch on top of 5.10/scsi-queue > --- > drivers/scsi/lpfc/lpfc_sli.c | 56 +++++++++++++++++++++++++++++++++++- > 1 file changed, 55 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c > index 51b99b7beaf9..53dbd6a3f460 100644 > --- a/drivers/scsi/lpfc/lpfc_sli.c > +++ b/drivers/scsi/lpfc/lpfc_sli.c > @@ -3724,7 +3724,7 @@ lpfc_sli_sp_handle_rspiocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, > > if (irsp->ulpStatus) { > /* Rsp ring <ringno> error: IOCB */ > - lpfc_printf_log(phba, KERN_WARNING, LOG_SLI, > + lpfc_printf_log(phba, KERN_ERR, LOG_SLI, > "0328 Rsp Ring %d error: " > "IOCB Data: " > "x%x x%x x%x x%x " > @@ -9625,6 +9625,8 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, > *pcmd == ELS_CMD_RSCN_XMT || > *pcmd == ELS_CMD_FDISC || > *pcmd == ELS_CMD_LOGO || > + *pcmd == ELS_CMD_QFPA || > + *pcmd == ELS_CMD_UVEM || > *pcmd == ELS_CMD_PLOGI)) { > bf_set(els_req64_sp, &wqe->els_req, 1); > bf_set(els_req64_sid, &wqe->els_req, > @@ -9756,6 +9758,24 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, > ptr = &wqe->words[22]; > memcpy(ptr, fcp_cmnd, sizeof(struct fcp_cmnd)); > } > + > + /* add the VMID tags as per the switch */ as per the switch? Maybe 'as per switch response'? > + if (iocbq->iocb_flag & LPFC_IO_VMID) { > + union lpfc_wqe128 *wqe128; > + > + if (phba->pport->vmid_priority_tagging) { > + bf_set(wqe_ccpe, &wqe->fcp_iwrite.wqe_com, 1); > + bf_set(wqe_ccp, &wqe->fcp_iwrite.wqe_com, > + (iocbq->vmid_tag.cs_ctl_vmid)); > + /* Bit 0 must be 0 */ > + } else { > + wqe128 = (union lpfc_wqe128 *)wqe; > + bf_set(wqe_appid, &wqe->fcp_iwrite.wqe_com, 1); > + bf_set(wqe_wqes, &wqe128->fcp_iwrite.wqe_com, > + 1); > + wqe128->words[31] = iocbq->vmid_tag.app_id; > + } > + } > break; > case CMD_FCP_IREAD64_CR: > /* word3 iocb=iotag wqe=payload_offset_len */ > @@ -9820,6 +9840,23 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, > ptr = &wqe->words[22]; > memcpy(ptr, fcp_cmnd, sizeof(struct fcp_cmnd)); > } > + > + /* add the VMID tags as per the switch */ Same here. > + if (iocbq->iocb_flag & LPFC_IO_VMID) { > + union lpfc_wqe128 *wqe128; > + > + if (phba->pport->vmid_priority_tagging) { > + bf_set(wqe_ccpe, &wqe->fcp_iread.wqe_com, 1); > + bf_set(wqe_ccp, &wqe->fcp_iread.wqe_com, > + (iocbq->vmid_tag.cs_ctl_vmid)); > + /* Bit 0 must be 0 */ > + } else { > + wqe128 = (union lpfc_wqe128 *)wqe; > + bf_set(wqe_appid, &wqe->fcp_iread.wqe_com, 1); > + bf_set(wqe_wqes, &wqe128->fcp_iread.wqe_com, 1); > + wqe128->words[31] = iocbq->vmid_tag.app_id; > + } > + } > break; > case CMD_FCP_ICMND64_CR: > /* word3 iocb=iotag wqe=payload_offset_len */ > @@ -9877,6 +9914,23 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, > ptr = &wqe->words[22]; > memcpy(ptr, fcp_cmnd, sizeof(struct fcp_cmnd)); > } > + > + /* add the VMID tags as per the switch */ And here. > + if (iocbq->iocb_flag & LPFC_IO_VMID) { > + union lpfc_wqe128 *wqe128; > + > + if (phba->pport->vmid_priority_tagging) { > + bf_set(wqe_ccpe, &wqe->fcp_icmd.wqe_com, 1); > + bf_set(wqe_ccp, &wqe->fcp_icmd.wqe_com, > + (iocbq->vmid_tag.cs_ctl_vmid)); > + /* Bit 0 must be 0 */ > + } else { > + wqe128 = (union lpfc_wqe128 *)wqe; > + bf_set(wqe_appid, &wqe->fcp_icmd.wqe_com, 1); > + bf_set(wqe_wqes, &wqe128->fcp_icmd.wqe_com, 1); > + wqe128->words[31] = iocbq->vmid_tag.app_id; > + } > + } > break; > case CMD_GEN_REQUEST64_CR: > /* For this command calculate the xmit length of the > Other than that: Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 51b99b7beaf9..53dbd6a3f460 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -3724,7 +3724,7 @@ lpfc_sli_sp_handle_rspiocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, if (irsp->ulpStatus) { /* Rsp ring <ringno> error: IOCB */ - lpfc_printf_log(phba, KERN_WARNING, LOG_SLI, + lpfc_printf_log(phba, KERN_ERR, LOG_SLI, "0328 Rsp Ring %d error: " "IOCB Data: " "x%x x%x x%x x%x " @@ -9625,6 +9625,8 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, *pcmd == ELS_CMD_RSCN_XMT || *pcmd == ELS_CMD_FDISC || *pcmd == ELS_CMD_LOGO || + *pcmd == ELS_CMD_QFPA || + *pcmd == ELS_CMD_UVEM || *pcmd == ELS_CMD_PLOGI)) { bf_set(els_req64_sp, &wqe->els_req, 1); bf_set(els_req64_sid, &wqe->els_req, @@ -9756,6 +9758,24 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, ptr = &wqe->words[22]; memcpy(ptr, fcp_cmnd, sizeof(struct fcp_cmnd)); } + + /* add the VMID tags as per the switch */ + if (iocbq->iocb_flag & LPFC_IO_VMID) { + union lpfc_wqe128 *wqe128; + + if (phba->pport->vmid_priority_tagging) { + bf_set(wqe_ccpe, &wqe->fcp_iwrite.wqe_com, 1); + bf_set(wqe_ccp, &wqe->fcp_iwrite.wqe_com, + (iocbq->vmid_tag.cs_ctl_vmid)); + /* Bit 0 must be 0 */ + } else { + wqe128 = (union lpfc_wqe128 *)wqe; + bf_set(wqe_appid, &wqe->fcp_iwrite.wqe_com, 1); + bf_set(wqe_wqes, &wqe128->fcp_iwrite.wqe_com, + 1); + wqe128->words[31] = iocbq->vmid_tag.app_id; + } + } break; case CMD_FCP_IREAD64_CR: /* word3 iocb=iotag wqe=payload_offset_len */ @@ -9820,6 +9840,23 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, ptr = &wqe->words[22]; memcpy(ptr, fcp_cmnd, sizeof(struct fcp_cmnd)); } + + /* add the VMID tags as per the switch */ + if (iocbq->iocb_flag & LPFC_IO_VMID) { + union lpfc_wqe128 *wqe128; + + if (phba->pport->vmid_priority_tagging) { + bf_set(wqe_ccpe, &wqe->fcp_iread.wqe_com, 1); + bf_set(wqe_ccp, &wqe->fcp_iread.wqe_com, + (iocbq->vmid_tag.cs_ctl_vmid)); + /* Bit 0 must be 0 */ + } else { + wqe128 = (union lpfc_wqe128 *)wqe; + bf_set(wqe_appid, &wqe->fcp_iread.wqe_com, 1); + bf_set(wqe_wqes, &wqe128->fcp_iread.wqe_com, 1); + wqe128->words[31] = iocbq->vmid_tag.app_id; + } + } break; case CMD_FCP_ICMND64_CR: /* word3 iocb=iotag wqe=payload_offset_len */ @@ -9877,6 +9914,23 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq, ptr = &wqe->words[22]; memcpy(ptr, fcp_cmnd, sizeof(struct fcp_cmnd)); } + + /* add the VMID tags as per the switch */ + if (iocbq->iocb_flag & LPFC_IO_VMID) { + union lpfc_wqe128 *wqe128; + + if (phba->pport->vmid_priority_tagging) { + bf_set(wqe_ccpe, &wqe->fcp_icmd.wqe_com, 1); + bf_set(wqe_ccp, &wqe->fcp_icmd.wqe_com, + (iocbq->vmid_tag.cs_ctl_vmid)); + /* Bit 0 must be 0 */ + } else { + wqe128 = (union lpfc_wqe128 *)wqe; + bf_set(wqe_appid, &wqe->fcp_icmd.wqe_com, 1); + bf_set(wqe_wqes, &wqe128->fcp_icmd.wqe_com, 1); + wqe128->words[31] = iocbq->vmid_tag.app_id; + } + } break; case CMD_GEN_REQUEST64_CR: /* For this command calculate the xmit length of the