Attachment 281251 Details for Bug 385351 – patch against z-stream 2.6.18-53.1.4 kernel

[patch] patch against z-stream 2.6.18-53.1.4 kernel

bz385351.patch (text/plain), 9.81 KB, created by Chip Coldwell on 2007-12-07 14:48:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chip Coldwell

Created: 2007-12-07 14:48:57 UTC

Size: 9.81 KB

patch

obsolete

> drivers/scsi/lpfc/lpfc_els.c     |  145 +++++++++++++++++++++++++-------------
> drivers/scsi/lpfc/lpfc_scsi.c    |    7 ++-
> drivers/scsi/lpfc/lpfc_version.h |    2 +-
> 3 files changed, 103 insertions(+), 51 deletions(-)
>
>diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
>index f0afc22..907567f 100644
>--- a/drivers/scsi/lpfc/lpfc_els.c
>+++ b/drivers/scsi/lpfc/lpfc_els.c
>@@ -868,19 +868,18 @@ lpfc_cmpl_els_prli(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
> 	cmdiocb->context_un.rsp_iocb = rspiocb;
> 
> 	irsp = &(rspiocb->iocb);
>-	ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
>+	if (((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
>+	     ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
>+	     (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
>+	     (irsp->un.ulpWord[4] == IOERR_SLI_DOWN)))) {
>+		ndlp = NULL ;
>+		goto out ;
>+	}
>+	ndlp = (struct lpfc_nodelist*) cmdiocb->context1 ;
> 	spin_lock_irq(phba->host->host_lock);
> 	ndlp->nlp_flag &= ~NLP_PRLI_SND;
> 	spin_unlock_irq(phba->host->host_lock);
> 
>-	/* PRLI completes to NPort <nlp_DID> */
>-	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
>-			"%d:0103 PRLI completes to NPort x%x "
>-			"Data: x%x x%x x%x x%x\n",
>-			phba->brd_no, ndlp->nlp_DID, irsp->ulpStatus,
>-			irsp->un.ulpWord[4], irsp->ulpTimeout,
>-			phba->num_disc_nodes);
>-
> 	phba->fc_prli_sent--;
> 	/* Check to see if link went down during discovery */
> 	if (lpfc_els_chk_latt(phba))
>@@ -910,6 +909,13 @@ lpfc_cmpl_els_prli(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
> 
> out:
> 	lpfc_els_free_iocb(phba, cmdiocb);
>+	/* PRLI completes to NPort <nlp_DID> */
>+	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
>+			"%d:0103 PRLI completes to NPort x%x "
>+			"Data: x%x x%x x%x x%x\n",
>+			phba->brd_no, cmdiocb->iocb.un.elsreq64.remoteID, 
>+			irsp->ulpStatus, irsp->un.ulpWord[4], irsp->ulpTimeout,
>+			phba->num_disc_nodes);
> 	return;
> }
> 
>@@ -1040,8 +1046,14 @@ lpfc_cmpl_els_adisc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
> 	cmdiocb->context_un.rsp_iocb = rspiocb;
> 
> 	irsp = &(rspiocb->iocb);
>-	ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
>-
>+	if (((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
>+	     ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
>+	     (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
>+	     (irsp->un.ulpWord[4] == IOERR_SLI_DOWN)))) {
>+		ndlp = NULL ;
>+		goto out ;
>+	}
>+	ndlp = (struct lpfc_nodelist*) cmdiocb->context1 ;
> 	/* Since ndlp can be freed in the disc state machine, note if this node
> 	 * is being used during discovery.
> 	 */
>@@ -1050,13 +1062,6 @@ lpfc_cmpl_els_adisc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
> 	ndlp->nlp_flag &= ~(NLP_ADISC_SND | NLP_NPR_2B_DISC);
> 	spin_unlock_irq(phba->host->host_lock);
> 
>-	/* ADISC completes to NPort <nlp_DID> */
>-	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
>-			"%d:0104 ADISC completes to NPort x%x "
>-			"Data: x%x x%x x%x x%x x%x\n",
>-			phba->brd_no, ndlp->nlp_DID, irsp->ulpStatus,
>-			irsp->un.ulpWord[4], irsp->ulpTimeout, disc,
>-			phba->num_disc_nodes);
> 
> 	/* Check to see if link went down during discovery */
> 	if (lpfc_els_chk_latt(phba)) {
>@@ -1137,6 +1142,13 @@ lpfc_cmpl_els_adisc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
> 	}
> out:
> 	lpfc_els_free_iocb(phba, cmdiocb);
>+	/* ADISC completes to NPort <nlp_DID> */
>+	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
>+			"%d:0104 ADISC completes to NPort x%x "
>+			"Data: x%x x%x x%x x%x x%x\n",
>+			phba->brd_no, cmdiocb->iocb.un.elsreq64.remoteID,
>+			irsp->ulpStatus, irsp->un.ulpWord[4], 
>+			irsp->ulpTimeout, disc, phba->num_disc_nodes);
> 	return;
> }
> 
>@@ -1202,18 +1214,19 @@ lpfc_cmpl_els_logo(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
> 	cmdiocb->context_un.rsp_iocb = rspiocb;
> 
> 	irsp = &(rspiocb->iocb);
>-	ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
>+
>+	if (((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
>+	     ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
>+	     (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
>+	     (irsp->un.ulpWord[4] == IOERR_SLI_DOWN)))) {
>+		ndlp = NULL ;
>+		goto out ;
>+	}
>+	ndlp = (struct lpfc_nodelist*) cmdiocb->context1 ;
> 	spin_lock_irq(phba->host->host_lock);
> 	ndlp->nlp_flag &= ~NLP_LOGO_SND;
> 	spin_unlock_irq(phba->host->host_lock);
> 
>-	/* LOGO completes to NPort <nlp_DID> */
>-	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
>-			"%d:0105 LOGO completes to NPort x%x "
>-			"Data: x%x x%x x%x x%x\n",
>-			phba->brd_no, ndlp->nlp_DID, irsp->ulpStatus,
>-			irsp->un.ulpWord[4], irsp->ulpTimeout,
>-			phba->num_disc_nodes);
> 
> 	/* Check to see if link went down during discovery */
> 	if (lpfc_els_chk_latt(phba))
>@@ -1245,6 +1258,13 @@ lpfc_cmpl_els_logo(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
> 
> out:
> 	lpfc_els_free_iocb(phba, cmdiocb);
>+	/* LOGO completes to NPort <nlp_DID> */
>+	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
>+			"%d:0105 LOGO completes to NPort x%x "
>+			"Data: x%x x%x x%x x%x\n",
>+			phba->brd_no, cmdiocb->iocb.un.elsreq64.remoteID, 
>+			irsp->ulpStatus, irsp->un.ulpWord[4], 
>+			irsp->ulpTimeout, phba->num_disc_nodes);
> 	return;
> }
> 
>@@ -1815,25 +1835,44 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
> 		       struct lpfc_iocbq * rspiocb)
> {
> 	struct lpfc_nodelist *ndlp;
>+	IOCB_t *irsp;
> 
>-	ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
>+	irsp = &rspiocb->iocb;
>+	
>+	if (((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
>+	     ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
>+	     (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
>+	     (irsp->un.ulpWord[4] == IOERR_SLI_DOWN)))) {
>+		ndlp = NULL ;
>+	}
>+	else {
>+		 ndlp = (struct lpfc_nodelist*) cmdiocb->context1 ;
>+	}
> 
> 	/* ACC to LOGO completes to NPort <nlp_DID> */
>-	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
>+	if (ndlp) {
>+		lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
> 			"%d:0109 ACC to LOGO completes to NPort x%x "
> 			"Data: x%x x%x x%x\n",
>-			phba->brd_no, ndlp->nlp_DID, ndlp->nlp_flag,
>+			phba->brd_no, ndlp->nlp_DID, ndlp->nlp_flag, 
> 			ndlp->nlp_state, ndlp->nlp_rpi);
>+	} else {
>+		lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
>+			"%d:0133 ACC to LOGO completes\n",
>+			phba->brd_no);
>+	}
> 
>-	switch (ndlp->nlp_state) {
>-	case NLP_STE_UNUSED_NODE:	/* node is just allocated */
>-		lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
>-		break;
>-	case NLP_STE_NPR_NODE:		/* NPort Recovery mode */
>-		lpfc_unreg_rpi(phba, ndlp);
>-		break;
>-	default:
>-		break;
>+	if (ndlp){
>+		switch (ndlp->nlp_state) {
>+		case NLP_STE_UNUSED_NODE:	/* node is just allocated */
>+			lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
>+			break;
>+		case NLP_STE_NPR_NODE:		/* NPort Recovery mode */
>+			lpfc_unreg_rpi(phba, ndlp);
>+			break;
>+		default:
>+			break;
>+		}
> 	}
> 	lpfc_els_free_iocb(phba, cmdiocb);
> 	return;
>@@ -1850,11 +1889,22 @@ lpfc_cmpl_els_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
> 
> 	irsp = &rspiocb->iocb;
> 
>-	ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
> 	if (cmdiocb->context_un.mbox)
> 		mbox = cmdiocb->context_un.mbox;
> 
> 
>+	if (((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
>+	     ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
>+	     (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
>+	     (irsp->un.ulpWord[4] == IOERR_SLI_DOWN)))) {
>+		ndlp = NULL ;
>+	}
>+	else {
>+		ndlp = (struct lpfc_nodelist*) cmdiocb->context1 ;
>+	}
>+
>+		
>+
> 	/* Check to see if link went down during discovery */
> 	if ((lpfc_els_chk_latt(phba)) || !ndlp) {
> 		if (mbox) {
>@@ -1868,15 +1918,6 @@ lpfc_cmpl_els_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
> 		goto out;
> 	}
> 
>-	/* ELS response tag <ulpIoTag> completes */
>-	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
>-			"%d:0110 ELS response tag x%x completes "
>-			"Data: x%x x%x x%x x%x x%x x%x x%x\n",
>-			phba->brd_no,
>-			cmdiocb->iocb.ulpIoTag, rspiocb->iocb.ulpStatus,
>-			rspiocb->iocb.un.ulpWord[4], rspiocb->iocb.ulpTimeout,
>- 			ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state,
>-			ndlp->nlp_rpi);
> 
> 	if (mbox) {
> 		if ((rspiocb->iocb.ulpStatus == 0)
>@@ -1920,6 +1961,14 @@ out:
> 		spin_unlock_irq(phba->host->host_lock);
> 	}
> 	lpfc_els_free_iocb(phba, cmdiocb);
>+	/* ELS response tag <ulpIoTag> completes */
>+	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
>+			"%d:0110 ELS response tag x%x completes "
>+			"Data: x%x x%x x%x x%x \n",
>+			phba->brd_no,
>+			cmdiocb->iocb.ulpIoTag, rspiocb->iocb.ulpStatus,
>+			rspiocb->iocb.un.ulpWord[4], rspiocb->iocb.ulpTimeout,
>+ 			cmdiocb->iocb.un.elsreq64.remoteID);
> 	return;
> }
> 
>diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
>index ccb8a72..60082bf 100644
>--- a/drivers/scsi/lpfc/lpfc_scsi.c
>+++ b/drivers/scsi/lpfc/lpfc_scsi.c
>@@ -561,6 +561,7 @@ lpfc_scsi_prep_cmnd(struct lpfc_hba * phba, struct lpfc_scsi_buf * lpfc_cmd,
> 	IOCB_t *iocb_cmd = &lpfc_cmd->cur_iocbq.iocb;
> 	struct lpfc_iocbq *piocbq = &(lpfc_cmd->cur_iocbq);
> 	int datadir = scsi_cmnd->sc_data_direction;
>+	char tag[2];
> 
> 	lpfc_cmd->fcp_rsp->rspSnsLen = 0;
> 	/* clear task management bits */
>@@ -571,8 +572,8 @@ lpfc_scsi_prep_cmnd(struct lpfc_hba * phba, struct lpfc_scsi_buf * lpfc_cmd,
> 
> 	memcpy(&fcp_cmnd->fcpCdb[0], scsi_cmnd->cmnd, 16);
> 
>-	if (scsi_cmnd->device->tagged_supported) {
>-		switch (scsi_cmnd->tag) {
>+	if (scsi_populate_tag_msg(scsi_cmnd, tag)) {
>+		switch (tag[0]) {
> 		case HEAD_OF_QUEUE_TAG:
> 			fcp_cmnd->fcpCntl1 = HEAD_OF_Q;
> 			break;
>@@ -637,6 +638,8 @@ lpfc_scsi_prep_cmnd(struct lpfc_hba * phba, struct lpfc_scsi_buf * lpfc_cmd,
> 	piocbq->iocb.ulpContext = pnode->nlp_rpi;
> 	if (pnode->nlp_fcp_info & NLP_FCP_2_DEVICE)
> 		piocbq->iocb.ulpFCP2Rcvy = 1;
>+	else
>+		piocbq->iocb.ulpFCP2Rcvy = 0;
> 
> 	piocbq->iocb.ulpClass = (pnode->nlp_fcp_info & 0x0f);
> 	piocbq->context1  = lpfc_cmd;
>diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h
>index 5d07ecd..c454008 100644
>--- a/drivers/scsi/lpfc/lpfc_version.h
>+++ b/drivers/scsi/lpfc/lpfc_version.h
>@@ -18,7 +18,7 @@
>  * included with this package.                                     *
>  *******************************************************************/
> 
>-#define LPFC_DRIVER_VERSION "8.1.10.9"
>+#define LPFC_DRIVER_VERSION "8.1.10.12"
> 
> #define LPFC_DRIVER_NAME "lpfc"
>

Actions: View | Diff

Attachments on bug 385351: 260281 | 281251