From d1f0c0b119b4ff2b0ddd4fe5c0519ef3df7c57d9 Mon Sep 17 00:00:00 2001 From: ksridharan Date: Tue, 26 Mar 2024 05:33:34 -0700 Subject: [PATCH 1/2] platform/innovium renaming to platform/marvell-teralynx --- orchagent/Makefile.am | 2 +- orchagent/aclorch.cpp | 4 ++-- orchagent/copporch.cpp | 4 ++-- orchagent/orch.h | 2 +- orchagent/orchdaemon.cpp | 8 +++++--- ...etect_innovium.lua => pfc_detect_marvell_teralynx.lua} | 0 6 files changed, 11 insertions(+), 9 deletions(-) rename orchagent/{pfc_detect_innovium.lua => pfc_detect_marvell_teralynx.lua} (100%) diff --git a/orchagent/Makefile.am b/orchagent/Makefile.am index 44714f62a1..f6086c7e97 100644 --- a/orchagent/Makefile.am +++ b/orchagent/Makefile.am @@ -19,7 +19,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 \ diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp index f8bf775868..b28ab32e1e 100644 --- a/orchagent/aclorch.cpp +++ b/orchagent/aclorch.cpp @@ -3101,7 +3101,7 @@ void AclOrch::init(vector& 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) @@ -3122,7 +3122,7 @@ void AclOrch::init(vector& connectors, PortsOrch *portOrch, Mirr } if ( platform == MRVL_PLATFORM_SUBSTRING || - platform == INVM_PLATFORM_SUBSTRING || + platform == MRVL_TL_PLATFORM_SUBSTRING || platform == VS_PLATFORM_SUBSTRING) { m_L3V4V6Capability = diff --git a/orchagent/copporch.cpp b/orchagent/copporch.cpp index 749a8aae7e..634a8a8ed6 100644 --- a/orchagent/copporch.cpp +++ b/orchagent/copporch.cpp @@ -1014,8 +1014,8 @@ bool CoppOrch::getAttribsFromTrapGroup (vector &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)); diff --git a/orchagent/orch.h b/orchagent/orch.h index bdbecf5f5f..5e8939c53f 100644 --- a/orchagent/orch.h +++ b/orchagent/orch.h @@ -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" diff --git a/orchagent/orchdaemon.cpp b/orchagent/orchdaemon.cpp index 0d2ab1c200..f6e9428ab6 100644 --- a/orchagent/orchdaemon.cpp +++ b/orchagent/orchdaemon.cpp @@ -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)) { @@ -624,7 +624,9 @@ bool OrchDaemon::init() static const vector 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( m_configDb, diff --git a/orchagent/pfc_detect_innovium.lua b/orchagent/pfc_detect_marvell_teralynx.lua similarity index 100% rename from orchagent/pfc_detect_innovium.lua rename to orchagent/pfc_detect_marvell_teralynx.lua From 81222c33c09f9b882aa6f794beed2b85335b4361 Mon Sep 17 00:00:00 2001 From: Krishnan Sridharan Date: Thu, 25 Jul 2024 17:47:29 +0000 Subject: [PATCH 2/2] platform/marvell renaming to platform/marvell-prestera --- mclagsyncd/mclaglink.cpp | 2 +- mclagsyncd/mclaglink.h | 2 +- orchagent/Makefile.am | 2 +- orchagent/aclorch.cpp | 6 +++--- orchagent/copporch.cpp | 4 ++-- orchagent/orch.h | 2 +- orchagent/orchdaemon.cpp | 4 ++-- ...c_detect_marvell.lua => pfc_detect_marvell_prestera.lua} | 0 8 files changed, 11 insertions(+), 11 deletions(-) rename orchagent/{pfc_detect_marvell.lua => pfc_detect_marvell_prestera.lua} (100%) diff --git a/mclagsyncd/mclaglink.cpp b/mclagsyncd/mclaglink.cpp index 3cd224ce50..f48a0e1376 100644 --- a/mclagsyncd/mclaglink.cpp +++ b/mclagsyncd/mclaglink.cpp @@ -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"); diff --git a/mclagsyncd/mclaglink.h b/mclagsyncd/mclaglink.h index 1ff006968b..24532e6b54 100644 --- a/mclagsyncd/mclaglink.h +++ b/mclagsyncd/mclaglink.h @@ -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; diff --git a/orchagent/Makefile.am b/orchagent/Makefile.am index f6086c7e97..9dbff0bfc8 100644 --- a/orchagent/Makefile.am +++ b/orchagent/Makefile.am @@ -22,7 +22,7 @@ dist_swss_DATA = \ 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 \ diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp index b28ab32e1e..0f3309327f 100644 --- a/orchagent/aclorch.cpp +++ b/orchagent/aclorch.cpp @@ -3100,7 +3100,7 @@ void AclOrch::init(vector& connectors, PortsOrch *portOrch, Mirr platform == CISCO_8000_PLATFORM_SUBSTRING || platform == MLNX_PLATFORM_SUBSTRING || platform == BFN_PLATFORM_SUBSTRING || - platform == MRVL_PLATFORM_SUBSTRING || + platform == MRVL_PRST_PLATFORM_SUBSTRING || platform == MRVL_TL_PLATFORM_SUBSTRING || platform == NPS_PLATFORM_SUBSTRING || platform == XS_PLATFORM_SUBSTRING || @@ -3121,7 +3121,7 @@ void AclOrch::init(vector& connectors, PortsOrch *portOrch, Mirr }; } - if ( platform == MRVL_PLATFORM_SUBSTRING || + if ( platform == MRVL_PRST_PLATFORM_SUBSTRING || platform == MRVL_TL_PLATFORM_SUBSTRING || platform == VS_PLATFORM_SUBSTRING) { @@ -3156,7 +3156,7 @@ void AclOrch::init(vector& 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)) { diff --git a/orchagent/copporch.cpp b/orchagent/copporch.cpp index 634a8a8ed6..6c6a7157e5 100644 --- a/orchagent/copporch.cpp +++ b/orchagent/copporch.cpp @@ -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; @@ -1015,7 +1015,7 @@ bool CoppOrch::getAttribsFromTrapGroup (vector &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)))) + 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)); diff --git a/orchagent/orch.h b/orchagent/orch.h index 5e8939c53f..e960db7e48 100644 --- a/orchagent/orch.h +++ b/orchagent/orch.h @@ -35,13 +35,13 @@ const char config_db_key_delimiter = '|'; const char state_db_key_delimiter = '|'; #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" diff --git a/orchagent/orchdaemon.cpp b/orchagent/orchdaemon.cpp index f6e9428ab6..ac89a4f55f 100644 --- a/orchagent/orchdaemon.cpp +++ b/orchagent/orchdaemon.cpp @@ -591,7 +591,7 @@ bool OrchDaemon::init() PFC_WD_POLL_MSECS)); } else if ((platform == MRVL_TL_PLATFORM_SUBSTRING) - || (platform == MRVL_PLATFORM_SUBSTRING) + || (platform == MRVL_PRST_PLATFORM_SUBSTRING) || (platform == BFN_PLATFORM_SUBSTRING) || (platform == NPS_PLATFORM_SUBSTRING)) { @@ -624,7 +624,7 @@ bool OrchDaemon::init() static const vector queueAttrIds; - if ((platform == MRVL_PLATFORM_SUBSTRING) || + if ((platform == MRVL_PRST_PLATFORM_SUBSTRING) || (platform == MRVL_TL_PLATFORM_SUBSTRING) || (platform == NPS_PLATFORM_SUBSTRING)) { diff --git a/orchagent/pfc_detect_marvell.lua b/orchagent/pfc_detect_marvell_prestera.lua similarity index 100% rename from orchagent/pfc_detect_marvell.lua rename to orchagent/pfc_detect_marvell_prestera.lua