]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - drivers/scsi/lpfc/lpfc_hbadisc.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[mv-sheeva.git] / drivers / scsi / lpfc / lpfc_hbadisc.c
index 2359d0bfb734f0cd352ca8c68560a07757a8c47c..e1466eec56b703ce1d8fda03d85d29b2be1d31cd 100644 (file)
@@ -20,6 +20,7 @@
  *******************************************************************/
 
 #include <linux/blkdev.h>
+#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/kthread.h>
 #include <linux/interrupt.h>
@@ -1481,8 +1482,6 @@ lpfc_match_fcf_conn_list(struct lpfc_hba *phba,
 int
 lpfc_check_pending_fcoe_event(struct lpfc_hba *phba, uint8_t unreg_fcf)
 {
-       LPFC_MBOXQ_t *mbox;
-       int rc;
        /*
         * If the Link is up and no FCoE events while in the
         * FCF discovery, no need to restart FCF discovery.
@@ -1491,86 +1490,70 @@ lpfc_check_pending_fcoe_event(struct lpfc_hba *phba, uint8_t unreg_fcf)
                (phba->fcoe_eventtag == phba->fcoe_eventtag_at_fcf_scan))
                return 0;
 
+       lpfc_printf_log(phba, KERN_INFO, LOG_FIP,
+                       "2768 Pending link or FCF event during current "
+                       "handling of the previous event: link_state:x%x, "
+                       "evt_tag_at_scan:x%x, evt_tag_current:x%x\n",
+                       phba->link_state, phba->fcoe_eventtag_at_fcf_scan,
+                       phba->fcoe_eventtag);
+
        spin_lock_irq(&phba->hbalock);
        phba->fcf.fcf_flag &= ~FCF_AVAILABLE;
        spin_unlock_irq(&phba->hbalock);
 
-       if (phba->link_state >= LPFC_LINK_UP)
-               lpfc_sli4_read_fcf_record(phba, LPFC_FCOE_FCF_GET_FIRST);
-       else {
+       if (phba->link_state >= LPFC_LINK_UP) {
+               lpfc_printf_log(phba, KERN_INFO, LOG_FIP | LOG_DISCOVERY,
+                               "2780 Restart FCF table scan due to "
+                               "pending FCF event:evt_tag_at_scan:x%x, "
+                               "evt_tag_current:x%x\n",
+                               phba->fcoe_eventtag_at_fcf_scan,
+                               phba->fcoe_eventtag);
+               lpfc_sli4_fcf_scan_read_fcf_rec(phba, LPFC_FCOE_FCF_GET_FIRST);
+       } else {
                /*
                 * Do not continue FCF discovery and clear FCF_DISC_INPROGRESS
                 * flag
                 */
                spin_lock_irq(&phba->hbalock);
                phba->hba_flag &= ~FCF_DISC_INPROGRESS;
-               phba->fcf.fcf_flag &= ~FCF_REDISC_FOV;
+               phba->fcf.fcf_flag &= ~(FCF_REDISC_FOV | FCF_DISCOVERY);
                spin_unlock_irq(&phba->hbalock);
        }
 
+       /* Unregister the currently registered FCF if required */
        if (unreg_fcf) {
                spin_lock_irq(&phba->hbalock);
                phba->fcf.fcf_flag &= ~FCF_REGISTERED;
                spin_unlock_irq(&phba->hbalock);
-               mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
-               if (!mbox) {
-                       lpfc_printf_log(phba, KERN_ERR,
-                               LOG_DISCOVERY|LOG_MBOX,
-                               "2610 UNREG_FCFI mbox allocation failed\n");
-                       return 1;
-               }
-               lpfc_unreg_fcfi(mbox, phba->fcf.fcfi);
-               mbox->vport = phba->pport;
-               mbox->mbox_cmpl = lpfc_unregister_fcfi_cmpl;
-               rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);
-               if (rc == MBX_NOT_FINISHED) {
-                       lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY|LOG_MBOX,
-                               "2611 UNREG_FCFI issue mbox failed\n");
-                       mempool_free(mbox, phba->mbox_mem_pool);
-               }
+               lpfc_sli4_unregister_fcf(phba);
        }
-
        return 1;
 }
 
 /**
- * lpfc_mbx_cmpl_read_fcf_record - Completion handler for read_fcf mbox.
+ * lpfc_sli4_fcf_rec_mbox_parse - parse non-embedded fcf record mailbox command
  * @phba: pointer to lpfc hba data structure.
  * @mboxq: pointer to mailbox object.
+ * @next_fcf_index: pointer to holder of next fcf index.
  *
- * This function iterate through all the fcf records available in
- * HBA and choose the optimal FCF record for discovery. After finding
- * the FCF for discovery it register the FCF record and kick start
- * discovery.
- * If FCF_IN_USE flag is set in currently used FCF, the routine try to
- * use a FCF record which match fabric name and mac address of the
- * currently used FCF record.
- * If the driver support only one FCF, it will try to use the FCF record
- * used by BOOT_BIOS.
+ * This routine parses the non-embedded fcf mailbox command by performing the
+ * necessarily error checking, non-embedded read FCF record mailbox command
+ * SGE parsing, and endianness swapping.
+ *
+ * Returns the pointer to the new FCF record in the non-embedded mailbox
+ * command DMA memory if successfully, other NULL.
  */
-void
-lpfc_mbx_cmpl_read_fcf_record(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
+static struct fcf_record *
+lpfc_sli4_fcf_rec_mbox_parse(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq,
+                            uint16_t *next_fcf_index)
 {
        void *virt_addr;
        dma_addr_t phys_addr;
-       uint8_t *bytep;
        struct lpfc_mbx_sge sge;
        struct lpfc_mbx_read_fcf_tbl *read_fcf;
        uint32_t shdr_status, shdr_add_status;
        union lpfc_sli4_cfg_shdr *shdr;
        struct fcf_record *new_fcf_record;
-       uint32_t boot_flag, addr_mode;
-       uint32_t next_fcf_index;
-       struct lpfc_fcf_rec *fcf_rec = NULL;
-       unsigned long iflags;
-       uint16_t vlan_id;
-       int rc;
-
-       /* If there is pending FCoE event restart FCF table scan */
-       if (lpfc_check_pending_fcoe_event(phba, 0)) {
-               lpfc_sli4_mbox_cmd_free(phba, mboxq);
-               return;
-       }
 
        /* Get the first SGE entry from the non-embedded DMA memory. This
         * routine only uses a single SGE.
@@ -1581,59 +1564,183 @@ lpfc_mbx_cmpl_read_fcf_record(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
                lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
                                "2524 Failed to get the non-embedded SGE "
                                "virtual address\n");
-               goto out;
+               return NULL;
        }
        virt_addr = mboxq->sge_array->addr[0];
 
        shdr = (union lpfc_sli4_cfg_shdr *)virt_addr;
        shdr_status = bf_get(lpfc_mbox_hdr_status, &shdr->response);
-       shdr_add_status = bf_get(lpfc_mbox_hdr_add_status,
-                                &shdr->response);
-       /*
-        * The FCF Record was read and there is no reason for the driver
-        * to maintain the FCF record data or memory. Instead, just need
-        * to book keeping the FCFIs can be used.
-        */
+       shdr_add_status = bf_get(lpfc_mbox_hdr_add_status, &shdr->response);
        if (shdr_status || shdr_add_status) {
-               if (shdr_status == STATUS_FCF_TABLE_EMPTY) {
-                       lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+               if (shdr_status == STATUS_FCF_TABLE_EMPTY)
+                       lpfc_printf_log(phba, KERN_ERR, LOG_FIP,
                                        "2726 READ_FCF_RECORD Indicates empty "
                                        "FCF table.\n");
-               } else {
-                       lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+               else
+                       lpfc_printf_log(phba, KERN_ERR, LOG_FIP,
                                        "2521 READ_FCF_RECORD mailbox failed "
-                                       "with status x%x add_status x%x, mbx\n",
-                                       shdr_status, shdr_add_status);
-               }
-               goto out;
+                                       "with status x%x add_status x%x, "
+                                       "mbx\n", shdr_status, shdr_add_status);
+               return NULL;
        }
-       /* Interpreting the returned information of FCF records */
+
+       /* Interpreting the returned information of the FCF record */
        read_fcf = (struct lpfc_mbx_read_fcf_tbl *)virt_addr;
        lpfc_sli_pcimem_bcopy(read_fcf, read_fcf,
                              sizeof(struct lpfc_mbx_read_fcf_tbl));
-       next_fcf_index = bf_get(lpfc_mbx_read_fcf_tbl_nxt_vindx, read_fcf);
-
+       *next_fcf_index = bf_get(lpfc_mbx_read_fcf_tbl_nxt_vindx, read_fcf);
        new_fcf_record = (struct fcf_record *)(virt_addr +
                          sizeof(struct lpfc_mbx_read_fcf_tbl));
        lpfc_sli_pcimem_bcopy(new_fcf_record, new_fcf_record,
                              sizeof(struct fcf_record));
-       bytep = virt_addr + sizeof(union lpfc_sli4_cfg_shdr);
 
+       return new_fcf_record;
+}
+
+/**
+ * lpfc_sli4_log_fcf_record_info - Log the information of a fcf record
+ * @phba: pointer to lpfc hba data structure.
+ * @fcf_record: pointer to the fcf record.
+ * @vlan_id: the lowest vlan identifier associated to this fcf record.
+ * @next_fcf_index: the index to the next fcf record in hba's fcf table.
+ *
+ * This routine logs the detailed FCF record if the LOG_FIP loggin is
+ * enabled.
+ **/
+static void
+lpfc_sli4_log_fcf_record_info(struct lpfc_hba *phba,
+                             struct fcf_record *fcf_record,
+                             uint16_t vlan_id,
+                             uint16_t next_fcf_index)
+{
+       lpfc_printf_log(phba, KERN_INFO, LOG_FIP,
+                       "2764 READ_FCF_RECORD:\n"
+                       "\tFCF_Index     : x%x\n"
+                       "\tFCF_Avail     : x%x\n"
+                       "\tFCF_Valid     : x%x\n"
+                       "\tFIP_Priority  : x%x\n"
+                       "\tMAC_Provider  : x%x\n"
+                       "\tLowest VLANID : x%x\n"
+                       "\tFCF_MAC Addr  : x%x:%x:%x:%x:%x:%x\n"
+                       "\tFabric_Name   : x%x:%x:%x:%x:%x:%x:%x:%x\n"
+                       "\tSwitch_Name   : x%x:%x:%x:%x:%x:%x:%x:%x\n"
+                       "\tNext_FCF_Index: x%x\n",
+                       bf_get(lpfc_fcf_record_fcf_index, fcf_record),
+                       bf_get(lpfc_fcf_record_fcf_avail, fcf_record),
+                       bf_get(lpfc_fcf_record_fcf_valid, fcf_record),
+                       fcf_record->fip_priority,
+                       bf_get(lpfc_fcf_record_mac_addr_prov, fcf_record),
+                       vlan_id,
+                       bf_get(lpfc_fcf_record_mac_0, fcf_record),
+                       bf_get(lpfc_fcf_record_mac_1, fcf_record),
+                       bf_get(lpfc_fcf_record_mac_2, fcf_record),
+                       bf_get(lpfc_fcf_record_mac_3, fcf_record),
+                       bf_get(lpfc_fcf_record_mac_4, fcf_record),
+                       bf_get(lpfc_fcf_record_mac_5, fcf_record),
+                       bf_get(lpfc_fcf_record_fab_name_0, fcf_record),
+                       bf_get(lpfc_fcf_record_fab_name_1, fcf_record),
+                       bf_get(lpfc_fcf_record_fab_name_2, fcf_record),
+                       bf_get(lpfc_fcf_record_fab_name_3, fcf_record),
+                       bf_get(lpfc_fcf_record_fab_name_4, fcf_record),
+                       bf_get(lpfc_fcf_record_fab_name_5, fcf_record),
+                       bf_get(lpfc_fcf_record_fab_name_6, fcf_record),
+                       bf_get(lpfc_fcf_record_fab_name_7, fcf_record),
+                       bf_get(lpfc_fcf_record_switch_name_0, fcf_record),
+                       bf_get(lpfc_fcf_record_switch_name_1, fcf_record),
+                       bf_get(lpfc_fcf_record_switch_name_2, fcf_record),
+                       bf_get(lpfc_fcf_record_switch_name_3, fcf_record),
+                       bf_get(lpfc_fcf_record_switch_name_4, fcf_record),
+                       bf_get(lpfc_fcf_record_switch_name_5, fcf_record),
+                       bf_get(lpfc_fcf_record_switch_name_6, fcf_record),
+                       bf_get(lpfc_fcf_record_switch_name_7, fcf_record),
+                       next_fcf_index);
+}
+
+/**
+ * lpfc_mbx_cmpl_fcf_scan_read_fcf_rec - fcf scan read_fcf mbox cmpl handler.
+ * @phba: pointer to lpfc hba data structure.
+ * @mboxq: pointer to mailbox object.
+ *
+ * This function iterates through all the fcf records available in
+ * HBA and chooses the optimal FCF record for discovery. After finding
+ * the FCF for discovery it registers the FCF record and kicks start
+ * discovery.
+ * If FCF_IN_USE flag is set in currently used FCF, the routine tries to
+ * use an FCF record which matches fabric name and mac address of the
+ * currently used FCF record.
+ * If the driver supports only one FCF, it will try to use the FCF record
+ * used by BOOT_BIOS.
+ */
+void
+lpfc_mbx_cmpl_fcf_scan_read_fcf_rec(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
+{
+       struct fcf_record *new_fcf_record;
+       uint32_t boot_flag, addr_mode;
+       uint16_t fcf_index, next_fcf_index;
+       struct lpfc_fcf_rec *fcf_rec = NULL;
+       uint16_t vlan_id;
+       int rc;
+
+       /* If there is pending FCoE event restart FCF table scan */
+       if (lpfc_check_pending_fcoe_event(phba, 0)) {
+               lpfc_sli4_mbox_cmd_free(phba, mboxq);
+               return;
+       }
+
+       /* Parse the FCF record from the non-embedded mailbox command */
+       new_fcf_record = lpfc_sli4_fcf_rec_mbox_parse(phba, mboxq,
+                                                     &next_fcf_index);
+       if (!new_fcf_record) {
+               lpfc_printf_log(phba, KERN_WARNING, LOG_FIP,
+                               "2765 Mailbox command READ_FCF_RECORD "
+                               "failed to retrieve a FCF record.\n");
+               /* Let next new FCF event trigger fast failover */
+               spin_lock_irq(&phba->hbalock);
+               phba->hba_flag &= ~FCF_DISC_INPROGRESS;
+               spin_unlock_irq(&phba->hbalock);
+               lpfc_sli4_mbox_cmd_free(phba, mboxq);
+               return;
+       }
+
+       /* Check the FCF record against the connection list */
        rc = lpfc_match_fcf_conn_list(phba, new_fcf_record, &boot_flag,
                                      &addr_mode, &vlan_id);
+
+       /* Log the FCF record information if turned on */
+       lpfc_sli4_log_fcf_record_info(phba, new_fcf_record, vlan_id,
+                                     next_fcf_index);
+
        /*
         * If the fcf record does not match with connect list entries
-        * read the next entry.
+        * read the next entry; otherwise, this is an eligible FCF
+        * record for round robin FCF failover.
         */
-       if (!rc)
+       if (!rc) {
+               lpfc_printf_log(phba, KERN_WARNING, LOG_FIP,
+                               "2781 FCF record fcf_index:x%x failed FCF "
+                               "connection list check, fcf_avail:x%x, "
+                               "fcf_valid:x%x\n",
+                               bf_get(lpfc_fcf_record_fcf_index,
+                                      new_fcf_record),
+                               bf_get(lpfc_fcf_record_fcf_avail,
+                                      new_fcf_record),
+                               bf_get(lpfc_fcf_record_fcf_valid,
+                                      new_fcf_record));
                goto read_next_fcf;
+       } else {
+               fcf_index = bf_get(lpfc_fcf_record_fcf_index, new_fcf_record);
+               rc = lpfc_sli4_fcf_rr_index_set(phba, fcf_index);
+               if (rc)
+                       goto read_next_fcf;
+       }
+
        /*
         * If this is not the first FCF discovery of the HBA, use last
         * FCF record for the discovery. The condition that a rescan
         * matches the in-use FCF record: fabric name, switch name, mac
         * address, and vlan_id.
         */
-       spin_lock_irqsave(&phba->hbalock, iflags);
+       spin_lock_irq(&phba->hbalock);
        if (phba->fcf.fcf_flag & FCF_IN_USE) {
                if (lpfc_fab_name_match(phba->fcf.current_rec.fabric_name,
                                        new_fcf_record) &&
@@ -1649,8 +1756,9 @@ lpfc_mbx_cmpl_read_fcf_record(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
                                __lpfc_sli4_stop_fcf_redisc_wait_timer(phba);
                        else if (phba->fcf.fcf_flag & FCF_REDISC_FOV)
                                /* If in fast failover, mark it's completed */
-                               phba->fcf.fcf_flag &= ~FCF_REDISC_FOV;
-                       spin_unlock_irqrestore(&phba->hbalock, iflags);
+                               phba->fcf.fcf_flag &= ~(FCF_REDISC_FOV |
+                                                       FCF_DISCOVERY);
+                       spin_unlock_irq(&phba->hbalock);
                        goto out;
                }
                /*
@@ -1661,7 +1769,7 @@ lpfc_mbx_cmpl_read_fcf_record(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
                 * next candidate.
                 */
                if (!(phba->fcf.fcf_flag & FCF_REDISC_FOV)) {
-                       spin_unlock_irqrestore(&phba->hbalock, iflags);
+                       spin_unlock_irq(&phba->hbalock);
                        goto read_next_fcf;
                }
        }
@@ -1669,14 +1777,9 @@ lpfc_mbx_cmpl_read_fcf_record(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
         * Update on failover FCF record only if it's in FCF fast-failover
         * period; otherwise, update on current FCF record.
         */
-       if (phba->fcf.fcf_flag & FCF_REDISC_FOV) {
-               /* Fast FCF failover only to the same fabric name */
-               if (lpfc_fab_name_match(phba->fcf.current_rec.fabric_name,
-                                       new_fcf_record))
-                       fcf_rec = &phba->fcf.failover_rec;
-               else
-                       goto read_next_fcf;
-       } else
+       if (phba->fcf.fcf_flag & FCF_REDISC_FOV)
+               fcf_rec = &phba->fcf.failover_rec;
+       else
                fcf_rec = &phba->fcf.current_rec;
 
        if (phba->fcf.fcf_flag & FCF_AVAILABLE) {
@@ -1689,7 +1792,7 @@ lpfc_mbx_cmpl_read_fcf_record(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
                        /* Choose this FCF record */
                        __lpfc_update_fcf_record(phba, fcf_rec, new_fcf_record,
                                        addr_mode, vlan_id, BOOT_ENABLE);
-                       spin_unlock_irqrestore(&phba->hbalock, iflags);
+                       spin_unlock_irq(&phba->hbalock);
                        goto read_next_fcf;
                }
                /*
@@ -1698,20 +1801,19 @@ lpfc_mbx_cmpl_read_fcf_record(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
                 * the next FCF record.
                 */
                if (!boot_flag && (fcf_rec->flag & BOOT_ENABLE)) {
-                       spin_unlock_irqrestore(&phba->hbalock, iflags);
+                       spin_unlock_irq(&phba->hbalock);
                        goto read_next_fcf;
                }
                /*
                 * If the new hba FCF record has lower priority value
                 * than the driver FCF record, use the new record.
                 */
-               if (lpfc_fab_name_match(fcf_rec->fabric_name, new_fcf_record) &&
-                   (new_fcf_record->fip_priority < fcf_rec->priority)) {
+               if (new_fcf_record->fip_priority < fcf_rec->priority) {
                        /* Choose this FCF record */
                        __lpfc_update_fcf_record(phba, fcf_rec, new_fcf_record,
                                        addr_mode, vlan_id, 0);
                }
-               spin_unlock_irqrestore(&phba->hbalock, iflags);
+               spin_unlock_irq(&phba->hbalock);
                goto read_next_fcf;
        }
        /*
@@ -1724,7 +1826,7 @@ lpfc_mbx_cmpl_read_fcf_record(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
                                         BOOT_ENABLE : 0));
                phba->fcf.fcf_flag |= FCF_AVAILABLE;
        }
-       spin_unlock_irqrestore(&phba->hbalock, iflags);
+       spin_unlock_irq(&phba->hbalock);
        goto read_next_fcf;
 
 read_next_fcf:
@@ -1740,9 +1842,22 @@ read_next_fcf:
                         * FCF scan inprogress, and do nothing
                         */
                        if (!(phba->fcf.failover_rec.flag & RECORD_VALID)) {
-                               spin_lock_irqsave(&phba->hbalock, iflags);
+                               lpfc_printf_log(phba, KERN_WARNING, LOG_FIP,
+                                              "2782 No suitable FCF record "
+                                              "found during this round of "
+                                              "post FCF rediscovery scan: "
+                                              "fcf_evt_tag:x%x, fcf_index: "
+                                              "x%x\n",
+                                              phba->fcoe_eventtag_at_fcf_scan,
+                                              bf_get(lpfc_fcf_record_fcf_index,
+                                                     new_fcf_record));
+                               /*
+                                * Let next new FCF event trigger fast
+                                * failover
+                                */
+                               spin_lock_irq(&phba->hbalock);
                                phba->hba_flag &= ~FCF_DISC_INPROGRESS;
-                               spin_unlock_irqrestore(&phba->hbalock, iflags);
+                               spin_unlock_irq(&phba->hbalock);
                                return;
                        }
                        /*
@@ -1754,16 +1869,23 @@ read_next_fcf:
                         * record.
                         */
 
-                       /* unregister the current in-use FCF record */
+                       /* Unregister the current in-use FCF record */
                        lpfc_unregister_fcf(phba);
-                       /* replace in-use record with the new record */
+
+                       /* Replace in-use record with the new record */
                        memcpy(&phba->fcf.current_rec,
                               &phba->fcf.failover_rec,
                               sizeof(struct lpfc_fcf_rec));
                        /* mark the FCF fast failover completed */
-                       spin_lock_irqsave(&phba->hbalock, iflags);
+                       spin_lock_irq(&phba->hbalock);
                        phba->fcf.fcf_flag &= ~FCF_REDISC_FOV;
-                       spin_unlock_irqrestore(&phba->hbalock, iflags);
+                       spin_unlock_irq(&phba->hbalock);
+                       /*
+                        * Set up the initial registered FCF index for FLOGI
+                        * round robin FCF failover.
+                        */
+                       phba->fcf.fcf_rr_init_indx =
+                                       phba->fcf.failover_rec.fcf_indx;
                        /* Register to the new FCF record */
                        lpfc_register_fcf(phba);
                } else {
@@ -1776,13 +1898,25 @@ read_next_fcf:
                                return;
                        /*
                         * Otherwise, initial scan or post linkdown rescan,
-                        * register with the best fit FCF record found so
-                        * far through the scanning process.
+                        * register with the best FCF record found so far
+                        * through the FCF scanning process.
+                        */
+
+                       /* mark the initial FCF discovery completed */
+                       spin_lock_irq(&phba->hbalock);
+                       phba->fcf.fcf_flag &= ~FCF_INIT_DISC;
+                       spin_unlock_irq(&phba->hbalock);
+                       /*
+                        * Set up the initial registered FCF index for FLOGI
+                        * round robin FCF failover
                         */
+                       phba->fcf.fcf_rr_init_indx =
+                                       phba->fcf.current_rec.fcf_indx;
+                       /* Register to the new FCF record */
                        lpfc_register_fcf(phba);
                }
        } else
-               lpfc_sli4_read_fcf_record(phba, next_fcf_index);
+               lpfc_sli4_fcf_scan_read_fcf_rec(phba, next_fcf_index);
        return;
 
 out:
@@ -1792,6 +1926,141 @@ out:
        return;
 }
 
+/**
+ * lpfc_mbx_cmpl_fcf_rr_read_fcf_rec - fcf round robin read_fcf mbox cmpl hdler
+ * @phba: pointer to lpfc hba data structure.
+ * @mboxq: pointer to mailbox object.
+ *
+ * This is the callback function for FLOGI failure round robin FCF failover
+ * read FCF record mailbox command from the eligible FCF record bmask for
+ * performing the failover. If the FCF read back is not valid/available, it
+ * fails through to retrying FLOGI to the currently registered FCF again.
+ * Otherwise, if the FCF read back is valid and available, it will set the
+ * newly read FCF record to the failover FCF record, unregister currently
+ * registered FCF record, copy the failover FCF record to the current
+ * FCF record, and then register the current FCF record before proceeding
+ * to trying FLOGI on the new failover FCF.
+ */
+void
+lpfc_mbx_cmpl_fcf_rr_read_fcf_rec(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
+{
+       struct fcf_record *new_fcf_record;
+       uint32_t boot_flag, addr_mode;
+       uint16_t next_fcf_index;
+       uint16_t current_fcf_index;
+       uint16_t vlan_id;
+
+       /* If link state is not up, stop the round robin failover process */
+       if (phba->link_state < LPFC_LINK_UP) {
+               spin_lock_irq(&phba->hbalock);
+               phba->fcf.fcf_flag &= ~FCF_DISCOVERY;
+               spin_unlock_irq(&phba->hbalock);
+               lpfc_sli4_mbox_cmd_free(phba, mboxq);
+               return;
+       }
+
+       /* Parse the FCF record from the non-embedded mailbox command */
+       new_fcf_record = lpfc_sli4_fcf_rec_mbox_parse(phba, mboxq,
+                                                     &next_fcf_index);
+       if (!new_fcf_record) {
+               lpfc_printf_log(phba, KERN_WARNING, LOG_FIP,
+                               "2766 Mailbox command READ_FCF_RECORD "
+                               "failed to retrieve a FCF record.\n");
+               goto out;
+       }
+
+       /* Get the needed parameters from FCF record */
+       lpfc_match_fcf_conn_list(phba, new_fcf_record, &boot_flag,
+                                &addr_mode, &vlan_id);
+
+       /* Log the FCF record information if turned on */
+       lpfc_sli4_log_fcf_record_info(phba, new_fcf_record, vlan_id,
+                                     next_fcf_index);
+
+       /* Upload new FCF record to the failover FCF record */
+       spin_lock_irq(&phba->hbalock);
+       __lpfc_update_fcf_record(phba, &phba->fcf.failover_rec,
+                                new_fcf_record, addr_mode, vlan_id,
+                                (boot_flag ? BOOT_ENABLE : 0));
+       spin_unlock_irq(&phba->hbalock);
+
+       current_fcf_index = phba->fcf.current_rec.fcf_indx;
+
+       /* Unregister the current in-use FCF record */
+       lpfc_unregister_fcf(phba);
+
+       /* Replace in-use record with the new record */
+       memcpy(&phba->fcf.current_rec, &phba->fcf.failover_rec,
+              sizeof(struct lpfc_fcf_rec));
+
+       lpfc_printf_log(phba, KERN_INFO, LOG_FIP,
+                       "2783 FLOGI round robin FCF failover from FCF "
+                       "(index:x%x) to FCF (index:x%x).\n",
+                       current_fcf_index,
+                       bf_get(lpfc_fcf_record_fcf_index, new_fcf_record));
+
+out:
+       lpfc_sli4_mbox_cmd_free(phba, mboxq);
+       lpfc_register_fcf(phba);
+}
+
+/**
+ * lpfc_mbx_cmpl_read_fcf_rec - read fcf completion handler.
+ * @phba: pointer to lpfc hba data structure.
+ * @mboxq: pointer to mailbox object.
+ *
+ * This is the callback function of read FCF record mailbox command for
+ * updating the eligible FCF bmask for FLOGI failure round robin FCF
+ * failover when a new FCF event happened. If the FCF read back is
+ * valid/available and it passes the connection list check, it updates
+ * the bmask for the eligible FCF record for round robin failover.
+ */
+void
+lpfc_mbx_cmpl_read_fcf_rec(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
+{
+       struct fcf_record *new_fcf_record;
+       uint32_t boot_flag, addr_mode;
+       uint16_t fcf_index, next_fcf_index;
+       uint16_t vlan_id;
+       int rc;
+
+       /* If link state is not up, no need to proceed */
+       if (phba->link_state < LPFC_LINK_UP)
+               goto out;
+
+       /* If FCF discovery period is over, no need to proceed */
+       if (phba->fcf.fcf_flag & FCF_DISCOVERY)
+               goto out;
+
+       /* Parse the FCF record from the non-embedded mailbox command */
+       new_fcf_record = lpfc_sli4_fcf_rec_mbox_parse(phba, mboxq,
+                                                     &next_fcf_index);
+       if (!new_fcf_record) {
+               lpfc_printf_log(phba, KERN_INFO, LOG_FIP,
+                               "2767 Mailbox command READ_FCF_RECORD "
+                               "failed to retrieve a FCF record.\n");
+               goto out;
+       }
+
+       /* Check the connection list for eligibility */
+       rc = lpfc_match_fcf_conn_list(phba, new_fcf_record, &boot_flag,
+                                     &addr_mode, &vlan_id);
+
+       /* Log the FCF record information if turned on */
+       lpfc_sli4_log_fcf_record_info(phba, new_fcf_record, vlan_id,
+                                     next_fcf_index);
+
+       if (!rc)
+               goto out;
+
+       /* Update the eligible FCF record index bmask */
+       fcf_index = bf_get(lpfc_fcf_record_fcf_index, new_fcf_record);
+       rc = lpfc_sli4_fcf_rr_index_set(phba, fcf_index);
+
+out:
+       lpfc_sli4_mbox_cmd_free(phba, mboxq);
+}
+
 /**
  * lpfc_init_vpi_cmpl - Completion handler for init_vpi mbox command.
  * @phba: pointer to lpfc hba data structure.
@@ -2024,8 +2293,6 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, READ_LA_VAR *la)
        int rc;
        struct fcf_record *fcf_record;
 
-       sparam_mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
-
        spin_lock_irq(&phba->hbalock);
        switch (la->UlnkSpeed) {
        case LA_1GHZ_LINK:
@@ -2117,18 +2384,24 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, READ_LA_VAR *la)
        spin_unlock_irq(&phba->hbalock);
 
        lpfc_linkup(phba);
-       if (sparam_mbox) {
-               lpfc_read_sparam(phba, sparam_mbox, 0);
-               sparam_mbox->vport = vport;
-               sparam_mbox->mbox_cmpl = lpfc_mbx_cmpl_read_sparam;
-               rc = lpfc_sli_issue_mbox(phba, sparam_mbox, MBX_NOWAIT);
-               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);
-                       goto out;
-               }
+       sparam_mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       if (!sparam_mbox)
+               goto out;
+
+       rc = lpfc_read_sparam(phba, sparam_mbox, 0);
+       if (rc) {
+               mempool_free(sparam_mbox, phba->mbox_mem_pool);
+               goto out;
+       }
+       sparam_mbox->vport = vport;
+       sparam_mbox->mbox_cmpl = lpfc_mbx_cmpl_read_sparam;
+       rc = lpfc_sli_issue_mbox(phba, sparam_mbox, MBX_NOWAIT);
+       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);
+               goto out;
        }
 
        if (!(phba->hba_flag & HBA_FCOE_SUPPORT)) {
@@ -2186,10 +2459,20 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, READ_LA_VAR *la)
                        spin_unlock_irq(&phba->hbalock);
                        return;
                }
+               /* This is the initial FCF discovery scan */
+               phba->fcf.fcf_flag |= FCF_INIT_DISC;
                spin_unlock_irq(&phba->hbalock);
-               rc = lpfc_sli4_read_fcf_record(phba, LPFC_FCOE_FCF_GET_FIRST);
-               if (rc)
+               lpfc_printf_log(phba, KERN_INFO, LOG_FIP | LOG_DISCOVERY,
+                               "2778 Start FCF table scan at linkup\n");
+
+               rc = lpfc_sli4_fcf_scan_read_fcf_rec(phba,
+                                                    LPFC_FCOE_FCF_GET_FIRST);
+               if (rc) {
+                       spin_lock_irq(&phba->hbalock);
+                       phba->fcf.fcf_flag &= ~FCF_INIT_DISC;
+                       spin_unlock_irq(&phba->hbalock);
                        goto out;
+               }
        }
 
        return;
@@ -3379,8 +3662,12 @@ lpfc_unreg_hba_rpis(struct lpfc_hba *phba)
                shost = lpfc_shost_from_vport(vports[i]);
                spin_lock_irq(shost->host_lock);
                list_for_each_entry(ndlp, &vports[i]->fc_nodes, nlp_listp) {
-                       if (ndlp->nlp_flag & NLP_RPI_VALID)
+                       if (ndlp->nlp_flag & NLP_RPI_VALID) {
+                               /* The mempool_alloc might sleep */
+                               spin_unlock_irq(shost->host_lock);
                                lpfc_unreg_rpi(vports[i], ndlp);
+                               spin_lock_irq(shost->host_lock);
+                       }
                }
                spin_unlock_irq(shost->host_lock);
        }
@@ -4756,6 +5043,7 @@ lpfc_unregister_fcf_rescan(struct lpfc_hba *phba)
                return;
        /* Reset HBA FCF states after successful unregister FCF */
        phba->fcf.fcf_flag = 0;
+       phba->fcf.current_rec.flag = 0;
 
        /*
         * If driver is not unloading, check if there is any other
@@ -4765,13 +5053,21 @@ lpfc_unregister_fcf_rescan(struct lpfc_hba *phba)
            (phba->link_state < LPFC_LINK_UP))
                return;
 
-       rc = lpfc_sli4_read_fcf_record(phba, LPFC_FCOE_FCF_GET_FIRST);
+       /* This is considered as the initial FCF discovery scan */
+       spin_lock_irq(&phba->hbalock);
+       phba->fcf.fcf_flag |= FCF_INIT_DISC;
+       spin_unlock_irq(&phba->hbalock);
+       rc = lpfc_sli4_fcf_scan_read_fcf_rec(phba, LPFC_FCOE_FCF_GET_FIRST);
 
-       if (rc)
+       if (rc) {
+               spin_lock_irq(&phba->hbalock);
+               phba->fcf.fcf_flag &= ~FCF_INIT_DISC;
+               spin_unlock_irq(&phba->hbalock);
                lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY|LOG_MBOX,
                                "2553 lpfc_unregister_unused_fcf failed "
                                "to read FCF record HBA state x%x\n",
                                phba->pport->port_state);
+       }
 }
 
 /**