Merge branch 'master' into amaitra_ptp

Author: archis001-marvell

doc/SAI-Proposal-Fast-Linkup.md

@@ -0,0 +1,38 @@
+# Fast Link-Up
+-------------------------------------------------------------------------------
+ Title       | Fast Link-Up
+-------------|-----------------------------------------------------------------
+ Authors     | Eddy Kvetny, Nvidia
+ Status      | In review
+ Type        | Standards track
+ Created     | 2025-09-09
+ SAI-Version | 1.17
+-------------------------------------------------------------------------------
+
+# 1. Overview
+In some cases the equalization parameters from the previous session can be used for a new link-up process. It can significantly reduce time of the Link-Up process
+
+# 2. Scope
+This approach is applicable to devices (switch-to-switch or switch-to-NIC) supporting this process, usually from the same vendor or from different vendors aligned on the process.
+
+Can be applied to cold/fast boot or link recovery flows (vendor decision)
+
+# 3. Architecture
+This feature shall be enabled per-port using a new SAI attribute - SAI_PORT_ATTR_FAST_LINKUP_ENABLED (default status - disabled/false)
+
+On ports with the enabled feature the ASIC FW shall try first to bring a link up using the equalization parameter stored from the previous successul session. The time given to ASIC to try to bring a link up with the old EQ parameters is limited by the Fast Link-Up Polling Timer. The time value is configured using a new SAI attribute - SAI_SWITCH_ATTR_FAST_LINKUP_POLLING_TIMEOUT. The supported range for this value (in secs) can be read by NOS using a new SAI attribute  SAI_SWITCH_ATTR_FAST_LINKUP_POLLING_TIMEOUT_RANGE
+
+If the process of brining a link up with the previosly used EQ parameters doesn't succeed the regular link-up process is triggered
+
+If the link succeeds moving to the Operation UP state then the BER level shall be checked to make sure that the establish link has a good quality. To do that another timer called Guard Timer is used. Its value is also configurable using a new SAI attribute (SAI_SWITCH_ATTR_FAST_LINKUP_GUARD_TIMEOUT)
+
+
+When the Guard Timer expires the BER is measured and compared with the "good" BER value configured using a new SAI attribure SAI_SWITCH_ATTR_FAST_LINKUP_BER_THRESHOLD. Only if the measured BER is equal or better than the configured BER threshold the process is considered completed. Otherwise, the fallback to the regular link-up process is done and link's Oper status changes to DOWN
+
+If the remote side doesn't support the Fast Link-up then the fallback to regular process will happen
+
+Note that the State Machine is implemented by ASIC FW and can vary between vendors. The proposal just defines just high level flow and SAI configuration for this flow
+
+The following State Machine is proposed for the Fast Link-UP process described above
+
+![](figures/sai_fast_linkup_state_machine.png)

doc/SAI-Proposal-Packet-Trimming.md

