SCSI fixes for 5.17-rc3
Subsystems (2)
James Bottomley
maintainerTwo minor fixes in the lpfc driver. One changing the classification of trace messages and the other fixing a build issue when NVME_FC is disabled.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
James Smart (2):
scsi: lpfc: Reduce log messages seen after firmware download
scsi: lpfc: Remove NVMe support if kernel has NVME_FC disabled
And the diffstat:
drivers/scsi/lpfc/lpfc.h | 13 ++++++++++--- drivers/scsi/lpfc/lpfc_attr.c | 4 ++-- drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 8 +++++++- 4 files changed, 20 insertions(+), 7 deletions(-)
With full diff below.
James
---
drivers/scsi/lpfc/lpfc.h +10 -3
@@ -1161,6 +1161,16 @@ struct lpfc_hba {uint32_t cfg_hostmem_hgp;uint32_t cfg_log_verbose;uint32_t cfg_enable_fc4_type; +#define LPFC_ENABLE_FCP 1 +#define LPFC_ENABLE_NVME 2 +#define LPFC_ENABLE_BOTH 3 +#if (IS_ENABLED (CONFIG_NVME_FC )) +#define LPFC_MAX_ENBL_FC4_TYPE LPFC_ENABLE_BOTH +#define LPFC_DEF_ENBL_FC4_TYPE LPFC_ENABLE_BOTH +#else +#define LPFC_MAX_ENBL_FC4_TYPE LPFC_ENABLE_FCP +#define LPFC_DEF_ENBL_FC4_TYPE LPFC_ENABLE_FCP +#endif uint32_t cfg_aer_support;uint32_t cfg_sriov_nr_virtfn;uint32_t cfg_request_firmware_upgrade;
@@ -1182,9 +1192,6 @@ struct lpfc_hba {uint32_t cfg_ras_fwlog_func;uint32_t cfg_enable_bbcr;/* Enable BB Credit Recovery */ uint32_t cfg_enable_dpp;/* Enable Direct Packet Push */ -#define LPFC_ENABLE_FCP 1 -#define LPFC_ENABLE_NVME 2 -#define LPFC_ENABLE_BOTH 3uint32_t cfg_enable_pbde;uint32_t cfg_enable_mi;struct nvmet_fc_target_port *targetport;
drivers/scsi/lpfc/lpfc_attr.c +2 -2
@@ -3978,8 +3978,8 @@ LPFC_ATTR_R(nvmet_mrq_post,* 3 - register both FCP and NVME * Supported values are [1,3]. Default value is 3 */ -LPFC_ATTR_R (enable_fc4_type,LPFC_ENABLE_BOTH , -LPFC_ENABLE_FCP ,LPFC_ENABLE_BOTH , +LPFC_ATTR_R (enable_fc4_type,LPFC_DEF_ENBL_FC4_TYPE , +LPFC_ENABLE_FCP ,LPFC_MAX_ENBL_FC4_TYPE ,"Enable FC4 Protocol support - FCP / NVME" );/*
drivers/scsi/lpfc/lpfc_init.c +1 -1
@@ -2104,7 +2104,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
@@ -13363,6 +13363,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
@@ -13413,7 +13414,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, "
The pull request you sent on Sat, 12 Feb 2022 11:41:32 -0500:
The pull request you sent on Sat, 12 Feb 2022 11:41:32 -0500:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b81b1829e7e39f6cebdf6e4d5484eacbceda8554
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html