From: James Smart <jsmart2021@gmail.com>

Date: Tue, 30 Jan 2018 15:58:47 -0800

Subject: scsi: lpfc: move placement of target destroy on driver detach

Patch-mainline: v4.17-rc1

Git-commit: 281d61902ffbab47901f8616a38a45144627dd9e

References: bsc#1080657

Ensure nvme localports/targetports are torn down before dismantling the

adapter sli interface on driver detachment.  This aids leaving

interfaces live while nvme may be making callbacks to abort it.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>

Signed-off-by: James Smart <james.smart@broadcom.com>

Reviewed-by: Hannes Reinecke <hare@suse.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Acked-by: Johannes Thumshirn <jthumshirn@suse.de>

---

 drivers/scsi/lpfc/lpfc_init.c |   14 +++++++-------

 1 file changed, 7 insertions(+), 7 deletions(-)

--- a/drivers/scsi/lpfc/lpfc_init.c

+++ b/drivers/scsi/lpfc/lpfc_init.c

@@ -11510,13 +11510,6 @@ lpfc_pci_remove_one_s4(struct pci_dev *p

 	/* Remove FC host and then SCSI host with the physical port */

 	fc_remove_host(shost);

 	scsi_remove_host(shost);

-	/*

-	 * Bring down the SLI Layer. This step disables all interrupts,

-	 * clears the rings, discards all mailbox commands, and resets

-	 * the HBA FCoE function.

-	 */

-	lpfc_debugfs_terminate(vport);

-	lpfc_sli4_hba_unset(phba);

 	/* Perform ndlp cleanup on the physical port.  The nvme and nvmet

 	 * localports are destroyed after to cleanup all transport memory.

@@ -11525,6 +11518,13 @@ lpfc_pci_remove_one_s4(struct pci_dev *p

 	lpfc_nvmet_destroy_targetport(phba);

 	lpfc_nvme_destroy_localport(vport);

+	/*

+	 * Bring down the SLI Layer. This step disables all interrupts,

+	 * clears the rings, discards all mailbox commands, and resets

+	 * the HBA FCoE function.

+	 */

+	lpfc_debugfs_terminate(vport);

+	lpfc_sli4_hba_unset(phba);

 	lpfc_stop_hba_timers(phba);

 	spin_lock_irq(&phba->hbalock);