Merge tag 'iwlwifi-for-kalle-2015-04-28' of https://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / lpfc / lpfc_init.c

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 4947cc4abc0dcf67c583450e2da18cc83ed60e6d..e8c8c1ecc1f54dbf7f1003199397284600eefd46 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2015 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -2775,9 +2775,19 @@ lpfc_sli4_node_prep(struct lpfc_hba *phba)
                        list_for_each_entry_safe(ndlp, next_ndlp,
                                                 &vports[i]->fc_nodes,
                                                 nlp_listp) {
-                               if (NLP_CHK_NODE_ACT(ndlp))
+                               if (NLP_CHK_NODE_ACT(ndlp)) {
                                        ndlp->nlp_rpi =
                                                lpfc_sli4_alloc_rpi(phba);
+                                       lpfc_printf_vlog(ndlp->vport, KERN_INFO,
+                                                        LOG_NODE,
+                                                        "0009 rpi:%x DID:%x "
+                                                        "flg:%x map:%x %p\n",
+                                                        ndlp->nlp_rpi,
+                                                        ndlp->nlp_DID,
+                                                        ndlp->nlp_flag,
+                                                        ndlp->nlp_usg_map,
+                                                        ndlp);
+                               }
                        }
                }
        }
@@ -2941,8 +2951,18 @@ lpfc_offline_prep(struct lpfc_hba *phba, int mbx_action)
                                 * RPI. Get a new RPI when the adapter port
                                 * comes back online.
                                 */
-                               if (phba->sli_rev == LPFC_SLI_REV4)
+                               if (phba->sli_rev == LPFC_SLI_REV4) {
+                                       lpfc_printf_vlog(ndlp->vport,
+                                                        KERN_INFO, LOG_NODE,
+                                                        "0011 lpfc_offline: "
+                                                        "ndlp:x%p did %x "
+                                                        "usgmap:x%x rpi:%x\n",
+                                                        ndlp, ndlp->nlp_DID,
+                                                        ndlp->nlp_usg_map,
+                                                        ndlp->nlp_rpi);
+
                                        lpfc_sli4_free_rpi(phba, ndlp->nlp_rpi);
+                               }
                                lpfc_unreg_rpi(vports[i], ndlp);
                        }
                }