Merge branch 'master' into master

abdosi · Nov 19, 2024 · 11da94d · 11da94d
2 parents 918ad05 + 0b331f0
commit 11da94d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/orchagent/Makefile.am b/orchagent/Makefile.am
@@ -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 \

diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
@@ -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)
@@ -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 =

diff --git a/orchagent/copporch.cpp b/orchagent/copporch.cpp
@@ -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));

diff --git 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
@@ -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<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,

diff --git a/orchagent/pfc_detect_innovium.lua → orchagent/pfc_detect_marvell_teralynx.lua b/orchagent/pfc_detect_innovium.lua → orchagent/pfc_detect_marvell_teralynx.lua