UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: lpfc: Indicate CONF support in NVMe PRLI 

Revise the NVME PRLI to indicate CONF support.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
James Smart 2018-01-30 15:58:56 -08:00 committed by Martin K. Petersen
parent 2289e9598d
commit a5ff06817e
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/lpfc/lpfc_els.c
View File

@ -2293,10 +2293,11 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
if (phba->nvmet_support) { if (phba->nvmet_support) {
bf_set(prli_tgt, npr_nvme, 1); bf_set(prli_tgt, npr_nvme, 1);
bf_set(prli_disc, npr_nvme, 1); bf_set(prli_disc, npr_nvme, 1);
} else { } else {
bf_set(prli_init, npr_nvme, 1); bf_set(prli_init, npr_nvme, 1);
bf_set(prli_conf, npr_nvme, 1);
} }
npr_nvme->word1 = cpu_to_be32(npr_nvme->word1); npr_nvme->word1 = cpu_to_be32(npr_nvme->word1);
npr_nvme->word4 = cpu_to_be32(npr_nvme->word4); npr_nvme->word4 = cpu_to_be32(npr_nvme->word4);
elsiocb->iocb_flag |= LPFC_PRLI_NVME_REQ; elsiocb->iocb_flag |= LPFC_PRLI_NVME_REQ;

6
drivers/scsi/lpfc/lpfc_hw4.h
View File

@ -4346,9 +4346,9 @@ struct lpfc_nvme_prli {
#define prli_init_SHIFT 5 #define prli_init_SHIFT 5
#define prli_init_MASK 0x00000001 #define prli_init_MASK 0x00000001
#define prli_init_WORD word4 #define prli_init_WORD word4
#define prli_recov_SHIFT 8 #define prli_conf_SHIFT 7
#define prli_recov_MASK 0x00000001 #define prli_conf_MASK 0x00000001
#define prli_recov_WORD word4 #define prli_conf_WORD word4
uint32_t word5; uint32_t word5;
#define prli_fb_sz_SHIFT 0 #define prli_fb_sz_SHIFT 0
#define prli_fb_sz_MASK 0x0000ffff #define prli_fb_sz_MASK 0x0000ffff

3
drivers/scsi/lpfc/lpfc_nportdisc.c
View File

@ -2011,9 +2011,6 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
} }
} }
if (bf_get_be32(prli_recov, nvpr))
ndlp->nlp_fcp_info |= NLP_FCP_2_DEVICE;
lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC, lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC,
"6029 NVME PRLI Cmpl w1 x%08x " "6029 NVME PRLI Cmpl w1 x%08x "
"w4 x%08x w5 x%08x flag x%x, " "w4 x%08x w5 x%08x flag x%x, "