lpfc: Set sli4_param's cmf option to zero when CMF is turned off
Subsystems (2)
PATCH 1/5 lpfc: Set sli4_param's cmf option to zero when CMF is turned off
Add missed clearing of phba->sli4_hba.pc_sli4_params.cmf when CMF is turned off.
--- drivers/scsi/lpfc/lpfc_sli.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/lpfc/lpfc_sli.c +1 -0
@@ -8354,6 +8354,7 @@ lpfc_cmf_setup(struct lpfc_hba *phba) phba->cgn_i =NULL ;/* Ensure CGN Mode is off */ phba->cmf_active_mode =LPFC_CFG_OFF ; + sli4_params->cmf =0 ;return 0 ; } }
Signature · 1 line
2.38.0.83.gd420dda057
PATCH 2/5 lpfc: Fix hard lockup when reading the rx_monitor from debugfs
During I/O and simultaneous cat of /sys/kernel/debug/lpfc/fnX/rx_monitor, a hard lockup similar to the call trace below may occur.
The spin_lock_bh in lpfc_rx_monitor_report is not protecting from timer interrupts as expected, so change the strength of the spin lock to _irq.
Kernel panic - not syncing: Hard LOCKUP CPU: 3 PID: 110402 Comm: cat Kdump: loaded
exception RIP: native_queued_spin_lock_slowpath+91
[IRQ stack]
native_queued_spin_lock_slowpath at ffffffffb814e30b _raw_spin_lock at ffffffffb89a667a lpfc_rx_monitor_record at ffffffffc0a73a36 [lpfc] lpfc_cmf_timer at ffffffffc0abbc67 [lpfc] __hrtimer_run_queues at ffffffffb8184250 hrtimer_interrupt at ffffffffb8184ab0 smp_apic_timer_interrupt at ffffffffb8a026ba apic_timer_interrupt at ffffffffb8a01c4f
[End of IRQ stack]
apic_timer_interrupt at ffffffffb8a01c4f lpfc_rx_monitor_report at ffffffffc0a73c80 [lpfc] lpfc_rx_monitor_read at ffffffffc0addde1 [lpfc] full_proxy_read at ffffffffb83e7fc3 vfs_read at ffffffffb833fe71
ksys_read at ffffffffb83402af do_syscall_64 at ffffffffb800430b entry_SYSCALL_64_after_hwframe at ffffffffb8a000ad
--- drivers/scsi/lpfc/lpfc_sli.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +3 -3
@@ -8150,10 +8150,10 @@ u32 lpfc_rx_monitor_report(struct lpfc_hba *phba, "IO_cnt", "Info", "BWutil(ms)"); } -/* Needs to be _bh because record is called from timer interrupt +/* Needs to be _irq because record is called from timer interrupt * context */ -spin_lock_bh (ring_lock); +spin_lock_irq (ring_lock);while (*head_idx != *tail_idx) { entry = &ring[*head_idx];
@@ -8197,7 +8197,7 @@ u32 lpfc_rx_monitor_report(struct lpfc_hba *phba,if (cnt >= max_read_entries)break ; } -spin_unlock_bh (ring_lock); +spin_unlock_irq (ring_lock);return cnt; }
Signature · 1 line
2.38.0.83.gd420dda057
PATCH 3/5 lpfc: Log when congestion management limits are in effect
In reply to Justin TeeWhen bandwidth reduces from or recovers back to 100% due to congestion management, log the event.
--- drivers/scsi/lpfc/lpfc_sli.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/scsi/lpfc/lpfc_sli.c +12 -0
@@ -1848,6 +1848,18 @@ lpfc_cmf_sync_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, phba->cmf_link_byte_count); bwpcent =div64_u64 (bw *100 + slop, phba->cmf_link_byte_count); + +if (phba->cmf_max_bytes_per_interval < bw && + bwpcent >95 ) +lpfc_printf_log (phba,KERN_INFO ,LOG_CGN_MGMT , +"6208 Congestion bandwidth " +"limits removed\n" ); +else if ((phba->cmf_max_bytes_per_interval > bw) && + ((bwpcent + pcent) <=100 ) && ((bwpcent + pcent) >95 )) +lpfc_printf_log (phba,KERN_INFO ,LOG_CGN_MGMT , +"6209 Congestion bandwidth " +"limits in effect\n" ); +if (asig) {lpfc_printf_log (phba,KERN_INFO ,LOG_CGN_MGMT , "6237 BW Threshold %lld%% (%lld): "
Signature · 1 line
2.38.0.83.gd420dda057
PATCH 4/5 lpfc: Create a sysfs entry called lpfc_xcvr_data for transceiver info
In reply to Justin TeeThe DUMP_MEMORY mailbox command is implemented for page A0 and A2 to retrieve transceiver information from firmware.
The mailbox command output is then formatted to print raw data values for userspace to parse via sysfs.
--- drivers/scsi/lpfc/lpfc_attr.c | 118 +++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_crtn.h | 3 + drivers/scsi/lpfc/lpfc_els.c | 128 ++++++++++++++++++++++++++++++++++ drivers/scsi/lpfc/lpfc_hw4.h | 5 +- 4 files changed, 252 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_attr.c +118 -0
@@ -1877,6 +1877,122 @@ lpfc_set_trunking(struct lpfc_hba *phba, char *buff_out)return 0 ; } +static ssize_t +lpfc_xcvr_data_show (struct device *dev,struct device_attribute *attr, +char *buf) +{ +struct Scsi_Host *shost =class_to_shost (dev); +struct lpfc_vport *vport = (struct lpfc_vport *)shost->hostdata; +struct lpfc_hba *phba = vport->phba; +int rc; +int len =0 ; +struct lpfc_rdp_context *rdp_context; +u16 temperature; +u16 rx_power; +u16 tx_bias; +u16 tx_power; +u16 vcc; +char chbuf[128 ]; +u16 wavelength =0 ; +struct sff_trasnceiver_codes_byte7 *trasn_code_byte7; + +/* Get transceiver information */ + rdp_context =kmalloc (sizeof (*rdp_context),GFP_KERNEL ); + + rc =lpfc_get_sfp_info_wait (phba, rdp_context); +if (rc) { + len =scnprintf (buf,PAGE_SIZE - len,"SFP info NA:\n" ); + goto out_free_rdp; + } + +strncpy (chbuf, &rdp_context->page_a0[SSF_VENDOR_NAME ],16 ); + chbuf[16 ] =0 ; + + len =scnprintf (buf,PAGE_SIZE - len,"VendorName:\t%s\n" , chbuf); + len +=scnprintf (buf + len,PAGE_SIZE - len, +"VendorOUI:\t%02x-%02x-%02x\n" , + (uint8_t )rdp_context->page_a0[SSF_VENDOR_OUI ], + (uint8_t )rdp_context->page_a0[SSF_VENDOR_OUI +1 ], + (uint8_t )rdp_context->page_a0[SSF_VENDOR_OUI +2 ]); +strncpy (chbuf, &rdp_context->page_a0[SSF_VENDOR_PN ],16 ); + chbuf[16 ] =0 ; + len +=scnprintf (buf + len,PAGE_SIZE - len,"VendorPN:\t%s\n" , chbuf); +strncpy (chbuf, &rdp_context->page_a0[SSF_VENDOR_SN ],16 ); + chbuf[16 ] =0 ; + len +=scnprintf (buf + len,PAGE_SIZE - len,"VendorSN:\t%s\n" , chbuf); +strncpy (chbuf, &rdp_context->page_a0[SSF_VENDOR_REV ],4 ); + chbuf[4 ] =0 ; + len +=scnprintf (buf + len,PAGE_SIZE - len,"VendorRev:\t%s\n" , chbuf); +strncpy (chbuf, &rdp_context->page_a0[SSF_DATE_CODE ],8 ); + chbuf[8 ] =0 ; + len +=scnprintf (buf + len,PAGE_SIZE - len,"DateCode:\t%s\n" , chbuf); + len +=scnprintf (buf + len,PAGE_SIZE - len,"Identifier:\t%xh\n" , + (uint8_t )rdp_context->page_a0[SSF_IDENTIFIER ]); + len +=scnprintf (buf + len,PAGE_SIZE - len,"ExtIdentifier:\t%xh\n" , + (uint8_t )rdp_context->page_a0[SSF_EXT_IDENTIFIER ]); + len +=scnprintf (buf + len,PAGE_SIZE - len,"Connector:\t%xh\n" , + (uint8_t )rdp_context->page_a0[SSF_CONNECTOR ]); + wavelength = (rdp_context->page_a0[SSF_WAVELENGTH_B1 ] <<8 ) | + rdp_context->page_a0[SSF_WAVELENGTH_B0 ]; + + len +=scnprintf (buf + len,PAGE_SIZE - len,"Wavelength:\t%d nm\n" , + wavelength); + trasn_code_byte7 = (struct sff_trasnceiver_codes_byte7 *) + &rdp_context->page_a0[SSF_TRANSCEIVER_CODE_B7 ]; + + len +=scnprintf (buf + len,PAGE_SIZE - len,"Speeds: \t" ); +if (*(uint8_t *)trasn_code_byte7 ==0 ) { + len +=scnprintf (buf + len,PAGE_SIZE - len, +"Unknown\n" ); + }else { +if (trasn_code_byte7->fc_sp_100MB) + len +=scnprintf (buf + len,PAGE_SIZE - len, +"1 " ); +if (trasn_code_byte7->fc_sp_200mb) + len +=scnprintf (buf + len,PAGE_SIZE - len, +"2 " ); +if (trasn_code_byte7->fc_sp_400MB) + len +=scnprintf (buf + len,PAGE_SIZE - len, +"4 " ); +if (trasn_code_byte7->fc_sp_800MB) + len +=scnprintf (buf + len,PAGE_SIZE - len, +"8 " ); +if (trasn_code_byte7->fc_sp_1600MB) + len +=scnprintf (buf + len,PAGE_SIZE - len, +"16 " ); +if (trasn_code_byte7->fc_sp_3200MB) + len +=scnprintf (buf + len,PAGE_SIZE - len, +"32 " ); +if (trasn_code_byte7->speed_chk_ecc) + len +=scnprintf (buf + len,PAGE_SIZE - len, +"64 " ); + len +=scnprintf (buf + len,PAGE_SIZE - len,"GB\n" ); + } + temperature = (rdp_context->page_a2[SFF_TEMPERATURE_B1 ] <<8 | + rdp_context->page_a2[SFF_TEMPERATURE_B0 ]); + vcc = (rdp_context->page_a2[SFF_VCC_B1 ] <<8 | + rdp_context->page_a2[SFF_VCC_B0 ]); + tx_power = (rdp_context->page_a2[SFF_TXPOWER_B1 ] <<8 | + rdp_context->page_a2[SFF_TXPOWER_B0 ]); + tx_bias = (rdp_context->page_a2[SFF_TX_BIAS_CURRENT_B1 ] <<8 | + rdp_context->page_a2[SFF_TX_BIAS_CURRENT_B0 ]); + rx_power = (rdp_context->page_a2[SFF_RXPOWER_B1 ] <<8 | + rdp_context->page_a2[SFF_RXPOWER_B0 ]); + + len +=scnprintf (buf + len,PAGE_SIZE - len, +"Temperature:\tx%04x C\n" , temperature); + len +=scnprintf (buf + len,PAGE_SIZE - len,"Vcc:\t\tx%04x V\n" , vcc); + len +=scnprintf (buf + len,PAGE_SIZE - len, +"TxBiasCurrent:\tx%04x mA\n" , tx_bias); + len +=scnprintf (buf + len,PAGE_SIZE - len,"TxPower:\tx%04x mW\n" , + tx_power); + len +=scnprintf (buf + len,PAGE_SIZE - len,"RxPower:\tx%04x mW\n" , + rx_power); +out_free_rdp: +kfree (rdp_context); +return len; +} +/** * lpfc_board_mode_show - Return the state of the board * @dev: class device that is converted into a Scsi_host.
@@ -2810,6 +2926,7 @@ static DEVICE_ATTR_RO(lpfc_drvr_version);static DEVICE_ATTR_RO (lpfc_enable_fip); static DEVICE_ATTR(board_mode, S_IRUGO | S_IWUSR, lpfc_board_mode_show, lpfc_board_mode_store); +static DEVICE_ATTR_RO (lpfc_xcvr_data); static DEVICE_ATTR(issue_reset, S_IWUSR, NULL, lpfc_issue_reset); static DEVICE_ATTR(max_vpi, S_IRUGO, lpfc_max_vpi_show, NULL); static DEVICE_ATTR(used_vpi, S_IRUGO, lpfc_used_vpi_show, NULL);
@@ -5906,6 +6023,7 @@ static struct attribute *lpfc_hba_attrs[] = { &dev_attr_lpfc_fcp_wait_abts_rsp.attr, &dev_attr_nport_evt_cnt.attr, &dev_attr_board_mode.attr, + &dev_attr_lpfc_xcvr_data.attr, &dev_attr_max_vpi.attr, &dev_attr_used_vpi.attr, &dev_attr_max_rpi.attr,
drivers/scsi/lpfc/lpfc_crtn.h +3 -0
@@ -687,3 +687,6 @@ int lpfc_issue_els_qfpa(struct lpfc_vport *vport);void lpfc_sli_rpi_release (struct lpfc_vport *vport,struct lpfc_nodelist *ndlp); + +int lpfc_get_sfp_info_wait (struct lpfc_hba *phba, +struct lpfc_rdp_context *rdp_context);
drivers/scsi/lpfc/lpfc_els.c +128 -0
134 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_hw4.h +3 -2
@@ -3162,7 +3162,8 @@ struct lpfc_mbx_memory_dump_type3 {#define SFF_LENGTH_COPPER 18#define SSF_LENGTH_50UM_OM3 19#define SSF_VENDOR_NAME 20 -#define SSF_VENDOR_OUI 36 +#define SSF_TRANSCEIVER2 36 +#define SSF_VENDOR_OUI 37#define SSF_VENDOR_PN 40#define SSF_VENDOR_REV 56#define SSF_WAVELENGTH_B1 60
@@ -3281,7 +3282,7 @@ struct sff_trasnceiver_codes_byte6 {struct sff_trasnceiver_codes_byte7 {uint8_t fc_sp_100MB:1 ;/* 100 MB/sec */ -uint8_t reserve:1 ; +uint8_t speed_chk_ecc:1 ;uint8_t fc_sp_200mb:1 ;/* 200 MB/sec */ uint8_t fc_sp_3200MB:1 ;/* 3200 MB/sec */ uint8_t fc_sp_400MB:1 ;/* 400 MB/sec */
Signature · 1 line
2.38.0.83.gd420dda057
PATCH 5/5 lpfc: Update lpfc version to 14.2.0.8
In reply to Justin TeeUpdate lpfc version to 14.2.0.8
--- drivers/scsi/lpfc/lpfc_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_version.h +1 -1
@@ -20,7 +20,7 @@* included with this package. * *******************************************************************/ -#define LPFC_DRIVER_VERSION "14.2.0.7" +#define LPFC_DRIVER_VERSION "14.2.0.8"#define LPFC_DRIVER_NAME "lpfc"/* Used for SLI 2/3 */
Signature · 1 line
2.38.0.83.gd420dda057
Martin K. Petersen
AppliedJustin,
Quoted 2 lines
Add missed clearing of
phba->sli4_hba.pc_sli4_params.cmfwhen CMF is turned off.
Applied to 6.2/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 4 lines · Justin Tee
Add missed clearing of
phba->sli4_hba.pc_sli4_params.cmfwhen CMF is turned off.
Applied to 6.2/scsi-queue, thanks!
[1/5] lpfc: Set sli4_param's cmf option to zero when CMF is turned off
https://git.kernel.org/mkp/scsi/c/4fc66e7b16ad [2/5] lpfc: Fix hard lockup when reading the rx_monitor from debugfs https://git.kernel.org/mkp/scsi/c/c44e50f4a0ec [3/5] lpfc: Log when congestion management limits are in effect https://git.kernel.org/mkp/scsi/c/eaf660e4282b [4/5] lpfc: Create a sysfs entry called lpfc_xcvr_data for transceiver info https://git.kernel.org/mkp/scsi/c/479b0917e447 [5/5] lpfc: Update lpfc version to 14.2.0.8 https://git.kernel.org/mkp/scsi/c/24b3e45ca9c5
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering