Merge branch 'opencomputeproject:master' into macsec_secure_policy

Author: rushanmu-cisco

inc/saiport.h

@@ -2721,6 +2721,16 @@ typedef enum _sai_port_attr_t
      */
     SAI_PORT_ATTR_FAST_LINKUP_ENABLED,
 
+    /**
+     * @brief Get port SerDes firmware revision
+     *
+     * Standard attribute to collect port SerDes firmware rev.
+     *
+     * @type sai_s8_list_t
+     * @flags READ_ONLY
+     */
+    SAI_PORT_ATTR_SERDES_FW_REVISION,
+
     /**
      * @brief End of attributes
      */

inc/saitam.h

@@ -180,6 +180,9 @@ typedef enum _sai_tam_tel_math_func_type_t
     /** Packet Rate computation */
     SAI_TAM_TEL_MATH_FUNC_TYPE_RATE,
 
+    /** Custom range base value */
+    SAI_TAM_TEL_MATH_FUNC_TYPE_CUSTOM_RANGE_BASE = 0x10000000
+
 } sai_tam_tel_math_func_type_t;
 
 /**

meta/Makefile

@@ -126,12 +126,12 @@ saiattrversion.h: $(DEPS) attrversion.sh
 saimetadatasize.h: $(DEPS)
 	./size.sh
 
-saimetadatatest.c saimetadata.c saimetadata.h: xml $(XMLDEPS) parse.pl $(CONSTHEADERS) $(EXTRA) saiattrversion.h
+saimetadatatest.c saimetadata.c saimetadata.h &: xml $(XMLDEPS) parse.pl $(CONSTHEADERS) $(EXTRA) saiattrversion.h
 	perl -I. parse.pl
 
 RPC_MODULES=$(shell find rpc -type f -name "*.pm")
 
-sai.thrift sai_rpc_server.cpp sai_adapter.py: xml $(XMLDEPS) gensairpc.pl templates/*.tt $(RPC_MODULES)
+sai.thrift sai_rpc_server.cpp sai_adapter.py &: xml $(XMLDEPS) gensairpc.pl templates/*.tt $(RPC_MODULES)
 	perl -Irpc gensairpc.pl $(GEN_SAIRPC_OPTS)
 
 rpc: sai.thrift sai_rpc_server.cpp sai_adapter.py

ptf/saiacl.py

@@ -4798,7 +4798,7 @@ def aclIPv6NextHdrTest(self, table_stage):
 
         packet_action = sai_thrift_acl_action_data_t(
             parameter=sai_thrift_acl_action_parameter_t(
-                s32=SAI_PACKET_ACTION_DROP))
+                s32=SAI_PACKET_ACTION_DROP), enable=True)
 
         field_ipv6_next_header = sai_thrift_acl_field_data_t(
             data=sai_thrift_acl_field_data_data_t(u8=ipv6_next_header),