Fixed link flap for 400G on X732Q-T

Author: hangtsi

README.md

@@ -152,9 +152,24 @@ Using TARGET_CONFIG_FILE /usr/local/sde/share/p4/targets/tofino2/diag.conf
 If you're running tofino2 based X-T bare metal switch and facing link issue with modules, please try to have this patch appiled to your SDE, which will significantly improve link stability.
 ```
 diff --git a/pkgsrc/bf-drivers/src/bf_pm/port_fsm/tof2_fsm/bf_pm_fsm_dfe.c b/pkgsrc/bf-drivers/src/bf_pm/port_fsm/tof2_fsm/bf_pm_fsm_dfe.c
-index a66d0e8..036488e 100644
+index a66d0e8d..79f65cc5 100644
 --- a/pkgsrc/bf-drivers/src/bf_pm/port_fsm/tof2_fsm/bf_pm_fsm_dfe.c
 +++ b/pkgsrc/bf-drivers/src/bf_pm/port_fsm/tof2_fsm/bf_pm_fsm_dfe.c
+@@ -228,12 +228,12 @@ static bf_status_t bf_pm_fsm_wait_rx_signal(bf_dev_id_t dev_id,
+     if (rc != BF_SUCCESS) return BF_INVALID_ARG;
+     if (!sig_detect || !phy_ready) return BF_NOT_READY;
+   }
+-
++#if 0
+   /* reset serdes to force re-adapt */
+   for (ln = 0; ln < num_lanes; ln++) {
+     bf_tof2_serdes_lane_reset_set(dev_id, dev_port, ln);
+   }
+-
++#endif
+   bf_port_signal_detect_time_set(dev_id, dev_port);
+   return BF_SUCCESS;
+ }
 @@ -812,7 +812,11 @@ static bf_status_t bf_pm_fsm_ber_check_done(bf_dev_id_t dev_id,
               dev_port,
               ctr,

drivers/include/bf_qsfp/bf_qsfp.h

@@ -634,16 +634,8 @@ double bf_qsfp_get_cached_module_temper (
 
 int bf_qsfp_get_cdr_support (int port,
                          bool *rx_cdr_support, bool *tx_cdr_support);
-int bf_qsfp_get_rx_cdr_ctrl_support (int port,
-                       bool *rx_cdr_ctrl_support);
 int bf_qsfp_get_rxtx_cdr_ctrl_state (int port,
                          uint8_t *cdr_ctrl_state);
-int bf_qsfp_get_tx_cdr_ctrl_support (int port,
-                       bool *tx_cdr_ctrl_support);
-int bf_qsfp_get_rx_cdr_lol_support (int port,
-                      bool *rx_cdr_lol_support);
-int bf_qsfp_get_tx_cdr_lol_support (int port,
-                      bool *tx_cdr_lol_support);
 void bf_qsfp_print_ddm (int conn_id, qsfp_global_sensor_t *trans, qsfp_channel_t *chnl);
 
 int bf_qsfp_ctrlmask_set (int port,

drivers/src/bf_port_mgmt/bf_pm_intf.c

@@ -85,8 +85,6 @@ static uint32_t
 qsfp_quick_rmv_pres_mask[3];  // 0->lower mask, 1->upper mask
 // 2->cpu port mask
 
-static uint32_t bf_pltfm_pm_dbnc_thres = 0;
-
 static int bf_pm_num_qsfp = 0;
 static int bf_pm_num_mac  = 0;
 
@@ -1708,9 +1706,6 @@ bf_pltfm_status_t bf_pltfm_pm_init (
     bf_pm_num_qsfp = bf_qsfp_get_max_qsfp_ports();
     bf_pm_num_mac  = platform_num_ports_get ();
 
-    /* Port debounce threshold. */
-    bf_pltfm_get_debounce_threshold (&bf_pltfm_pm_dbnc_thres);
-
     for (conn_id = 0; conn_id < bf_pm_num_qsfp;
          conn_id++) {
         qsfp_info_clear (conn_id);
@@ -1988,8 +1983,3 @@ bf_pm_qsfp_info_t *bf_pltfm_get_pm_qsfp_info_ptr (
 {
     return &pm_qsfp_info_arr[connector];
 }
-
-uint32_t bf_pltfm_pm_dbnc_thres_get()
-{
-    return bf_pltfm_pm_dbnc_thres;
-}

drivers/src/bf_port_mgmt/bf_pm_intf_tf2.c

@@ -22,6 +22,7 @@
 #include <bf_pm/bf_pm_intf.h>
 #include <bf_pltfm.h>
 #include <bf_pltfm_ext_phy.h>
+#include "bf_pltfm_chss_mgmt_intf.h"
 #include "bf_pm_priv.h"
 
 static bf_pm_intf_t intf_obj[MAX_CONNECTORS][MAX_CHAN_PER_CONNECTOR];
@@ -462,7 +463,8 @@ static void bf_pm_intf_set_debounce_thresh(bf_pm_intf_cfg_t *icfg,
         bf_pm_qsfp_info_t *qsfp_info) {
     bf_pal_front_port_handle_t port_hdl;
     bf_dev_id_t dev_id;
-    uint32_t debounce_value = bf_pltfm_pm_dbnc_thres_get();
+    uint32_t debounce_value = 0;
+    bf_pltfm_get_debounce_threshold(&debounce_value);
 
     if (!icfg || !intf || !qsfp_info) return;
 
@@ -476,10 +478,8 @@ static void bf_pm_intf_set_debounce_thresh(bf_pm_intf_cfg_t *icfg,
     port_hdl.chnl_id = icfg->channel;
 
     port_hdl = port_hdl;
-    if ((!qsfp_info->is_optic) && (icfg->encoding == BF_PLTFM_ENCODING_PAM4)) {
-        if (!bf_pm_intf_is_qsfpdd_short(qsfp_info->qsfpdd_type)) {
+    if (icfg->encoding == BF_PLTFM_ENCODING_PAM4) {
             bfn_pp_dbnc_set(dev_id, &port_hdl, debounce_value);
-        }
     }
 }
 
@@ -835,6 +835,9 @@ static void bf_pm_interface_fsm_run(bf_pm_intf_cfg_t *icfg,
         // restore debounce threshold
         bf_pm_intf_restore_debounce_thresh(icfg, intf, qsfp_info);
 
+        // Set debounce threshold for PAM4
+        bf_pm_intf_set_debounce_thresh(icfg, intf, qsfp_info);
+
         // enable SERDES TX
         if (qsfp_info->is_optic) {
             bf_pm_pltfm_front_port_eligible_for_autoneg(
@@ -940,6 +943,7 @@ static void bf_pm_interface_fsm_run(bf_pm_intf_cfg_t *icfg,
             intf->rxlos_debounce_cntr =
                 bf_qsfp_rxlos_debounce_get(port_hdl.conn_id);
             next_st = PM_INTF_FSM_SET_RX_READY;
+            next_st = PM_INTF_FSM_WAIT_MEDIA_RX_LOS; // by tsihang, 2025/07/28.
             break;
         }
 
@@ -1044,8 +1048,6 @@ static void bf_pm_interface_fsm_run(bf_pm_intf_cfg_t *icfg,
         break;
     case PM_INTF_FSM_SET_RX_READY:
         if ((!bf_pltfm_pm_is_ha_mode()) && qsfp_info->is_present) {
-            /* Set debounce threshold before set Rx ready. */
-            bf_pm_intf_set_debounce_thresh(icfg, intf, qsfp_info);
             /* If Rx not ready, bf_pm_fsm_run will keep in BF_PM_FSM_ST_WAIT_SIGNAL_OK state. */
             bf_pm_port_serdes_rx_ready_for_bringup_set(
                 icfg->dev_id, &port_hdl, true);

drivers/src/bf_port_mgmt/bf_pm_priv.h

@@ -153,7 +153,6 @@ bf_status_t bf_pltfm_pm_media_type_get (
 bf_pltfm_status_t bf_pltfm_pm_ha_mode_set();
 bf_pltfm_status_t bf_pltfm_pm_ha_mode_clear();
 bool bf_pltfm_pm_is_ha_mode();
-uint32_t bf_pltfm_pm_dbnc_thres_get();
 
 #if defined(HAVE_SFP)
 bf_pm_sfp_info_t *bf_pltfm_get_pm_sfp_info_ptr (

drivers/src/bf_qsfp/bf_qsfp_comm.c

@@ -8375,70 +8375,6 @@ int bf_qsfp_get_cdr_support (int port,
    return 0;
 }
 
-/* TF1, by tsihang 2023-05-10. */
-int bf_qsfp_get_rx_cdr_ctrl_support (int port,
-                         bool *rx_cdr_ctrl_support)
-{
-   int rc;
-   uint8_t readval[3];
-
-   if (port > bf_plt_max_qsfp) {
-       return 0;
-   }
-
-   if (bf_qsfp_is_passive_cu (port)) {
-       *rx_cdr_ctrl_support = false;
-       return 0;
-   }
-
-   if (bf_qsfp_is_sff8636 (port)) {
-       rc = bf_qsfp_field_read_onebank (
-                port, OPTIONS, 0, 0, sizeof (readval),
-                readval);
-       if (rc == 0) {
-           *rx_cdr_ctrl_support = (readval[1] >> 6) & 0x1;
-       } else {
-           return -1;
-       }
-   } else {
-       *rx_cdr_ctrl_support = false;
-   }
-
-   return 0;
-}
-
-/* TF1, by tsihang 2023-05-10. */
-int bf_qsfp_get_tx_cdr_ctrl_support (int port,
-                       bool *tx_cdr_ctrl_support)
-{
-   int rc;
-   uint8_t readval[3];
-
-   if (port > bf_plt_max_qsfp) {
-       return 0;
-   }
-
-   if (bf_qsfp_is_passive_cu (port)) {
-       *tx_cdr_ctrl_support = false;
-       return 0;
-   }
-
-   if (bf_qsfp_is_sff8636 (port)) {
-       rc = bf_qsfp_field_read_onebank (
-                port, OPTIONS, 0, 0, sizeof (readval),
-                readval);
-       if (rc == 0) {
-           *tx_cdr_ctrl_support = (readval[1] >> 7) & 0x1;
-       } else {
-           return -1;
-       }
-   } else {
-       *tx_cdr_ctrl_support = false;
-   }
-
-   return 0;
-}
-
 /* SFF-8636 only, by tsihang 2023-05-10. */
 int bf_qsfp_get_rxtx_cdr_ctrl_state (int port,
                          uint8_t *cdr_ctrl_state)
@@ -8472,67 +8408,6 @@ int bf_qsfp_get_rxtx_cdr_ctrl_state (int port,
     return 0;
 }
 
-/* TF1, by tsihang 2023-05-10. */
-int bf_qsfp_get_rx_cdr_lol_support (int port,
-                      bool *rx_cdr_lol_support)
-{
-    int rc;
-    uint8_t readval[3];
-
-    if (port > bf_plt_max_qsfp) {
-        return 0;
-    }
-
-    if (bf_qsfp_is_passive_cu (port)) {
-        *rx_cdr_lol_support = false;
-        return 0;
-    }
-
-    if (bf_qsfp_is_sff8636 (port)) {
-      rc = bf_qsfp_field_read_onebank (
-               port, OPTIONS, 0, 0, sizeof (readval),
-               readval);
-      if (rc == 0) {
-          *rx_cdr_lol_support = (readval[1] >> 4) & 0x1;
-      } else {
-          return -1;
-      }
-    } else {
-      *rx_cdr_lol_support = false;
-    }
-    return 0;
-}
-/* TF1, by tsihang 2023-05-10. */
-int bf_qsfp_get_tx_cdr_lol_support (int port,
-                    bool *tx_cdr_lol_support)
-{
-    int rc;
-    uint8_t readval[3];
-
-    if (port > bf_plt_max_qsfp) {
-        return 0;
-    }
-
-    if (bf_qsfp_is_passive_cu (port)) {
-        *tx_cdr_lol_support = false;
-        return 0;
-    }
-
-    if (bf_qsfp_is_sff8636 (port)) {
-      rc = bf_qsfp_field_read_onebank (
-               port, OPTIONS, 0, 0, sizeof (readval),
-               readval);
-      if (rc == 0) {
-          *tx_cdr_lol_support = (readval[1] >> 5) & 0x1;
-      } else {
-          return -1;
-      }
-    } else {
-      *tx_cdr_lol_support = false;
-    }
-    return 0;
-}
-
 int bf_qsfp_is_cdr_required (int port, bool *rx_cdr_required, bool *tx_cdr_required) {
     if (port > bf_plt_max_qsfp) {
         return 0;

platforms/asterfusion-bf/src/platform_mgr/platform_health_mntr.c

@@ -410,7 +410,7 @@ static void bf_pltfm_onlp_mntr_transceiver()
     int module;
     int max_sfp_modules;
     int max_qsfp_modules;
-    uint8_t buf[MAX_QSFP_PAGE_SIZE * 4] = {0};
+    uint8_t buf[MAX_QSFP_PAGE_SIZE * 6] = {0};
     uint32_t flags = bf_pltfm_mgr_ctx()->flags;
 
     struct qsfp_ctx_t *qsfp, *qsfp_ctx;
@@ -491,6 +491,14 @@ static void bf_pltfm_onlp_mntr_transceiver()
             }
         }
 
+        
+        /* Providing limited memory pages should be enough since
+           the claim is only for DDM information.
+           SFF8436 & SFF8636: LP00h + UP(00-03)h, 128 * 5
+           CMIS: LM + P(00-04)h, 128 * 6
+           Thus we need a buffer of at least size 128 * 6.
+           By SunZheng, 2025/04/11.
+        */
         if (bf_qsfp_get_cached_info (i,
                 QSFP_PAGE0_LOWER, buf)) {
             continue;
@@ -500,13 +508,33 @@ static void bf_pltfm_onlp_mntr_transceiver()
                 buf + MAX_QSFP_PAGE_SIZE)) {
             continue;
         }
-#if 0
-        if (bf_qsfp_is_cmis (i)) {
+        if (bf_qsfp_get_cached_info (
+                i, QSFP_PAGE1,
+                buf + MAX_QSFP_PAGE_SIZE * 2)) {
             continue;
         }
-#endif
-        onlp_save (path, (char *)buf,
-                   MAX_QSFP_PAGE_SIZE * 2);
+        if (bf_qsfp_get_cached_info (
+                i, QSFP_PAGE2,
+                buf + MAX_QSFP_PAGE_SIZE * 3)) {
+            continue;
+        }
+        if (bf_qsfp_get_cached_info (
+                i, QSFP_PAGE3,
+                buf + MAX_QSFP_PAGE_SIZE * 4)) {
+            continue;
+        }
+        if (bf_qsfp_is_cmis (i)) {
+            if (bf_qsfp_get_cached_info (
+                    i, QSFP_PAGE4,
+                    buf + MAX_QSFP_PAGE_SIZE * 5)) {
+                continue;
+            }
+            onlp_save (path, (char *)buf,
+                       MAX_QSFP_PAGE_SIZE * 6);
+        } else {
+            onlp_save (path, (char *)buf,
+                       MAX_QSFP_PAGE_SIZE * 5);
+        }
     }
     sprintf (path, ONLP_LOG_QSFP_PRES_PATH,
              "presence");
@@ -573,12 +601,12 @@ static void bf_pltfm_onlp_mntr_transceiver()
             continue;
         }
         if (bf_sfp_get_cached_info (i, 1,
-                                    buf + 2 * MAX_QSFP_PAGE_SIZE) ) {
+                                    buf + MAX_QSFP_PAGE_SIZE) ) {
             continue;
         }
         /* $ hexdump /var/asterfusion/qsfp_10_eeprom is helpful. */
         onlp_save (path, (char *)buf,
-                   MAX_QSFP_PAGE_SIZE * 4);
+                   MAX_QSFP_PAGE_SIZE * 2);
     }
     sprintf (path, ONLP_LOG_SFP_PRES_PATH,
              "presence");

platforms/asterfusion-bf/utils/quick-start.sh

@@ -13,7 +13,7 @@
 
 # You could get the version of current ONL via 'cat /etc/onl/rootfs/manifest.json'.
 # The following VERSION in quick-start.sh should never be changed by user.
-VERSION="25.0414"
+VERSION="25.0811"
 
 PKGS=/root/bfnplatform
 
@@ -44,11 +44,11 @@ xt_platform='X312P-T'
 #    - install bsp-lts_Y.M-sde9u3_generic_amd64.deb
 #
 ################################################################
-bfnplatform_debs_bsp=("$PKGS/bsp-lts_25.03-sde9u9_generic_amd64.deb")
+bfnplatform_debs_bsp=("$PKGS/bsp-lts_25.08-sde9u9_generic_amd64.deb")
 # sde-x.y.z_1.**.deb for tof1 only
 bfnplatform_debs_sde=("$PKGS/sde-9.13.3_1.00-all_generic_amd64.deb")
 # sde-x.y.z_2.**.deb for tof2 only
-bfnplatform_debs_sde_tof2=("$PKGS/sde-9.13.3_2.00-2.4E0-4-all_generic_amd64.deb")
+bfnplatform_debs_sde_tof2=("$PKGS/sde-9.13.3_2.01-2.4E0-4-all_generic_amd64.deb")
 
 ################################################################
 # Install dependencies. And should never forget to modify
@@ -78,7 +78,7 @@ bfnplatform_debs_sde_common=("$PKGS/p4c-9.13.3_1.00-all_generic_amd64.deb"
 "$PKGS/protobuf-cpp_3.15.8_generic_amd64.deb")
 
 # LEGACY: For tof1 based X5/X3 only
-bfnplatform_debs_97x_bsp=("$PKGS/bsp-lts_25.03-sde9u3_generic_amd64.deb")
+bfnplatform_debs_97x_bsp=("$PKGS/bsp-lts_25.08-sde9u3_generic_amd64.deb")
 bfnplatform_debs_97x=("$PKGS/sde-9.7.4_1.00-all_generic_amd64.deb" 
 "$PKGS/thrift_0.13.0_generic_amd64.deb" 
 "$PKGS/grpc_1.17.0-r1_generic_amd64.deb"