Skip to content

W
White Rabbit Switch - Software
Commit 2c8f84cd authored by Maciej Lipinski's avatar Maciej Lipinski
Browse files
Options

[HAL] correct behavior for SFPs with corrupted header. 

Despite corrupted header, we still want to use this
SFP because it can actually be functional. We have
copper SFPs with such problem that are fully functional
(and did work with the previous version of HAL, by chance).

So, we now detect insertion of such SFP (with unreadable
header), yet we make sure that such SFP is declared
unrecognized (zero header data) such that SNMP complains.
parent afd24ac1
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
userspace/wrsw_hal/hal_ports.c
View file @ 2c8f84cd
......@@ -312,7 +312,6 @@ static void hal_port_insert_sfp(struct hal_port_state * ps)
memset(&shdr, 0, sizeof(struct shw_sfp_header));
memset(&ps->calib.sfp_dom_raw, 0, sizeof(struct shw_sfp_dom));
err = shw_sfp_read_verify_header(ps->hw_index, &shdr);
memcpy(&ps->calib.sfp_header_raw, &shdr, sizeof(struct shw_sfp_header));
if (err == -2) {
pr_error("%s SFP module not inserted. Failed to read SFP "
"configuration header\n", ps->name);
......@@ -320,8 +319,12 @@ static void hal_port_insert_sfp(struct hal_port_state * ps)
} else if (err < 0) {
pr_error("Failed to read SFP configuration header for %s\n",
ps->name);
return;
/* Clear any mess that was wrongly read to make sure that
the SFP will be unrecognized. */
memset(&shdr, 0, sizeof(struct shw_sfp_header));
}
memcpy(&ps->calib.sfp_header_raw, &shdr, sizeof(struct shw_sfp_header));
if (hal_shmem->read_sfp_diag == READ_SFP_DIAG_ENABLE
&& shdr.diagnostic_monitoring_type & SFP_DIAGNOSTIC_IMPLEMENTED) {
pr_info("SFP Diagnostic Monitoring implemented in SFP plugged"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment