X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Flpfc%2Flpfc_nportdisc.c;h=0c7e731dc45a6cdba715693d4c72ae0526920a7b;hb=refs%2Fheads%2Fvserver;hp=c3f431bff4fd6a1f19420f4565b4ade09a86232d;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c index c3f431bff..0c7e731dc 100644 --- a/drivers/scsi/lpfc/lpfc_nportdisc.c +++ b/drivers/scsi/lpfc/lpfc_nportdisc.c @@ -1,43 +1,40 @@ /******************************************************************* * This file is part of the Emulex Linux Device Driver for * - * Enterprise Fibre Channel Host Bus Adapters. * - * Refer to the README file included with this package for * - * driver version and adapter support. * - * Copyright (C) 2004 Emulex Corporation. * + * Fibre Channel Host Bus Adapters. * + * Copyright (C) 2004-2006 Emulex. All rights reserved. * + * EMULEX and SLI are trademarks of Emulex. * * www.emulex.com * + * Portions Copyright (C) 2004-2005 Christoph Hellwig * * * * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License * - * as published by the Free Software Foundation; either version 2 * - * of the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details, a copy of which * - * can be found in the file COPYING included with this package. * + * modify it under the terms of version 2 of the GNU General * + * Public License as published by the Free Software Foundation. * + * This program is distributed in the hope that it will be useful. * + * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * + * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * + * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * + * TO BE LEGALLY INVALID. See the GNU General Public License for * + * more details, a copy of which can be found in the file COPYING * + * included with this package. * *******************************************************************/ -/* - * $Id: lpfc_nportdisc.c 1.146 2004/11/18 14:53:54EST sf_support Exp $ - */ - -#include #include -#include #include -#include +#include + +#include #include +#include +#include + +#include "lpfc_hw.h" #include "lpfc_sli.h" #include "lpfc_disc.h" #include "lpfc_scsi.h" #include "lpfc.h" -#include "lpfc_crtn.h" -#include "lpfc_hw.h" #include "lpfc_logmsg.h" -#include "lpfc_mem.h" - -extern uint8_t lpfcAlpaArray[]; +#include "lpfc_crtn.h" /* Called to verify a rcv'ed ADISC was intended for us. */ @@ -49,64 +46,85 @@ lpfc_check_adisc(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, * table entry for that node. */ if (memcmp(nn, &ndlp->nlp_nodename, sizeof (struct lpfc_name)) != 0) - return (0); + return 0; if (memcmp(pn, &ndlp->nlp_portname, sizeof (struct lpfc_name)) != 0) - return (0); + return 0; /* we match, return success */ - return (1); + return 1; } - int lpfc_check_sparm(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, struct serv_parm * sp, uint32_t class) { volatile struct serv_parm *hsp = &phba->fc_sparam; - /* First check for supported version */ - - /* Next check for class validity */ + uint16_t hsp_value, ssp_value = 0; + + /* + * The receive data field size and buffer-to-buffer receive data field + * size entries are 16 bits but are represented as two 8-bit fields in + * the driver data structure to account for rsvd bits and other control + * bits. Reconstruct and compare the fields as a 16-bit values before + * correcting the byte values. + */ if (sp->cls1.classValid) { - - if (sp->cls1.rcvDataSizeMsb > hsp->cls1.rcvDataSizeMsb) - sp->cls1.rcvDataSizeMsb = hsp->cls1.rcvDataSizeMsb; - if (sp->cls1.rcvDataSizeLsb > hsp->cls1.rcvDataSizeLsb) + hsp_value = (hsp->cls1.rcvDataSizeMsb << 8) | + hsp->cls1.rcvDataSizeLsb; + ssp_value = (sp->cls1.rcvDataSizeMsb << 8) | + sp->cls1.rcvDataSizeLsb; + if (ssp_value > hsp_value) { sp->cls1.rcvDataSizeLsb = hsp->cls1.rcvDataSizeLsb; + sp->cls1.rcvDataSizeMsb = hsp->cls1.rcvDataSizeMsb; + } } else if (class == CLASS1) { - return (0); + return 0; } if (sp->cls2.classValid) { - - if (sp->cls2.rcvDataSizeMsb > hsp->cls2.rcvDataSizeMsb) - sp->cls2.rcvDataSizeMsb = hsp->cls2.rcvDataSizeMsb; - if (sp->cls2.rcvDataSizeLsb > hsp->cls2.rcvDataSizeLsb) + hsp_value = (hsp->cls2.rcvDataSizeMsb << 8) | + hsp->cls2.rcvDataSizeLsb; + ssp_value = (sp->cls2.rcvDataSizeMsb << 8) | + sp->cls2.rcvDataSizeLsb; + if (ssp_value > hsp_value) { sp->cls2.rcvDataSizeLsb = hsp->cls2.rcvDataSizeLsb; + sp->cls2.rcvDataSizeMsb = hsp->cls2.rcvDataSizeMsb; + } } else if (class == CLASS2) { - return (0); + return 0; } if (sp->cls3.classValid) { - - if (sp->cls3.rcvDataSizeMsb > hsp->cls3.rcvDataSizeMsb) - sp->cls3.rcvDataSizeMsb = hsp->cls3.rcvDataSizeMsb; - if (sp->cls3.rcvDataSizeLsb > hsp->cls3.rcvDataSizeLsb) + hsp_value = (hsp->cls3.rcvDataSizeMsb << 8) | + hsp->cls3.rcvDataSizeLsb; + ssp_value = (sp->cls3.rcvDataSizeMsb << 8) | + sp->cls3.rcvDataSizeLsb; + if (ssp_value > hsp_value) { sp->cls3.rcvDataSizeLsb = hsp->cls3.rcvDataSizeLsb; + sp->cls3.rcvDataSizeMsb = hsp->cls3.rcvDataSizeMsb; + } } else if (class == CLASS3) { - return (0); + return 0; } - if (sp->cmn.bbRcvSizeMsb > hsp->cmn.bbRcvSizeMsb) - sp->cmn.bbRcvSizeMsb = hsp->cmn.bbRcvSizeMsb; - if (sp->cmn.bbRcvSizeLsb > hsp->cmn.bbRcvSizeLsb) + /* + * Preserve the upper four bits of the MSB from the PLOGI response. + * These bits contain the Buffer-to-Buffer State Change Number + * from the target and need to be passed to the FW. + */ + hsp_value = (hsp->cmn.bbRcvSizeMsb << 8) | hsp->cmn.bbRcvSizeLsb; + ssp_value = (sp->cmn.bbRcvSizeMsb << 8) | sp->cmn.bbRcvSizeLsb; + if (ssp_value > hsp_value) { sp->cmn.bbRcvSizeLsb = hsp->cmn.bbRcvSizeLsb; + sp->cmn.bbRcvSizeMsb = (sp->cmn.bbRcvSizeMsb & 0xF0) | + (hsp->cmn.bbRcvSizeMsb & 0x0F); + } - /* If check is good, copy wwpn wwnn into ndlp */ memcpy(&ndlp->nlp_nodename, &sp->nodeName, sizeof (struct lpfc_name)); memcpy(&ndlp->nlp_portname, &sp->portName, sizeof (struct lpfc_name)); - return (1); + return 1; } static void * @@ -116,7 +134,7 @@ lpfc_check_elscmpl_iocb(struct lpfc_hba * phba, { struct lpfc_dmabuf *pcmd, *prsp; uint32_t *lp; - void *ptr; + void *ptr = NULL; IOCB_t *irsp; irsp = &rspiocb->iocb; @@ -126,15 +144,13 @@ lpfc_check_elscmpl_iocb(struct lpfc_hba * phba, * freeing associated memory till after ABTS completes. */ if (pcmd) { - prsp = (struct lpfc_dmabuf *) pcmd->list.next; - lp = (uint32_t *) prsp->virt; - - pci_dma_sync_single_for_cpu(phba->pcidev, prsp->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); - - ptr = (void *)((uint8_t *)lp + sizeof(uint32_t)); - } - else { + prsp = list_get_first(&pcmd->list, struct lpfc_dmabuf, + list); + if (prsp) { + lp = (uint32_t *) prsp->virt; + ptr = (void *)((uint8_t *)lp + sizeof(uint32_t)); + } + } else { /* Force ulpStatus error since we are returning NULL ptr */ if (!(irsp->ulpStatus)) { irsp->ulpStatus = IOSTAT_LOCAL_REJECT; @@ -142,7 +158,7 @@ lpfc_check_elscmpl_iocb(struct lpfc_hba * phba, } ptr = NULL; } - return (ptr); + return ptr; } @@ -151,7 +167,7 @@ lpfc_check_elscmpl_iocb(struct lpfc_hba * phba, * associated with a LPFC_NODELIST entry. This * routine effectively results in a "software abort". */ -static int +int lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, int send_abts) { @@ -159,10 +175,11 @@ lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, struct lpfc_sli_ring *pring; struct lpfc_iocbq *iocb, *next_iocb; IOCB_t *icmd; + int found = 0; /* Abort outstanding I/O on NPort */ lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, - "%d:0201 Abort outstanding I/O on NPort x%x " + "%d:0205 Abort outstanding I/O on NPort x%x " "Data: x%x x%x x%x\n", phba->brd_no, ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi); @@ -171,60 +188,80 @@ lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, pring = &psli->ring[LPFC_ELS_RING]; /* First check the txq */ - list_for_each_entry_safe(iocb, next_iocb, &pring->txq, list) { - /* Check to see if iocb matches the nport we are looking for */ - if ((lpfc_check_sli_ndlp(phba, pring, iocb, ndlp))) { - /* It matches, so deque and call compl with an error */ - list_del(&iocb->list); - pring->txq_cnt--; - if (iocb->iocb_cmpl) { - icmd = &iocb->iocb; - icmd->ulpStatus = IOSTAT_LOCAL_REJECT; - icmd->un.ulpWord[4] = IOERR_SLI_ABORTED; - (iocb->iocb_cmpl) (phba, iocb, iocb); - } else { - mempool_free(iocb, phba->iocb_mem_pool); + do { + found = 0; + spin_lock_irq(phba->host->host_lock); + list_for_each_entry_safe(iocb, next_iocb, &pring->txq, list) { + /* Check to see if iocb matches the nport we are looking + for */ + if ((lpfc_check_sli_ndlp(phba, pring, iocb, ndlp))) { + found = 1; + /* It matches, so deque and call compl with an + error */ + list_del(&iocb->list); + pring->txq_cnt--; + if (iocb->iocb_cmpl) { + icmd = &iocb->iocb; + icmd->ulpStatus = IOSTAT_LOCAL_REJECT; + icmd->un.ulpWord[4] = IOERR_SLI_ABORTED; + spin_unlock_irq(phba->host->host_lock); + (iocb->iocb_cmpl) (phba, iocb, iocb); + spin_lock_irq(phba->host->host_lock); + } else + lpfc_sli_release_iocbq(phba, iocb); + break; } } - } + spin_unlock_irq(phba->host->host_lock); + } while (found); /* Everything on txcmplq will be returned by firmware - * with a no rpi / linkdown / abort error. For ring 0, - * ELS discovery, we want to get rid of it right here. - */ + * with a no rpi / linkdown / abort error. For ring 0, + * ELS discovery, we want to get rid of it right here. + */ /* Next check the txcmplq */ - list_for_each_entry_safe(iocb, next_iocb, &pring->txcmplq, list) { - /* Check to see if iocb matches the nport we are looking for */ - if ((lpfc_check_sli_ndlp (phba, pring, iocb, ndlp))) { - /* It matches, so deque and call compl with an error */ - list_del(&iocb->list); - pring->txcmplq_cnt--; - - icmd = &iocb->iocb; - /* If the driver is completing an ELS - * command early, flush it out of the firmware. - */ - if (send_abts && - (icmd->ulpCommand == CMD_ELS_REQUEST64_CR) && - (icmd->un.elsreq64.bdl.ulpIoTag32)) { - lpfc_sli_issue_abort_iotag32(phba, pring, iocb); - } - if (iocb->iocb_cmpl) { - icmd->ulpStatus = IOSTAT_LOCAL_REJECT; - icmd->un.ulpWord[4] = IOERR_SLI_ABORTED; - (iocb->iocb_cmpl) (phba, iocb, iocb); - } else { - mempool_free(iocb, phba->iocb_mem_pool); + do { + found = 0; + spin_lock_irq(phba->host->host_lock); + list_for_each_entry_safe(iocb, next_iocb, &pring->txcmplq, + list) { + /* Check to see if iocb matches the nport we are looking + for */ + if ((lpfc_check_sli_ndlp (phba, pring, iocb, ndlp))) { + found = 1; + /* It matches, so deque and call compl with an + error */ + list_del(&iocb->list); + pring->txcmplq_cnt--; + + icmd = &iocb->iocb; + /* If the driver is completing an ELS + * command early, flush it out of the firmware. + */ + if (send_abts && + (icmd->ulpCommand == CMD_ELS_REQUEST64_CR) && + (icmd->un.elsreq64.bdl.ulpIoTag32)) { + lpfc_sli_issue_abort_iotag32(phba, + pring, iocb); + } + if (iocb->iocb_cmpl) { + icmd->ulpStatus = IOSTAT_LOCAL_REJECT; + icmd->un.ulpWord[4] = IOERR_SLI_ABORTED; + spin_unlock_irq(phba->host->host_lock); + (iocb->iocb_cmpl) (phba, iocb, iocb); + spin_lock_irq(phba->host->host_lock); + } else + lpfc_sli_release_iocbq(phba, iocb); + break; } } - } + spin_unlock_irq(phba->host->host_lock); + } while(found); /* If we are delaying issuing an ELS command, cancel it */ - if(ndlp->nlp_flag & NLP_DELAY_TMO) { - ndlp->nlp_flag &= ~NLP_DELAY_TMO; - del_timer_sync(&ndlp->nlp_delayfunc); - } - return (0); + if (ndlp->nlp_flag & NLP_DELAY_TMO) + lpfc_cancel_retry_delay_tmo(phba, ndlp); + return 0; } static int @@ -238,6 +275,7 @@ lpfc_rcv_plogi(struct lpfc_hba * phba, struct serv_parm *sp; LPFC_MBOXQ_t *mbox; struct ls_rjt stat; + int rc; memset(&stat, 0, sizeof (struct ls_rjt)); if (phba->hba_state <= LPFC_FLOGI) { @@ -247,7 +285,7 @@ lpfc_rcv_plogi(struct lpfc_hba * phba, */ if (phba->fc_flag & FC_PT2PT) { lpfc_els_abort_flogi(phba); - if(!(phba->fc_flag & FC_PT2PT_PLOGI)) { + if (!(phba->fc_flag & FC_PT2PT_PLOGI)) { /* If the other side is supposed to initiate * the PLOGI anyway, just ACC it now and * move on with discovery. @@ -257,15 +295,15 @@ lpfc_rcv_plogi(struct lpfc_hba * phba, /* Start discovery - this should just do CLEAR_LA */ lpfc_disc_start(phba); - } - else { + } else { lpfc_initial_flogi(phba); } - } - else { + } else { stat.un.b.lsRjtRsnCode = LSRJT_LOGICAL_BSY; stat.un.b.lsRjtRsnCodeExp = LSEXP_NOTHING_MORE; - goto out; + lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, + ndlp); + return 0; } } pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; @@ -275,7 +313,8 @@ lpfc_rcv_plogi(struct lpfc_hba * phba, /* Reject this request because invalid parameters */ stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC; stat.un.b.lsRjtRsnCodeExp = LSEXP_SPARM_OPTIONS; - goto out; + lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp); + return 0; } icmd = &cmdiocb->iocb; @@ -294,53 +333,57 @@ lpfc_rcv_plogi(struct lpfc_hba * phba, } else { ndlp->nlp_fcp_info |= CLASS3; } + ndlp->nlp_class_sup = 0; + if (sp->cls1.classValid) + ndlp->nlp_class_sup |= FC_COS_CLASS1; + if (sp->cls2.classValid) + ndlp->nlp_class_sup |= FC_COS_CLASS2; + if (sp->cls3.classValid) + ndlp->nlp_class_sup |= FC_COS_CLASS3; + if (sp->cls4.classValid) + ndlp->nlp_class_sup |= FC_COS_CLASS4; + ndlp->nlp_maxframe = + ((sp->cmn.bbRcvSizeMsb & 0x0F) << 8) | sp->cmn.bbRcvSizeLsb; /* no need to reg_login if we are already in one of these states */ - switch(ndlp->nlp_state) { + switch (ndlp->nlp_state) { + case NLP_STE_NPR_NODE: + if (!(ndlp->nlp_flag & NLP_NPR_ADISC)) + break; case NLP_STE_REG_LOGIN_ISSUE: case NLP_STE_PRLI_ISSUE: case NLP_STE_UNMAPPED_NODE: case NLP_STE_MAPPED_NODE: lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp, NULL, 0); - return (1); - } - - if ((mbox = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC)) == 0) { - stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC; - stat.un.b.lsRjtRsnCodeExp = LSEXP_OUT_OF_RESOURCE; - goto out; + return 1; } if ((phba->fc_flag & FC_PT2PT) && !(phba->fc_flag & FC_PT2PT_PLOGI)) { /* rcv'ed PLOGI decides what our NPortId will be */ phba->fc_myDID = icmd->un.rcvels.parmRo; + mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL); + if (mbox == NULL) + goto out; lpfc_config_link(phba, mbox); - if (lpfc_sli_issue_mbox - (phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB)) - == MBX_NOT_FINISHED) { + mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl; + rc = lpfc_sli_issue_mbox + (phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB)); + if (rc == MBX_NOT_FINISHED) { mempool_free( mbox, phba->mbox_mem_pool); - stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC; - stat.un.b.lsRjtRsnCodeExp = LSEXP_OUT_OF_RESOURCE; - goto out; - } - if ((mbox = mempool_alloc(phba->mbox_mem_pool, - GFP_ATOMIC)) == 0) { - stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC; - stat.un.b.lsRjtRsnCodeExp = LSEXP_OUT_OF_RESOURCE; goto out; } + lpfc_can_disctmo(phba); } + mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL); + if (mbox == NULL) + goto out; - if(lpfc_reg_login(phba, icmd->un.rcvels.remoteID, + if (lpfc_reg_login(phba, icmd->un.rcvels.remoteID, (uint8_t *) sp, mbox, 0)) { mempool_free( mbox, phba->mbox_mem_pool); - stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC; - stat.un.b.lsRjtRsnCodeExp = LSEXP_OUT_OF_RESOURCE; -out: - lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp); - return (0); + goto out; } /* ACC PLOGI rsp command needs to execute first, @@ -348,18 +391,30 @@ out: */ mbox->mbox_cmpl = lpfc_mbx_cmpl_reg_login; mbox->context2 = ndlp; - ndlp->nlp_flag |= NLP_ACC_REGLOGIN; - - /* If there is an outstanding PLOGI issued, abort it before - * sending ACC rsp to PLOGI recieved. + ndlp->nlp_flag |= (NLP_ACC_REGLOGIN | NLP_RCV_PLOGI); + + /* + * If there is an outstanding PLOGI issued, abort it before + * sending ACC rsp for received PLOGI. If pending plogi + * is not canceled here, the plogi will be rejected by + * remote port and will be retried. On a configuration with + * single discovery thread, this will cause a huge delay in + * discovery. Also this will cause multiple state machines + * running in parallel for this node. */ - if(ndlp->nlp_state == NLP_STE_PLOGI_ISSUE) { + if (ndlp->nlp_state == NLP_STE_PLOGI_ISSUE) { /* software abort outstanding PLOGI */ lpfc_els_abort(phba, ndlp, 1); } - ndlp->nlp_flag |= NLP_RCV_PLOGI; + lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp, mbox, 0); - return (1); + return 1; + +out: + stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC; + stat.un.b.lsRjtRsnCodeExp = LSEXP_OUT_OF_RESOURCE; + lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp); + return 0; } static int @@ -395,12 +450,11 @@ lpfc_rcv_padisc(struct lpfc_hba * phba, (lpfc_check_adisc(phba, ndlp, pnn, ppn))) { if (cmd == ELS_CMD_ADISC) { lpfc_els_rsp_adisc_acc(phba, cmdiocb, ndlp); - } - else { + } else { lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp, NULL, 0); } - return (1); + return 1; } /* Reject this request because invalid parameters */ stat.un.b.lsRjtRsvd0 = 0; @@ -409,273 +463,99 @@ lpfc_rcv_padisc(struct lpfc_hba * phba, stat.un.b.vendorUnique = 0; lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp); - ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI; /* 1 sec timeout */ mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ); + spin_lock_irq(phba->host->host_lock); ndlp->nlp_flag |= NLP_DELAY_TMO; + spin_unlock_irq(phba->host->host_lock); + ndlp->nlp_last_elscmd = ELS_CMD_PLOGI; + ndlp->nlp_prev_state = ndlp->nlp_state; ndlp->nlp_state = NLP_STE_NPR_NODE; lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); - return (0); + return 0; } static int lpfc_rcv_logo(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, - struct lpfc_iocbq *cmdiocb) + struct lpfc_iocbq *cmdiocb, + uint32_t els_cmd) { /* Put ndlp on NPR list with 1 sec timeout for plogi, ACC logo */ /* Only call LOGO ACC for first LOGO, this avoids sending unnecessary * PLOGIs during LOGO storms from a device. */ ndlp->nlp_flag |= NLP_LOGO_ACC; - lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0); + if (els_cmd == ELS_CMD_PRLO) + lpfc_els_rsp_acc(phba, ELS_CMD_PRLO, cmdiocb, ndlp, NULL, 0); + else + lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0); - if (!(ndlp->nlp_type & NLP_FABRIC)) { + if (!(ndlp->nlp_type & NLP_FABRIC) || + (ndlp->nlp_state == NLP_STE_ADISC_ISSUE)) { /* Only try to re-login if this is NOT a Fabric Node */ - ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI; mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1); + spin_lock_irq(phba->host->host_lock); ndlp->nlp_flag |= NLP_DELAY_TMO; - } + spin_unlock_irq(phba->host->host_lock); - ndlp->nlp_state = NLP_STE_NPR_NODE; - lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); + ndlp->nlp_last_elscmd = ELS_CMD_PLOGI; + ndlp->nlp_prev_state = ndlp->nlp_state; + ndlp->nlp_state = NLP_STE_NPR_NODE; + lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); + } else { + ndlp->nlp_prev_state = ndlp->nlp_state; + ndlp->nlp_state = NLP_STE_UNUSED_NODE; + lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST); + } + spin_lock_irq(phba->host->host_lock); ndlp->nlp_flag &= ~NLP_NPR_ADISC; + spin_unlock_irq(phba->host->host_lock); /* The driver has to wait until the ACC completes before it continues * processing the LOGO. The action will resume in * lpfc_cmpl_els_logo_acc routine. Since part of processing includes an * unreg_login, the driver waits so the ACC does not get aborted. */ - return (0); -} - -static int -lpfc_binding_found(struct lpfc_bindlist * blp, struct lpfc_nodelist * ndlp) -{ - uint16_t bindtype = blp->nlp_bind_type; - - if ((bindtype & FCP_SEED_DID) && - (ndlp->nlp_DID == be32_to_cpu(blp->nlp_DID))) { - return (1); - } else if ((bindtype & FCP_SEED_WWPN) && - (memcmp(&ndlp->nlp_portname, &blp->nlp_portname, - sizeof (struct lpfc_name)) == 0)) { - return (1); - } else if ((bindtype & FCP_SEED_WWNN) && - (memcmp(&ndlp->nlp_nodename, &blp->nlp_nodename, - sizeof (struct lpfc_name)) == 0)) { - return (1); - } - return (0); + return 0; } -static int -lpfc_binding_useid(struct lpfc_hba * phba, uint32_t sid) -{ - struct lpfc_bindlist *blp; - - list_for_each_entry(blp, &phba->fc_nlpbind_list, nlp_listp) { - if (blp->nlp_sid == sid) { - return (1); - } - } - return (0); -} - -static int -lpfc_mapping_useid(struct lpfc_hba * phba, uint32_t sid) -{ - struct lpfc_nodelist *mapnode; - struct lpfc_bindlist *blp; - - list_for_each_entry(mapnode, &phba->fc_nlpmap_list, nlp_listp) { - blp = mapnode->nlp_listp_bind; - if (blp->nlp_sid == sid) { - return (1); - } - } - return (0); -} - -static struct lpfc_bindlist * -lpfc_create_binding(struct lpfc_hba * phba, - struct lpfc_nodelist * ndlp, uint16_t index, - uint16_t bindtype) -{ - struct lpfc_bindlist *blp; - - if ((blp = mempool_alloc(phba->bind_mem_pool, GFP_ATOMIC))) { - memset(blp, 0, sizeof (struct lpfc_bindlist)); - switch (bindtype) { - case FCP_SEED_WWPN: - blp->nlp_bind_type = FCP_SEED_WWPN; - break; - case FCP_SEED_WWNN: - blp->nlp_bind_type = FCP_SEED_WWNN; - break; - case FCP_SEED_DID: - blp->nlp_bind_type = FCP_SEED_DID; - break; - } - blp->nlp_sid = index; - blp->nlp_DID = ndlp->nlp_DID; - memcpy(&blp->nlp_nodename, &ndlp->nlp_nodename, - sizeof (struct lpfc_name)); - memcpy(&blp->nlp_portname, &ndlp->nlp_portname, - sizeof (struct lpfc_name)); - - return (blp); - } - return NULL; -} - - -static struct lpfc_bindlist * -lpfc_consistent_bind_get(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp) -{ - struct lpfc_bindlist *blp, *next_blp; - uint16_t index; - - /* check binding list */ - list_for_each_entry_safe(blp, next_blp, &phba->fc_nlpbind_list, - nlp_listp) { - if (lpfc_binding_found(blp, ndlp)) { - - /* take it off the binding list */ - phba->fc_bind_cnt--; - list_del_init(&blp->nlp_listp); - - /* Reassign scsi id to NPort */ - lpfc_printf_log(phba, - KERN_INFO, - LOG_DISCOVERY | LOG_FCP, - "%d:0213 Reassign scsi id x%x to " - "NPort x%x Data: x%x x%x x%x x%x\n", - phba->brd_no, - blp->nlp_sid, ndlp->nlp_DID, - blp->nlp_bind_type, ndlp->nlp_flag, - ndlp->nlp_state, ndlp->nlp_rpi); - - return (blp); - } - } - - /* NOTE: if scan-down = 2 and we have private loop, then we use - * AlpaArray to determine sid. - */ - if ((phba->cfg_fcp_bind_method == 4) && - ((phba->fc_flag & (FC_PUBLIC_LOOP | FC_FABRIC)) || - (phba->fc_topology != TOPOLOGY_LOOP))) { - /* Log message: ALPA based binding used on a non loop - topology */ - lpfc_printf_log(phba, - KERN_WARNING, - LOG_DISCOVERY, - "%d:0245 ALPA based bind method used on an HBA " - "which is in a nonloop topology Data: x%x\n", - phba->brd_no, - phba->fc_topology); - } - - if ((phba->cfg_fcp_bind_method == 4) && - !(phba->fc_flag & (FC_PUBLIC_LOOP | FC_FABRIC)) && - (phba->fc_topology == TOPOLOGY_LOOP)) { - for (index = 0; index < FC_MAXLOOP; index++) { - if (ndlp->nlp_DID == (uint32_t) lpfcAlpaArray[index]) { - if ((blp = - lpfc_create_binding(phba, ndlp, index, - FCP_SEED_DID))) { - return (blp); - } - goto errid; - } - } - } - - if (phba->cfg_automap) { - while (1) { - if ((lpfc_binding_useid(phba, phba->sid_cnt)) - || (lpfc_mapping_useid (phba, phba->sid_cnt))) { - - phba->sid_cnt++; - } else { - if ((blp = - lpfc_create_binding(phba, ndlp, - phba->sid_cnt, - phba->fcp_mapping))) { - blp->nlp_bind_type |= FCP_SEED_AUTO; - - phba->sid_cnt++; - return (blp); - } - goto errid; - } - } - } - /* if automap on */ -errid: - /* Cannot assign scsi id on NPort */ - lpfc_printf_log(phba, - KERN_INFO, - LOG_DISCOVERY | LOG_FCP, - "%d:0230 Cannot assign scsi ID on NPort x%x " - "Data: x%x x%x x%x\n", - phba->brd_no, - ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state, - ndlp->nlp_rpi); - - return NULL; -} - -static uint32_t -lpfc_assign_binding(struct lpfc_hba * phba, - struct lpfc_nodelist * ndlp, struct lpfc_bindlist *blp) +static void +lpfc_rcv_prli(struct lpfc_hba * phba, + struct lpfc_nodelist * ndlp, + struct lpfc_iocbq *cmdiocb) { - struct lpfc_target *targetp; + struct lpfc_dmabuf *pcmd; + uint32_t *lp; + PRLI *npr; + struct fc_rport *rport = ndlp->rport; + u32 roles; - targetp = lpfc_find_target(phba, blp->nlp_sid, ndlp); - if(!targetp) { - /* Cannot assign scsi id to NPort */ - lpfc_printf_log(phba, - KERN_INFO, - LOG_DISCOVERY | LOG_FCP, - "%d:0229 Cannot assign scsi id x%x to NPort x%x " - "Data: x%x x%x x%x\n", - phba->brd_no, blp->nlp_sid, - ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state, - ndlp->nlp_rpi); - return(0); - } - ndlp->nlp_sid = blp->nlp_sid; - ndlp->nlp_flag &= ~NLP_SEED_MASK; - switch ((blp->nlp_bind_type & FCP_SEED_MASK)) { - case FCP_SEED_WWPN: - ndlp->nlp_flag |= NLP_SEED_WWPN; - break; - case FCP_SEED_WWNN: - ndlp->nlp_flag |= NLP_SEED_WWNN; - break; - case FCP_SEED_DID: - ndlp->nlp_flag |= NLP_SEED_DID; - break; + pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; + lp = (uint32_t *) pcmd->virt; + npr = (PRLI *) ((uint8_t *) lp + sizeof (uint32_t)); + + ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR); + ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE; + if ((npr->acceptRspCode == PRLI_REQ_EXECUTED) && + (npr->prliType == PRLI_FCP_TYPE)) { + if (npr->initiatorFunc) + ndlp->nlp_type |= NLP_FCP_INITIATOR; + if (npr->targetFunc) + ndlp->nlp_type |= NLP_FCP_TARGET; + if (npr->Retry) + ndlp->nlp_fcp_info |= NLP_FCP_2_DEVICE; } - if (blp->nlp_bind_type & FCP_SEED_AUTO) { - ndlp->nlp_flag |= NLP_AUTOMAP; + if (rport) { + /* We need to update the rport role values */ + roles = FC_RPORT_ROLE_UNKNOWN; + if (ndlp->nlp_type & NLP_FCP_INITIATOR) + roles |= FC_RPORT_ROLE_FCP_INITIATOR; + if (ndlp->nlp_type & NLP_FCP_TARGET) + roles |= FC_RPORT_ROLE_FCP_TARGET; + fc_remote_port_rolechg(rport, roles); } - /* Assign scsi id to NPort */ - lpfc_printf_log(phba, - KERN_INFO, - LOG_DISCOVERY | LOG_FCP, - "%d:0216 Assign scsi " - "id x%x to NPort x%x " - "Data: x%x x%x x%x x%x\n", - phba->brd_no, - ndlp->nlp_sid, ndlp->nlp_DID, - blp->nlp_bind_type, - ndlp->nlp_flag, ndlp->nlp_state, - ndlp->nlp_rpi); - return(1); } static uint32_t @@ -685,18 +565,13 @@ lpfc_disc_set_adisc(struct lpfc_hba * phba, /* Check config parameter use-adisc or FCP-2 */ if ((phba->cfg_use_adisc == 0) && !(phba->fc_flag & FC_RSCN_MODE)) { - return (0); + if (!(ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE)) + return 0; } + spin_lock_irq(phba->host->host_lock); ndlp->nlp_flag |= NLP_NPR_ADISC; - return (1); -} - -static uint32_t -lpfc_disc_noop(struct lpfc_hba * phba, - struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) -{ - /* This routine does nothing, just return the current state */ - return (ndlp->nlp_state); + spin_unlock_irq(phba->host->host_lock); + return 1; } static uint32_t @@ -711,7 +586,7 @@ lpfc_disc_illegal(struct lpfc_hba * phba, phba->brd_no, ndlp->nlp_DID, evt, ndlp->nlp_state, ndlp->nlp_rpi, ndlp->nlp_flag); - return (ndlp->nlp_state); + return ndlp->nlp_state; } /* Start of Discovery State Machine routines */ @@ -721,21 +596,17 @@ lpfc_rcv_plogi_unused_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); - - if(lpfc_rcv_plogi(phba, ndlp, cmdiocb)) { + if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) { + ndlp->nlp_prev_state = NLP_STE_UNUSED_NODE; ndlp->nlp_state = NLP_STE_UNUSED_NODE; lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST); - return (ndlp->nlp_state); + return ndlp->nlp_state; } lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); - return (NLP_STE_FREED_NODE); + return NLP_STE_FREED_NODE; } static uint32_t @@ -744,7 +615,7 @@ lpfc_rcv_els_unused_node(struct lpfc_hba * phba, { lpfc_issue_els_logo(phba, ndlp, 0); lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -752,19 +623,16 @@ lpfc_rcv_logo_unused_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); + spin_lock_irq(phba->host->host_lock); ndlp->nlp_flag |= NLP_LOGO_ACC; + spin_unlock_irq(phba->host->host_lock); lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0); lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -772,7 +640,7 @@ lpfc_cmpl_logo_unused_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); - return (NLP_STE_FREED_NODE); + return NLP_STE_FREED_NODE; } static uint32_t @@ -780,14 +648,14 @@ lpfc_device_rm_unused_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); - return (NLP_STE_FREED_NODE); + return NLP_STE_FREED_NODE; } static uint32_t -lpfc_rcv_plogi_plogi_issue(struct lpfc_hba * phba, - struct lpfc_nodelist * ndlp, - struct lpfc_iocbq *cmdiocb, uint32_t evt) +lpfc_rcv_plogi_plogi_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, + void *arg, uint32_t evt) { + struct lpfc_iocbq *cmdiocb = arg; struct lpfc_dmabuf *pcmd; struct serv_parm *sp; uint32_t *lp; @@ -798,9 +666,6 @@ lpfc_rcv_plogi_plogi_issue(struct lpfc_hba * phba, lp = (uint32_t *) pcmd->virt; sp = (struct serv_parm *) ((uint8_t *) lp + sizeof (uint32_t)); - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); - memset(&stat, 0, sizeof (struct ls_rjt)); /* For a PLOGI, we only accept if our portname is less @@ -816,45 +681,56 @@ lpfc_rcv_plogi_plogi_issue(struct lpfc_hba * phba, stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC; stat.un.b.lsRjtRsnCodeExp = LSEXP_CMD_IN_PROGRESS; lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp); - } - else { + } else { lpfc_rcv_plogi(phba, ndlp, cmdiocb); } /* if our portname was less */ - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t -lpfc_rcv_els_plogi_issue(struct lpfc_hba * phba, +lpfc_rcv_logo_plogi_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); + /* software abort outstanding PLOGI */ + lpfc_els_abort(phba, ndlp, 1); + + lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_LOGO); + return ndlp->nlp_state; +} + +static uint32_t +lpfc_rcv_els_plogi_issue(struct lpfc_hba * phba, + struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) +{ + struct lpfc_iocbq *cmdiocb; + + cmdiocb = (struct lpfc_iocbq *) arg; /* software abort outstanding PLOGI */ lpfc_els_abort(phba, ndlp, 1); - mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1); - ndlp->nlp_flag |= NLP_DELAY_TMO; - if(evt == NLP_EVT_RCV_LOGO) { + if (evt == NLP_EVT_RCV_LOGO) { lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0); - } - else { + } else { lpfc_issue_els_logo(phba, ndlp, 0); } /* Put ndlp in npr list set plogi timer for 1 sec */ - ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI; + mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1); + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag |= NLP_DELAY_TMO; + spin_unlock_irq(phba->host->host_lock); + ndlp->nlp_last_elscmd = ELS_CMD_PLOGI; + ndlp->nlp_prev_state = NLP_STE_PLOGI_ISSUE; ndlp->nlp_state = NLP_STE_NPR_NODE; lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -863,7 +739,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb, *rspiocb; - struct lpfc_dmabuf *pcmd, *prsp; + struct lpfc_dmabuf *pcmd, *prsp, *mp; uint32_t *lp; IOCB_t *irsp; struct serv_parm *sp; @@ -873,95 +749,117 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba, rspiocb = cmdiocb->context_un.rsp_iocb; if (ndlp->nlp_flag & NLP_ACC_REGLOGIN) { - return (ndlp->nlp_state); + /* Recovery from PLOGI collision logic */ + return ndlp->nlp_state; } irsp = &rspiocb->iocb; - if (irsp->ulpStatus == 0) { - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - prsp = (struct lpfc_dmabuf *) pcmd->list.next; - lp = (uint32_t *) prsp->virt; - - pci_dma_sync_single_for_cpu(phba->pcidev, prsp->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); - - sp = (struct serv_parm *) ((uint8_t *) lp + sizeof (uint32_t)); - if ((lpfc_check_sparm(phba, ndlp, sp, CLASS3))) { - /* PLOGI chkparm OK */ - lpfc_printf_log(phba, - KERN_INFO, - LOG_ELS, - "%d:0121 PLOGI chkparm OK " - "Data: x%x x%x x%x x%x\n", - phba->brd_no, - ndlp->nlp_DID, ndlp->nlp_state, - ndlp->nlp_flag, ndlp->nlp_rpi); - - if ((phba->cfg_fcp_class == 2) && - (sp->cls2.classValid)) { - ndlp->nlp_fcp_info |= CLASS2; - } else { - ndlp->nlp_fcp_info |= CLASS3; - } + if (irsp->ulpStatus) + goto out; - if ((mbox = mempool_alloc(phba->mbox_mem_pool, - GFP_ATOMIC))) { - lpfc_unreg_rpi(phba, ndlp); - if (lpfc_reg_login - (phba, irsp->un.elsreq64.remoteID, - (uint8_t *) sp, mbox, 0) == 0) { - /* set_slim mailbox command needs to - * execute first, queue this command to - * be processed later. - */ - switch(ndlp->nlp_DID) { - case NameServer_DID: - mbox->mbox_cmpl = - lpfc_mbx_cmpl_ns_reg_login; - break; - case FDMI_DID: - mbox->mbox_cmpl = - lpfc_mbx_cmpl_fdmi_reg_login; - break; - default: - mbox->mbox_cmpl = - lpfc_mbx_cmpl_reg_login; - } - mbox->context2 = ndlp; - if (lpfc_sli_issue_mbox(phba, mbox, - (MBX_NOWAIT | MBX_STOP_IOCB)) - != MBX_NOT_FINISHED) { - ndlp->nlp_state = - NLP_STE_REG_LOGIN_ISSUE; - lpfc_nlp_list(phba, ndlp, - NLP_REGLOGIN_LIST); - return (ndlp->nlp_state); - } - mempool_free(mbox, phba->mbox_mem_pool); - } else { - mempool_free(mbox, phba->mbox_mem_pool); - } - } + pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; + + prsp = list_get_first(&pcmd->list, + struct lpfc_dmabuf, + list); + lp = (uint32_t *) prsp->virt; + + sp = (struct serv_parm *) ((uint8_t *) lp + sizeof (uint32_t)); + if (!lpfc_check_sparm(phba, ndlp, sp, CLASS3)) + goto out; + + /* PLOGI chkparm OK */ + lpfc_printf_log(phba, + KERN_INFO, + LOG_ELS, + "%d:0121 PLOGI chkparm OK " + "Data: x%x x%x x%x x%x\n", + phba->brd_no, + ndlp->nlp_DID, ndlp->nlp_state, + ndlp->nlp_flag, ndlp->nlp_rpi); + + if ((phba->cfg_fcp_class == 2) && + (sp->cls2.classValid)) { + ndlp->nlp_fcp_info |= CLASS2; + } else { + ndlp->nlp_fcp_info |= CLASS3; + } + ndlp->nlp_class_sup = 0; + if (sp->cls1.classValid) + ndlp->nlp_class_sup |= FC_COS_CLASS1; + if (sp->cls2.classValid) + ndlp->nlp_class_sup |= FC_COS_CLASS2; + if (sp->cls3.classValid) + ndlp->nlp_class_sup |= FC_COS_CLASS3; + if (sp->cls4.classValid) + ndlp->nlp_class_sup |= FC_COS_CLASS4; + ndlp->nlp_maxframe = + ((sp->cmn.bbRcvSizeMsb & 0x0F) << 8) | + sp->cmn.bbRcvSizeLsb; + + if (!(mbox = mempool_alloc(phba->mbox_mem_pool, + GFP_KERNEL))) + goto out; + + lpfc_unreg_rpi(phba, ndlp); + if (lpfc_reg_login + (phba, irsp->un.elsreq64.remoteID, + (uint8_t *) sp, mbox, 0) == 0) { + switch (ndlp->nlp_DID) { + case NameServer_DID: + mbox->mbox_cmpl = + lpfc_mbx_cmpl_ns_reg_login; + break; + case FDMI_DID: + mbox->mbox_cmpl = + lpfc_mbx_cmpl_fdmi_reg_login; + break; + default: + mbox->mbox_cmpl = + lpfc_mbx_cmpl_reg_login; } + mbox->context2 = ndlp; + if (lpfc_sli_issue_mbox(phba, mbox, + (MBX_NOWAIT | MBX_STOP_IOCB)) + != MBX_NOT_FINISHED) { + ndlp->nlp_state = + NLP_STE_REG_LOGIN_ISSUE; + lpfc_nlp_list(phba, ndlp, + NLP_REGLOGIN_LIST); + return ndlp->nlp_state; + } + mp = (struct lpfc_dmabuf *)mbox->context1; + lpfc_mbuf_free(phba, mp->virt, mp->phys); + kfree(mp); + mempool_free(mbox, phba->mbox_mem_pool); + } else { + mempool_free(mbox, phba->mbox_mem_pool); } + + out: /* Free this node since the driver cannot login or has the wrong sparm */ lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); - return (NLP_STE_FREED_NODE); + return NLP_STE_FREED_NODE; } static uint32_t lpfc_device_rm_plogi_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { - /* software abort outstanding PLOGI */ - lpfc_els_abort(phba, ndlp, 1); + if(ndlp->nlp_flag & NLP_NPR_2B_DISC) { + ndlp->nlp_flag |= NLP_NODEV_REMOVE; + return ndlp->nlp_state; + } + else { + /* software abort outstanding PLOGI */ + lpfc_els_abort(phba, ndlp, 1); - lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); - return (NLP_STE_FREED_NODE); + lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); + return NLP_STE_FREED_NODE; + } } static uint32_t @@ -972,11 +870,14 @@ lpfc_device_recov_plogi_issue(struct lpfc_hba * phba, /* software abort outstanding PLOGI */ lpfc_els_abort(phba, ndlp, 1); + ndlp->nlp_prev_state = NLP_STE_PLOGI_ISSUE; ndlp->nlp_state = NLP_STE_NPR_NODE; lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); - ndlp->nlp_flag &= ~NLP_NPR_2B_DISC; + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC); + spin_unlock_irq(phba->host->host_lock); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -985,25 +886,21 @@ lpfc_rcv_plogi_adisc_issue(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; /* software abort outstanding ADISC */ lpfc_els_abort(phba, ndlp, 1); cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); - - if(lpfc_rcv_plogi(phba, ndlp, cmdiocb)) { - return (ndlp->nlp_state); + if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) { + return ndlp->nlp_state; } + ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE; ndlp->nlp_state = NLP_STE_PLOGI_ISSUE; lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST); - lpfc_issue_els_plogi(phba, ndlp, 0); + lpfc_issue_els_plogi(phba, ndlp->nlp_DID, 0); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1012,16 +909,11 @@ lpfc_rcv_prli_adisc_issue(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1030,19 +922,14 @@ lpfc_rcv_logo_adisc_issue(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); /* software abort outstanding ADISC */ lpfc_els_abort(phba, ndlp, 0); - lpfc_rcv_logo(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_LOGO); + return ndlp->nlp_state; } static uint32_t @@ -1051,16 +938,11 @@ lpfc_rcv_padisc_adisc_issue(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_rcv_padisc(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1069,17 +951,12 @@ lpfc_rcv_prlo_adisc_issue(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); /* Treat like rcv logo */ - lpfc_rcv_logo(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_PRLO); + return ndlp->nlp_state; } static uint32_t @@ -1088,7 +965,6 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb, *rspiocb; - struct lpfc_bindlist *blp; IOCB_t *irsp; ADISC *ap; @@ -1100,44 +976,33 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_hba * phba, if ((irsp->ulpStatus) || (!lpfc_check_adisc(phba, ndlp, &ap->nodeName, &ap->portName))) { - ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI; /* 1 sec timeout */ mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ); + spin_lock_irq(phba->host->host_lock); ndlp->nlp_flag |= NLP_DELAY_TMO; + spin_unlock_irq(phba->host->host_lock); + ndlp->nlp_last_elscmd = ELS_CMD_PLOGI; memset(&ndlp->nlp_nodename, 0, sizeof (struct lpfc_name)); memset(&ndlp->nlp_portname, 0, sizeof (struct lpfc_name)); + ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE; ndlp->nlp_state = NLP_STE_NPR_NODE; lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); lpfc_unreg_rpi(phba, ndlp); - return (ndlp->nlp_state); + return ndlp->nlp_state; } - /* move to mapped / unmapped list accordingly */ - /* Can we assign a SCSI Id to this NPort */ - if ((blp = lpfc_consistent_bind_get(phba, ndlp))) { - /* Next 4 lines MUST be in this order */ - if(lpfc_assign_binding(phba, ndlp, blp)) { - ndlp->nlp_state = NLP_STE_MAPPED_NODE; - lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST); - ndlp->nlp_listp_bind = blp; - - lpfc_set_failmask(phba, ndlp, - (LPFC_DEV_DISCOVERY_INP|LPFC_DEV_DISCONNECTED), - LPFC_CLR_BITMASK); - - return (ndlp->nlp_state); - } - } - ndlp->nlp_flag |= NLP_TGT_NO_SCSIID; - ndlp->nlp_state = NLP_STE_UNMAPPED_NODE; - lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST); - - lpfc_set_failmask(phba, ndlp, - (LPFC_DEV_DISCOVERY_INP | LPFC_DEV_DISCONNECTED), - LPFC_CLR_BITMASK); - return (ndlp->nlp_state); + if (ndlp->nlp_type & NLP_FCP_TARGET) { + ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE; + ndlp->nlp_state = NLP_STE_MAPPED_NODE; + lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST); + } else { + ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE; + ndlp->nlp_state = NLP_STE_UNMAPPED_NODE; + lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST); + } + return ndlp->nlp_state; } static uint32_t @@ -1145,11 +1010,17 @@ lpfc_device_rm_adisc_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { - /* software abort outstanding ADISC */ - lpfc_els_abort(phba, ndlp, 1); + if(ndlp->nlp_flag & NLP_NPR_2B_DISC) { + ndlp->nlp_flag |= NLP_NODEV_REMOVE; + return ndlp->nlp_state; + } + else { + /* software abort outstanding ADISC */ + lpfc_els_abort(phba, ndlp, 1); - lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); - return (NLP_STE_FREED_NODE); + lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); + return NLP_STE_FREED_NODE; + } } static uint32_t @@ -1160,12 +1031,15 @@ lpfc_device_recov_adisc_issue(struct lpfc_hba * phba, /* software abort outstanding ADISC */ lpfc_els_abort(phba, ndlp, 1); + ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE; ndlp->nlp_state = NLP_STE_NPR_NODE; lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); - ndlp->nlp_flag &= ~NLP_NPR_2B_DISC; + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC); + ndlp->nlp_flag |= NLP_NPR_ADISC; + spin_unlock_irq(phba->host->host_lock); - lpfc_disc_set_adisc(phba, ndlp); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1174,16 +1048,11 @@ lpfc_rcv_plogi_reglogin_issue(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_rcv_plogi(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1192,16 +1061,11 @@ lpfc_rcv_prli_reglogin_issue(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1210,16 +1074,11 @@ lpfc_rcv_logo_reglogin_issue(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); - - lpfc_rcv_logo(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_LOGO); + return ndlp->nlp_state; } static uint32_t @@ -1228,16 +1087,11 @@ lpfc_rcv_padisc_reglogin_issue(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_rcv_padisc(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1248,8 +1102,8 @@ lpfc_rcv_prlo_reglogin_issue(struct lpfc_hba * phba, struct lpfc_iocbq *cmdiocb; cmdiocb = (struct lpfc_iocbq *) arg; - lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0); - return (ndlp->nlp_state); + lpfc_els_rsp_acc(phba, ELS_CMD_PRLO, cmdiocb, ndlp, NULL, 0); + return ndlp->nlp_state; } static uint32_t @@ -1273,33 +1127,45 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_hba * phba, phba->brd_no, did, mb->mbxStatus, phba->hba_state); + /* + * If RegLogin failed due to lack of HBA resources do not + * retry discovery. + */ + if (mb->mbxStatus == MBXERR_RPI_FULL) { + ndlp->nlp_prev_state = NLP_STE_UNUSED_NODE; + ndlp->nlp_state = NLP_STE_UNUSED_NODE; + lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST); + return ndlp->nlp_state; + } + + /* Put ndlp in npr list set plogi timer for 1 sec */ mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1); + spin_lock_irq(phba->host->host_lock); ndlp->nlp_flag |= NLP_DELAY_TMO; + spin_unlock_irq(phba->host->host_lock); + ndlp->nlp_last_elscmd = ELS_CMD_PLOGI; lpfc_issue_els_logo(phba, ndlp, 0); - /* Put ndlp in npr list set plogi timer for 1 sec */ - ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI; + ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE; ndlp->nlp_state = NLP_STE_NPR_NODE; lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); - return (ndlp->nlp_state); + return ndlp->nlp_state; } - if (ndlp->nlp_rpi != 0) - lpfc_findnode_remove_rpi(phba, ndlp->nlp_rpi); - ndlp->nlp_rpi = mb->un.varWords[0]; - lpfc_addnode_rpi(phba, ndlp, ndlp->nlp_rpi); /* Only if we are not a fabric nport do we issue PRLI */ if (!(ndlp->nlp_type & NLP_FABRIC)) { + ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE; ndlp->nlp_state = NLP_STE_PRLI_ISSUE; lpfc_nlp_list(phba, ndlp, NLP_PRLI_LIST); lpfc_issue_els_prli(phba, ndlp, 0); } else { + ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE; ndlp->nlp_state = NLP_STE_UNMAPPED_NODE; lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST); } - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1307,8 +1173,14 @@ lpfc_device_rm_reglogin_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { - lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); - return (NLP_STE_FREED_NODE); + if(ndlp->nlp_flag & NLP_NPR_2B_DISC) { + ndlp->nlp_flag |= NLP_NODEV_REMOVE; + return ndlp->nlp_state; + } + else { + lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); + return NLP_STE_FREED_NODE; + } } static uint32_t @@ -1316,10 +1188,13 @@ lpfc_device_recov_reglogin_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { + ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE; ndlp->nlp_state = NLP_STE_NPR_NODE; lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); - ndlp->nlp_flag &= ~NLP_NPR_2B_DISC; - return (ndlp->nlp_state); + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC); + spin_unlock_irq(phba->host->host_lock); + return ndlp->nlp_state; } static uint32_t @@ -1327,16 +1202,11 @@ lpfc_rcv_plogi_prli_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_rcv_plogi(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1344,16 +1214,11 @@ lpfc_rcv_prli_prli_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1361,19 +1226,14 @@ lpfc_rcv_logo_prli_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); /* Software abort outstanding PRLI before sending acc */ lpfc_els_abort(phba, ndlp, 1); - lpfc_rcv_logo(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_LOGO); + return ndlp->nlp_state; } static uint32_t @@ -1381,16 +1241,11 @@ lpfc_rcv_padisc_prli_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_rcv_padisc(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + return ndlp->nlp_state; } /* This routine is envoked when we rcv a PRLO request from a nport @@ -1405,8 +1260,8 @@ lpfc_rcv_prlo_prli_issue(struct lpfc_hba * phba, struct lpfc_iocbq *cmdiocb; cmdiocb = (struct lpfc_iocbq *) arg; - lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0); - return (ndlp->nlp_state); + lpfc_els_rsp_acc(phba, ELS_CMD_PRLO, cmdiocb, ndlp, NULL, 0); + return ndlp->nlp_state; } static uint32_t @@ -1416,7 +1271,6 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_hba * phba, struct lpfc_iocbq *cmdiocb, *rspiocb; IOCB_t *irsp; PRLI *npr; - struct lpfc_bindlist *blp; cmdiocb = (struct lpfc_iocbq *) arg; rspiocb = cmdiocb->context_un.rsp_iocb; @@ -1424,49 +1278,29 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_hba * phba, irsp = &rspiocb->iocb; if (irsp->ulpStatus) { + ndlp->nlp_prev_state = NLP_STE_PRLI_ISSUE; ndlp->nlp_state = NLP_STE_UNMAPPED_NODE; lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST); - lpfc_set_failmask(phba, ndlp, LPFC_DEV_DISCOVERY_INP, - LPFC_CLR_BITMASK); - return (ndlp->nlp_state); + return ndlp->nlp_state; } /* Check out PRLI rsp */ - if ((npr->acceptRspCode != PRLI_REQ_EXECUTED) || - (npr->prliType != PRLI_FCP_TYPE) || (npr->targetFunc != 1)) { - ndlp->nlp_state = NLP_STE_UNMAPPED_NODE; - lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST); - lpfc_set_failmask(phba, ndlp, - (LPFC_DEV_DISCOVERY_INP | LPFC_DEV_DISCONNECTED), - LPFC_CLR_BITMASK); - return (ndlp->nlp_state); - } - if (npr->Retry == 1) { - ndlp->nlp_fcp_info |= NLP_FCP_2_DEVICE; + ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR); + ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE; + if ((npr->acceptRspCode == PRLI_REQ_EXECUTED) && + (npr->prliType == PRLI_FCP_TYPE)) { + if (npr->initiatorFunc) + ndlp->nlp_type |= NLP_FCP_INITIATOR; + if (npr->targetFunc) + ndlp->nlp_type |= NLP_FCP_TARGET; + if (npr->Retry) + ndlp->nlp_fcp_info |= NLP_FCP_2_DEVICE; } - /* Can we assign a SCSI Id to this NPort */ - if ((blp = lpfc_consistent_bind_get(phba, ndlp))) { - /* Next 4 lines MUST be in this order */ - if(lpfc_assign_binding(phba, ndlp, blp)) { - ndlp->nlp_state = NLP_STE_MAPPED_NODE; - lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST); - ndlp->nlp_listp_bind = blp; - - lpfc_set_failmask(phba, ndlp, - (LPFC_DEV_DISCOVERY_INP|LPFC_DEV_DISCONNECTED), - LPFC_CLR_BITMASK); - return (ndlp->nlp_state); - } - } - ndlp->nlp_flag |= NLP_TGT_NO_SCSIID; - ndlp->nlp_state = NLP_STE_UNMAPPED_NODE; - lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST); - - lpfc_set_failmask(phba, ndlp, - (LPFC_DEV_DISCOVERY_INP | LPFC_DEV_DISCONNECTED), - LPFC_CLR_BITMASK); - return (ndlp->nlp_state); + ndlp->nlp_prev_state = NLP_STE_PRLI_ISSUE; + ndlp->nlp_state = NLP_STE_MAPPED_NODE; + lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST); + return ndlp->nlp_state; } /*! lpfc_device_rm_prli_issue @@ -1490,11 +1324,17 @@ static uint32_t lpfc_device_rm_prli_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { - /* software abort outstanding PRLI */ - lpfc_els_abort(phba, ndlp, 1); + if(ndlp->nlp_flag & NLP_NPR_2B_DISC) { + ndlp->nlp_flag |= NLP_NODEV_REMOVE; + return ndlp->nlp_state; + } + else { + /* software abort outstanding PLOGI */ + lpfc_els_abort(phba, ndlp, 1); - lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); - return (NLP_STE_FREED_NODE); + lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); + return NLP_STE_FREED_NODE; + } } @@ -1521,10 +1361,13 @@ lpfc_device_recov_prli_issue(struct lpfc_hba * phba, /* software abort outstanding PRLI */ lpfc_els_abort(phba, ndlp, 1); + ndlp->nlp_prev_state = NLP_STE_PRLI_ISSUE; ndlp->nlp_state = NLP_STE_NPR_NODE; lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); - ndlp->nlp_flag &= ~NLP_NPR_2B_DISC; - return (ndlp->nlp_state); + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC); + spin_unlock_irq(phba->host->host_lock); + return ndlp->nlp_state; } static uint32_t @@ -1532,16 +1375,11 @@ lpfc_rcv_plogi_unmap_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_rcv_plogi(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1549,16 +1387,12 @@ lpfc_rcv_prli_unmap_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); + lpfc_rcv_prli(phba, ndlp, cmdiocb); lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1566,16 +1400,11 @@ lpfc_rcv_logo_unmap_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); - - lpfc_rcv_logo(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_LOGO); + return ndlp->nlp_state; } static uint32_t @@ -1583,16 +1412,11 @@ lpfc_rcv_padisc_unmap_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_rcv_padisc(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1600,29 +1424,24 @@ lpfc_rcv_prlo_unmap_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); - /* Treat like rcv logo */ - lpfc_rcv_logo(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + lpfc_els_rsp_acc(phba, ELS_CMD_PRLO, cmdiocb, ndlp, NULL, 0); + return ndlp->nlp_state; } static uint32_t lpfc_device_recov_unmap_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { + ndlp->nlp_prev_state = NLP_STE_UNMAPPED_NODE; ndlp->nlp_state = NLP_STE_NPR_NODE; lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); - ndlp->nlp_flag &= ~NLP_NPR_2B_DISC; + ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC); lpfc_disc_set_adisc(phba, ndlp); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1630,16 +1449,11 @@ lpfc_rcv_plogi_mapped_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_rcv_plogi(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1647,16 +1461,11 @@ lpfc_rcv_prli_mapped_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1664,16 +1473,11 @@ lpfc_rcv_logo_mapped_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); - - lpfc_rcv_logo(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_LOGO); + return ndlp->nlp_state; } static uint32_t @@ -1682,16 +1486,11 @@ lpfc_rcv_padisc_mapped_node(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_rcv_padisc(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1699,22 +1498,18 @@ lpfc_rcv_prlo_mapped_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); /* flush the target */ - lpfc_sli_abort_iocb_tgt(phba, - &phba->sli.ring[phba->sli.fcp_ring], - ndlp->nlp_sid, LPFC_ABORT_ALLQ); + spin_lock_irq(phba->host->host_lock); + lpfc_sli_abort_iocb(phba, &phba->sli.ring[phba->sli.fcp_ring], + ndlp->nlp_sid, 0, 0, LPFC_CTX_TGT); + spin_unlock_irq(phba->host->host_lock); /* Treat like rcv logo */ - lpfc_rcv_logo(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_PRLO); + return ndlp->nlp_state; } static uint32_t @@ -1722,11 +1517,14 @@ lpfc_device_recov_mapped_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { + ndlp->nlp_prev_state = NLP_STE_MAPPED_NODE; ndlp->nlp_state = NLP_STE_NPR_NODE; lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); - ndlp->nlp_flag &= ~NLP_NPR_2B_DISC; + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC); + spin_unlock_irq(phba->host->host_lock); lpfc_disc_set_adisc(phba, ndlp); - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1735,31 +1533,30 @@ lpfc_rcv_plogi_npr_node(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); /* Ignore PLOGI if we have an outstanding LOGO */ if (ndlp->nlp_flag & NLP_LOGO_SND) { - return (ndlp->nlp_state); + return ndlp->nlp_state; } - if(lpfc_rcv_plogi(phba, ndlp, cmdiocb)) { - ndlp->nlp_flag &= ~(NLP_NPR_ADISC | NLP_NPR_2B_DISC); - return (ndlp->nlp_state); + if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) { + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag &= ~NLP_NPR_ADISC; + spin_unlock_irq(phba->host->host_lock); + return ndlp->nlp_state; } /* send PLOGI immediately, move to PLOGI issue state */ - if(!(ndlp->nlp_flag & NLP_DELAY_TMO)) { - ndlp->nlp_state = NLP_STE_PLOGI_ISSUE; - lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST); - lpfc_issue_els_plogi(phba, ndlp, 0); + if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) { + ndlp->nlp_prev_state = NLP_STE_NPR_NODE; + ndlp->nlp_state = NLP_STE_PLOGI_ISSUE; + lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST); + lpfc_issue_els_plogi(phba, ndlp->nlp_DID, 0); } - return (ndlp->nlp_state); + + return ndlp->nlp_state; } static uint32_t @@ -1768,32 +1565,33 @@ lpfc_rcv_prli_npr_node(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; struct ls_rjt stat; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); memset(&stat, 0, sizeof (struct ls_rjt)); stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC; stat.un.b.lsRjtRsnCodeExp = LSEXP_NOTHING_MORE; lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp); - if(!(ndlp->nlp_flag & NLP_DELAY_TMO)) { + if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) { if (ndlp->nlp_flag & NLP_NPR_ADISC) { + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag &= ~NLP_NPR_ADISC; + spin_unlock_irq(phba->host->host_lock); + ndlp->nlp_prev_state = NLP_STE_NPR_NODE; ndlp->nlp_state = NLP_STE_ADISC_ISSUE; lpfc_nlp_list(phba, ndlp, NLP_ADISC_LIST); lpfc_issue_els_adisc(phba, ndlp, 0); } else { + ndlp->nlp_prev_state = NLP_STE_NPR_NODE; ndlp->nlp_state = NLP_STE_PLOGI_ISSUE; lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST); - lpfc_issue_els_plogi(phba, ndlp, 0); + lpfc_issue_els_plogi(phba, ndlp->nlp_DID, 0); } + } - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1802,16 +1600,11 @@ lpfc_rcv_logo_npr_node(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); - - lpfc_rcv_logo(phba, ndlp, cmdiocb); - return (ndlp->nlp_state); + lpfc_rcv_logo(phba, ndlp, cmdiocb, ELS_CMD_LOGO); + return ndlp->nlp_state; } static uint32_t @@ -1820,28 +1613,31 @@ lpfc_rcv_padisc_npr_node(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); lpfc_rcv_padisc(phba, ndlp, cmdiocb); - if(!(ndlp->nlp_flag & NLP_DELAY_TMO)) { + /* + * Do not start discovery if discovery is about to start + * or discovery in progress for this node. Starting discovery + * here will affect the counting of discovery threads. + */ + if (!(ndlp->nlp_flag & NLP_DELAY_TMO) && + !(ndlp->nlp_flag & NLP_NPR_2B_DISC)){ if (ndlp->nlp_flag & NLP_NPR_ADISC) { + ndlp->nlp_prev_state = NLP_STE_NPR_NODE; ndlp->nlp_state = NLP_STE_ADISC_ISSUE; lpfc_nlp_list(phba, ndlp, NLP_ADISC_LIST); lpfc_issue_els_adisc(phba, ndlp, 0); } else { + ndlp->nlp_prev_state = NLP_STE_NPR_NODE; ndlp->nlp_state = NLP_STE_PLOGI_ISSUE; lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST); - lpfc_issue_els_plogi(phba, ndlp, 0); + lpfc_issue_els_plogi(phba, ndlp->nlp_DID, 0); } } - return (ndlp->nlp_state); + return ndlp->nlp_state; } static uint32_t @@ -1850,29 +1646,64 @@ lpfc_rcv_prlo_npr_node(struct lpfc_hba * phba, uint32_t evt) { struct lpfc_iocbq *cmdiocb; - struct lpfc_dmabuf *pcmd; cmdiocb = (struct lpfc_iocbq *) arg; - pcmd = (struct lpfc_dmabuf *) cmdiocb->context2; - pci_dma_sync_single_for_cpu(phba->pcidev, pcmd->phys, - LPFC_BPL_SIZE, PCI_DMA_FROMDEVICE); + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag |= NLP_LOGO_ACC; + spin_unlock_irq(phba->host->host_lock); lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0); - if(ndlp->nlp_flag & NLP_DELAY_TMO) { - if (ndlp->nlp_last_elscmd == (unsigned long)ELS_CMD_PLOGI) { - return (ndlp->nlp_state); - } else { - del_timer_sync(&ndlp->nlp_delayfunc); - ndlp->nlp_flag &= ~NLP_DELAY_TMO; - } + if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) { + mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1); + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag |= NLP_DELAY_TMO; + ndlp->nlp_flag &= ~NLP_NPR_ADISC; + spin_unlock_irq(phba->host->host_lock); + ndlp->nlp_last_elscmd = ELS_CMD_PLOGI; + } else { + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag &= ~NLP_NPR_ADISC; + spin_unlock_irq(phba->host->host_lock); } + return ndlp->nlp_state; +} - ndlp->nlp_state = NLP_STE_PLOGI_ISSUE; - lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST); - lpfc_issue_els_plogi(phba, ndlp, 0); - return (ndlp->nlp_state); +static uint32_t +lpfc_cmpl_plogi_npr_node(struct lpfc_hba * phba, + struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) +{ + struct lpfc_iocbq *cmdiocb, *rspiocb; + IOCB_t *irsp; + + cmdiocb = (struct lpfc_iocbq *) arg; + rspiocb = cmdiocb->context_un.rsp_iocb; + + irsp = &rspiocb->iocb; + if (irsp->ulpStatus) { + lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); + return NLP_STE_FREED_NODE; + } + return ndlp->nlp_state; +} + +static uint32_t +lpfc_cmpl_prli_npr_node(struct lpfc_hba * phba, + struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) +{ + struct lpfc_iocbq *cmdiocb, *rspiocb; + IOCB_t *irsp; + + cmdiocb = (struct lpfc_iocbq *) arg; + rspiocb = cmdiocb->context_un.rsp_iocb; + + irsp = &rspiocb->iocb; + if (irsp->ulpStatus && (ndlp->nlp_flag & NLP_NODEV_REMOVE)) { + lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); + return NLP_STE_FREED_NODE; + } + return ndlp->nlp_state; } static uint32_t @@ -1881,7 +1712,26 @@ lpfc_cmpl_logo_npr_node(struct lpfc_hba * phba, { lpfc_unreg_rpi(phba, ndlp); /* This routine does nothing, just return the current state */ - return (ndlp->nlp_state); + return ndlp->nlp_state; +} + +static uint32_t +lpfc_cmpl_adisc_npr_node(struct lpfc_hba * phba, + struct lpfc_nodelist * ndlp, void *arg, + uint32_t evt) +{ + struct lpfc_iocbq *cmdiocb, *rspiocb; + IOCB_t *irsp; + + cmdiocb = (struct lpfc_iocbq *) arg; + rspiocb = cmdiocb->context_un.rsp_iocb; + + irsp = &rspiocb->iocb; + if (irsp->ulpStatus && (ndlp->nlp_flag & NLP_NODEV_REMOVE)) { + lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); + return NLP_STE_FREED_NODE; + } + return ndlp->nlp_state; } static uint32_t @@ -1895,14 +1745,15 @@ lpfc_cmpl_reglogin_npr_node(struct lpfc_hba * phba, pmb = (LPFC_MBOXQ_t *) arg; mb = &pmb->mb; - /* save rpi */ - if (ndlp->nlp_rpi != 0) - lpfc_findnode_remove_rpi(phba, ndlp->nlp_rpi); - - ndlp->nlp_rpi = mb->un.varWords[0]; - lpfc_addnode_rpi(phba, ndlp, ndlp->nlp_rpi); - - return (ndlp->nlp_state); + if (!mb->mbxStatus) + ndlp->nlp_rpi = mb->un.varWords[0]; + else { + if (ndlp->nlp_flag & NLP_NODEV_REMOVE) { + lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); + return NLP_STE_FREED_NODE; + } + } + return ndlp->nlp_state; } static uint32_t @@ -1910,8 +1761,12 @@ lpfc_device_rm_npr_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { + if (ndlp->nlp_flag & NLP_NPR_2B_DISC) { + ndlp->nlp_flag |= NLP_NODEV_REMOVE; + return ndlp->nlp_state; + } lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); - return (NLP_STE_FREED_NODE); + return NLP_STE_FREED_NODE; } static uint32_t @@ -1919,8 +1774,13 @@ lpfc_device_recov_npr_node(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, void *arg, uint32_t evt) { - ndlp->nlp_flag &= ~NLP_NPR_2B_DISC; - return (ndlp->nlp_state); + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC); + spin_unlock_irq(phba->host->host_lock); + if (ndlp->nlp_flag & NLP_DELAY_TMO) { + lpfc_cancel_retry_delay_tmo(phba, ndlp); + } + return ndlp->nlp_state; } @@ -1956,7 +1816,7 @@ lpfc_device_recov_npr_node(struct lpfc_hba * phba, */ /* * For a Link Down, all nodes on the ADISC, PLOGI, unmapped or mapped - * lists will receive a DEVICE_RECOVERY event. If the linkdown or nodev timers + * lists will receive a DEVICE_RECOVERY event. If the linkdown or devloss timers * expire, all effected nodes will receive a DEVICE_RM event. */ /* @@ -1980,119 +1840,120 @@ lpfc_device_recov_npr_node(struct lpfc_hba * phba, * unmapped lists. */ -static void *lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT] = { - /* Action routine Event Current State */ - (void *)lpfc_rcv_plogi_unused_node, /* RCV_PLOGI UNUSED_NODE */ - (void *)lpfc_rcv_els_unused_node, /* RCV_PRLI */ - (void *)lpfc_rcv_logo_unused_node, /* RCV_LOGO */ - (void *)lpfc_rcv_els_unused_node, /* RCV_ADISC */ - (void *)lpfc_rcv_els_unused_node, /* RCV_PDISC */ - (void *)lpfc_rcv_els_unused_node, /* RCV_PRLO */ - (void *)lpfc_disc_illegal, /* CMPL_PLOGI */ - (void *)lpfc_disc_illegal, /* CMPL_PRLI */ - (void *)lpfc_cmpl_logo_unused_node, /* CMPL_LOGO */ - (void *)lpfc_disc_illegal, /* CMPL_ADISC */ - (void *)lpfc_disc_illegal, /* CMPL_REG_LOGIN */ - (void *)lpfc_device_rm_unused_node, /* DEVICE_RM */ - (void *)lpfc_disc_illegal, /* DEVICE_RECOVERY */ - - (void *)lpfc_rcv_plogi_plogi_issue, /* RCV_PLOGI PLOGI_ISSUE */ - (void *)lpfc_rcv_els_plogi_issue, /* RCV_PRLI */ - (void *)lpfc_rcv_els_plogi_issue, /* RCV_LOGO */ - (void *)lpfc_rcv_els_plogi_issue, /* RCV_ADISC */ - (void *)lpfc_rcv_els_plogi_issue, /* RCV_PDISC */ - (void *)lpfc_rcv_els_plogi_issue, /* RCV_PRLO */ - (void *)lpfc_cmpl_plogi_plogi_issue, /* CMPL_PLOGI */ - (void *)lpfc_disc_illegal, /* CMPL_PRLI */ - (void *)lpfc_disc_illegal, /* CMPL_LOGO */ - (void *)lpfc_disc_illegal, /* CMPL_ADISC */ - (void *)lpfc_disc_illegal, /* CMPL_REG_LOGIN */ - (void *)lpfc_device_rm_plogi_issue, /* DEVICE_RM */ - (void *)lpfc_device_recov_plogi_issue, /* DEVICE_RECOVERY */ - - (void *)lpfc_rcv_plogi_adisc_issue, /* RCV_PLOGI ADISC_ISSUE */ - (void *)lpfc_rcv_prli_adisc_issue, /* RCV_PRLI */ - (void *)lpfc_rcv_logo_adisc_issue, /* RCV_LOGO */ - (void *)lpfc_rcv_padisc_adisc_issue, /* RCV_ADISC */ - (void *)lpfc_rcv_padisc_adisc_issue, /* RCV_PDISC */ - (void *)lpfc_rcv_prlo_adisc_issue, /* RCV_PRLO */ - (void *)lpfc_disc_illegal, /* CMPL_PLOGI */ - (void *)lpfc_disc_illegal, /* CMPL_PRLI */ - (void *)lpfc_disc_illegal, /* CMPL_LOGO */ - (void *)lpfc_cmpl_adisc_adisc_issue, /* CMPL_ADISC */ - (void *)lpfc_disc_illegal, /* CMPL_REG_LOGIN */ - (void *)lpfc_device_rm_adisc_issue, /* DEVICE_RM */ - (void *)lpfc_device_recov_adisc_issue, /* DEVICE_RECOVERY */ - - (void *)lpfc_rcv_plogi_reglogin_issue, /* RCV_PLOGI REG_LOGIN_ISSUE */ - (void *)lpfc_rcv_prli_reglogin_issue, /* RCV_PLOGI */ - (void *)lpfc_rcv_logo_reglogin_issue, /* RCV_LOGO */ - (void *)lpfc_rcv_padisc_reglogin_issue, /* RCV_ADISC */ - (void *)lpfc_rcv_padisc_reglogin_issue, /* RCV_PDISC */ - (void *)lpfc_rcv_prlo_reglogin_issue, /* RCV_PRLO */ - (void *)lpfc_disc_illegal, /* CMPL_PLOGI */ - (void *)lpfc_disc_illegal, /* CMPL_PRLI */ - (void *)lpfc_disc_illegal, /* CMPL_LOGO */ - (void *)lpfc_disc_illegal, /* CMPL_ADISC */ - (void *)lpfc_cmpl_reglogin_reglogin_issue,/* CMPL_REG_LOGIN */ - (void *)lpfc_device_rm_reglogin_issue, /* DEVICE_RM */ - (void *)lpfc_device_recov_reglogin_issue,/* DEVICE_RECOVERY */ - - (void *)lpfc_rcv_plogi_prli_issue, /* RCV_PLOGI PRLI_ISSUE */ - (void *)lpfc_rcv_prli_prli_issue, /* RCV_PRLI */ - (void *)lpfc_rcv_logo_prli_issue, /* RCV_LOGO */ - (void *)lpfc_rcv_padisc_prli_issue, /* RCV_ADISC */ - (void *)lpfc_rcv_padisc_prli_issue, /* RCV_PDISC */ - (void *)lpfc_rcv_prlo_prli_issue, /* RCV_PRLO */ - (void *)lpfc_disc_illegal, /* CMPL_PLOGI */ - (void *)lpfc_cmpl_prli_prli_issue, /* CMPL_PRLI */ - (void *)lpfc_disc_illegal, /* CMPL_LOGO */ - (void *)lpfc_disc_illegal, /* CMPL_ADISC */ - (void *)lpfc_disc_illegal, /* CMPL_REG_LOGIN */ - (void *)lpfc_device_rm_prli_issue, /* DEVICE_RM */ - (void *)lpfc_device_recov_prli_issue, /* DEVICE_RECOVERY */ - - (void *)lpfc_rcv_plogi_unmap_node, /* RCV_PLOGI UNMAPPED_NODE */ - (void *)lpfc_rcv_prli_unmap_node, /* RCV_PRLI */ - (void *)lpfc_rcv_logo_unmap_node, /* RCV_LOGO */ - (void *)lpfc_rcv_padisc_unmap_node, /* RCV_ADISC */ - (void *)lpfc_rcv_padisc_unmap_node, /* RCV_PDISC */ - (void *)lpfc_rcv_prlo_unmap_node, /* RCV_PRLO */ - (void *)lpfc_disc_illegal, /* CMPL_PLOGI */ - (void *)lpfc_disc_illegal, /* CMPL_PRLI */ - (void *)lpfc_disc_illegal, /* CMPL_LOGO */ - (void *)lpfc_disc_illegal, /* CMPL_ADISC */ - (void *)lpfc_disc_illegal, /* CMPL_REG_LOGIN */ - (void *)lpfc_disc_illegal, /* DEVICE_RM */ - (void *)lpfc_device_recov_unmap_node, /* DEVICE_RECOVERY */ - - (void *)lpfc_rcv_plogi_mapped_node, /* RCV_PLOGI MAPPED_NODE */ - (void *)lpfc_rcv_prli_mapped_node, /* RCV_PRLI */ - (void *)lpfc_rcv_logo_mapped_node, /* RCV_LOGO */ - (void *)lpfc_rcv_padisc_mapped_node, /* RCV_ADISC */ - (void *)lpfc_rcv_padisc_mapped_node, /* RCV_PDISC */ - (void *)lpfc_rcv_prlo_mapped_node, /* RCV_PRLO */ - (void *)lpfc_disc_illegal, /* CMPL_PLOGI */ - (void *)lpfc_disc_illegal, /* CMPL_PRLI */ - (void *)lpfc_disc_illegal, /* CMPL_LOGO */ - (void *)lpfc_disc_illegal, /* CMPL_ADISC */ - (void *)lpfc_disc_illegal, /* CMPL_REG_LOGIN */ - (void *)lpfc_disc_illegal, /* DEVICE_RM */ - (void *)lpfc_device_recov_mapped_node, /* DEVICE_RECOVERY */ - - (void *)lpfc_rcv_plogi_npr_node, /* RCV_PLOGI NPR_NODE */ - (void *)lpfc_rcv_prli_npr_node, /* RCV_PRLI */ - (void *)lpfc_rcv_logo_npr_node, /* RCV_LOGO */ - (void *)lpfc_rcv_padisc_npr_node, /* RCV_ADISC */ - (void *)lpfc_rcv_padisc_npr_node, /* RCV_PDISC */ - (void *)lpfc_rcv_prlo_npr_node, /* RCV_PRLO */ - (void *)lpfc_disc_noop, /* CMPL_PLOGI */ - (void *)lpfc_disc_noop, /* CMPL_PRLI */ - (void *)lpfc_cmpl_logo_npr_node, /* CMPL_LOGO */ - (void *)lpfc_disc_noop, /* CMPL_ADISC */ - (void *)lpfc_cmpl_reglogin_npr_node, /* CMPL_REG_LOGIN */ - (void *)lpfc_device_rm_npr_node, /* DEVICE_RM */ - (void *)lpfc_device_recov_npr_node, /* DEVICE_RECOVERY */ +static uint32_t (*lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT]) + (struct lpfc_hba *, struct lpfc_nodelist *, void *, uint32_t) = { + /* Action routine Event Current State */ + lpfc_rcv_plogi_unused_node, /* RCV_PLOGI UNUSED_NODE */ + lpfc_rcv_els_unused_node, /* RCV_PRLI */ + lpfc_rcv_logo_unused_node, /* RCV_LOGO */ + lpfc_rcv_els_unused_node, /* RCV_ADISC */ + lpfc_rcv_els_unused_node, /* RCV_PDISC */ + lpfc_rcv_els_unused_node, /* RCV_PRLO */ + lpfc_disc_illegal, /* CMPL_PLOGI */ + lpfc_disc_illegal, /* CMPL_PRLI */ + lpfc_cmpl_logo_unused_node, /* CMPL_LOGO */ + lpfc_disc_illegal, /* CMPL_ADISC */ + lpfc_disc_illegal, /* CMPL_REG_LOGIN */ + lpfc_device_rm_unused_node, /* DEVICE_RM */ + lpfc_disc_illegal, /* DEVICE_RECOVERY */ + + lpfc_rcv_plogi_plogi_issue, /* RCV_PLOGI PLOGI_ISSUE */ + lpfc_rcv_els_plogi_issue, /* RCV_PRLI */ + lpfc_rcv_logo_plogi_issue, /* RCV_LOGO */ + lpfc_rcv_els_plogi_issue, /* RCV_ADISC */ + lpfc_rcv_els_plogi_issue, /* RCV_PDISC */ + lpfc_rcv_els_plogi_issue, /* RCV_PRLO */ + lpfc_cmpl_plogi_plogi_issue, /* CMPL_PLOGI */ + lpfc_disc_illegal, /* CMPL_PRLI */ + lpfc_disc_illegal, /* CMPL_LOGO */ + lpfc_disc_illegal, /* CMPL_ADISC */ + lpfc_disc_illegal, /* CMPL_REG_LOGIN */ + lpfc_device_rm_plogi_issue, /* DEVICE_RM */ + lpfc_device_recov_plogi_issue, /* DEVICE_RECOVERY */ + + lpfc_rcv_plogi_adisc_issue, /* RCV_PLOGI ADISC_ISSUE */ + lpfc_rcv_prli_adisc_issue, /* RCV_PRLI */ + lpfc_rcv_logo_adisc_issue, /* RCV_LOGO */ + lpfc_rcv_padisc_adisc_issue, /* RCV_ADISC */ + lpfc_rcv_padisc_adisc_issue, /* RCV_PDISC */ + lpfc_rcv_prlo_adisc_issue, /* RCV_PRLO */ + lpfc_disc_illegal, /* CMPL_PLOGI */ + lpfc_disc_illegal, /* CMPL_PRLI */ + lpfc_disc_illegal, /* CMPL_LOGO */ + lpfc_cmpl_adisc_adisc_issue, /* CMPL_ADISC */ + lpfc_disc_illegal, /* CMPL_REG_LOGIN */ + lpfc_device_rm_adisc_issue, /* DEVICE_RM */ + lpfc_device_recov_adisc_issue, /* DEVICE_RECOVERY */ + + lpfc_rcv_plogi_reglogin_issue, /* RCV_PLOGI REG_LOGIN_ISSUE */ + lpfc_rcv_prli_reglogin_issue, /* RCV_PLOGI */ + lpfc_rcv_logo_reglogin_issue, /* RCV_LOGO */ + lpfc_rcv_padisc_reglogin_issue, /* RCV_ADISC */ + lpfc_rcv_padisc_reglogin_issue, /* RCV_PDISC */ + lpfc_rcv_prlo_reglogin_issue, /* RCV_PRLO */ + lpfc_disc_illegal, /* CMPL_PLOGI */ + lpfc_disc_illegal, /* CMPL_PRLI */ + lpfc_disc_illegal, /* CMPL_LOGO */ + lpfc_disc_illegal, /* CMPL_ADISC */ + lpfc_cmpl_reglogin_reglogin_issue,/* CMPL_REG_LOGIN */ + lpfc_device_rm_reglogin_issue, /* DEVICE_RM */ + lpfc_device_recov_reglogin_issue,/* DEVICE_RECOVERY */ + + lpfc_rcv_plogi_prli_issue, /* RCV_PLOGI PRLI_ISSUE */ + lpfc_rcv_prli_prli_issue, /* RCV_PRLI */ + lpfc_rcv_logo_prli_issue, /* RCV_LOGO */ + lpfc_rcv_padisc_prli_issue, /* RCV_ADISC */ + lpfc_rcv_padisc_prli_issue, /* RCV_PDISC */ + lpfc_rcv_prlo_prli_issue, /* RCV_PRLO */ + lpfc_disc_illegal, /* CMPL_PLOGI */ + lpfc_cmpl_prli_prli_issue, /* CMPL_PRLI */ + lpfc_disc_illegal, /* CMPL_LOGO */ + lpfc_disc_illegal, /* CMPL_ADISC */ + lpfc_disc_illegal, /* CMPL_REG_LOGIN */ + lpfc_device_rm_prli_issue, /* DEVICE_RM */ + lpfc_device_recov_prli_issue, /* DEVICE_RECOVERY */ + + lpfc_rcv_plogi_unmap_node, /* RCV_PLOGI UNMAPPED_NODE */ + lpfc_rcv_prli_unmap_node, /* RCV_PRLI */ + lpfc_rcv_logo_unmap_node, /* RCV_LOGO */ + lpfc_rcv_padisc_unmap_node, /* RCV_ADISC */ + lpfc_rcv_padisc_unmap_node, /* RCV_PDISC */ + lpfc_rcv_prlo_unmap_node, /* RCV_PRLO */ + lpfc_disc_illegal, /* CMPL_PLOGI */ + lpfc_disc_illegal, /* CMPL_PRLI */ + lpfc_disc_illegal, /* CMPL_LOGO */ + lpfc_disc_illegal, /* CMPL_ADISC */ + lpfc_disc_illegal, /* CMPL_REG_LOGIN */ + lpfc_disc_illegal, /* DEVICE_RM */ + lpfc_device_recov_unmap_node, /* DEVICE_RECOVERY */ + + lpfc_rcv_plogi_mapped_node, /* RCV_PLOGI MAPPED_NODE */ + lpfc_rcv_prli_mapped_node, /* RCV_PRLI */ + lpfc_rcv_logo_mapped_node, /* RCV_LOGO */ + lpfc_rcv_padisc_mapped_node, /* RCV_ADISC */ + lpfc_rcv_padisc_mapped_node, /* RCV_PDISC */ + lpfc_rcv_prlo_mapped_node, /* RCV_PRLO */ + lpfc_disc_illegal, /* CMPL_PLOGI */ + lpfc_disc_illegal, /* CMPL_PRLI */ + lpfc_disc_illegal, /* CMPL_LOGO */ + lpfc_disc_illegal, /* CMPL_ADISC */ + lpfc_disc_illegal, /* CMPL_REG_LOGIN */ + lpfc_disc_illegal, /* DEVICE_RM */ + lpfc_device_recov_mapped_node, /* DEVICE_RECOVERY */ + + lpfc_rcv_plogi_npr_node, /* RCV_PLOGI NPR_NODE */ + lpfc_rcv_prli_npr_node, /* RCV_PRLI */ + lpfc_rcv_logo_npr_node, /* RCV_LOGO */ + lpfc_rcv_padisc_npr_node, /* RCV_ADISC */ + lpfc_rcv_padisc_npr_node, /* RCV_PDISC */ + lpfc_rcv_prlo_npr_node, /* RCV_PRLO */ + lpfc_cmpl_plogi_npr_node, /* CMPL_PLOGI */ + lpfc_cmpl_prli_npr_node, /* CMPL_PRLI */ + lpfc_cmpl_logo_npr_node, /* CMPL_LOGO */ + lpfc_cmpl_adisc_npr_node, /* CMPL_ADISC */ + lpfc_cmpl_reglogin_npr_node, /* CMPL_REG_LOGIN */ + lpfc_device_rm_npr_node, /* DEVICE_RM */ + lpfc_device_recov_npr_node, /* DEVICE_RECOVERY */ }; int @@ -2115,9 +1976,7 @@ lpfc_disc_state_machine(struct lpfc_hba * phba, phba->brd_no, evt, ndlp->nlp_DID, cur_state, ndlp->nlp_flag); - func = (uint32_t(*)(struct lpfc_hba *, struct lpfc_nodelist *, void *, - uint32_t)) - lpfc_disc_action[(cur_state * NLP_EVT_MAX_EVENT) + evt]; + func = lpfc_disc_action[(cur_state * NLP_EVT_MAX_EVENT) + evt]; rc = (func) (phba, ndlp, arg, evt); /* DSM out state on NPort */ @@ -2133,13 +1992,13 @@ lpfc_disc_state_machine(struct lpfc_hba * phba, /* Check to see if ndlp removal is deferred */ if ((ndlp->nlp_disc_refcnt == 0) && (ndlp->nlp_flag & NLP_DELAY_REMOVE)) { - + spin_lock_irq(phba->host->host_lock); ndlp->nlp_flag &= ~NLP_DELAY_REMOVE; + spin_unlock_irq(phba->host->host_lock); lpfc_nlp_remove(phba, ndlp); - return (NLP_STE_FREED_NODE); + return NLP_STE_FREED_NODE; } if (rc == NLP_STE_FREED_NODE) - return (NLP_STE_FREED_NODE); - ndlp->nlp_state = rc; - return (rc); + return NLP_STE_FREED_NODE; + return rc; }