Skip to content
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

Jump to bottom

[Marvell] platform renaming for innovium #3252

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Marvell] platform renaming for innovium #3252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1f0c0b
platform/innovium renaming to platform/marvell-teralynx
krismarvell Mar 26, 2024
81222c3
platform/marvell renaming to platform/marvell-prestera
krismarvell Jul 25, 2024
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 mclagsyncd/mclaglink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ void MclagLink::setPortIsolate(char *msg)
BRCM_PLATFORM_SUBSTRING,
BFN_PLATFORM_SUBSTRING,
CTC_PLATFORM_SUBSTRING,
MRVL_PLATFORM_SUBSTRING
MRVL_PRST_PLATFORM_SUBSTRING
};

const char *platform = getenv("platform");
Expand Down
2 changes: 1 addition & 1 deletion mclagsyncd/mclaglink.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#define BRCM_PLATFORM_SUBSTRING "broadcom"
#define BFN_PLATFORM_SUBSTRING "barefoot"
#define CTC_PLATFORM_SUBSTRING "centec"
#define MRVL_PLATFORM_SUBSTRING "marvell"
#define MRVL_PRST_PLATFORM_SUBSTRING "marvell-prestera"

using namespace std;

Expand Down
4 changes: 2 additions & 2 deletions orchagent/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ 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 \
pfc_detect_marvell_prestera.lua \
pfc_detect_barefoot.lua \
pfc_detect_nephos.lua \
pfc_detect_cisco-8000.lua \
Expand Down
10 changes: 5 additions & 5 deletions orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3100,8 +3100,8 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
platform == CISCO_8000_PLATFORM_SUBSTRING ||
platform == MLNX_PLATFORM_SUBSTRING ||
platform == BFN_PLATFORM_SUBSTRING ||
platform == MRVL_PLATFORM_SUBSTRING ||
platform == INVM_PLATFORM_SUBSTRING ||
platform == MRVL_PRST_PLATFORM_SUBSTRING ||
platform == MRVL_TL_PLATFORM_SUBSTRING ||
platform == NPS_PLATFORM_SUBSTRING ||
platform == XS_PLATFORM_SUBSTRING ||
platform == VS_PLATFORM_SUBSTRING)
Expand All @@ -3121,8 +3121,8 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
};
}

if ( platform == MRVL_PLATFORM_SUBSTRING ||
platform == INVM_PLATFORM_SUBSTRING ||
if ( platform == MRVL_PRST_PLATFORM_SUBSTRING ||
platform == MRVL_TL_PLATFORM_SUBSTRING ||
platform == VS_PLATFORM_SUBSTRING)
{
m_L3V4V6Capability =
Expand Down Expand Up @@ -3156,7 +3156,7 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
// In Broadcom DNX platform also, V4 and V6 rules are stored in different tables
if (platform == MLNX_PLATFORM_SUBSTRING ||
platform == CISCO_8000_PLATFORM_SUBSTRING ||
platform == MRVL_PLATFORM_SUBSTRING ||
platform == MRVL_PRST_PLATFORM_SUBSTRING ||
platform == XS_PLATFORM_SUBSTRING ||
(platform == BRCM_PLATFORM_SUBSTRING && sub_platform == BRCM_DNX_PLATFORM_SUBSTRING))
{
Expand Down
6 changes: 3 additions & 3 deletions orchagent/copporch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ void CoppOrch::initDefaultTrapIds()
/* 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))))
if (!platform || (!strstr(platform, MLNX_PLATFORM_SUBSTRING) && (!strstr(platform, MRVL_PRST_PLATFORM_SUBSTRING))))
{
attr.id = SAI_HOSTIF_TRAP_ATTR_TRAP_PRIORITY;
attr.value.u32 = 0;
Expand Down 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_PRST_PLATFORM_SUBSTRING))))
{
attr.id = SAI_HOSTIF_TRAP_ATTR_TRAP_PRIORITY,
attr.value.u32 = (uint32_t)stoul(fvValue(*i));
Expand Down
4 changes: 2 additions & 2 deletions orchagent/orch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ 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 MRVL_PRST_PLATFORM_SUBSTRING "marvell-prestera"
#define MLNX_PLATFORM_SUBSTRING "mellanox"
#define BRCM_PLATFORM_SUBSTRING "broadcom"
#define BRCM_DNX_PLATFORM_SUBSTRING "broadcom-dnx"
#define BFN_PLATFORM_SUBSTRING "barefoot"
#define VS_PLATFORM_SUBSTRING "vs"
#define NPS_PLATFORM_SUBSTRING "nephos"
#define MRVL_PLATFORM_SUBSTRING "marvell"
#define CISCO_8000_PLATFORM_SUBSTRING "cisco-8000"
#define XS_PLATFORM_SUBSTRING "xsight"

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_PRST_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_PRST_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_marvell.lua → orchagent/pfc_detect_marvell_prestera.lua
View file
Open in desktop
File renamed without changes.
0 orchagent/pfc_detect_innovium.lua → orchagent/pfc_detect_marvell_teralynx.lua
View file
Open in desktop
File renamed without changes.
Loading