Skip to content

Extract serdes programming logic into dedicated function #4285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prsunny merged 18 commits into from
Mar 20, 2026
Merged

Extract serdes programming logic into dedicated function #4285

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7907fb7
Address Copilot review feedback from previous PR
bgallagher-nexthop Mar 2, 2026
fdd5e19
Merge branch 'master' into bgallagher.copilot-review-feedback
bgallagher-nexthop Mar 3, 2026
a2e0429
copilot review feedback
bgallagher-nexthop Mar 3, 2026
497d75d
Empty commit to re-trigger builds
bgallagher-nexthop Mar 3, 2026
ba67b23
Empty commit to trigger builds
bgallagher-nexthop Mar 4, 2026
3ca8607
Refactor lambda to a standalone function
bgallagher-nexthop Mar 4, 2026
309e59c
Add function declaration to header file
bgallagher-nexthop Mar 5, 2026
ffa589f
Merge branch 'master' into bgallagher.copilot-review-feedback
bgallagher-nexthop Mar 5, 2026
1b4fb5c
Merge branch 'master' into bgallagher.copilot-review-feedback
bgallagher-nexthop Mar 6, 2026
e5e5b9e
Empty commit to retry build
bgallagher-nexthop Mar 6, 2026
551f8a2
Merge branch 'master' into bgallagher.copilot-review-feedback
bgallagher-nexthop Mar 10, 2026
372808d
Empty commit to retry CI jobs
bgallagher-nexthop Mar 10, 2026
bffd654
empty commit to retry build
bgallagher-nexthop Mar 11, 2026
d461677
Merge branch 'master' into bgallagher.copilot-review-feedback
bgallagher-nexthop Mar 11, 2026
cc1ce4e
Merge branch 'master' into bgallagher.copilot-review-feedback
bgallagher-nexthop Mar 11, 2026
ea2fc2f
Merge branch 'master' into bgallagher.copilot-review-feedback
bgallagher-nexthop Mar 16, 2026
fe87ef1
Merge branch 'master' into bgallagher.copilot-review-feedback
bgallagher-nexthop Mar 18, 2026
108bb86
Merge branch 'master' into bgallagher.copilot-review-feedback
bgallagher-nexthop Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 40 additions & 62 deletions orchagent/portsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5260,6 +5260,41 @@ void PortsOrch::doPortTask(Consumer &consumer)
}
}

// Helper lambda to program serdes with admin state management
auto programSerdes = [&](
sai_object_id_t port_id,
sai_object_id_t switch_id,
map<sai_port_serdes_attr_t, SerdesValue> &serdes_attr,
const char* serdes_type_name) -> bool
{
if (p.m_admin_state_up)
{
/* Bring port down before applying serdes attribute */
if (!setPortAdminStatus(p, false))
{
SWSS_LOG_ERROR("Failed to set port %s admin status DOWN to set %s serdes attr",
p.m_alias.c_str(), serdes_type_name);
return false;
}

p.m_admin_state_up = false;
m_portList[p.m_alias] = p;
}

if (setPortSerdesAttribute(port_id, switch_id, serdes_attr))
{
SWSS_LOG_NOTICE("Successfully set %s serdes tunings for port %s",
serdes_type_name, p.m_alias.c_str());
return true;
}
else
{
SWSS_LOG_ERROR("Failed to set %s serdes tunings for port %s",
serdes_type_name, p.m_alias.c_str());
return false;
}
};

if (!serdes_attr.empty())
{
if (p.m_link_training)
Expand All @@ -5270,32 +5305,13 @@ void PortsOrch::doPortTask(Consumer &consumer)
}
else
{
if (p.m_admin_state_up)
{
/* Bring port down before applying serdes attribute*/
if (!setPortAdminStatus(p, false))
{
SWSS_LOG_ERROR("Failed to set port %s admin status DOWN to set serdes attr", p.m_alias.c_str());
it++;
continue;
}

p.m_admin_state_up = false;
m_portList[p.m_alias] = p;
}

if (setPortSerdesAttribute(p.m_port_id, gSwitchId, serdes_attr))
{
SWSS_LOG_NOTICE("Set port %s SI settings is successful", p.m_alias.c_str());
p.m_serdes_attrs = serdes_attr;
m_portList[p.m_alias] = p;
}
else
if (!programSerdes(p.m_port_id, gSwitchId, serdes_attr, "ASIC"))
{
SWSS_LOG_ERROR("Failed to set port %s SI settings", p.m_alias.c_str());
it++;
continue;
}
p.m_serdes_attrs = serdes_attr;
m_portList[p.m_alias] = p;
}
}
if (pCfg.media_type.is_set)
Expand All @@ -5316,55 +5332,17 @@ void PortsOrch::doPortTask(Consumer &consumer)

if (p.m_line_side_id && !line_serdes_attr.empty())
{
if (p.m_admin_state_up)
if (!programSerdes(p.m_line_side_id, p.m_switch_id, line_serdes_attr, "gearbox line-side"))
{
/* Bring port down before applying serdes attribute*/
if (!setPortAdminStatus(p, false))
{
SWSS_LOG_ERROR("Failed to set port %s admin status DOWN to set gb line serdes attr", p.m_alias.c_str());
it++;
continue;
}

p.m_admin_state_up = false;
m_portList[p.m_alias] = p;
}

if (setPortSerdesAttribute(p.m_line_side_id, p.m_switch_id, line_serdes_attr))
{
SWSS_LOG_NOTICE("Successfully set line-side gearbox tunings for port %s", p.m_alias.c_str());
}
else
{
SWSS_LOG_ERROR("Failed to set line-side gearbox tunings for port %s", p.m_alias.c_str());
it++;
continue;
}
}

if (p.m_system_side_id && !system_serdes_attr.empty())
{
if (p.m_admin_state_up)
{
/* Bring port down before applying serdes attribute*/
if (!setPortAdminStatus(p, false))
{
SWSS_LOG_ERROR("Failed to set port %s admin status DOWN to set gb system serdes attr", p.m_alias.c_str());
it++;
continue;
}

p.m_admin_state_up = false;
m_portList[p.m_alias] = p;
}

if (setPortSerdesAttribute(p.m_system_side_id, p.m_switch_id, system_serdes_attr))
{
SWSS_LOG_NOTICE("Successfully set system-side gearbox tunings for port %s", p.m_alias.c_str());
}
else
if (!programSerdes(p.m_system_side_id, p.m_switch_id, system_serdes_attr, "gearbox system-side"))
{
SWSS_LOG_ERROR("Failed to set system-side gearbox tunings for port %s", p.m_alias.c_str());
it++;
continue;
}
Expand Down
15 changes: 15 additions & 0 deletions tests/mock_tests/portsorch_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,21 @@ namespace portsorch_test
_In_ sai_object_id_t port_serdes_id)
{
_sai_remove_port_serdes_calls.push_back(port_serdes_id);

// Erase any port-to-serdes mappings that reference this serdes ID,
// so subsequent SAI_PORT_ATTR_PORT_SERDES_ID queries reflect removal.
for (auto it = _port_to_serdes_map.begin(); it != _port_to_serdes_map.end(); )
{
if (it->second == port_serdes_id)
{
it = _port_to_serdes_map.erase(it);
}
else
{
++it;
}
}

return SAI_STATUS_SUCCESS;
}

Expand Down
Loading