Skip to content

[orchagent]: admin-disable port before setPortSerdesAttribute() #2831

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
lguohan merged 13 commits into from
Aug 24, 2023
Merged

[orchagent]: admin-disable port before setPortSerdesAttribute() #2831

Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
629f264
Media-based NPU setting: admin-disable port before setPortSerdesAttri…
amnsinghal May 9, 2023
30d3bc2
Merge branch 'master' into OA_serdes_attr_admin_down
amnsinghal Jul 7, 2023
46fc09c
Merge branch 'master' into OA_serdes_attr_admin_down
amnsinghal Jul 18, 2023
1256245
Merge 2 commits from sonic-net:master
amnsinghal Jul 24, 2023
41eab18
Revert "Merge 2 commits from sonic-net:master"
amnsinghal Jul 24, 2023
7698b8d
Merge branch 'master' into OA_serdes_attr_admin_down
amnsinghal Jul 24, 2023
a5b94f3
Update syslog in orchagent/portsorch.cpp
amnsinghal Jul 25, 2023
653a291
Update syslog in orchagent/portsorch.cpp
amnsinghal Jul 25, 2023
20183a1
Merge branch 'master' into OA_serdes_attr_admin_down
amnsinghal Aug 17, 2023
845f5d3
Merge branch 'master' into OA_serdes_attr_admin_down
amnsinghal Aug 21, 2023
c556b19
Merge branch 'master' into OA_serdes_attr_admin_down
prsunny Aug 22, 2023
cfae7f8
Added UT for admin-disable before setPortSerdesAttribute()
amnsinghal Aug 23, 2023
0b75d3b
Merge branch 'master' into OA_serdes_attr_admin_down
amnsinghal Aug 24, 2023
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
35 changes: 26 additions & 9 deletions orchagent/portsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3996,17 +3996,34 @@ void PortsOrch::doPortTask(Consumer &consumer)
p.m_preemphasis = serdes_attr;
m_portList[p.m_alias] = p;
}
else if (setPortSerdesAttribute(p.m_port_id, gSwitchId, serdes_attr))
{
SWSS_LOG_NOTICE("Set port %s preemphasis is success", p.m_alias.c_str());
p.m_preemphasis = serdes_attr;
m_portList[p.m_alias] = p;
}
else
{
SWSS_LOG_ERROR("Failed to set port %s pre-emphasis", p.m_alias.c_str());
it++;
continue;
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_preemphasis = serdes_attr;
m_portList[p.m_alias] = p;
}
else
{
SWSS_LOG_ERROR("Failed to set port %s SI settings", p.m_alias.c_str());
it++;
continue;
}
}
}

Expand Down