X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Flpfc%2Flpfc_hbadisc.c;h=c39564e85e944f62ebed5d8b3d41a6f75daf4ff7;hb=refs%2Fheads%2Fvserver;hp=74c454311a71d8e87a95a4c60524846c6c468114;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 74c454311..c39564e85 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -1,53 +1,44 @@ /******************************************************************* * 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_hbadisc.c 1.199 2004/11/18 20:19:30EST sf_support Exp $ - */ - -#include #include -#include #include -#include -#include -#include +#include +#include -#include +#include #include #include - #include -#include "lpfc_sli.h" +#include "lpfc_hw.h" #include "lpfc_disc.h" +#include "lpfc_sli.h" #include "lpfc_scsi.h" #include "lpfc.h" -#include "lpfc_crtn.h" -#include "lpfc_fcp.h" -#include "lpfc_hw.h" #include "lpfc_logmsg.h" -#include "lpfc_mem.h" +#include "lpfc_crtn.h" /* AlpaArray for assignment of scsid for scan-down and bind_method */ -uint8_t lpfcAlpaArray[] = { +static uint8_t lpfcAlpaArray[] = { 0xEF, 0xE8, 0xE4, 0xE2, 0xE1, 0xE0, 0xDC, 0xDA, 0xD9, 0xD6, 0xD5, 0xD4, 0xD3, 0xD2, 0xD1, 0xCE, 0xCD, 0xCC, 0xCB, 0xCA, 0xC9, 0xC7, 0xC6, 0xC5, 0xC3, 0xBC, 0xBA, 0xB9, 0xB6, 0xB5, @@ -63,196 +54,306 @@ uint8_t lpfcAlpaArray[] = { 0x10, 0x0F, 0x08, 0x04, 0x02, 0x01 }; -static void -lpfc_evt_iocb_free(struct lpfc_hba * phba, struct lpfc_iocbq * saveq) +static void lpfc_disc_timeout_handler(struct lpfc_hba *); + +void +lpfc_terminate_rport_io(struct fc_rport *rport) { - struct lpfc_iocbq *rspiocbp, *tmpiocbp; + struct lpfc_rport_data *rdata; + struct lpfc_nodelist * ndlp; + struct lpfc_hba *phba; + + rdata = rport->dd_data; + ndlp = rdata->pnode; - /* Free up iocb buffer chain for cmd just processed */ - list_for_each_entry_safe(rspiocbp, tmpiocbp, - &saveq->list, list) { - list_del(&rspiocbp->list); - mempool_free( rspiocbp, phba->iocb_mem_pool); + if (!ndlp) { + if (rport->roles & FC_RPORT_ROLE_FCP_TARGET) + printk(KERN_ERR "Cannot find remote node" + " to terminate I/O Data x%x\n", + rport->port_id); + return; + } + + phba = ndlp->nlp_phba; + + spin_lock_irq(phba->host->host_lock); + if (ndlp->nlp_sid != NLP_NO_SID) { + lpfc_sli_abort_iocb(phba, &phba->sli.ring[phba->sli.fcp_ring], + ndlp->nlp_sid, 0, 0, LPFC_CTX_TGT); } - mempool_free( saveq, phba->iocb_mem_pool); + spin_unlock_irq(phba->host->host_lock); + + return; } +/* + * This function will be called when dev_loss_tmo fire. + */ void -lpfc_process_nodev_timeout(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) +lpfc_dev_loss_tmo_callbk(struct fc_rport *rport) { - struct lpfc_target *targetp; - int scsid; + struct lpfc_rport_data *rdata; + struct lpfc_nodelist * ndlp; + uint8_t *name; + int warn_on = 0; + struct lpfc_hba *phba; - if (!(ndlp->nlp_type & NLP_FABRIC)) { - /* Nodev timeout on NPort */ - lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, - "%d:0203 Nodev timeout 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); + rdata = rport->dd_data; + ndlp = rdata->pnode; + + if (!ndlp) { + if (rport->roles & FC_RPORT_ROLE_FCP_TARGET) + printk(KERN_ERR "Cannot find remote node" + " for rport in dev_loss_tmo_callbk x%x\n", + rport->port_id); + return; } - ndlp->nlp_flag &= ~NLP_NODEV_TMO; + name = (uint8_t *)&ndlp->nlp_portname; + phba = ndlp->nlp_phba; - for(scsid=0;scsiddevice_queue_hash[scsid]; - /* First see if the SCSI ID has an allocated struct - lpfc_target */ - if (targetp) { - if (targetp->pnode == ndlp) { - /* flush the target */ - lpfc_sli_abort_iocb_tgt(phba, - &phba->sli.ring[phba->sli.fcp_ring], - scsid, LPFC_ABORT_ALLQ); - } - } + spin_lock_irq(phba->host->host_lock); + + if (ndlp->nlp_sid != NLP_NO_SID) { + warn_on = 1; + /* flush the target */ + lpfc_sli_abort_iocb(phba, &phba->sli.ring[phba->sli.fcp_ring], + ndlp->nlp_sid, 0, 0, LPFC_CTX_TGT); + } + if (phba->fc_flag & FC_UNLOADING) + warn_on = 0; + + spin_unlock_irq(phba->host->host_lock); + + if (warn_on) { + lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, + "%d:0203 Devloss timeout on " + "WWPN %x:%x:%x:%x:%x:%x:%x:%x " + "NPort x%x Data: x%x x%x x%x\n", + phba->brd_no, + *name, *(name+1), *(name+2), *(name+3), + *(name+4), *(name+5), *(name+6), *(name+7), + ndlp->nlp_DID, ndlp->nlp_flag, + ndlp->nlp_state, ndlp->nlp_rpi); + } else { + lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, + "%d:0204 Devloss timeout on " + "WWPN %x:%x:%x:%x:%x:%x:%x:%x " + "NPort x%x Data: x%x x%x x%x\n", + phba->brd_no, + *name, *(name+1), *(name+2), *(name+3), + *(name+4), *(name+5), *(name+6), *(name+7), + ndlp->nlp_DID, ndlp->nlp_flag, + ndlp->nlp_state, ndlp->nlp_rpi); } - lpfc_disc_state_machine(phba, ndlp, NULL, NLP_EVT_DEVICE_RM); + ndlp->rport = NULL; + rdata->pnode = NULL; + + if (!(phba->fc_flag & FC_UNLOADING)) + lpfc_disc_state_machine(phba, ndlp, NULL, NLP_EVT_DEVICE_RM); + return; } static void -lpfc_disc_done(struct lpfc_hba * phba) +lpfc_work_list_done(struct lpfc_hba * phba) { - struct lpfc_sli *psli = &phba->sli; - LPFC_DISC_EVT_t *evtp, *next_evtp; - LPFC_MBOXQ_t *pmb; - struct lpfc_iocbq *cmdiocbp, *saveq; + struct lpfc_work_evt *evtp = NULL; struct lpfc_nodelist *ndlp; - LPFC_RING_MASK_t *func; - struct Scsi_Host *shost; - LIST_HEAD(local_dpc_disc); - - list_splice_init(&phba->dpc_disc, &local_dpc_disc); - - /* check discovery event list */ - list_for_each_entry_safe(evtp, next_evtp, &local_dpc_disc, evt_listp) { - list_del(&evtp->evt_listp); + int free_evt; - switch(evtp->evt) { - case LPFC_EVT_MBOX: - pmb = (LPFC_MBOXQ_t *)(evtp->evt_arg1); - (pmb->mbox_cmpl) (phba, pmb); + spin_lock_irq(phba->host->host_lock); + while(!list_empty(&phba->work_list)) { + list_remove_head((&phba->work_list), evtp, typeof(*evtp), + evt_listp); + spin_unlock_irq(phba->host->host_lock); + free_evt = 1; + switch (evtp->evt) { + case LPFC_EVT_ELS_RETRY: + ndlp = (struct lpfc_nodelist *)(evtp->evt_arg1); + lpfc_els_retry_delay_handler(ndlp); + free_evt = 0; break; - case LPFC_EVT_SOL_IOCB: - cmdiocbp = (struct lpfc_iocbq *)(evtp->evt_arg1); - saveq = (struct lpfc_iocbq *)(evtp->evt_arg2); - (cmdiocbp->iocb_cmpl) (phba, cmdiocbp, saveq); - lpfc_evt_iocb_free(phba, saveq); + case LPFC_EVT_ONLINE: + if (phba->hba_state < LPFC_LINK_DOWN) + *(int *)(evtp->evt_arg1) = lpfc_online(phba); + else + *(int *)(evtp->evt_arg1) = 0; + complete((struct completion *)(evtp->evt_arg2)); break; - case LPFC_EVT_UNSOL_IOCB: - func = (LPFC_RING_MASK_t *)(evtp->evt_arg1); - saveq = (struct lpfc_iocbq *)(evtp->evt_arg2); - (func->lpfc_sli_rcv_unsol_event) (phba, - &psli->ring[LPFC_ELS_RING], saveq); - lpfc_evt_iocb_free(phba, saveq); + case LPFC_EVT_OFFLINE: + if (phba->hba_state >= LPFC_LINK_DOWN) + lpfc_offline(phba); + lpfc_sli_brdrestart(phba); + *(int *)(evtp->evt_arg1) = + lpfc_sli_brdready(phba,HS_FFRDY | HS_MBRDY); + complete((struct completion *)(evtp->evt_arg2)); break; - case LPFC_EVT_NODEV_TMO: - ndlp = (struct lpfc_nodelist *)(evtp->evt_arg1); - lpfc_process_nodev_timeout(phba, ndlp); + case LPFC_EVT_WARM_START: + if (phba->hba_state >= LPFC_LINK_DOWN) + lpfc_offline(phba); + lpfc_reset_barrier(phba); + lpfc_sli_brdreset(phba); + lpfc_hba_down_post(phba); + *(int *)(evtp->evt_arg1) = + lpfc_sli_brdready(phba, HS_MBRDY); + complete((struct completion *)(evtp->evt_arg2)); break; - case LPFC_EVT_SCAN: - /* SCSI HOTPLUG supported */ - shost = phba->host; -#ifdef USE_SCAN_TARGET - { - struct lpfc_target *targetp; - - targetp = (struct lpfc_target *)(evtp->evt_arg1); - lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY | LOG_FCP, - "%d:0251 Rescanning scsi target %d\n", - phba->brd_no, targetp->scsi_id); - - if(targetp == - phba->device_queue_hash[targetp->scsi_id]) { - spin_unlock_irq(phba->host->host_lock); - scsi_scan_single_target(shost, 0, - targetp->scsi_id); - spin_lock_irq(phba->host->host_lock); - } - } -#else - lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY | LOG_FCP, - "%d:0251 Rescanning scsi host\n", phba->brd_no); - spin_unlock_irq(shost->host_lock); - scsi_scan_host(shost); - spin_lock_irq(shost->host_lock); -#endif + case LPFC_EVT_KILL: + if (phba->hba_state >= LPFC_LINK_DOWN) + lpfc_offline(phba); + *(int *)(evtp->evt_arg1) + = (phba->stopped) ? 0 : lpfc_sli_brdkill(phba); + complete((struct completion *)(evtp->evt_arg2)); break; } - kfree(evtp); + if (free_evt) + kfree(evtp); + spin_lock_irq(phba->host->host_lock); } + spin_unlock_irq(phba->host->host_lock); + } -int -lpfc_do_dpc(void *p) +static void +lpfc_work_done(struct lpfc_hba * phba) { - unsigned long flags; - DECLARE_MUTEX_LOCKED(sem); - struct lpfc_hba *phba = (struct lpfc_hba *)p; + struct lpfc_sli_ring *pring; + int i; + uint32_t ha_copy; + uint32_t control; + uint32_t work_hba_events; + + spin_lock_irq(phba->host->host_lock); + ha_copy = phba->work_ha; + phba->work_ha = 0; + work_hba_events=phba->work_hba_events; + spin_unlock_irq(phba->host->host_lock); - lock_kernel(); + if (ha_copy & HA_ERATT) + lpfc_handle_eratt(phba); - daemonize("lpfc_dpc_%d", phba->brd_no); - allow_signal(SIGHUP); + if (ha_copy & HA_MBATT) + lpfc_sli_handle_mb_event(phba); - phba->dpc_wait = &sem; - set_user_nice(current, -20); + if (ha_copy & HA_LATT) + lpfc_handle_latt(phba); + + if (work_hba_events & WORKER_DISC_TMO) + lpfc_disc_timeout_handler(phba); + + if (work_hba_events & WORKER_ELS_TMO) + lpfc_els_timeout_handler(phba); + + if (work_hba_events & WORKER_MBOX_TMO) + lpfc_mbox_timeout_handler(phba); + + if (work_hba_events & WORKER_FDMI_TMO) + lpfc_fdmi_tmo_handler(phba); + + spin_lock_irq(phba->host->host_lock); + phba->work_hba_events &= ~work_hba_events; + spin_unlock_irq(phba->host->host_lock); + + for (i = 0; i < phba->sli.num_rings; i++, ha_copy >>= 4) { + pring = &phba->sli.ring[i]; + if ((ha_copy & HA_RXATT) + || (pring->flag & LPFC_DEFERRED_RING_EVENT)) { + if (pring->flag & LPFC_STOP_IOCB_MASK) { + pring->flag |= LPFC_DEFERRED_RING_EVENT; + } else { + lpfc_sli_handle_slow_ring_event(phba, pring, + (ha_copy & + HA_RXMASK)); + pring->flag &= ~LPFC_DEFERRED_RING_EVENT; + } + /* + * Turn on Ring interrupts + */ + spin_lock_irq(phba->host->host_lock); + control = readl(phba->HCregaddr); + control |= (HC_R0INT_ENA << i); + writel(control, phba->HCregaddr); + readl(phba->HCregaddr); /* flush */ + spin_unlock_irq(phba->host->host_lock); + } + } + + lpfc_work_list_done (phba); + +} + +static int +check_work_wait_done(struct lpfc_hba *phba) { + + spin_lock_irq(phba->host->host_lock); + if (phba->work_ha || + phba->work_hba_events || + (!list_empty(&phba->work_list)) || + kthread_should_stop()) { + spin_unlock_irq(phba->host->host_lock); + return 1; + } else { + spin_unlock_irq(phba->host->host_lock); + return 0; + } +} - unlock_kernel(); +int +lpfc_do_work(void *p) +{ + struct lpfc_hba *phba = p; + int rc; + DECLARE_WAIT_QUEUE_HEAD_ONSTACK(work_waitq); - complete(&phba->dpc_startup); + set_user_nice(current, -20); + phba->work_wait = &work_waitq; while (1) { - if (down_interruptible(&sem)) - break; - if (signal_pending(current)) - break; + rc = wait_event_interruptible(work_waitq, + check_work_wait_done(phba)); + BUG_ON(rc); - if (phba->dpc_kill) + if (kthread_should_stop()) break; - spin_lock_irqsave(phba->host->host_lock, flags); - lpfc_disc_done(phba); - spin_unlock_irqrestore(phba->host->host_lock, flags); - } + lpfc_work_done(phba); - /* Zero out semaphore we were waiting on. */ - phba->dpc_wait = NULL; - complete_and_exit(&phba->dpc_exiting, 0); - return(0); + } + phba->work_wait = NULL; + return 0; } /* - * This is only called to handle FC discovery events. Since this a rare - * occurance, we allocate an LPFC_DISC_EVT_t structure here instead of + * This is only called to handle FC worker events. Since this a rare + * occurance, we allocate a struct lpfc_work_evt structure here instead of * embedding it in the IOCB. */ int -lpfc_discq_post_event(struct lpfc_hba * phba, void *arg1, void *arg2, +lpfc_workq_post_event(struct lpfc_hba * phba, void *arg1, void *arg2, uint32_t evt) { - LPFC_DISC_EVT_t *evtp; + struct lpfc_work_evt *evtp; - /* All Mailbox completions and LPFC_ELS_RING rcv ring IOCB events - * will be queued to DPC for processing + /* + * All Mailbox completions and LPFC_ELS_RING rcv ring IOCB events will + * be queued to worker thread for processing */ - evtp = (LPFC_DISC_EVT_t *) kmalloc(sizeof(LPFC_DISC_EVT_t), GFP_ATOMIC); + evtp = kmalloc(sizeof(struct lpfc_work_evt), GFP_KERNEL); if (!evtp) return 0; evtp->evt_arg1 = arg1; evtp->evt_arg2 = arg2; evtp->evt = evt; - evtp->evt_listp.next = NULL; - evtp->evt_listp.prev = NULL; - /* Queue the event to the DPC to be processed later */ - list_add_tail(&evtp->evt_listp, &phba->dpc_disc); - if (phba->dpc_wait) - up(phba->dpc_wait); + spin_lock_irq(phba->host->host_lock); + list_add_tail(&evtp->evt_listp, &phba->work_list); + if (phba->work_wait) + wake_up(phba->work_wait); + spin_unlock_irq(phba->host->host_lock); return 1; } @@ -262,24 +363,28 @@ lpfc_linkdown(struct lpfc_hba * phba) { struct lpfc_sli *psli; struct lpfc_nodelist *ndlp, *next_ndlp; - struct list_head *listp; - struct list_head *node_list[7]; + struct list_head *listp, *node_list[7]; LPFC_MBOXQ_t *mb; int rc, i; psli = &phba->sli; - phba->hba_state = LPFC_LINK_DOWN; + /* sysfs or selective reset may call this routine to clean up */ + if (phba->hba_state >= LPFC_LINK_DOWN) { + if (phba->hba_state == LPFC_LINK_DOWN) + return 0; -#if !defined(FC_TRANS_VER1) && !defined(FC_TRANS_265_BLKPATCH) - /* Stop all requests to the driver from the midlayer. */ - scsi_block_requests(phba->host); -#endif + spin_lock_irq(phba->host->host_lock); + phba->hba_state = LPFC_LINK_DOWN; + spin_unlock_irq(phba->host->host_lock); + } - lpfc_put_event(phba, HBA_EVENT_LINK_DOWN, phba->fc_myDID, NULL, 0, 0); + fc_host_post_event(phba->host, fc_get_event_number(), + FCH_EVT_LINKDOWN, 0); /* Clean up any firmware default rpi's */ - if ((mb = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC))) { + if ((mb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL))) { lpfc_unreg_did(phba, 0xffffffff, mb); + mb->mbox_cmpl=lpfc_sli_def_mbox_cmpl; if (lpfc_sli_issue_mbox(phba, mb, (MBX_NOWAIT | MBX_STOP_IOCB)) == MBX_NOT_FINISHED) { mempool_free( mb, phba->mbox_mem_pool); @@ -292,15 +397,6 @@ lpfc_linkdown(struct lpfc_hba * phba) /* Cleanup any outstanding ELS commands */ lpfc_els_flush_cmd(phba); - /* - * If this function was called by the lpfc_do_dpc, don't recurse into - * the routine again. If not, just process any outstanding - * discovery events. - */ - if (!list_empty(&phba->dpc_disc)) { - lpfc_disc_done(phba); - } - /* Issue a LINK DOWN event to all nodes */ node_list[0] = &phba->fc_npr_list; /* MUST do this list first */ node_list[1] = &phba->fc_nlpmap_list; @@ -315,24 +411,10 @@ lpfc_linkdown(struct lpfc_hba * phba) continue; list_for_each_entry_safe(ndlp, next_ndlp, listp, nlp_listp) { - /* Fabric nodes are not handled thru state machine for - link down */ - if (ndlp->nlp_type & NLP_FABRIC) { - /* Remove ALL Fabric nodes except Fabric_DID */ - if (ndlp->nlp_DID != Fabric_DID) { - /* Take it off current list and free */ - lpfc_nlp_list(phba, ndlp, - NLP_NO_LIST); - } - } - else { - lpfc_set_failmask(phba, ndlp, - LPFC_DEV_LINK_DOWN, - LPFC_SET_BITMASK); - rc = lpfc_disc_state_machine(phba, ndlp, NULL, - NLP_EVT_DEVICE_RECOVERY); - } + rc = lpfc_disc_state_machine(phba, ndlp, NULL, + NLP_EVT_DEVICE_RECOVERY); + } } @@ -345,61 +427,49 @@ lpfc_linkdown(struct lpfc_hba * phba) /* Setup myDID for link up if we are in pt2pt mode */ if (phba->fc_flag & FC_PT2PT) { phba->fc_myDID = 0; - if ((mb = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC))) { + if ((mb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL))) { lpfc_config_link(phba, mb); + mb->mbox_cmpl=lpfc_sli_def_mbox_cmpl; if (lpfc_sli_issue_mbox (phba, mb, (MBX_NOWAIT | MBX_STOP_IOCB)) == MBX_NOT_FINISHED) { mempool_free( mb, phba->mbox_mem_pool); } } + spin_lock_irq(phba->host->host_lock); phba->fc_flag &= ~(FC_PT2PT | FC_PT2PT_PLOGI); + spin_unlock_irq(phba->host->host_lock); } + spin_lock_irq(phba->host->host_lock); phba->fc_flag &= ~FC_LBIT; + spin_unlock_irq(phba->host->host_lock); /* Turn off discovery timer if its running */ lpfc_can_disctmo(phba); /* Must process IOCBs on all rings to handle ABORTed I/Os */ - return (0); + return 0; } static int lpfc_linkup(struct lpfc_hba * phba) { struct lpfc_nodelist *ndlp, *next_ndlp; - struct list_head *listp; - struct list_head *node_list[7]; + struct list_head *listp, *node_list[7]; int i; + fc_host_post_event(phba->host, fc_get_event_number(), + FCH_EVT_LINKUP, 0); + + spin_lock_irq(phba->host->host_lock); phba->hba_state = LPFC_LINK_UP; phba->fc_flag &= ~(FC_PT2PT | FC_PT2PT_PLOGI | FC_ABORT_DISCOVERY | FC_RSCN_MODE | FC_NLP_MORE | FC_RSCN_DISCOVERY); + phba->fc_flag |= FC_NDISC_ACTIVE; phba->fc_ns_retry = 0; + spin_unlock_irq(phba->host->host_lock); - lpfc_put_event(phba, HBA_EVENT_LINK_UP, phba->fc_myDID, - (void *)(unsigned long)(phba->fc_topology), - 0, phba->fc_linkspeed); - - /* - * Clean up old Fabric NLP_FABRIC logins. - */ - list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nlpunmap_list, - nlp_listp) { - if (ndlp->nlp_DID == Fabric_DID) { - /* Take it off current list and free */ - lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); - } - } - - /* free any ndlp's on unused list */ - list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_unused_list, - nlp_listp) { - lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); - } - - /* Mark all nodes for LINK UP */ node_list[0] = &phba->fc_plogi_list; node_list[1] = &phba->fc_adisc_list; node_list[2] = &phba->fc_reglogin_list; @@ -412,19 +482,30 @@ lpfc_linkup(struct lpfc_hba * phba) if (list_empty(listp)) continue; - list_for_each_entry(ndlp, listp, nlp_listp) { - lpfc_set_failmask(phba, ndlp, LPFC_DEV_DISCOVERY_INP, - LPFC_SET_BITMASK); - lpfc_set_failmask(phba, ndlp, LPFC_DEV_LINK_DOWN, - LPFC_CLR_BITMASK); + list_for_each_entry_safe(ndlp, next_ndlp, listp, nlp_listp) { + if (phba->fc_flag & FC_LBIT) { + if (ndlp->nlp_type & NLP_FABRIC) { + /* On Linkup its safe to clean up the + * ndlp from Fabric connections. + */ + lpfc_nlp_list(phba, ndlp, + NLP_UNUSED_LIST); + } else if (!(ndlp->nlp_flag & NLP_NPR_ADISC)) { + /* Fail outstanding IO now since device + * is marked for PLOGI. + */ + lpfc_unreg_rpi(phba, ndlp); + } + } } } -#if !defined(FC_TRANS_VER1) && !defined(FC_TRANS_265_BLKPATCH) - spin_unlock_irq(phba->host->host_lock); - scsi_unblock_requests(phba->host); - spin_lock_irq(phba->host->host_lock); -#endif + /* free any ndlp's on unused list */ + list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_unused_list, + nlp_listp) { + lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); + } + return 0; } @@ -444,9 +525,10 @@ lpfc_mbx_cmpl_clear_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) psli = &phba->sli; mb = &pmb->mb; /* Since we don't do discovery right now, turn these off here */ - psli->ring[psli->ip_ring].flag &= ~LPFC_STOP_IOCB_EVENT; + psli->ring[psli->extra_ring].flag &= ~LPFC_STOP_IOCB_EVENT; psli->ring[psli->fcp_ring].flag &= ~LPFC_STOP_IOCB_EVENT; psli->ring[psli->next_ring].flag &= ~LPFC_STOP_IOCB_EVENT; + /* Check for error */ if ((mb->mbxStatus) && (mb->mbxStatus != 0x1601)) { /* CLEAR_LA mbox error state */ @@ -459,7 +541,7 @@ lpfc_mbx_cmpl_clear_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) goto out; } - if(phba->fc_flag & FC_ABORT_DISCOVERY) + if (phba->fc_flag & FC_ABORT_DISCOVERY) goto out; phba->num_disc_nodes = 0; @@ -468,10 +550,15 @@ lpfc_mbx_cmpl_clear_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) lpfc_els_disc_plogi(phba); } + if (!phba->num_disc_nodes) { + spin_lock_irq(phba->host->host_lock); + phba->fc_flag &= ~FC_NDISC_ACTIVE; + spin_unlock_irq(phba->host->host_lock); + } + phba->hba_state = LPFC_HBA_READY; out: - phba->fc_flag &= ~FC_ABORT_DISCOVERY; /* Device Discovery completes */ lpfc_printf_log(phba, KERN_INFO, @@ -480,97 +567,84 @@ out: phba->brd_no); mempool_free( pmb, phba->mbox_mem_pool); + + spin_lock_irq(phba->host->host_lock); + phba->fc_flag &= ~FC_ABORT_DISCOVERY; if (phba->fc_flag & FC_ESTABLISH_LINK) { phba->fc_flag &= ~FC_ESTABLISH_LINK; } + spin_unlock_irq(phba->host->host_lock); + del_timer_sync(&phba->fc_estabtmo); + lpfc_can_disctmo(phba); /* turn on Link Attention interrupts */ - psli->sliinit.sli_flag |= LPFC_PROCESS_LA; + spin_lock_irq(phba->host->host_lock); + psli->sli_flag |= LPFC_PROCESS_LA; control = readl(phba->HCregaddr); control |= HC_LAINT_ENA; writel(control, phba->HCregaddr); readl(phba->HCregaddr); /* flush */ + spin_unlock_irq(phba->host->host_lock); return; } static void -lpfc_mbx_cmpl_config_link(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) +lpfc_mbx_cmpl_local_config_link(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) { - struct lpfc_sli *psli; - MAILBOX_t *mb; - - psli = &phba->sli; - mb = &pmb->mb; - /* Check for error */ - if (mb->mbxStatus) { - /* CONFIG_LINK mbox error state */ - lpfc_printf_log(phba, KERN_ERR, LOG_MBOX, - "%d:0306 CONFIG_LINK mbxStatus error x%x " - "HBA state x%x\n", - phba->brd_no, mb->mbxStatus, phba->hba_state); + struct lpfc_sli *psli = &phba->sli; + int rc; - lpfc_linkdown(phba); - phba->hba_state = LPFC_HBA_ERROR; + if (pmb->mb.mbxStatus) goto out; - } - if (phba->hba_state == LPFC_LOCAL_CFG_LINK) { - if (phba->fc_topology == TOPOLOGY_LOOP) { - /* If we are public loop and L bit was set */ - if ((phba->fc_flag & FC_PUBLIC_LOOP) && - !(phba->fc_flag & FC_LBIT)) { - /* Need to wait for FAN - use discovery timer - * for timeout. hba_state is identically - * LPFC_LOCAL_CFG_LINK while waiting for FAN - */ - lpfc_set_disctmo(phba); - mempool_free( pmb, phba->mbox_mem_pool); - return; - } + mempool_free(pmb, phba->mbox_mem_pool); + + if (phba->fc_topology == TOPOLOGY_LOOP && + phba->fc_flag & FC_PUBLIC_LOOP && + !(phba->fc_flag & FC_LBIT)) { + /* Need to wait for FAN - use discovery timer + * for timeout. hba_state is identically + * LPFC_LOCAL_CFG_LINK while waiting for FAN + */ + lpfc_set_disctmo(phba); + return; } - /* Start discovery by sending a FLOGI hba_state is identically - * LPFC_FLOGI while waiting for FLOGI cmpl - */ - phba->hba_state = LPFC_FLOGI; - lpfc_set_disctmo(phba); - lpfc_initial_flogi(phba); - mempool_free( pmb, phba->mbox_mem_pool); - return; - } - if (phba->hba_state == LPFC_FABRIC_CFG_LINK) { - mempool_free( pmb, phba->mbox_mem_pool); - return; - } + /* Start discovery by sending a FLOGI. hba_state is identically + * LPFC_FLOGI while waiting for FLOGI cmpl + */ + phba->hba_state = LPFC_FLOGI; + lpfc_set_disctmo(phba); + lpfc_initial_flogi(phba); + return; out: - /* CONFIG_LINK bad hba state */ - lpfc_printf_log(phba, - KERN_ERR, - LOG_DISCOVERY, + lpfc_printf_log(phba, KERN_ERR, LOG_MBOX, + "%d:0306 CONFIG_LINK mbxStatus error x%x " + "HBA state x%x\n", + phba->brd_no, pmb->mb.mbxStatus, phba->hba_state); + + lpfc_linkdown(phba); + + phba->hba_state = LPFC_HBA_ERROR; + + lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, "%d:0200 CONFIG_LINK bad hba state x%x\n", phba->brd_no, phba->hba_state); - if (phba->hba_state != LPFC_CLEAR_LA) { - lpfc_clear_la(phba, pmb); - pmb->mbox_cmpl = lpfc_mbx_cmpl_clear_la; - if (lpfc_sli_issue_mbox(phba, pmb, (MBX_NOWAIT | MBX_STOP_IOCB)) - == MBX_NOT_FINISHED) { - mempool_free( pmb, phba->mbox_mem_pool); - lpfc_disc_flush_list(phba); - psli->ring[(psli->ip_ring)].flag &= - ~LPFC_STOP_IOCB_EVENT; - psli->ring[(psli->fcp_ring)].flag &= - ~LPFC_STOP_IOCB_EVENT; - psli->ring[(psli->next_ring)].flag &= - ~LPFC_STOP_IOCB_EVENT; - phba->hba_state = LPFC_HBA_READY; - } - } else { - mempool_free( pmb, phba->mbox_mem_pool); + lpfc_clear_la(phba, pmb); + pmb->mbox_cmpl = lpfc_mbx_cmpl_clear_la; + rc = lpfc_sli_issue_mbox(phba, pmb, (MBX_NOWAIT | MBX_STOP_IOCB)); + if (rc == MBX_NOT_FINISHED) { + mempool_free(pmb, phba->mbox_mem_pool); + lpfc_disc_flush_list(phba); + psli->ring[(psli->extra_ring)].flag &= ~LPFC_STOP_IOCB_EVENT; + psli->ring[(psli->fcp_ring)].flag &= ~LPFC_STOP_IOCB_EVENT; + psli->ring[(psli->next_ring)].flag &= ~LPFC_STOP_IOCB_EVENT; + phba->hba_state = LPFC_HBA_READY; } return; } @@ -596,15 +670,12 @@ lpfc_mbx_cmpl_read_sparam(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) goto out; } - /* The mailbox was populated by the HBA. Flush it to main store for the - * driver. Note that all context buffers are from the driver's - * dma pool and have length LPFC_BPL_SIZE. - */ - pci_dma_sync_single_for_cpu(phba->pcidev, mp->phys, LPFC_BPL_SIZE, - PCI_DMA_FROMDEVICE); - memcpy((uint8_t *) & phba->fc_sparam, (uint8_t *) mp->virt, sizeof (struct serv_parm)); + if (phba->cfg_soft_wwnn) + u64_to_wwn(phba->cfg_soft_wwnn, phba->fc_sparam.nodeName.u.wwn); + if (phba->cfg_soft_wwpn) + u64_to_wwn(phba->cfg_soft_wwpn, phba->fc_sparam.portName.u.wwn); memcpy((uint8_t *) & phba->fc_nodename, (uint8_t *) & phba->fc_sparam.nodeName, sizeof (struct lpfc_name)); @@ -627,7 +698,7 @@ out: == MBX_NOT_FINISHED) { mempool_free( pmb, phba->mbox_mem_pool); lpfc_disc_flush_list(phba); - psli->ring[(psli->ip_ring)].flag &= + psli->ring[(psli->extra_ring)].flag &= ~LPFC_STOP_IOCB_EVENT; psli->ring[(psli->fcp_ring)].flag &= ~LPFC_STOP_IOCB_EVENT; @@ -641,69 +712,176 @@ out: return; } -/* - * This routine handles processing a READ_LA mailbox - * command upon completion. It is setup in the LPFC_MBOXQ - * as the completion routine when the command is - * handed off to the SLI layer. - */ -void -lpfc_mbx_cmpl_read_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) +static void +lpfc_mbx_process_link_up(struct lpfc_hba *phba, READ_LA_VAR *la) { - struct lpfc_sli *psli = &phba->sli; - READ_LA_VAR *la; - LPFC_MBOXQ_t *mbox; - MAILBOX_t *mb = &pmb->mb; - struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) (pmb->context1); - uint32_t control; int i; + LPFC_MBOXQ_t *sparam_mbox, *cfglink_mbox; + struct lpfc_dmabuf *mp; + int rc; - /* Check for error */ - if (mb->mbxStatus) { - /* READ_LA mbox error state */ - lpfc_printf_log(phba, - KERN_INFO, - LOG_LINK_EVENT, - "%d:1307 READ_LA mbox error x%x state x%x\n", - phba->brd_no, - mb->mbxStatus, phba->hba_state); - - lpfc_linkdown(phba); - phba->hba_state = LPFC_HBA_ERROR; + sparam_mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL); + cfglink_mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL); - /* turn on Link Attention interrupts */ - psli->sliinit.sli_flag |= LPFC_PROCESS_LA; - control = readl(phba->HCregaddr); - control |= HC_LAINT_ENA; - writel(control, phba->HCregaddr); - readl(phba->HCregaddr); /* flush */ - return; + spin_lock_irq(phba->host->host_lock); + switch (la->UlnkSpeed) { + case LA_1GHZ_LINK: + phba->fc_linkspeed = LA_1GHZ_LINK; + break; + case LA_2GHZ_LINK: + phba->fc_linkspeed = LA_2GHZ_LINK; + break; + case LA_4GHZ_LINK: + phba->fc_linkspeed = LA_4GHZ_LINK; + break; + default: + phba->fc_linkspeed = LA_UNKNW_LINK; + break; } - la = (READ_LA_VAR *) & pmb->mb.un.varReadLA; + phba->fc_topology = la->topology; - /* The mailbox was populated by the HBA. Flush it to main store for the - * driver. Note that all context buffers are from the driver's - * dma pool and have length LPFC_BPL_SIZE. - */ - pci_dma_sync_single_for_cpu(phba->pcidev, mp->phys, LPFC_BPL_SIZE, - PCI_DMA_FROMDEVICE); - + if (phba->fc_topology == TOPOLOGY_LOOP) { /* Get Loop Map information */ - if (mp) { - memcpy(&phba->alpa_map[0], mp->virt, 128); + + if (la->il) + phba->fc_flag |= FC_LBIT; + + phba->fc_myDID = la->granted_AL_PA; + i = la->un.lilpBde64.tus.f.bdeSize; + + if (i == 0) { + phba->alpa_map[0] = 0; + } else { + if (phba->cfg_log_verbose & LOG_LINK_EVENT) { + int numalpa, j, k; + union { + uint8_t pamap[16]; + struct { + uint32_t wd1; + uint32_t wd2; + uint32_t wd3; + uint32_t wd4; + } pa; + } un; + numalpa = phba->alpa_map[0]; + j = 0; + while (j < numalpa) { + memset(un.pamap, 0, 16); + for (k = 1; j < numalpa; k++) { + un.pamap[k - 1] = + phba->alpa_map[j + 1]; + j++; + if (k == 16) + break; + } + /* Link Up Event ALPA map */ + lpfc_printf_log(phba, + KERN_WARNING, + LOG_LINK_EVENT, + "%d:1304 Link Up Event " + "ALPA map Data: x%x " + "x%x x%x x%x\n", + phba->brd_no, + un.pa.wd1, un.pa.wd2, + un.pa.wd3, un.pa.wd4); + } + } + } } else { - memset(&phba->alpa_map[0], 0, 128); + phba->fc_myDID = phba->fc_pref_DID; + phba->fc_flag |= FC_LBIT; } + spin_unlock_irq(phba->host->host_lock); + + lpfc_linkup(phba); + if (sparam_mbox) { + lpfc_read_sparam(phba, sparam_mbox); + sparam_mbox->mbox_cmpl = lpfc_mbx_cmpl_read_sparam; + rc = lpfc_sli_issue_mbox(phba, sparam_mbox, + (MBX_NOWAIT | MBX_STOP_IOCB)); + if (rc == MBX_NOT_FINISHED) { + mp = (struct lpfc_dmabuf *) sparam_mbox->context1; + lpfc_mbuf_free(phba, mp->virt, mp->phys); + kfree(mp); + mempool_free(sparam_mbox, phba->mbox_mem_pool); + if (cfglink_mbox) + mempool_free(cfglink_mbox, phba->mbox_mem_pool); + return; + } + } + + if (cfglink_mbox) { + phba->hba_state = LPFC_LOCAL_CFG_LINK; + lpfc_config_link(phba, cfglink_mbox); + cfglink_mbox->mbox_cmpl = lpfc_mbx_cmpl_local_config_link; + rc = lpfc_sli_issue_mbox(phba, cfglink_mbox, + (MBX_NOWAIT | MBX_STOP_IOCB)); + if (rc == MBX_NOT_FINISHED) + mempool_free(cfglink_mbox, phba->mbox_mem_pool); + } +} + +static void +lpfc_mbx_issue_link_down(struct lpfc_hba *phba) { + uint32_t control; + struct lpfc_sli *psli = &phba->sli; + + lpfc_linkdown(phba); + + /* turn on Link Attention interrupts - no CLEAR_LA needed */ + spin_lock_irq(phba->host->host_lock); + psli->sli_flag |= LPFC_PROCESS_LA; + control = readl(phba->HCregaddr); + control |= HC_LAINT_ENA; + writel(control, phba->HCregaddr); + readl(phba->HCregaddr); /* flush */ + spin_unlock_irq(phba->host->host_lock); +} + +/* + * This routine handles processing a READ_LA mailbox + * command upon completion. It is setup in the LPFC_MBOXQ + * as the completion routine when the command is + * handed off to the SLI layer. + */ +void +lpfc_mbx_cmpl_read_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) +{ + READ_LA_VAR *la; + MAILBOX_t *mb = &pmb->mb; + struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) (pmb->context1); + + /* Check for error */ + if (mb->mbxStatus) { + lpfc_printf_log(phba, + KERN_INFO, + LOG_LINK_EVENT, + "%d:1307 READ_LA mbox error x%x state x%x\n", + phba->brd_no, + mb->mbxStatus, phba->hba_state); + lpfc_mbx_issue_link_down(phba); + phba->hba_state = LPFC_HBA_ERROR; + goto lpfc_mbx_cmpl_read_la_free_mbuf; + } + + la = (READ_LA_VAR *) & pmb->mb.un.varReadLA; + + memcpy(&phba->alpa_map[0], mp->virt, 128); + + spin_lock_irq(phba->host->host_lock); + if (la->pb) + phba->fc_flag |= FC_BYPASSED_MODE; + else + phba->fc_flag &= ~FC_BYPASSED_MODE; + spin_unlock_irq(phba->host->host_lock); if (((phba->fc_eventTag + 1) < la->eventTag) || - (phba->fc_eventTag == la->eventTag)) { + (phba->fc_eventTag == la->eventTag)) { phba->fc_stat.LinkMultiEvent++; if (la->attType == AT_LINK_UP) { - if (phba->fc_eventTag != 0) { - + if (phba->fc_eventTag != 0) lpfc_linkdown(phba); - } } } @@ -711,122 +889,27 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) if (la->attType == AT_LINK_UP) { phba->fc_stat.LinkUp++; - /* Link Up Event received */ lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT, "%d:1303 Link Up Event x%x received " "Data: x%x x%x x%x x%x\n", phba->brd_no, la->eventTag, phba->fc_eventTag, la->granted_AL_PA, la->UlnkSpeed, phba->alpa_map[0]); - - switch(la->UlnkSpeed) { - case LA_1GHZ_LINK: - phba->fc_linkspeed = LA_1GHZ_LINK; - break; - case LA_2GHZ_LINK: - phba->fc_linkspeed = LA_2GHZ_LINK; - break; - case LA_4GHZ_LINK: - phba->fc_linkspeed = LA_4GHZ_LINK; - break; - default: - phba->fc_linkspeed = LA_UNKNW_LINK; - break; - } - - if ((phba->fc_topology = la->topology) == TOPOLOGY_LOOP) { - - if (la->il) { - phba->fc_flag |= FC_LBIT; - } - - phba->fc_myDID = la->granted_AL_PA; - - i = la->un.lilpBde64.tus.f.bdeSize; - if (i == 0) { - phba->alpa_map[0] = 0; - } else { - if (phba->cfg_log_verbose - & LOG_LINK_EVENT) { - int numalpa, j, k; - union { - uint8_t pamap[16]; - struct { - uint32_t wd1; - uint32_t wd2; - uint32_t wd3; - uint32_t wd4; - } pa; - } un; - - numalpa = phba->alpa_map[0]; - j = 0; - while (j < numalpa) { - memset(un.pamap, 0, 16); - for (k = 1; j < numalpa; k++) { - un.pamap[k - 1] = - phba->alpa_map[j + - 1]; - j++; - if (k == 16) - break; - } - /* Link Up Event ALPA map */ - lpfc_printf_log(phba, - KERN_WARNING, - LOG_LINK_EVENT, - "%d:1304 Link Up Event " - "ALPA map Data: x%x " - "x%x x%x x%x\n", - phba->brd_no, - un.pa.wd1, un.pa.wd2, - un.pa.wd3, un.pa.wd4); - } - } - } - } else { - phba->fc_myDID = phba->fc_pref_DID; - phba->fc_flag |= FC_LBIT; - } - - lpfc_linkup(phba); - if ((mbox = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC))) { - lpfc_read_sparam(phba, mbox); - mbox->mbox_cmpl = lpfc_mbx_cmpl_read_sparam; - lpfc_sli_issue_mbox - (phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB)); - } - - if ((mbox = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC))) { - phba->hba_state = LPFC_LOCAL_CFG_LINK; - lpfc_config_link(phba, mbox); - mbox->mbox_cmpl = lpfc_mbx_cmpl_config_link; - lpfc_sli_issue_mbox - (phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB)); - } + lpfc_mbx_process_link_up(phba, la); } else { phba->fc_stat.LinkDown++; - /* Link Down Event received */ lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT, "%d:1305 Link Down Event x%x received " "Data: x%x x%x x%x\n", phba->brd_no, la->eventTag, phba->fc_eventTag, phba->hba_state, phba->fc_flag); - - lpfc_linkdown(phba); - - /* turn on Link Attention interrupts - no CLEAR_LA needed */ - psli->sliinit.sli_flag |= LPFC_PROCESS_LA; - control = readl(phba->HCregaddr); - control |= HC_LAINT_ENA; - writel(control, phba->HCregaddr); - readl(phba->HCregaddr); /* flush */ + lpfc_mbx_issue_link_down(phba); } - pmb->context1 = NULL; +lpfc_mbx_cmpl_read_la_free_mbuf: lpfc_mbuf_free(phba, mp->virt, mp->phys); kfree(mp); - mempool_free( pmb, phba->mbox_mem_pool); + mempool_free(pmb, phba->mbox_mem_pool); return; } @@ -850,13 +933,6 @@ lpfc_mbx_cmpl_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) ndlp = (struct lpfc_nodelist *) pmb->context2; mp = (struct lpfc_dmabuf *) (pmb->context1); - /* The mailbox was populated by the HBA. Flush it to main store for the - * driver. Note that all context buffers are from the driver's - * dma pool and have length LPFC_BPL_SIZE. - */ - pci_dma_sync_single_for_cpu(phba->pcidev, mp->phys, LPFC_BPL_SIZE, - PCI_DMA_FROMDEVICE); - pmb->context1 = NULL; /* Good status, call state machine */ @@ -904,19 +980,9 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) return; } - /* The mailbox was populated by the HBA. Flush it to main store for the - * driver. Note that all context buffers are from the driver's - * dma pool and have length LPFC_BPL_SIZE. - */ - pci_dma_sync_single_for_cpu(phba->pcidev, mp->phys, LPFC_BPL_SIZE, - PCI_DMA_FROMDEVICE); - pmb->context1 = NULL; - 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); ndlp->nlp_type |= NLP_FABRIC; ndlp->nlp_state = NLP_STE_UNMAPPED_NODE; lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST); @@ -930,32 +996,36 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) */ lpfc_issue_els_scr(phba, SCR_DID, 0); - /* Allocate a new node instance. If the pool is empty, just - * start the discovery process and skip the Nameserver login - * process. This is attempted again later on. Otherwise, issue - * a Port Login (PLOGI) to the NameServer - */ - if ((ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_ATOMIC)) - == 0) { - lpfc_disc_start(phba); - } else { - lpfc_nlp_init(phba, ndlp, NameServer_DID); - ndlp->nlp_type |= NLP_FABRIC; - ndlp->nlp_state = NLP_STE_PLOGI_ISSUE; - lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST); - lpfc_issue_els_plogi(phba, ndlp, 0); - if (phba->cfg_fdmi_on) { - if ((ndlp_fdmi = mempool_alloc( - phba->nlp_mem_pool, - GFP_ATOMIC))) { - lpfc_nlp_init(phba, ndlp_fdmi, - FDMI_DID); - ndlp_fdmi->nlp_type |= NLP_FABRIC; - ndlp_fdmi->nlp_state = - NLP_STE_PLOGI_ISSUE; - lpfc_issue_els_plogi(phba, ndlp_fdmi, - 0); - } + ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, NameServer_DID); + if (!ndlp) { + /* Allocate a new node instance. If the pool is empty, + * start the discovery process and skip the Nameserver + * login process. This is attempted again later on. + * Otherwise, issue a Port Login (PLOGI) to NameServer. + */ + ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_ATOMIC); + if (!ndlp) { + lpfc_disc_start(phba); + lpfc_mbuf_free(phba, mp->virt, mp->phys); + kfree(mp); + mempool_free( pmb, phba->mbox_mem_pool); + return; + } else { + lpfc_nlp_init(phba, ndlp, NameServer_DID); + ndlp->nlp_type |= NLP_FABRIC; + } + } + ndlp->nlp_state = NLP_STE_PLOGI_ISSUE; + lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST); + lpfc_issue_els_plogi(phba, NameServer_DID, 0); + if (phba->cfg_fdmi_on) { + ndlp_fdmi = mempool_alloc(phba->nlp_mem_pool, + GFP_KERNEL); + if (ndlp_fdmi) { + lpfc_nlp_init(phba, ndlp_fdmi, FDMI_DID); + ndlp_fdmi->nlp_type |= NLP_FABRIC; + ndlp_fdmi->nlp_state = NLP_STE_PLOGI_ISSUE; + lpfc_issue_els_plogi(phba, FDMI_DID, 0); } } } @@ -963,7 +1033,6 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) lpfc_mbuf_free(phba, mp->virt, mp->phys); kfree(mp); mempool_free( pmb, phba->mbox_mem_pool); - return; } @@ -1002,19 +1071,9 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) return; } - /* The mailbox was populated by the HBA. Flush it to main store for the - * driver. Note that all context buffers are from the driver's - * dma pool and have length LPFC_BPL_SIZE. - */ - pci_dma_sync_single_for_cpu(phba->pcidev, mp->phys, LPFC_BPL_SIZE, - PCI_DMA_FROMDEVICE); - pmb->context1 = NULL; - 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); ndlp->nlp_type |= NLP_FABRIC; ndlp->nlp_state = NLP_STE_UNMAPPED_NODE; lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST); @@ -1024,6 +1083,7 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) lpfc_ns_cmd(phba, ndlp, SLI_CTNS_RNN_ID); lpfc_ns_cmd(phba, ndlp, SLI_CTNS_RSNN_NN); lpfc_ns_cmd(phba, ndlp, SLI_CTNS_RFT_ID); + lpfc_ns_cmd(phba, ndlp, SLI_CTNS_RFF_ID); } phba->fc_ns_retry = 0; @@ -1040,124 +1100,149 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) return; } -/* Put blp on the bind list */ -int -lpfc_consistent_bind_save(struct lpfc_hba * phba, struct lpfc_bindlist * blp) +static void +lpfc_register_remote_port(struct lpfc_hba * phba, + struct lpfc_nodelist * ndlp) { - /* Put it at the end of the bind list */ - list_add_tail(&blp->nlp_listp, &phba->fc_nlpbind_list); - phba->fc_bind_cnt++; + struct fc_rport *rport; + struct lpfc_rport_data *rdata; + struct fc_rport_identifiers rport_ids; + + /* Remote port has reappeared. Re-register w/ FC transport */ + rport_ids.node_name = wwn_to_u64(ndlp->nlp_nodename.u.wwn); + rport_ids.port_name = wwn_to_u64(ndlp->nlp_portname.u.wwn); + rport_ids.port_id = ndlp->nlp_DID; + rport_ids.roles = FC_RPORT_ROLE_UNKNOWN; + + ndlp->rport = rport = fc_remote_port_add(phba->host, 0, &rport_ids); + if (!rport) { + dev_printk(KERN_WARNING, &phba->pcidev->dev, + "Warning: fc_remote_port_add failed\n"); + return; + } - /* Add scsiid to BIND list */ - lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0903 Add scsiid %d to BIND list " - "Data: x%x x%x x%x x%p\n", - phba->brd_no, blp->nlp_sid, phba->fc_bind_cnt, - blp->nlp_DID, blp->nlp_bind_type, blp); + /* initialize static port data */ + rport->maxframe_size = ndlp->nlp_maxframe; + rport->supported_classes = ndlp->nlp_class_sup; + rdata = rport->dd_data; + rdata->pnode = ndlp; + + if (ndlp->nlp_type & NLP_FCP_TARGET) + rport_ids.roles |= FC_RPORT_ROLE_FCP_TARGET; + if (ndlp->nlp_type & NLP_FCP_INITIATOR) + rport_ids.roles |= FC_RPORT_ROLE_FCP_INITIATOR; + + + if (rport_ids.roles != FC_RPORT_ROLE_UNKNOWN) + fc_remote_port_rolechg(rport, rport_ids.roles); + + if ((rport->scsi_target_id != -1) && + (rport->scsi_target_id < LPFC_MAX_TARGET)) { + ndlp->nlp_sid = rport->scsi_target_id; + } - return (0); + return; +} + +static void +lpfc_unregister_remote_port(struct lpfc_hba * phba, + struct lpfc_nodelist * ndlp) +{ + struct fc_rport *rport = ndlp->rport; + struct lpfc_rport_data *rdata = rport->dd_data; + + if (rport->scsi_target_id == -1) { + ndlp->rport = NULL; + rdata->pnode = NULL; + } + + fc_remote_port_delete(rport); + + return; } int lpfc_nlp_list(struct lpfc_hba * phba, struct lpfc_nodelist * nlp, int list) { - struct lpfc_bindlist *blp; - struct lpfc_target *targetp; + enum { none, unmapped, mapped } rport_add = none, rport_del = none; struct lpfc_sli *psli; - psli = &phba->sli; + psli = &phba->sli; /* Sanity check to ensure we are not moving to / from the same list */ - if((nlp->nlp_flag & NLP_LIST_MASK) == list) { - if(list != NLP_NO_LIST) - return(0); - } + if ((nlp->nlp_flag & NLP_LIST_MASK) == list) + if (list != NLP_NO_LIST) + return 0; - blp = nlp->nlp_listp_bind; - - switch(nlp->nlp_flag & NLP_LIST_MASK) { + spin_lock_irq(phba->host->host_lock); + switch (nlp->nlp_flag & NLP_LIST_MASK) { case NLP_NO_LIST: /* Not on any list */ break; case NLP_UNUSED_LIST: phba->fc_unused_cnt--; list_del(&nlp->nlp_listp); - nlp->nlp_flag &= ~NLP_LIST_MASK; break; case NLP_PLOGI_LIST: phba->fc_plogi_cnt--; list_del(&nlp->nlp_listp); - nlp->nlp_flag &= ~NLP_LIST_MASK; break; case NLP_ADISC_LIST: phba->fc_adisc_cnt--; list_del(&nlp->nlp_listp); - nlp->nlp_flag &= ~NLP_LIST_MASK; break; case NLP_REGLOGIN_LIST: phba->fc_reglogin_cnt--; list_del(&nlp->nlp_listp); - nlp->nlp_flag &= ~NLP_LIST_MASK; break; case NLP_PRLI_LIST: phba->fc_prli_cnt--; list_del(&nlp->nlp_listp); - nlp->nlp_flag &= ~NLP_LIST_MASK; break; case NLP_UNMAPPED_LIST: phba->fc_unmap_cnt--; list_del(&nlp->nlp_listp); - nlp->nlp_flag &= ~NLP_LIST_MASK; nlp->nlp_flag &= ~NLP_TGT_NO_SCSIID; - nlp->nlp_type &= ~NLP_FC_NODE; + nlp->nlp_type &= ~NLP_FC_NODE; phba->nport_event_cnt++; + if (nlp->rport) + rport_del = unmapped; break; case NLP_MAPPED_LIST: phba->fc_map_cnt--; list_del(&nlp->nlp_listp); - nlp->nlp_flag &= ~NLP_LIST_MASK; phba->nport_event_cnt++; - lpfc_set_failmask(phba, nlp, LPFC_DEV_DISAPPEARED, - LPFC_SET_BITMASK); - nlp->nlp_type &= ~NLP_FCP_TARGET; - targetp = nlp->nlp_Target; - if (targetp && (list != NLP_MAPPED_LIST)) { - nlp->nlp_Target = NULL; -#if defined(FC_TRANS_VER1) || defined(FC_TRANS_265_BLKPATCH) - /* - * Do not block the target if the driver has just reset - * its interface to the hardware. - */ - if (phba->hba_state != LPFC_INIT_START) - lpfc_target_block(phba, targetp); -#endif - } - + if (nlp->rport) + rport_del = mapped; break; case NLP_NPR_LIST: phba->fc_npr_cnt--; list_del(&nlp->nlp_listp); - nlp->nlp_flag &= ~NLP_LIST_MASK; /* Stop delay tmo if taking node off NPR list */ if ((nlp->nlp_flag & NLP_DELAY_TMO) && (list != NLP_NPR_LIST)) { - nlp->nlp_flag &= ~NLP_DELAY_TMO; - del_timer_sync(&nlp->nlp_delayfunc); + spin_unlock_irq(phba->host->host_lock); + lpfc_cancel_retry_delay_tmo(phba, nlp); + spin_lock_irq(phba->host->host_lock); } break; } + nlp->nlp_flag &= ~NLP_LIST_MASK; + /* Add NPort to list */ lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0904 Add NPort x%x to %d list Data: x%x x%p\n", + "%d:0904 Add NPort x%x to %d list Data: x%x\n", phba->brd_no, - nlp->nlp_DID, list, nlp->nlp_flag, blp); + nlp->nlp_DID, list, nlp->nlp_flag); - nlp->nlp_listp_bind = NULL; - - switch(list) { + switch (list) { case NLP_NO_LIST: /* No list, just remove it */ + spin_unlock_irq(phba->host->host_lock); lpfc_nlp_remove(phba, nlp); + spin_lock_irq(phba->host->host_lock); + /* as node removed - stop further transport calls */ + rport_del = none; break; case NLP_UNUSED_LIST: nlp->nlp_flag |= list; @@ -1190,46 +1275,25 @@ lpfc_nlp_list(struct lpfc_hba * phba, struct lpfc_nodelist * nlp, int list) phba->fc_prli_cnt++; break; case NLP_UNMAPPED_LIST: + rport_add = unmapped; + /* ensure all vestiges of "mapped" significance are gone */ + nlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR); nlp->nlp_flag |= list; /* Put it at the end of the unmap list */ list_add_tail(&nlp->nlp_listp, &phba->fc_nlpunmap_list); phba->fc_unmap_cnt++; phba->nport_event_cnt++; - /* stop nodev tmo if running */ - if (nlp->nlp_flag & NLP_NODEV_TMO) { - del_timer_sync(&nlp->nlp_tmofunc); - } - nlp->nlp_flag &= ~NLP_NODEV_TMO; - nlp->nlp_type |= NLP_FC_NODE; - lpfc_set_failmask(phba, nlp, LPFC_DEV_DISCOVERY_INP, - LPFC_CLR_BITMASK); + nlp->nlp_flag &= ~NLP_NODEV_REMOVE; + nlp->nlp_type |= NLP_FC_NODE; break; case NLP_MAPPED_LIST: + rport_add = mapped; nlp->nlp_flag |= list; /* Put it at the end of the map list */ list_add_tail(&nlp->nlp_listp, &phba->fc_nlpmap_list); phba->fc_map_cnt++; phba->nport_event_cnt++; - /* stop nodev tmo if running */ - if (nlp->nlp_flag & NLP_NODEV_TMO) { - del_timer_sync(&nlp->nlp_tmofunc); - } - nlp->nlp_flag &= ~NLP_NODEV_TMO; - nlp->nlp_type |= NLP_FCP_TARGET; - lpfc_set_failmask(phba, nlp, LPFC_DEV_DISAPPEARED, - LPFC_CLR_BITMASK); - lpfc_set_failmask(phba, nlp, LPFC_DEV_DISCOVERY_INP, - LPFC_CLR_BITMASK); - - targetp = phba->device_queue_hash[nlp->nlp_sid]; - if (targetp && targetp->pnode) { - nlp->nlp_Target = targetp; -#if defined(FC_TRANS_VER1) || defined(FC_TRANS_265_BLKPATCH) - /* Unblock I/Os on target */ - if(targetp->blocked) - lpfc_target_unblock(phba, targetp); -#endif - } + nlp->nlp_flag &= ~NLP_NODEV_REMOVE; break; case NLP_NPR_LIST: nlp->nlp_flag |= list; @@ -1237,31 +1301,58 @@ lpfc_nlp_list(struct lpfc_hba * phba, struct lpfc_nodelist * nlp, int list) list_add_tail(&nlp->nlp_listp, &phba->fc_npr_list); phba->fc_npr_cnt++; - /* - * Sanity check for Fabric entity. - * Set nodev_tmo for NPR state, for Fabric use 1 sec. - */ - if (nlp->nlp_type & NLP_FABRIC) { - mod_timer(&nlp->nlp_tmofunc, jiffies + HZ); - } - else { - mod_timer(&nlp->nlp_tmofunc, - jiffies + HZ * phba->cfg_nodev_tmo); - } - nlp->nlp_flag |= NLP_NODEV_TMO; nlp->nlp_flag &= ~NLP_RCV_PLOGI; break; case NLP_JUST_DQ: break; } - if (blp) { - nlp->nlp_sid = 0; - nlp->nlp_flag &= ~NLP_SEED_MASK; - nlp->nlp_Target = NULL; - lpfc_consistent_bind_save(phba, blp); + spin_unlock_irq(phba->host->host_lock); + + /* + * We make all the calls into the transport after we have + * moved the node between lists. This so that we don't + * release the lock while in-between lists. + */ + + /* Don't upcall midlayer if we're unloading */ + if (!(phba->fc_flag & FC_UNLOADING)) { + /* + * We revalidate the rport pointer as the "add" function + * may have removed the remote port. + */ + if ((rport_del != none) && nlp->rport) + lpfc_unregister_remote_port(phba, nlp); + + if (rport_add != none) { + /* + * Tell the fc transport about the port, if we haven't + * already. If we have, and it's a scsi entity, be + * sure to unblock any attached scsi devices + */ + if ((!nlp->rport) || (nlp->rport->port_state == + FC_PORTSTATE_BLOCKED)) + lpfc_register_remote_port(phba, nlp); + + /* + * if we added to Mapped list, but the remote port + * registration failed or assigned a target id outside + * our presentable range - move the node to the + * Unmapped List + */ + if ((rport_add == mapped) && + ((!nlp->rport) || + (nlp->rport->scsi_target_id == -1) || + (nlp->rport->scsi_target_id >= LPFC_MAX_TARGET))) { + nlp->nlp_state = NLP_STE_UNMAPPED_NODE; + spin_lock_irq(phba->host->host_lock); + nlp->nlp_flag |= NLP_TGT_NO_SCSIID; + spin_unlock_irq(phba->host->host_lock); + lpfc_nlp_list(phba, nlp, NLP_UNMAPPED_LIST); + } + } } - return (0); + return 0; } /* @@ -1272,10 +1363,20 @@ lpfc_set_disctmo(struct lpfc_hba * phba) { uint32_t tmo; - tmo = ((phba->fc_ratov * 2) + 1); + if (phba->hba_state == LPFC_LOCAL_CFG_LINK) { + /* For FAN, timeout should be greater then edtov */ + tmo = (((phba->fc_edtov + 999) / 1000) + 1); + } else { + /* Normal discovery timeout should be > then ELS/CT timeout + * FC spec states we need 3 * ratov for CT requests + */ + tmo = ((phba->fc_ratov * 3) + 3); + } mod_timer(&phba->fc_disctmo, jiffies + HZ * tmo); + spin_lock_irq(phba->host->host_lock); phba->fc_flag |= FC_DISC_TMO; + spin_unlock_irq(phba->host->host_lock); /* Start Discovery Timer state */ lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, @@ -1295,10 +1396,13 @@ int lpfc_can_disctmo(struct lpfc_hba * phba) { /* Turn off discovery timer if its running */ - if(phba->fc_flag & FC_DISC_TMO) { + if (phba->fc_flag & FC_DISC_TMO) { + spin_lock_irq(phba->host->host_lock); + phba->fc_flag &= ~FC_DISC_TMO; + spin_unlock_irq(phba->host->host_lock); del_timer_sync(&phba->fc_disctmo); + phba->work_hba_events &= ~WORKER_DISC_TMO; } - phba->fc_flag &= ~FC_DISC_TMO; /* Cancel Discovery Timer state */ lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, @@ -1307,7 +1411,7 @@ lpfc_can_disctmo(struct lpfc_hba * phba) phba->brd_no, phba->hba_state, phba->fc_flag, phba->fc_plogi_cnt, phba->fc_adisc_cnt); - return (0); + return 0; } /* @@ -1328,27 +1432,29 @@ lpfc_check_sli_ndlp(struct lpfc_hba * phba, switch (icmd->ulpCommand) { case CMD_GEN_REQUEST64_CR: if (icmd->ulpContext == (volatile ushort)ndlp->nlp_rpi) - return (1); + return 1; case CMD_ELS_REQUEST64_CR: + if (icmd->un.elsreq64.remoteID == ndlp->nlp_DID) + return 1; case CMD_XMIT_ELS_RSP64_CX: if (iocb->context1 == (uint8_t *) ndlp) - return (1); + return 1; } - } else if (pring->ringno == psli->ip_ring) { + } else if (pring->ringno == psli->extra_ring) { } else if (pring->ringno == psli->fcp_ring) { /* Skip match check if waiting to relogin to FCP target */ - if ((ndlp->nlp_type & NLP_FCP_TARGET) && + if ((ndlp->nlp_type & NLP_FCP_TARGET) && (ndlp->nlp_flag & NLP_DELAY_TMO)) { - return (0); + return 0; } if (icmd->ulpContext == (volatile ushort)ndlp->nlp_rpi) { - return (1); + return 1; } } else if (pring->ringno == psli->next_ring) { } - return (0); + return 0; } /* @@ -1364,13 +1470,18 @@ lpfc_no_rpi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp) IOCB_t *icmd; uint32_t rpi, i; + /* + * Everything that matches on txcmplq will be returned + * by firmware with a no rpi error. + */ psli = &phba->sli; rpi = ndlp->nlp_rpi; if (rpi) { /* Now process each ring */ - for (i = 0; i < psli->sliinit.num_rings; i++) { + for (i = 0; i < psli->num_rings; i++) { pring = &psli->ring[i]; + spin_lock_irq(phba->host->host_lock); list_for_each_entry_safe(iocb, next_iocb, &pring->txq, list) { /* @@ -1389,20 +1500,22 @@ lpfc_no_rpi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp) IOSTAT_LOCAL_REJECT; icmd->un.ulpWord[4] = IOERR_SLI_ABORTED; + spin_unlock_irq(phba->host-> + host_lock); (iocb->iocb_cmpl) (phba, iocb, iocb); - } else { - mempool_free(iocb, - phba->iocb_mem_pool); - } + spin_lock_irq(phba->host-> + host_lock); + } else + lpfc_sli_release_iocbq(phba, + iocb); } } - /* Everything that matches on txcmplq will be returned - * by firmware with a no rpi error. - */ + spin_unlock_irq(phba->host->host_lock); + } } - return (0); + return 0; } /* @@ -1418,21 +1531,19 @@ int lpfc_unreg_rpi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp) { LPFC_MBOXQ_t *mbox; + int rc; if (ndlp->nlp_rpi) { - if ((mbox = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC))) { + if ((mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL))) { lpfc_unreg_login(phba, ndlp->nlp_rpi, 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); - } } - lpfc_findnode_remove_rpi(phba, ndlp->nlp_rpi); lpfc_no_rpi(phba, ndlp); ndlp->nlp_rpi = 0; - lpfc_set_failmask(phba, ndlp, LPFC_DEV_DISCONNECTED, - LPFC_SET_BITMASK); return 1; } return 0; @@ -1445,12 +1556,9 @@ lpfc_unreg_rpi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp) static int lpfc_freenode(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp) { - struct lpfc_target *targetp; - struct lpfc_sli *psli; - int scsid; - - /* The psli variable gets rid of the long pointer deference. */ - psli = &phba->sli; + LPFC_MBOXQ_t *mb; + LPFC_MBOXQ_t *nextmb; + struct lpfc_dmabuf *mp; /* Cleanup node for NPort */ lpfc_printf_log(phba, KERN_INFO, LOG_NODE, @@ -1461,43 +1569,54 @@ lpfc_freenode(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp) lpfc_nlp_list(phba, ndlp, NLP_JUST_DQ); - if(ndlp->nlp_flag & NLP_NODEV_TMO) { - del_timer_sync(&ndlp->nlp_tmofunc); + /* + * if unloading the driver - just leave the remote port in place. + * The driver unload will force the attached devices to detach + * and flush cache's w/o generating flush errors. + */ + if ((ndlp->rport) && !(phba->fc_flag & FC_UNLOADING)) { + lpfc_unregister_remote_port(phba, ndlp); + ndlp->nlp_sid = NLP_NO_SID; } - ndlp->nlp_flag &= ~NLP_NODEV_TMO; - if(ndlp->nlp_flag & NLP_DELAY_TMO) { - del_timer_sync(&ndlp->nlp_delayfunc); + /* cleanup any ndlp on mbox q waiting for reglogin cmpl */ + if ((mb = phba->sli.mbox_active)) { + if ((mb->mb.mbxCommand == MBX_REG_LOGIN64) && + (ndlp == (struct lpfc_nodelist *) mb->context2)) { + mb->context2 = NULL; + mb->mbox_cmpl = lpfc_sli_def_mbox_cmpl; + } } - ndlp->nlp_flag &= ~NLP_DELAY_TMO; - lpfc_unreg_rpi(phba, ndlp); - - for(scsid=0;scsiddevice_queue_hash[scsid]; - /* First see if the SCSI ID has an allocated struct - lpfc_target */ - if (targetp) { - if (targetp->pnode == ndlp) { - targetp->pnode = NULL; - ndlp->nlp_Target = NULL; -#ifdef FC_TRANS_VER1 - /* - * This code does not apply to SLES9 since there - * is no starget defined in the midlayer. - * Additionally, dynamic target discovery to the - * midlayer is not supported yet. - */ - if (targetp->starget) { - /* Remove SCSI target / SCSI Hotplug */ - lpfc_target_remove(phba, targetp); - } -#endif - break; + spin_lock_irq(phba->host->host_lock); + list_for_each_entry_safe(mb, nextmb, &phba->sli.mboxq, list) { + if ((mb->mb.mbxCommand == MBX_REG_LOGIN64) && + (ndlp == (struct lpfc_nodelist *) mb->context2)) { + mp = (struct lpfc_dmabuf *) (mb->context1); + if (mp) { + lpfc_mbuf_free(phba, mp->virt, mp->phys); + kfree(mp); } + list_del(&mb->list); + mempool_free(mb, phba->mbox_mem_pool); } } - return (0); + spin_unlock_irq(phba->host->host_lock); + + lpfc_els_abort(phba,ndlp,0); + spin_lock_irq(phba->host->host_lock); + ndlp->nlp_flag &= ~NLP_DELAY_TMO; + spin_unlock_irq(phba->host->host_lock); + + ndlp->nlp_last_elscmd = 0; + del_timer_sync(&ndlp->nlp_delayfunc); + + if (!list_empty(&ndlp->els_retry_evt.evt_listp)) + list_del_init(&ndlp->els_retry_evt.evt_listp); + + lpfc_unreg_rpi(phba, ndlp); + + return 0; } /* @@ -1508,24 +1627,20 @@ lpfc_freenode(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp) int lpfc_nlp_remove(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp) { - if(ndlp->nlp_flag & NLP_NODEV_TMO) { - del_timer_sync(&ndlp->nlp_tmofunc); - } - ndlp->nlp_flag &= ~NLP_NODEV_TMO; - if(ndlp->nlp_flag & NLP_DELAY_TMO) { - del_timer_sync(&ndlp->nlp_delayfunc); + if (ndlp->nlp_flag & NLP_DELAY_TMO) { + lpfc_cancel_retry_delay_tmo(phba, ndlp); } - ndlp->nlp_flag &= ~NLP_DELAY_TMO; if (ndlp->nlp_disc_refcnt) { + spin_lock_irq(phba->host->host_lock); ndlp->nlp_flag |= NLP_DELAY_REMOVE; - } - else { + spin_unlock_irq(phba->host->host_lock); + } else { lpfc_freenode(phba, ndlp); mempool_free( ndlp, phba->nlp_mem_pool); } - return(0); + return 0; } static int @@ -1536,349 +1651,100 @@ lpfc_matchdid(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, uint32_t did) D_ID matchdid; if (did == Bcast_DID) - return (0); + return 0; if (ndlp->nlp_DID == 0) { - return (0); + return 0; } /* First check for Direct match */ if (ndlp->nlp_DID == did) - return (1); + return 1; /* Next check for area/domain identically equals 0 match */ mydid.un.word = phba->fc_myDID; if ((mydid.un.b.domain == 0) && (mydid.un.b.area == 0)) { - return (0); + return 0; } matchdid.un.word = did; ndlpdid.un.word = ndlp->nlp_DID; if (matchdid.un.b.id == ndlpdid.un.b.id) { if ((mydid.un.b.domain == matchdid.un.b.domain) && - (mydid.un.b.area == matchdid.un.b.area)) { - if ((ndlpdid.un.b.domain == 0) && - (ndlpdid.un.b.area == 0)) { - if (ndlpdid.un.b.id) - return (1); - } - return (0); - } - - matchdid.un.word = ndlp->nlp_DID; - if ((mydid.un.b.domain == ndlpdid.un.b.domain) && - (mydid.un.b.area == ndlpdid.un.b.area)) { - if ((matchdid.un.b.domain == 0) && - (matchdid.un.b.area == 0)) { - if (matchdid.un.b.id) - return (1); - } - } - } - return (0); -} - -/* Search for a nodelist entry on a specific list */ -struct lpfc_nodelist * -lpfc_findnode_wwpn(struct lpfc_hba * phba, uint32_t order, - struct lpfc_name * wwpn) -{ - struct lpfc_nodelist *ndlp, *next_ndlp; - uint32_t data1; - - if (order & NLP_SEARCH_UNMAPPED) { - list_for_each_entry_safe(ndlp, next_ndlp, - &phba->fc_nlpunmap_list, nlp_listp) { - if (memcmp(&ndlp->nlp_portname, wwpn, - sizeof(struct lpfc_name)) == 0) { - - data1 = (((uint32_t) ndlp->nlp_state << 24) | - ((uint32_t) ndlp->nlp_xri << 16) | - ((uint32_t) ndlp->nlp_type << 8) | - ((uint32_t) ndlp->nlp_rpi & 0xff)); - /* FIND node DID unmapped */ - lpfc_printf_log(phba, - KERN_INFO, - LOG_NODE, - "%d:0911 FIND node DID unmapped" - " Data: x%p x%x x%x x%x\n", - phba->brd_no, - ndlp, ndlp->nlp_DID, - ndlp->nlp_flag, data1); - return (ndlp); - } - } - } - - if (order & NLP_SEARCH_MAPPED) { - list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nlpmap_list, - nlp_listp) { - if (memcmp(&ndlp->nlp_portname, wwpn, - sizeof(struct lpfc_name)) == 0) { - - data1 = (((uint32_t) ndlp->nlp_state << 24) | - ((uint32_t) ndlp->nlp_xri << 16) | - ((uint32_t) ndlp->nlp_type << 8) | - ((uint32_t) ndlp->nlp_rpi & 0xff)); - /* FIND node DID mapped */ - lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0901 FIND node DID mapped " - "Data: x%p x%x x%x x%x\n", - phba->brd_no, - ndlp, ndlp->nlp_DID, - ndlp->nlp_flag, data1); - return (ndlp); - } - } - } - - /* no match found */ - return ((struct lpfc_nodelist *) 0); -} -/* Search for a nodelist entry on a specific list */ -struct lpfc_nodelist * -lpfc_findnode_wwnn(struct lpfc_hba * phba, uint32_t order, - struct lpfc_name * wwnn) -{ - struct lpfc_nodelist *ndlp, *next_ndlp; - uint32_t data1; - - if (order & NLP_SEARCH_UNMAPPED) { - list_for_each_entry_safe(ndlp, next_ndlp, - &phba->fc_nlpunmap_list, nlp_listp) { - if (memcmp(&ndlp->nlp_nodename, wwnn, - sizeof(struct lpfc_name)) == 0) { - - data1 = (((uint32_t) ndlp->nlp_state << 24) | - ((uint32_t) ndlp->nlp_xri << 16) | - ((uint32_t) ndlp->nlp_type << 8) | - ((uint32_t) ndlp->nlp_rpi & 0xff)); - /* FIND node DID unmapped */ - lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0910 FIND node DID unmapped" - "Data: x%p x%x x%x x%x\n", - phba->brd_no, - ndlp, ndlp->nlp_DID, - ndlp->nlp_flag, data1); - return (ndlp); - } - } - } - - if (order & NLP_SEARCH_MAPPED) { - list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nlpmap_list, - nlp_listp) { - if (memcmp(&ndlp->nlp_nodename, wwnn, - sizeof(struct lpfc_name)) == 0) { - - data1 = (((uint32_t) ndlp->nlp_state << 24) | - ((uint32_t) ndlp->nlp_xri << 16) | - ((uint32_t) ndlp->nlp_type << 8) | - ((uint32_t) ndlp->nlp_rpi & 0xff)); - /* FIND node did mapped */ - lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0902 FIND node DID mapped " - "Data: x%p x%x x%x x%x\n", - phba->brd_no, - ndlp, ndlp->nlp_DID, - ndlp->nlp_flag, data1); - return (ndlp); - } - } - } - - /* no match found */ - return ((struct lpfc_nodelist *) 0); -} -/* Search for a nodelist entry on a specific list */ -struct lpfc_nodelist * -lpfc_findnode_did(struct lpfc_hba * phba, uint32_t order, uint32_t did) -{ - struct lpfc_nodelist *ndlp, *next_ndlp; - uint32_t data1; - - if (order & NLP_SEARCH_UNMAPPED) { - list_for_each_entry_safe(ndlp, next_ndlp, - &phba->fc_nlpunmap_list, nlp_listp) { - if (lpfc_matchdid(phba, ndlp, did)) { - data1 = (((uint32_t) ndlp->nlp_state << 24) | - ((uint32_t) ndlp->nlp_xri << 16) | - ((uint32_t) ndlp->nlp_type << 8) | - ((uint32_t) ndlp->nlp_rpi & 0xff)); - /* FIND node DID unmapped */ - lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0929 FIND node DID unmapped" - " Data: x%p x%x x%x x%x\n", - phba->brd_no, - ndlp, ndlp->nlp_DID, - ndlp->nlp_flag, data1); - return (ndlp); - } - } - } - - if (order & NLP_SEARCH_MAPPED) { - list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nlpmap_list, - nlp_listp) { - if (lpfc_matchdid(phba, ndlp, did)) { - - data1 = (((uint32_t) ndlp->nlp_state << 24) | - ((uint32_t) ndlp->nlp_xri << 16) | - ((uint32_t) ndlp->nlp_type << 8) | - ((uint32_t) ndlp->nlp_rpi & 0xff)); - /* FIND node DID mapped */ - lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0930 FIND node DID mapped " - "Data: x%p x%x x%x x%x\n", - phba->brd_no, - ndlp, ndlp->nlp_DID, - ndlp->nlp_flag, data1); - return (ndlp); - } - } - } - - if (order & NLP_SEARCH_PLOGI) { - list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_plogi_list, - nlp_listp) { - if (lpfc_matchdid(phba, ndlp, did)) { - - data1 = (((uint32_t) ndlp->nlp_state << 24) | - ((uint32_t) ndlp->nlp_xri << 16) | - ((uint32_t) ndlp->nlp_type << 8) | - ((uint32_t) ndlp->nlp_rpi & 0xff)); - /* LOG change to PLOGI */ - /* FIND node DID plogi */ - lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0908 FIND node DID plogi " - "Data: x%p x%x x%x x%x\n", - phba->brd_no, - ndlp, ndlp->nlp_DID, - ndlp->nlp_flag, data1); - return (ndlp); - } - } - } - - if (order & NLP_SEARCH_ADISC) { - list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_adisc_list, - nlp_listp) { - if (lpfc_matchdid(phba, ndlp, did)) { - - data1 = (((uint32_t) ndlp->nlp_state << 24) | - ((uint32_t) ndlp->nlp_xri << 16) | - ((uint32_t) ndlp->nlp_type << 8) | - ((uint32_t) ndlp->nlp_rpi & 0xff)); - /* LOG change to ADISC */ - /* FIND node DID adisc */ - lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0931 FIND node DID adisc " - "Data: x%p x%x x%x x%x\n", - phba->brd_no, - ndlp, ndlp->nlp_DID, - ndlp->nlp_flag, data1); - return (ndlp); - } - } - } - - if (order & NLP_SEARCH_REGLOGIN) { - list_for_each_entry_safe(ndlp, next_ndlp, - &phba->fc_reglogin_list, nlp_listp) { - if (lpfc_matchdid(phba, ndlp, did)) { - - data1 = (((uint32_t) ndlp->nlp_state << 24) | - ((uint32_t) ndlp->nlp_xri << 16) | - ((uint32_t) ndlp->nlp_type << 8) | - ((uint32_t) ndlp->nlp_rpi & 0xff)); - /* LOG change to REGLOGIN */ - /* FIND node DID reglogin */ - lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0931 FIND node DID reglogin" - " Data: x%p x%x x%x x%x\n", - phba->brd_no, - ndlp, ndlp->nlp_DID, - ndlp->nlp_flag, data1); - return (ndlp); - } - } - } - - if (order & NLP_SEARCH_PRLI) { - list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_prli_list, - nlp_listp) { - if (lpfc_matchdid(phba, ndlp, did)) { - - data1 = (((uint32_t) ndlp->nlp_state << 24) | - ((uint32_t) ndlp->nlp_xri << 16) | - ((uint32_t) ndlp->nlp_type << 8) | - ((uint32_t) ndlp->nlp_rpi & 0xff)); - /* LOG change to PRLI */ - /* FIND node DID prli */ - lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0931 FIND node DID prli " - "Data: x%p x%x x%x x%x\n", - phba->brd_no, - ndlp, ndlp->nlp_DID, - ndlp->nlp_flag, data1); - return (ndlp); - } - } - } - - if (order & NLP_SEARCH_NPR) { - list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list, - nlp_listp) { - if (lpfc_matchdid(phba, ndlp, did)) { - - data1 = (((uint32_t) ndlp->nlp_state << 24) | - ((uint32_t) ndlp->nlp_xri << 16) | - ((uint32_t) ndlp->nlp_type << 8) | - ((uint32_t) ndlp->nlp_rpi & 0xff)); - /* LOG change to NPR */ - /* FIND node DID npr */ - lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0931 FIND node DID npr " - "Data: x%p x%x x%x x%x\n", - phba->brd_no, - ndlp, ndlp->nlp_DID, - ndlp->nlp_flag, data1); - return (ndlp); + (mydid.un.b.area == matchdid.un.b.area)) { + if ((ndlpdid.un.b.domain == 0) && + (ndlpdid.un.b.area == 0)) { + if (ndlpdid.un.b.id) + return 1; + } + return 0; + } + + matchdid.un.word = ndlp->nlp_DID; + if ((mydid.un.b.domain == ndlpdid.un.b.domain) && + (mydid.un.b.area == ndlpdid.un.b.area)) { + if ((matchdid.un.b.domain == 0) && + (matchdid.un.b.area == 0)) { + if (matchdid.un.b.id) + return 1; } } } + return 0; +} - if (order & NLP_SEARCH_UNUSED) { - list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_adisc_list, - nlp_listp) { - if (lpfc_matchdid(phba, ndlp, did)) { +/* Search for a nodelist entry on a specific list */ +struct lpfc_nodelist * +lpfc_findnode_did(struct lpfc_hba * phba, uint32_t order, uint32_t did) +{ + struct lpfc_nodelist *ndlp; + struct list_head *lists[]={&phba->fc_nlpunmap_list, + &phba->fc_nlpmap_list, + &phba->fc_plogi_list, + &phba->fc_adisc_list, + &phba->fc_reglogin_list, + &phba->fc_prli_list, + &phba->fc_npr_list, + &phba->fc_unused_list}; + uint32_t search[]={NLP_SEARCH_UNMAPPED, + NLP_SEARCH_MAPPED, + NLP_SEARCH_PLOGI, + NLP_SEARCH_ADISC, + NLP_SEARCH_REGLOGIN, + NLP_SEARCH_PRLI, + NLP_SEARCH_NPR, + NLP_SEARCH_UNUSED}; + int i; + uint32_t data1; + spin_lock_irq(phba->host->host_lock); + for (i = 0; i < ARRAY_SIZE(lists); i++ ) { + if (!(order & search[i])) + continue; + list_for_each_entry(ndlp, lists[i], nlp_listp) { + if (lpfc_matchdid(phba, ndlp, did)) { data1 = (((uint32_t) ndlp->nlp_state << 24) | ((uint32_t) ndlp->nlp_xri << 16) | ((uint32_t) ndlp->nlp_type << 8) | ((uint32_t) ndlp->nlp_rpi & 0xff)); - /* LOG change to UNUSED */ - /* FIND node DID unused */ lpfc_printf_log(phba, KERN_INFO, LOG_NODE, - "%d:0931 FIND node DID unused " - "Data: x%p x%x x%x x%x\n", + "%d:0929 FIND node DID " + " Data: x%p x%x x%x x%x\n", phba->brd_no, ndlp, ndlp->nlp_DID, ndlp->nlp_flag, data1); - return (ndlp); + spin_unlock_irq(phba->host->host_lock); + return ndlp; } } } + spin_unlock_irq(phba->host->host_lock); /* FIND node did NOT FOUND */ - lpfc_printf_log(phba, - KERN_INFO, - LOG_NODE, + lpfc_printf_log(phba, KERN_INFO, LOG_NODE, "%d:0932 FIND node did x%x NOT FOUND Data: x%x\n", phba->brd_no, did, order); - - /* no match found */ - return ((struct lpfc_nodelist *) 0); + return NULL; } struct lpfc_nodelist * @@ -1887,12 +1753,13 @@ lpfc_setup_disc_node(struct lpfc_hba * phba, uint32_t did) struct lpfc_nodelist *ndlp; uint32_t flg; - if((ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, did)) == 0) { - if ((phba->hba_state == LPFC_HBA_READY) && + ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, did); + if (!ndlp) { + if ((phba->fc_flag & FC_RSCN_MODE) && ((lpfc_rscn_payload_check(phba, did) == 0))) return NULL; ndlp = (struct lpfc_nodelist *) - mempool_alloc(phba->nlp_mem_pool, GFP_ATOMIC); + mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL); if (!ndlp) return NULL; lpfc_nlp_init(phba, ndlp, did); @@ -1901,22 +1768,21 @@ lpfc_setup_disc_node(struct lpfc_hba * phba, uint32_t did) ndlp->nlp_flag |= NLP_NPR_2B_DISC; return ndlp; } - if ((phba->hba_state == LPFC_HBA_READY) && - (phba->fc_flag & FC_RSCN_MODE)) { - if(lpfc_rscn_payload_check(phba, did)) { + if (phba->fc_flag & FC_RSCN_MODE) { + if (lpfc_rscn_payload_check(phba, did)) { ndlp->nlp_flag |= NLP_NPR_2B_DISC; - } - else { - ndlp->nlp_flag &= ~NLP_NPR_2B_DISC; + + /* Since this node is marked for discovery, + * delay timeout is not needed. + */ + if (ndlp->nlp_flag & NLP_DELAY_TMO) + lpfc_cancel_retry_delay_tmo(phba, ndlp); + } else ndlp = NULL; - } - } - else { + } else { flg = ndlp->nlp_flag & NLP_LIST_MASK; - if ((flg == NLP_ADISC_LIST) || - (flg == NLP_PLOGI_LIST)) { + if ((flg == NLP_ADISC_LIST) || (flg == NLP_PLOGI_LIST)) return NULL; - } ndlp->nlp_state = NLP_STE_NPR_NODE; lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST); ndlp->nlp_flag |= NLP_NPR_2B_DISC; @@ -1978,6 +1844,7 @@ lpfc_disc_start(struct lpfc_hba * phba) struct lpfc_nodelist *ndlp, *next_ndlp; uint32_t did_changed, num_sent; uint32_t clear_la_pending; + int rc; psli = &phba->sli; @@ -2012,35 +1879,38 @@ lpfc_disc_start(struct lpfc_hba * phba) /* If our did changed, we MUST do PLOGI */ list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list, nlp_listp) { - if(ndlp->nlp_flag & NLP_NPR_2B_DISC) { - if(did_changed) + if (ndlp->nlp_flag & NLP_NPR_2B_DISC) { + if (did_changed) { + spin_lock_irq(phba->host->host_lock); ndlp->nlp_flag &= ~NLP_NPR_ADISC; + spin_unlock_irq(phba->host->host_lock); + } } } /* First do ADISCs - if any */ num_sent = lpfc_els_disc_adisc(phba); - if(num_sent) + if (num_sent) return; if ((phba->hba_state < LPFC_HBA_READY) && (!clear_la_pending)) { /* If we get here, there is nothing to ADISC */ - if ((mbox = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC))) { + if ((mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL))) { phba->hba_state = LPFC_CLEAR_LA; lpfc_clear_la(phba, mbox); mbox->mbox_cmpl = lpfc_mbx_cmpl_clear_la; - if (lpfc_sli_issue_mbox - (phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB)) - == MBX_NOT_FINISHED) { + rc = lpfc_sli_issue_mbox(phba, mbox, + (MBX_NOWAIT | MBX_STOP_IOCB)); + if (rc == MBX_NOT_FINISHED) { mempool_free( mbox, phba->mbox_mem_pool); lpfc_disc_flush_list(phba); - psli->ring[(psli->ip_ring)].flag &= - ~LPFC_STOP_IOCB_EVENT; + psli->ring[(psli->extra_ring)].flag &= + ~LPFC_STOP_IOCB_EVENT; psli->ring[(psli->fcp_ring)].flag &= - ~LPFC_STOP_IOCB_EVENT; + ~LPFC_STOP_IOCB_EVENT; psli->ring[(psli->next_ring)].flag &= - ~LPFC_STOP_IOCB_EVENT; + ~LPFC_STOP_IOCB_EVENT; phba->hba_state = LPFC_HBA_READY; } } @@ -2048,7 +1918,7 @@ lpfc_disc_start(struct lpfc_hba * phba) /* Next do PLOGIs - if any */ num_sent = lpfc_els_disc_plogi(phba); - if(num_sent) + if (num_sent) return; if (phba->fc_flag & FC_RSCN_MODE) { @@ -2057,10 +1927,11 @@ lpfc_disc_start(struct lpfc_hba * phba) */ if ((phba->fc_rscn_id_cnt == 0) && (!(phba->fc_flag & FC_RSCN_DISCOVERY))) { - lpfc_els_flush_rscn(phba); - } else { + spin_lock_irq(phba->host->host_lock); + phba->fc_flag &= ~FC_RSCN_MODE; + spin_unlock_irq(phba->host->host_lock); + } else lpfc_els_handle_rscn(phba); - } } } return; @@ -2115,9 +1986,10 @@ lpfc_free_tx(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp) /* Free the response IOCB before handling the command. */ - mp = (struct lpfc_dmabuf *) - (((struct lpfc_dmabuf *) (iocb->context2)) - ->list.next); + mp = (struct lpfc_dmabuf *) (iocb->context2); + mp = list_get_first(&mp->list, + struct lpfc_dmabuf, + list); if (mp) { /* Delay before releasing rsp buffer to * give UNREG mbox a chance to take @@ -2156,8 +2028,6 @@ lpfc_disc_flush_list(struct lpfc_hba * phba) if (phba->fc_plogi_cnt) { list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_plogi_list, nlp_listp) { - lpfc_set_failmask(phba, ndlp, LPFC_DEV_DISCONNECTED, - LPFC_SET_BITMASK); lpfc_free_tx(phba, ndlp); lpfc_nlp_remove(phba, ndlp); } @@ -2165,8 +2035,6 @@ lpfc_disc_flush_list(struct lpfc_hba * phba) if (phba->fc_adisc_cnt) { list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_adisc_list, nlp_listp) { - lpfc_set_failmask(phba, ndlp, LPFC_DEV_DISCONNECTED, - LPFC_SET_BITMASK); lpfc_free_tx(phba, ndlp); lpfc_nlp_remove(phba, ndlp); } @@ -2192,23 +2060,46 @@ lpfc_disc_flush_list(struct lpfc_hba * phba) void lpfc_disc_timeout(unsigned long ptr) { - struct lpfc_hba *phba; - struct lpfc_sli *psli; - struct lpfc_nodelist *ndlp; - LPFC_MBOXQ_t *mbox; - unsigned long iflag; + struct lpfc_hba *phba = (struct lpfc_hba *)ptr; + unsigned long flags = 0; - phba = (struct lpfc_hba *)ptr; - if (!phba) { + if (unlikely(!phba)) return; + + spin_lock_irqsave(phba->host->host_lock, flags); + if (!(phba->work_hba_events & WORKER_DISC_TMO)) { + phba->work_hba_events |= WORKER_DISC_TMO; + if (phba->work_wait) + wake_up(phba->work_wait); } - spin_lock_irqsave(phba->host->host_lock, iflag); + spin_unlock_irqrestore(phba->host->host_lock, flags); + return; +} + +static void +lpfc_disc_timeout_handler(struct lpfc_hba *phba) +{ + struct lpfc_sli *psli; + struct lpfc_nodelist *ndlp, *next_ndlp; + LPFC_MBOXQ_t *clearlambox, *initlinkmbox; + int rc, clrlaerr = 0; + + if (unlikely(!phba)) + return; + + if (!(phba->fc_flag & FC_DISC_TMO)) + return; psli = &phba->sli; + + spin_lock_irq(phba->host->host_lock); phba->fc_flag &= ~FC_DISC_TMO; + spin_unlock_irq(phba->host->host_lock); + + switch (phba->hba_state) { + case LPFC_LOCAL_CFG_LINK: /* hba_state is identically LPFC_LOCAL_CFG_LINK while waiting for FAN */ - if (phba->hba_state == LPFC_LOCAL_CFG_LINK) { /* FAN timeout */ lpfc_printf_log(phba, KERN_WARNING, @@ -2216,18 +2107,26 @@ lpfc_disc_timeout(unsigned long ptr) "%d:0221 FAN timeout\n", phba->brd_no); - /* Forget about FAN, Start discovery by sending a FLOGI - * hba_state is identically LPFC_FLOGI while waiting for FLOGI - * cmpl - */ + /* Start discovery by sending FLOGI, clean up old rpis */ + list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list, + nlp_listp) { + if (ndlp->nlp_type & NLP_FABRIC) { + /* Clean up the ndlp on Fabric connections */ + lpfc_nlp_list(phba, ndlp, NLP_NO_LIST); + } else if (!(ndlp->nlp_flag & NLP_NPR_ADISC)) { + /* Fail outstanding IO now since device + * is marked for PLOGI. + */ + lpfc_unreg_rpi(phba, ndlp); + } + } phba->hba_state = LPFC_FLOGI; lpfc_set_disctmo(phba); lpfc_initial_flogi(phba); - goto out; - } + break; + case LPFC_FLOGI: /* hba_state is identically LPFC_FLOGI while waiting for FLOGI cmpl */ - if (phba->hba_state == LPFC_FLOGI) { /* Initial FLOGI timeout */ lpfc_printf_log(phba, KERN_ERR, @@ -2244,315 +2143,153 @@ lpfc_disc_timeout(unsigned long ptr) /* Start discovery */ lpfc_disc_start(phba); - goto out; - } + break; + case LPFC_FABRIC_CFG_LINK: /* hba_state is identically LPFC_FABRIC_CFG_LINK while waiting for NameServer login */ - if (phba->hba_state == LPFC_FABRIC_CFG_LINK) { - /* Timeout while waiting for NameServer login */ lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, "%d:0223 Timeout while waiting for NameServer " "login\n", phba->brd_no); /* Next look for NameServer ndlp */ - if ((ndlp = lpfc_findnode_did(phba, - NLP_SEARCH_ALL, NameServer_DID))) { + ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, NameServer_DID); + if (ndlp) lpfc_nlp_remove(phba, ndlp); - } /* Start discovery */ lpfc_disc_start(phba); - goto out; - } + break; + case LPFC_NS_QRY: /* Check for wait for NameServer Rsp timeout */ - if (phba->hba_state == LPFC_NS_QRY) { - /* NameServer Query timeout */ lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, "%d:0224 NameServer Query timeout " "Data: x%x x%x\n", phba->brd_no, phba->fc_ns_retry, LPFC_MAX_NS_RETRY); - if ((ndlp = - lpfc_findnode_did(phba, NLP_SEARCH_UNMAPPED, - NameServer_DID))) { + ndlp = lpfc_findnode_did(phba, NLP_SEARCH_UNMAPPED, + NameServer_DID); + if (ndlp) { if (phba->fc_ns_retry < LPFC_MAX_NS_RETRY) { /* Try it one more time */ - if (lpfc_ns_cmd(phba, ndlp, SLI_CTNS_GID_FT) == - 0) { - goto out; - } + rc = lpfc_ns_cmd(phba, ndlp, SLI_CTNS_GID_FT); + if (rc == 0) + break; } phba->fc_ns_retry = 0; } /* Nothing to authenticate, so CLEAR_LA right now */ - if (phba->hba_state != LPFC_CLEAR_LA) { - if ((mbox = mempool_alloc(phba->mbox_mem_pool, - GFP_ATOMIC))) { - phba->hba_state = LPFC_CLEAR_LA; - lpfc_clear_la(phba, mbox); - mbox->mbox_cmpl = lpfc_mbx_cmpl_clear_la; - if (lpfc_sli_issue_mbox - (phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB)) - == MBX_NOT_FINISHED) { - mempool_free(mbox, phba->mbox_mem_pool); - goto clrlaerr; - } - } else { - /* Device Discovery completion error */ - lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, - "%d:0226 Device Discovery " - "completion error\n", - phba->brd_no); - phba->hba_state = LPFC_HBA_ERROR; - } + clearlambox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL); + if (!clearlambox) { + clrlaerr = 1; + lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, + "%d:0226 Device Discovery " + "completion error\n", + phba->brd_no); + phba->hba_state = LPFC_HBA_ERROR; + break; } - if ((mbox = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC))) { - /* Setup and issue mailbox INITIALIZE LINK command */ - lpfc_linkdown(phba); - lpfc_init_link(phba, mbox, - phba->cfg_topology, - phba->cfg_link_speed); - mbox->mb.un.varInitLnk.lipsr_AL_PA = 0; - if (lpfc_sli_issue_mbox - (phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB)) - == MBX_NOT_FINISHED) { - mempool_free( mbox, phba->mbox_mem_pool); - } + + phba->hba_state = LPFC_CLEAR_LA; + lpfc_clear_la(phba, clearlambox); + clearlambox->mbox_cmpl = lpfc_mbx_cmpl_clear_la; + rc = lpfc_sli_issue_mbox(phba, clearlambox, + (MBX_NOWAIT | MBX_STOP_IOCB)); + if (rc == MBX_NOT_FINISHED) { + mempool_free(clearlambox, phba->mbox_mem_pool); + clrlaerr = 1; + break; } - goto out; - } - if (phba->hba_state == LPFC_DISC_AUTH) { - /* Node Authentication timeout */ + /* Setup and issue mailbox INITIALIZE LINK command */ + initlinkmbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL); + if (!initlinkmbox) { + lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, + "%d:0206 Device Discovery " + "completion error\n", + phba->brd_no); + phba->hba_state = LPFC_HBA_ERROR; + break; + } + + lpfc_linkdown(phba); + lpfc_init_link(phba, initlinkmbox, phba->cfg_topology, + phba->cfg_link_speed); + initlinkmbox->mb.un.varInitLnk.lipsr_AL_PA = 0; + rc = lpfc_sli_issue_mbox(phba, initlinkmbox, + (MBX_NOWAIT | MBX_STOP_IOCB)); + if (rc == MBX_NOT_FINISHED) + mempool_free(initlinkmbox, phba->mbox_mem_pool); + + break; + + case LPFC_DISC_AUTH: + /* Node Authentication timeout */ lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, "%d:0227 Node Authentication timeout\n", phba->brd_no); lpfc_disc_flush_list(phba); - if (phba->hba_state != LPFC_CLEAR_LA) { - if ((mbox = mempool_alloc(phba->mbox_mem_pool, - GFP_ATOMIC))) { - phba->hba_state = LPFC_CLEAR_LA; - lpfc_clear_la(phba, mbox); - mbox->mbox_cmpl = lpfc_mbx_cmpl_clear_la; - if (lpfc_sli_issue_mbox - (phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB)) - == MBX_NOT_FINISHED) { - mempool_free(mbox, phba->mbox_mem_pool); - goto clrlaerr; - } - } + clearlambox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL); + if (!clearlambox) { + clrlaerr = 1; + lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, + "%d:0207 Device Discovery " + "completion error\n", + phba->brd_no); + phba->hba_state = LPFC_HBA_ERROR; + break; } - goto out; - } + phba->hba_state = LPFC_CLEAR_LA; + lpfc_clear_la(phba, clearlambox); + clearlambox->mbox_cmpl = lpfc_mbx_cmpl_clear_la; + rc = lpfc_sli_issue_mbox(phba, clearlambox, + (MBX_NOWAIT | MBX_STOP_IOCB)); + if (rc == MBX_NOT_FINISHED) { + mempool_free(clearlambox, phba->mbox_mem_pool); + clrlaerr = 1; + } + break; - if (phba->hba_state == LPFC_CLEAR_LA) { - /* CLEAR LA timeout */ + case LPFC_CLEAR_LA: + /* CLEAR LA timeout */ lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY, "%d:0228 CLEAR LA timeout\n", phba->brd_no); -clrlaerr: - lpfc_disc_flush_list(phba); - psli->ring[(psli->ip_ring)].flag &= ~LPFC_STOP_IOCB_EVENT; - psli->ring[(psli->fcp_ring)].flag &= ~LPFC_STOP_IOCB_EVENT; - psli->ring[(psli->next_ring)].flag &= ~LPFC_STOP_IOCB_EVENT; - phba->hba_state = LPFC_HBA_READY; - goto out; - } - - if ((phba->hba_state == LPFC_HBA_READY) && - (phba->fc_flag & FC_RSCN_MODE)) { - /* RSCN timeout */ - lpfc_printf_log(phba, - KERN_ERR, - LOG_DISCOVERY, - "%d:0231 RSCN timeout Data: x%x x%x\n", - phba->brd_no, - phba->fc_ns_retry, LPFC_MAX_NS_RETRY); - - /* Cleanup any outstanding ELS commands */ - lpfc_els_flush_cmd(phba); - - lpfc_els_flush_rscn(phba); - lpfc_disc_flush_list(phba); - goto out; - } - -out: - spin_unlock_irqrestore(phba->host->host_lock, iflag); - return; -} - -/*****************************************************************************/ -/* - * NAME: lpfc_scan_timeout - * - * FUNCTION: Fibre Channel driver scsi_scan_host timeout routine. - * - * EXECUTION ENVIRONMENT: interrupt only - * - * CALLED FROM: - * Timer function - * - * RETURNS: - * none - */ -/*****************************************************************************/ -void -lpfc_scan_timeout(unsigned long ptr) -{ - struct lpfc_hba *phba; - unsigned long iflag; - - phba = (struct lpfc_hba *)ptr; - if (!phba) { - return; - } - spin_lock_irqsave(phba->host->host_lock, iflag); - phba->fc_flag &= ~FC_SCSI_SCAN_TMO; - lpfc_discq_post_event(phba, NULL, NULL, LPFC_EVT_SCAN); - spin_unlock_irqrestore(phba->host->host_lock, iflag); - return; -} - -static void -lpfc_nodev_timeout(unsigned long ptr) -{ - struct lpfc_hba *phba; - struct lpfc_nodelist *ndlp; - unsigned long iflag; - - ndlp = (struct lpfc_nodelist *)ptr; - phba = ndlp->nlp_phba; - spin_lock_irqsave(phba->host->host_lock, iflag); - - /* All nodev timeouts are posted to discovery tasklet */ - lpfc_discq_post_event(phba, ndlp, NULL, LPFC_EVT_NODEV_TMO); + clrlaerr = 1; + break; - spin_unlock_irqrestore(phba->host->host_lock, iflag); - return; -} + case LPFC_HBA_READY: + if (phba->fc_flag & FC_RSCN_MODE) { + lpfc_printf_log(phba, + KERN_ERR, + LOG_DISCOVERY, + "%d:0231 RSCN timeout Data: x%x x%x\n", + phba->brd_no, + phba->fc_ns_retry, LPFC_MAX_NS_RETRY); -/*****************************************************************************/ -/* - * NAME: lpfc_find_target - * - * FUNCTION: Fibre Channel bus/target/LUN to struct lpfc_target lookup - * - * EXECUTION ENVIRONMENT: - * - * RETURNS: - * ptr to desired struct lpfc_target - */ -/*****************************************************************************/ -struct lpfc_target * -lpfc_find_target(struct lpfc_hba * phba, uint32_t tgt, - struct lpfc_nodelist *nlp) -{ - struct lpfc_target *targetp; + /* Cleanup any outstanding ELS commands */ + lpfc_els_flush_cmd(phba); - /* search the mapped list for this target ID */ - if(!nlp) { - list_for_each_entry(nlp, &phba->fc_nlpmap_list, nlp_listp) { - if (tgt == nlp->nlp_sid) - break; + lpfc_els_flush_rscn(phba); + lpfc_disc_flush_list(phba); } - - if (&(nlp->nlp_listp) == &(phba->fc_nlpmap_list)) - return NULL; - } - - targetp = phba->device_queue_hash[tgt]; - - /* First see if the SCSI ID has an allocated struct lpfc_target */ - if (!targetp) { - targetp = kmalloc(sizeof (struct lpfc_target), GFP_ATOMIC); - if (!targetp) - return NULL; - - memset(targetp, 0, sizeof (struct lpfc_target)); - phba->device_queue_hash[tgt] = targetp; - targetp->scsi_id = tgt; - - /* Create SCSI Target */ - lpfc_printf_log(phba, - KERN_INFO, - LOG_DISCOVERY | LOG_FCP, - "%d:0204 Create SCSI Target %d\n", - phba->brd_no, tgt); + break; } - if (targetp->pnode == NULL) { - targetp->pnode = nlp; - nlp->nlp_Target = targetp; -#ifdef FC_TRANS_VER1 - /* - * This code does not apply to SLES9 since there is no - * starget defined in the midlayer. Additionally, - * dynamic target discovery to the midlayer is not - * supported yet. - */ - if(!(phba->fc_flag & FC_LOADING)) { - /* Add SCSI target / SCSI Hotplug if called - * after initial driver load. - */ - lpfc_target_add(phba, targetp); - } -#endif - } - else { - if(targetp->pnode != nlp) { - /* - * Get rid of the old nlp before updating - * targetp with the new one. - */ - lpfc_nlp_list(phba, targetp->pnode, NLP_NO_LIST); - targetp->pnode = nlp; - } + if (clrlaerr) { + lpfc_disc_flush_list(phba); + psli->ring[(psli->extra_ring)].flag &= ~LPFC_STOP_IOCB_EVENT; + psli->ring[(psli->fcp_ring)].flag &= ~LPFC_STOP_IOCB_EVENT; + psli->ring[(psli->next_ring)].flag &= ~LPFC_STOP_IOCB_EVENT; + phba->hba_state = LPFC_HBA_READY; } - nlp->nlp_Target = targetp; - return (targetp); -} - -/* - * lpfc_set_failmask - * Set, or clear, failMask bits in struct lpfc_nodelist - */ -void -lpfc_set_failmask(struct lpfc_hba * phba, - struct lpfc_nodelist * ndlp, uint32_t bitmask, uint32_t flag) -{ - uint32_t oldmask; - uint32_t changed; - - /* Failmask change on NPort */ - lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY, - "%d:0208 Failmask change on NPort x%x " - "Data: x%x x%x x%x\n", - phba->brd_no, - ndlp->nlp_DID, ndlp->nlp_failMask, bitmask, flag); - - if (flag == LPFC_SET_BITMASK) { - oldmask = ndlp->nlp_failMask; - /* Set failMask event */ - ndlp->nlp_failMask |= bitmask; - if (oldmask != ndlp->nlp_failMask) { - changed = 1; - } else { - changed = 0; - } - } else { - /* Clear failMask event */ - ndlp->nlp_failMask &= ~bitmask; - changed = 1; - } return; } @@ -2576,19 +2313,9 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) ndlp = (struct lpfc_nodelist *) pmb->context2; mp = (struct lpfc_dmabuf *) (pmb->context1); - /* The mailbox was populated by the HBA. Flush it to main store for the - * driver. Note that all context buffers are from the driver's - * dma pool and have length LPFC_BPL_SIZE. - */ - pci_dma_sync_single_for_cpu(phba->pcidev, mp->phys, LPFC_BPL_SIZE, - PCI_DMA_FROMDEVICE); - pmb->context1 = NULL; - 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); ndlp->nlp_type |= NLP_FABRIC; ndlp->nlp_state = NLP_STE_UNMAPPED_NODE; lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST); @@ -2614,75 +2341,74 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb) } /* - * This routine looks up the ndlp hash - * table for the given RPI. If rpi found + * This routine looks up the ndlp lists + * for the given RPI. If rpi found * it return the node list pointer - * else return 0. + * else return NULL. */ struct lpfc_nodelist * lpfc_findnode_rpi(struct lpfc_hba * phba, uint16_t rpi) { - struct lpfc_nodelist *ret; + struct lpfc_nodelist *ndlp; + struct list_head * lists[]={&phba->fc_nlpunmap_list, + &phba->fc_nlpmap_list, + &phba->fc_plogi_list, + &phba->fc_adisc_list, + &phba->fc_reglogin_list}; + int i; - ret = phba->fc_nlplookup[LPFC_RPI_HASH_FUNC(rpi)]; - while ((ret != 0) && (ret->nlp_rpi != rpi)) { - ret = ret->nlp_rpi_hash_next; - } - return ret; + spin_lock_irq(phba->host->host_lock); + for (i = 0; i < ARRAY_SIZE(lists); i++ ) + list_for_each_entry(ndlp, lists[i], nlp_listp) + if (ndlp->nlp_rpi == rpi) { + spin_unlock_irq(phba->host->host_lock); + return ndlp; + } + spin_unlock_irq(phba->host->host_lock); + return NULL; } /* - * This routine looks up the ndlp hash table for the - * given RPI. If rpi found it return the node list - * pointer else return 0 after deleting the entry - * from hash table. + * This routine looks up the ndlp lists + * for the given WWPN. If WWPN found + * it return the node list pointer + * else return NULL. */ struct lpfc_nodelist * -lpfc_findnode_remove_rpi(struct lpfc_hba * phba, uint16_t rpi) +lpfc_findnode_wwpn(struct lpfc_hba * phba, uint32_t order, + struct lpfc_name * wwpn) { - struct lpfc_nodelist *ret, *temp;; - - ret = phba->fc_nlplookup[LPFC_RPI_HASH_FUNC(rpi)]; - if (ret == 0) - return NULL; - - if (ret->nlp_rpi == rpi) { - phba->fc_nlplookup[LPFC_RPI_HASH_FUNC(rpi)] = - ret->nlp_rpi_hash_next; - ret->nlp_rpi_hash_next = NULL; - return ret; - } - - while ((ret->nlp_rpi_hash_next != 0) && - (ret->nlp_rpi_hash_next->nlp_rpi != rpi)) { - ret = ret->nlp_rpi_hash_next; - } + struct lpfc_nodelist *ndlp; + struct list_head * lists[]={&phba->fc_nlpunmap_list, + &phba->fc_nlpmap_list, + &phba->fc_npr_list, + &phba->fc_plogi_list, + &phba->fc_adisc_list, + &phba->fc_reglogin_list, + &phba->fc_prli_list}; + uint32_t search[]={NLP_SEARCH_UNMAPPED, + NLP_SEARCH_MAPPED, + NLP_SEARCH_NPR, + NLP_SEARCH_PLOGI, + NLP_SEARCH_ADISC, + NLP_SEARCH_REGLOGIN, + NLP_SEARCH_PRLI}; + int i; - if (ret->nlp_rpi_hash_next != 0) { - temp = ret->nlp_rpi_hash_next; - ret->nlp_rpi_hash_next = temp->nlp_rpi_hash_next; - temp->nlp_rpi_hash_next = NULL; - return temp; - } else { - return NULL; + spin_lock_irq(phba->host->host_lock); + for (i = 0; i < ARRAY_SIZE(lists); i++ ) { + if (!(order & search[i])) + continue; + list_for_each_entry(ndlp, lists[i], nlp_listp) { + if (memcmp(&ndlp->nlp_portname, wwpn, + sizeof(struct lpfc_name)) == 0) { + spin_unlock_irq(phba->host->host_lock); + return ndlp; + } + } } -} - -/* - * This routine adds the node list entry to the - * ndlp hash table. - */ -void -lpfc_addnode_rpi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, - uint16_t rpi) -{ - - uint32_t index; - - index = LPFC_RPI_HASH_FUNC(rpi); - ndlp->nlp_rpi_hash_next = phba->fc_nlplookup[index]; - phba->fc_nlplookup[index] = ndlp; - return; + spin_unlock_irq(phba->host->host_lock); + return NULL; } void @@ -2690,14 +2416,12 @@ lpfc_nlp_init(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp, uint32_t did) { memset(ndlp, 0, sizeof (struct lpfc_nodelist)); - init_timer(&ndlp->nlp_tmofunc); - ndlp->nlp_tmofunc.function = lpfc_nodev_timeout; - ndlp->nlp_tmofunc.data = (unsigned long)ndlp; + INIT_LIST_HEAD(&ndlp->els_retry_evt.evt_listp); init_timer(&ndlp->nlp_delayfunc); ndlp->nlp_delayfunc.function = lpfc_els_retry_delay; ndlp->nlp_delayfunc.data = (unsigned long)ndlp; ndlp->nlp_DID = did; ndlp->nlp_phba = phba; + ndlp->nlp_sid = NLP_NO_SID; return; } -