Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two 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"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: lpfc: Reduce log messages seen after firmware download
scsi: lpfc: Remove NVMe support if kernel has NVME_FC disabled
+20
-7
+10
-3
drivers/scsi/lpfc/lpfc.h
+10
-3
drivers/scsi/lpfc/lpfc.h
···
1161
1161
uint32_t cfg_hostmem_hgp;
1162
1162
uint32_t cfg_log_verbose;
1163
1163
uint32_t cfg_enable_fc4_type;
1164
+
#define LPFC_ENABLE_FCP 1
1165
+
#define LPFC_ENABLE_NVME 2
1166
+
#define LPFC_ENABLE_BOTH 3
1167
+
#if (IS_ENABLED(CONFIG_NVME_FC))
1168
+
#define LPFC_MAX_ENBL_FC4_TYPE LPFC_ENABLE_BOTH
1169
+
#define LPFC_DEF_ENBL_FC4_TYPE LPFC_ENABLE_BOTH
1170
+
#else
1171
+
#define LPFC_MAX_ENBL_FC4_TYPE LPFC_ENABLE_FCP
1172
+
#define LPFC_DEF_ENBL_FC4_TYPE LPFC_ENABLE_FCP
1173
+
#endif
1164
1174
uint32_t cfg_aer_support;
1165
1175
uint32_t cfg_sriov_nr_virtfn;
1166
1176
uint32_t cfg_request_firmware_upgrade;
···
1192
1182
uint32_t cfg_ras_fwlog_func;
1193
1183
uint32_t cfg_enable_bbcr; /* Enable BB Credit Recovery */
1194
1184
uint32_t cfg_enable_dpp; /* Enable Direct Packet Push */
1195
-
#define LPFC_ENABLE_FCP 1
1196
-
#define LPFC_ENABLE_NVME 2
1197
-
#define LPFC_ENABLE_BOTH 3
1198
1185
uint32_t cfg_enable_pbde;
1199
1186
uint32_t cfg_enable_mi;
1200
1187
struct nvmet_fc_target_port *targetport;
+2
-2
drivers/scsi/lpfc/lpfc_attr.c
+2
-2
drivers/scsi/lpfc/lpfc_attr.c
···
3978
3978
* 3 - register both FCP and NVME
3979
3979
* Supported values are [1,3]. Default value is 3
3980
3980
*/
3981
-
LPFC_ATTR_R(enable_fc4_type, LPFC_ENABLE_BOTH,
3982
-
LPFC_ENABLE_FCP, LPFC_ENABLE_BOTH,
3981
+
LPFC_ATTR_R(enable_fc4_type, LPFC_DEF_ENBL_FC4_TYPE,
3982
+
LPFC_ENABLE_FCP, LPFC_MAX_ENBL_FC4_TYPE,
3983
3983
"Enable FC4 Protocol support - FCP / NVME");
3984
3984
3985
3985
/*
+1
-1
drivers/scsi/lpfc/lpfc_init.c
+1
-1
drivers/scsi/lpfc/lpfc_init.c
···
2104
2104
}
2105
2105
if (reg_err1 == SLIPORT_ERR1_REG_ERR_CODE_2 &&
2106
2106
reg_err2 == SLIPORT_ERR2_REG_FW_RESTART) {
2107
-
lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
2107
+
lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
2108
2108
"3143 Port Down: Firmware Update "
2109
2109
"Detected\n");
2110
2110
en_rn_msg = false;
+7
-1
drivers/scsi/lpfc/lpfc_sli.c
+7
-1
drivers/scsi/lpfc/lpfc_sli.c
···
13363
13363
uint32_t uerr_sta_hi, uerr_sta_lo;
13364
13364
uint32_t if_type, portsmphr;
13365
13365
struct lpfc_register portstat_reg;
13366
+
u32 logmask;
13366
13367
13367
13368
/*
13368
13369
* For now, use the SLI4 device internal unrecoverable error
···
13414
13413
readl(phba->sli4_hba.u.if_type2.ERR1regaddr);
13415
13414
phba->work_status[1] =
13416
13415
readl(phba->sli4_hba.u.if_type2.ERR2regaddr);
13417
-
lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
13416
+
logmask = LOG_TRACE_EVENT;
13417
+
if (phba->work_status[0] ==
13418
+
SLIPORT_ERR1_REG_ERR_CODE_2 &&
13419
+
phba->work_status[1] == SLIPORT_ERR2_REG_FW_RESTART)
13420
+
logmask = LOG_SLI;
13421
+
lpfc_printf_log(phba, KERN_ERR, logmask,
13418
13422
"2885 Port Status Event: "
13419
13423
"port status reg 0x%x, "
13420
13424
"port smphr reg 0x%x, "