Commit 96a4f426 authored by James Smart's avatar James Smart Committed by Zheng Zengkai
Browse files

scsi: lpfc: Reduce log messages seen after firmware download 

stable inclusion
from stable-v5.10.101
commit 759aeacdfe7082d17ecbfcae0dfc0e9740b9416d
bugzilla: https://gitee.com/openeuler/kernel/issues/I5669Z

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=759aeacdfe7082d17ecbfcae0dfc0e9740b9416d

--------------------------------

commit 5852ed2a upstream.

Messages around firmware download were incorrectly tagged as being related
to discovery trace events. Thus, firmware download status ended up dumping
the trace log as well as the firmware update message. As there were a
couple of log messages in this state, the trace log was dumped multiple
times.

Resolve this by converting from trace events to SLI events.

Link: https://lore.kernel.org/r/20220207180442.72836-1-jsmart2021@gmail.com


Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarYu Liao <liaoyu15@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 32dfd4e1

drivers/scsi/lpfc/lpfc_init.c

+1 −1
Original line number Diff line number Diff line
@@ -1998,7 +1998,7 @@ lpfc_handle_eratt_s4(struct lpfc_hba *phba) 
		}

		if (reg_err1 == SLIPORT_ERR1_REG_ERR_CODE_2 &&

		    reg_err2 == SLIPORT_ERR2_REG_FW_RESTART) {

			lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,

			lpfc_printf_log(phba, KERN_ERR, LOG_SLI,

					"3143 Port Down: Firmware Update "

					"Detected\n");

			en_rn_msg = false;

drivers/scsi/lpfc/lpfc_sli.c

+7 −1
Original line number Diff line number Diff line
@@ -12402,6 +12402,7 @@ lpfc_sli4_eratt_read(struct lpfc_hba *phba) 
	uint32_t uerr_sta_hi, uerr_sta_lo;

	uint32_t if_type, portsmphr;

	struct lpfc_register portstat_reg;

	u32 logmask;









	/*









	 * For now, use the SLI4 device internal unrecoverable error








@@ -12452,7 +12453,12 @@ lpfc_sli4_eratt_read(struct lpfc_hba *phba)







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









			phba->work_status[1] =









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









			lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,









			logmask = LOG_TRACE_EVENT;









			if (phba->work_status[0] ==









				SLIPORT_ERR1_REG_ERR_CODE_2 &&









			    phba->work_status[1] == SLIPORT_ERR2_REG_FW_RESTART)









				logmask = LOG_SLI;









			lpfc_printf_log(phba, KERN_ERR, logmask,









					"2885 Port Status Event: "









					"port status reg 0x%x, "









					"port smphr reg 0x%x, "