@@ -212,3 +212,15 @@ typedef enum _sai_packet_trim_dscp_resolution_mode_t
      */
     SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE,
 ```
+
+## Counter
+|Header file|SAI attribute|Description|
+|-----------|-------------|-----------|
+|saiswitch.h|SAI_SWITCH_STAT_DROPPED_TRIM_PACKETS|Global counter (aggregated value of all ports) of packets trimmed but dropped due to failed shared buffer admission on a trim queue|
+|           |SAI_SWITCH_STAT_TX_TRIM_PACKETS|Global counter (aggregated value of all ports) of packets trimmed and successfully sent via a trim queue|
+|saiport.h  |SAI_PORT_STAT_TRIM_PACKETS|Per-port counter of packets trimmed due to failed shared buffer admission|
+|           |SAI_PORT_STAT_DROPPED_TRIM_PACKETS|Per-port counter of packets trimmed but dropped due to failed shared buffer admission on a trim queue|
+|           |SAI_PORT_STAT_TX_TRIM_PACKETS|Per-port counter of packets trimmed and successfully sent via a trim queue|
+|saiqueue.h |SAI_QUEUE_STAT_TRIM_PACKETS|Per-queue counter of packets trimmed on trimming-eligible queue due to failed shared buffer admission|
+|           |SAI_QUEUE_STAT_DROPPED_TRIM_PACKETS|Per-queue counter of packets trimmed on trimming-eligible queue but dropped due to failed shared buffer admission on a trim queue|
+|           |SAI_QUEUE_STAT_TX_TRIM_PACKETS|Per-queue counter of packets trimmed on trimming-eligible queue and successfully sent via a trim queue|

doc/figures/sai_fast_linkup_state_machine.png

@@ -2723,6 +2723,25 @@ typedef enum _sai_port_attr_t
      * @default 0
      */
     SAI_PORT_ATTR_PTP_PEER_MEAN_PATH_DELAY,
+    
+    /**
+     * @brief Enables the fast link-up for a port on port/link recovery. Vendors can use to reduce linkup time on remote link failure
+     *
+     * @type bool
+     * @flags CREATE_AND_SET
+     * @default false
+     */
+    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
@@ -3977,7 +3996,7 @@ typedef enum _sai_port_serdes_attr_t
     /**
      * @brief Port serdes control TX FIR PRE1 filter
      *
-     * List of port serdes TX fir precursor1 tap-filter values.
+     * List of port serdes TX FIR precursor1 tap-filter values.
      * The values are of type sai_s32_list_t where the count is number lanes in
      * a port and the list specifies list of values to be applied to each lane.
      *
@@ -3990,7 +4009,7 @@ typedef enum _sai_port_serdes_attr_t
     /**
      * @brief Port serdes control TX FIR PRE2 filter
      *
-     * List of port serdes TX fir precursor2 tap-filter values.
+     * List of port serdes TX FIR precursor2 tap-filter values.
      * The values are of type sai_s32_list_t where the count is number lanes in
      * a port and the list specifies list of values to be applied to each lane.
      *
@@ -4003,7 +4022,7 @@ typedef enum _sai_port_serdes_attr_t
     /**
      * @brief Port serdes control TX FIR PRE3 filter
      *
-     * List of port serdes TX fir precursor3 tap-filter values.
+     * List of port serdes TX FIR precursor3 tap-filter values.
      * The values are of type sai_s32_list_t where the count is number lanes in
      * a port and the list specifies list of values to be applied to each lane.
      *
@@ -4016,7 +4035,7 @@ typedef enum _sai_port_serdes_attr_t
     /**
      * @brief Port serdes control TX FIR MAIN filter
      *
-     * List of port serdes TX fir maincursor tap-filter values.
+     * List of port serdes TX FIR maincursor tap-filter values.
      * The values are of type sai_s32_list_t where the count is number lanes in
      * a port and the list specifies list of values to be applied to each lane.
      *
@@ -4029,7 +4048,7 @@ typedef enum _sai_port_serdes_attr_t
     /**
      * @brief Port serdes control TX FIR POST1 filter
      *
-     * List of port serdes TX fir postcursor1 tap-filter values.
+     * List of port serdes TX FIR postcursor1 tap-filter values.
      * The values are of type sai_s32_list_t where the count is number lanes in
      * a port and the list specifies list of values to be applied to each lane.
      *
@@ -4042,7 +4061,7 @@ typedef enum _sai_port_serdes_attr_t
     /**
      * @brief Port serdes control TX FIR POST2 filter
      *
-     * List of port serdes TX fir postcursor2 tap-filter values.
+     * List of port serdes TX FIR postcursor2 tap-filter values.
      * The values are of type sai_s32_list_t where the count is number lanes in
      * a port and the list specifies list of values to be applied to each lane.
      *
@@ -4055,7 +4074,7 @@ typedef enum _sai_port_serdes_attr_t
     /**
      * @brief Port serdes control TX FIR POST3 filter
      *
-     * List of port serdes TX fir postcursor3 tap-filter values.
+     * List of port serdes TX FIR postcursor3 tap-filter values.
      * The values are of type sai_s32_list_t where the count is number lanes in
      * a port and the list specifies list of values to be applied to each lane.
      *
@@ -4068,7 +4087,7 @@ typedef enum _sai_port_serdes_attr_t
     /**
      * @brief Port serdes control TX FIR attenuation
      *
-     * List of port serdes TX fir attn values.
+     * List of port serdes TX FIR attn values.
      * The values are of type sai_s32_list_t where the count is number lanes in
      * a port and the list specifies list of values to be applied to each lane.
      *
@@ -4289,6 +4308,76 @@ typedef enum _sai_port_serdes_attr_t
      */
     SAI_PORT_SERDES_ATTR_RX_POLARITY,
 
+    /**
+     * @brief Total number of RX FFE taps supported
+     *
+     * @type sai_uint32_t
+     * @flags READ_ONLY
+     */
+    SAI_PORT_SERDES_ATTR_RX_FFE_COUNT,
+
+    /**
+     * @brief Total number of TX FIR taps supported
+     *
+     * @type sai_uint32_t
+     * @flags READ_ONLY
+     */
+    SAI_PORT_SERDES_ATTR_TX_FIR_COUNT,
+
+    /**
+     * @brief Total number of RX DFE taps supported
+     *
+     * @type sai_uint32_t
+     * @flags READ_ONLY
+     */
+    SAI_PORT_SERDES_ATTR_RX_DFE_COUNT,
+
+    /**
+     * @brief Port serdes RX FFE taps
+     *
+     * List of port serdes RX FFE tap values
+     *
+     * @type sai_taps_list_t
+     * @flags CREATE_AND_SET
+     * @default internal
+     */
+    SAI_PORT_SERDES_ATTR_RX_FFE_TAPS_LIST,
+
+    /**
+     * @brief Port serdes TX FIR taps
+     *
+     * List of port serdes TX FIR tap values
+     *
+     * @type sai_taps_list_t
+     * @flags CREATE_AND_SET
+     * @default internal
+     */
+    SAI_PORT_SERDES_ATTR_TX_FIR_TAPS_LIST,
+
+    /**
+     * @brief Port serdes DFE taps
+     *
+     * List of port serdes RX DFE tap values
+     *
+     * @type sai_taps_list_t
+     * @flags CREATE_AND_SET
+     * @default internal
+     */
+    SAI_PORT_SERDES_ATTR_RX_DFE_TAPS_LIST,
+
+    /**
+     * @brief Port serdes VGA settings
+     *
+     * List of port serdes VGA settings values
+     * The values are of type sai_u32_list_t where the count is number of lanes
+     * in a port and the list specifies list of VGA settings for each lane.
+     *
+     * @type sai_u32_list_t
+     * @flags CREATE_AND_SET
+     * @default internal
+     */
+    SAI_PORT_SERDES_ATTR_RX_VGA,
+
     /**
      * @brief End of attributes
      */

inc/saiport.h

@@ -3488,6 +3488,59 @@ typedef enum _sai_switch_attr_t
      * @default 0
      */
     SAI_SWITCH_ATTR_PTP_SYNTONIZE_ADJUST,
+    
+    /**
+     * @brief Linkup polling time range (in secs)
+     *
+     * @type sai_u16_range_t
+     * @flags READ_ONLY
+     */
+    SAI_SWITCH_ATTR_FAST_LINKUP_POLLING_TIMEOUT_RANGE,
+
+    /**
+     * @brief Time (in sec) during which the fast link-up is attempted.
+     *
+     * If this timer expires before the link is UP the regular link-up will be performed
+     * Supported range can be obtained using SAI_SWITCH_ATTR_FAST_LINKUP_POLLING_TIMEOUT_RANGE
+     *
+     * @type sai_uint16_t
+     * @flags CREATE_AND_SET
+     * @isvlan false
+     * @default 60
+     */
+    SAI_SWITCH_ATTR_FAST_LINKUP_POLLING_TIMEOUT,
+
+    /**
+     * @brief Linkup guard time range (in secs)
+     *
+     * @type sai_u16_range_t
+     * @flags READ_ONLY
+     */
+    SAI_SWITCH_ATTR_FAST_LINKUP_GUARD_TIMEOUT_RANGE,
+
+    /**
+     * @brief Time (in secs) during which the link must be UP with the BER below the level configured with SAI_SWITCH_ATTR_FAST_LINKUP_BER_THRESHOLD to keep the fast link-up configuration.
+     *
+     * If either link failures happens within this time or high BER is measured at the end of this period of time the link should undergo regular link up process
+     * Supported range can be obtained using SAI_SWITCH_ATTR_FAST_LINKUP_GUARD_TIMEOUT_RANGE
+     *
+     * @type sai_uint8_t
+     * @flags CREATE_AND_SET
+     * @default 10
+     */
+    SAI_SWITCH_ATTR_FAST_LINKUP_GUARD_TIMEOUT,
+
+    /**
+     * @brief Threshold to control regular link-up happened after fast linkup Time-out
+     *
+     * Configures the BER (negative exponent only, mantissa is always 1) which is if measured during
+     * SAI_SWITCH_ATTR_FAST_LINKUP_GUARD_TIMEOUT causes the full link-up flow. For example, value 12 configured here is 1e^-12
+     *
+     * @type sai_uint8_t
+     * @flags CREATE_AND_SET
+     * @default 12
+     */
+    SAI_SWITCH_ATTR_FAST_LINKUP_BER_THRESHOLD,
 
     /**
      * @brief End of attributes

inc/saiswitch.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;
 
 /**

inc/saitam.h

@@ -392,6 +392,18 @@ typedef struct _sai_vlan_list_t
 
 } sai_vlan_list_t;
 
+/**
+ * @brief Defines a list of FIR/FFE/DFE taps
+ */
+typedef struct _sai_taps_list_t
+{
+    /** Number of taps */
+    uint32_t count;
+
+    /** List of tap values */
+    sai_s32_list_t *list;
+} sai_taps_list_t;
+
 typedef enum _sai_ip_addr_family_t
 {
     SAI_IP_ADDR_FAMILY_IPV4,
@@ -1696,6 +1708,12 @@ typedef union _sai_attribute_value_t
 
     /** @validonly meta->attrvaluetype == SAI_ATTR_VALUE_TYPE_PORT_PAM4_EYE_VALUES_LIST */
     sai_port_pam4_eye_values_list_t portpam4eyevalues;
+
+    /** @validonly meta->attrvaluetype == SAI_ATTR_VALUE_TYPE_TAPS_LIST */
+    sai_taps_list_t portserdestaps;
+
+    /** @validonly meta->attrvaluetype == SAI_ATTR_VALUE_TYPE_UINT16_RANGE */
+    sai_u16_range_t u16range;
 } sai_attribute_value_t;
 
 /**

inc/saitypes.h

@@ -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

meta/Makefile

@@ -27,6 +27,7 @@ CMIS - Common Management Interface Specification
 CPLD - Complex programmable logic device
 CPU - Central Processing Unit
 CRC - Cyclic Redundancy Code
+DFE - Decision Feedback Equalizer
 DHCP - Dynamic Host Configuration Protocol
 DHCPV6 - Dynamic Host Configuration Protocol for IPv6
 DLD - Dead Lock Detection
@@ -54,6 +55,8 @@ FCS - Frame Check Sequence
 FD - File Descriptor
 FDB - Forwarding Data Base
 FEC - Forward Error Correction
+FFE - Feedforward Equalizer
+FIR - Finite Impulse Response
 FPGA - Field Programmable Gate Array
 FW  - Firmware
 GCM - Galois Counter Mode
@@ -173,6 +176,7 @@ UDP - User Datagram Protocol
 USD - Ultimate Segment Decapsulation
 USP - Ultimate Segment Pop
 USXGMII - Universal Serial 10 Gigabit Media Independent Interface
+VGA - Variable Gain Amplifier
 VNET - Virtual Network
 VNI - Virtual Network Interface
 VNID - Virtual Network Identifier

meta/acronyms.txt

@@ -191,6 +191,11 @@ typedef enum _sai_attr_value_type_t
      */
     SAI_ATTR_VALUE_TYPE_UINT32_RANGE,
 
+    /**
+     * @brief Attribute value is 16bit unsigned integer range.
+     */
+    SAI_ATTR_VALUE_TYPE_UINT16_RANGE,
+
     /**
      * @brief Attribute value is 16 bit unsigned integer range list.
      */
@@ -500,6 +505,11 @@ typedef enum _sai_attr_value_type_t
      * @brief Attribute value is port PAM4 eye values list.
      */
     SAI_ATTR_VALUE_TYPE_PORT_PAM4_EYE_VALUES_LIST,
+
+    /**
+     * @brief Attribute value is port SerDes tap values list.
+     */
+    SAI_ATTR_VALUE_TYPE_TAPS_LIST
 } sai_attr_value_type_t;
 
 /**