Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fcb8acd authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.30: Fix SLI4 driver module load and unload 



Signed-off-by: default avatarAlex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 80c17849

drivers/scsi/lpfc/lpfc_init.c

+8 −9
Original line number Original line Diff line number Diff line
@@ -5821,10 +5821,9 @@ lpfc_sli4_post_status_check(struct lpfc_hba *phba) 
					readl(phba->sli4_hba.u.if_type2.

					readl(phba->sli4_hba.u.if_type2.

					      ERR2regaddr);

					      ERR2regaddr);

				lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

				lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

					"2888 Port Error Detected "

					"2888 Unrecoverable port error "

					"during POST: "

					"following POST: port status reg "

					"port status reg 0x%x, "

					"0x%x, port_smphr reg 0x%x, "

					"port_smphr reg 0x%x, "

					"error 1=0x%x, error 2=0x%x\n",

					"error 1=0x%x, error 2=0x%x\n",

					reg_data.word0,

					reg_data.word0,

					portsmphr_reg.word0,

					portsmphr_reg.word0,
@@ -7279,7 +7278,8 @@ lpfc_pci_function_reset(struct lpfc_hba *phba) 
			       LPFC_SLIPORT_INIT_PORT);

			       LPFC_SLIPORT_INIT_PORT);

			writel(reg_data.word0, phba->sli4_hba.u.if_type2.

			writel(reg_data.word0, phba->sli4_hba.u.if_type2.

			       CTRLregaddr);

			       CTRLregaddr);



			/* flush */

			readl(phba->sli4_hba.u.if_type2.STATUSregaddr);

			/*

			/*

			 * Poll the Port Status Register and wait for RDY for

			 * Poll the Port Status Register and wait for RDY for

			 * up to 10 seconds.  If the port doesn't respond, treat

			 * up to 10 seconds.  If the port doesn't respond, treat
@@ -7317,11 +7317,10 @@ lpfc_pci_function_reset(struct lpfc_hba *phba) 
				phba->work_status[1] = readl(

				phba->work_status[1] = readl(

					phba->sli4_hba.u.if_type2.ERR2regaddr);

					phba->sli4_hba.u.if_type2.ERR2regaddr);

				lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

				lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

					"2890 Port Error Detected "

					"2890 Port error detected during port "

					"during Port Reset: "

					"reset(%d): port status reg 0x%x, "

					"port status reg 0x%x, "

					"error 1=0x%x, error 2=0x%x\n",

					"error 1=0x%x, error 2=0x%x\n",

					reg_data.word0,

					num_resets, reg_data.word0,

					phba->work_status[0],

					phba->work_status[0],

					phba->work_status[1]);

					phba->work_status[1]);

				rc = -ENODEV;

				rc = -ENODEV;