Skip to content

[Marvell] platform renaming for innovium #3252

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 1 commit into from
Nov 19, 2024
Merged

[Marvell] platform renaming for innovium #3252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion orchagent/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ swssdir = $(datadir)/swss
dist_swss_DATA = \
eliminate_events.lua \
rif_rates.lua \
pfc_detect_innovium.lua \
pfc_detect_marvell_teralynx.lua \
pfc_detect_mellanox.lua \
pfc_detect_broadcom.lua \
pfc_detect_marvell.lua \
Expand Down
4 changes: 2 additions & 2 deletions orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3128,7 +3128,7 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
platform == MLNX_PLATFORM_SUBSTRING ||
platform == BFN_PLATFORM_SUBSTRING ||
platform == MRVL_PLATFORM_SUBSTRING ||
platform == INVM_PLATFORM_SUBSTRING ||
platform == MRVL_TL_PLATFORM_SUBSTRING ||
platform == NPS_PLATFORM_SUBSTRING ||
platform == XS_PLATFORM_SUBSTRING ||
platform == VS_PLATFORM_SUBSTRING)
Expand All @@ -3149,7 +3149,7 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
}

if ( platform == MRVL_PLATFORM_SUBSTRING ||
platform == INVM_PLATFORM_SUBSTRING ||
platform == MRVL_TL_PLATFORM_SUBSTRING ||
platform == VS_PLATFORM_SUBSTRING)
{
m_L3V4V6Capability =
Expand Down
4 changes: 2 additions & 2 deletions orchagent/copporch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,8 +1014,8 @@ bool CoppOrch::getAttribsFromTrapGroup (vector<FieldValueTuple> &fv_tuple,
{
/* Mellanox platform doesn't support trap priority setting */
/* Marvell platform doesn't support trap priority. */
char *platform = getenv("platform");
if (!platform || (!strstr(platform, MLNX_PLATFORM_SUBSTRING) && (!strstr(platform, MRVL_PLATFORM_SUBSTRING))))
char *platform = getenv("platform");
if (!platform || (!strstr(platform, MLNX_PLATFORM_SUBSTRING) && (!strstr(platform, MRVL_PLATFORM_SUBSTRING))))
{
attr.id = SAI_HOSTIF_TRAP_ATTR_TRAP_PRIORITY,
attr.value.u32 = (uint32_t)stoul(fvValue(*i));
Expand Down
2 changes: 1 addition & 1 deletion orchagent/orch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const char range_specifier = '-';
const char config_db_key_delimiter = '|';
const char state_db_key_delimiter = '|';

#define INVM_PLATFORM_SUBSTRING "innovium"
#define MRVL_TL_PLATFORM_SUBSTRING "marvell-teralynx"
#define MLNX_PLATFORM_SUBSTRING "mellanox"
#define BRCM_PLATFORM_SUBSTRING "broadcom"
#define BRCM_DNX_PLATFORM_SUBSTRING "broadcom-dnx"
Expand Down
8 changes: 5 additions & 3 deletions orchagent/orchdaemon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,9 +590,9 @@ bool OrchDaemon::init()
queueAttrIds,
PFC_WD_POLL_MSECS));
}
else if ((platform == INVM_PLATFORM_SUBSTRING)
else if ((platform == MRVL_TL_PLATFORM_SUBSTRING)
|| (platform == MRVL_PLATFORM_SUBSTRING)
|| (platform == BFN_PLATFORM_SUBSTRING)
|| (platform == MRVL_PLATFORM_SUBSTRING)
|| (platform == NPS_PLATFORM_SUBSTRING))
{

Expand Down Expand Up @@ -624,7 +624,9 @@ bool OrchDaemon::init()

static const vector<sai_queue_attr_t> queueAttrIds;

if ((platform == INVM_PLATFORM_SUBSTRING) || (platform == NPS_PLATFORM_SUBSTRING) || (platform == MRVL_PLATFORM_SUBSTRING))
if ((platform == MRVL_PLATFORM_SUBSTRING) ||
(platform == MRVL_TL_PLATFORM_SUBSTRING) ||
(platform == NPS_PLATFORM_SUBSTRING))
{
m_orchList.push_back(new PfcWdSwOrch<PfcWdZeroBufferHandler, PfcWdLossyHandler>(
m_configDb,
Expand Down
0 orchagent/pfc_detect_innovium.lua → orchagent/pfc_detect_marvell_teralynx.lua
View file
Open in desktop
File renamed without changes.