1. uart_util supports eeprom writing.

hangtsi · hangtsi · commit 9ddc82bc5d5b · 2025-06-06T18:48:41.000+08:00
2. Fix a module risk for X312P-T.
diff --git a/drivers/include/bf_port_mgmt/bf_port_mgmt_intf.h b/drivers/include/bf_port_mgmt/bf_port_mgmt_intf.h
@@ -494,6 +494,8 @@ void bf_pltfm_pm_qsfp_simulate_all_removed (void);
 
 void qsfp_luxtera_lpbk (int conn_id,
                         bool near_lpbk);
+void qsfp_luxtera_hipwr (int conn_id,
+                         bool is_cmis);
 
 void bf_pm_qsfp_luxtera_state_capture (
     int conn_id, uint8_t arr_0x3k[0x3000]);
diff --git a/drivers/include/bf_qsfp/bf_qsfp.h b/drivers/include/bf_qsfp/bf_qsfp.h
@@ -59,6 +59,7 @@ extern "C" {
 #define BF_TRANS_CTRLMASK_IGNORE_DPAPPLY_STATE  (1 << 25)
 #define BF_TRANS_CTRLMASK_REQUIRE_HIGH_PWR_INIT (1 << 26)
 #define BF_TRANS_CTRLMASK_REQUIRE_SOFTWARE_RST  (1 << 27)
+#define BF_TRANS_CTRLMASK_REQUIRE_HIGH_PWR_MODE (1 << 28)
 
 /* Cached state for [q]sfp_info[port].trans_state.
  * To be clarified, the belowing runtime state will not be updated
diff --git a/drivers/src/bf_port_mgmt/bf_pm_qsfp_mgmt.c b/drivers/src/bf_port_mgmt/bf_pm_qsfp_mgmt.c
@@ -1850,6 +1850,12 @@ static int qsfp_fsm_poll_los (bf_dev_id_t dev_id,
         return -1;
     }
 
+    // skip trigger quick removal action until everything goes right.
+    if (platform_type_equal(AFN_X312PT) &&
+        (bf_pltfm_mgr_ctx()->flags & AF_PLAT_CTRL_HA_MODE)) {
+        return 0;
+    }
+
     // CPLD told us this module is absent.
     // Donot move FSM until removal is hanlded
     //if (!bf_qsfp_is_present (conn_id)) {
@@ -1879,10 +1885,23 @@ static int qsfp_fsm_poll_los (bf_dev_id_t dev_id,
     }
 
     if (rc) {
+        // skip trigger quick removal action and disable chassis monitor.
+        // requires maunally op via command chassis-ctrlmask-set if everything goes right.
+        // Query the QSFP library for the qsfp presence mask
+        if (platform_type_equal(AFN_X312PT)) {
+            uint32_t lower_mask, upper_mask, cpu_mask;
+            if (bf_qsfp_get_transceiver_pres (&lower_mask,
+                                              &upper_mask, &cpu_mask) != 0) {
+                bf_pltfm_mgr_ctx()->flags |= AF_PLAT_CTRL_HA_MODE;
+                return 0;
+            }
+        }
+
         /* Added by tsihang, 2023-03-21. */
         // Detect and latch the removal
         // state, so that can qsfp-scan handle the rest.
-        if (!qsfp_state[conn_id].qsfp_quick_removed) {
+        if (!platform_type_equal(AFN_X312PT) &&
+            !qsfp_state[conn_id].qsfp_quick_removed) {
             bool is_present = 0;
             bf_qsfp_detect_transceiver (conn_id, &is_present);
             if (!is_present) {
@@ -2295,12 +2314,13 @@ static void qsfp_module_fsm_run (bf_dev_id_t
             }
             qsfp_state[conn_id].qsfp_quick_removed = false;
 
+            // checks for QSFPs with "special" requirements
+            qsfp_fsm_identify_model_requirements (conn_id);
+            bf_qsfp_ctrlmask_get(conn_id, &ctrlmask);
+
             if (is_optical) {
                 int ch;
 
-                // checks for QSFPs with "special" requirements
-                qsfp_fsm_identify_model_requirements (conn_id);
-
                 // set initial state for each of the 4 channel FSMs
                 for (ch = 0; ch < CHANNEL_COUNT; ch++) {
                     qsfp_state[conn_id].per_ch_fsm[ch] =
@@ -2313,6 +2333,12 @@ static void qsfp_module_fsm_run (bf_dev_id_t
             } else {
                 LOG_WARNING ("QSFP    %2d : NOT OPTICAL ...",
                              conn_id);
+                /* Trigger high power mode. */
+                if (ctrlmask & BF_TRANS_CTRLMASK_REQUIRE_HIGH_PWR_MODE) {
+                    LOG_WARNING ("QSFP    %2d : trigger high power mode for module ...",
+                                 conn_id);
+                    qsfp_luxtera_hipwr (conn_id, bf_qsfp_is_cmis(conn_id));
+                }
                 if (bf_pm_intf_is_device_family_tofino(dev_id)) {
                     qsfp_fsm_notify_bf_pltfm (dev_id, conn_id);
                 }
@@ -4874,6 +4900,93 @@ void qsfp_luxtera_lpbk (int conn_id,
                  near_lpbk ? "NEAR/ELEC." : "FAR/OPTICAL");
 }
 
+/*****************************************************************
+ *
+ *****************************************************************/
+void qsfp_luxtera_hipwr (int conn_id,
+                         bool is_cmis)
+{
+    uint8_t pwd[] = {0x00, 0x00, 0x10, 0x11};
+    uint8_t wr[] = {0x10, 0x10, 0x10, 0x00};
+    uint8_t rd[] = {0x00, 0x00, 0x00, 0x00};
+    uint8_t pwr_class = 0x08, output_enb = 0x01;
+    uint8_t pg0 = 0x0, pg2 = 0x2;
+    int rc;
+
+    if (!is_cmis) {
+        rc = bf_fsm_qsfp_wr2 (conn_id, pg0, 0x7b, 4, pwd);
+        if (rc) {
+            LOG_WARNING (
+                "QSFP    %2d : Error <%d> Setting pwd for high power mode",
+                conn_id, rc);
+            return;
+        }
+    }
+
+    if (is_cmis) {
+        rc = bf_fsm_qsfp_wr2 (conn_id, pg0, 0xc8, 1,
+                              &pwr_class);
+    } else {
+        rc = bf_fsm_qsfp_wr2 (conn_id, pg2, 0x8b, 1,
+                              &output_enb);
+        rc = bf_fsm_qsfp_wr2 (conn_id, pg2, 0x82, 4,
+                              wr);
+    }
+    if (rc) {
+        LOG_WARNING ("QSFP    %2d : Error <%d> Setting high power mode",
+                     conn_id,
+                     rc);
+        return;
+    }
+
+    if (is_cmis) {
+        rc = bf_fsm_qsfp_rd2 (conn_id, pg0, 0xc8, 1, &rd[0]);
+        if (rc) {
+            LOG_WARNING ("QSFP    %2d : Error <%d> Reading byte 0xC8 for high power mode",
+                        conn_id,
+                        rc);
+            return;
+        }
+        if (rd[0] != pwr_class) {
+            LOG_WARNING ("QSFP    %2d : Error <%d> Setting byte 0xC8 for high power mode",
+                        conn_id,
+                        rc);
+            return;
+        }
+    } else {
+        rc = bf_fsm_qsfp_rd2 (conn_id, pg2, 0x8b, 1, &rd[0]);
+        if (rc) {
+            LOG_WARNING ("QSFP    %2d : Error <%d> Reading byte 0x8B for high power mode",
+                        conn_id,
+                        rc);
+            return;
+        }
+        if (rd[0] != output_enb) {
+            LOG_WARNING ("QSFP    %2d : Error <%d> Setting byte 0x8B for high power mode",
+                        conn_id,
+                        rc);
+            return;
+        }
+        rc = bf_fsm_qsfp_rd2 (conn_id, pg2, 0x82, 4, &rd[0]);
+        if (rc) {
+            LOG_WARNING ("QSFP    %2d : Error <%d> Reading byte 0x8B for high power mode",
+                        conn_id,
+                        rc);
+            return;
+        }
+        if ((rd[0] != wr[0]) || 
+            (rd[1] != wr[1]) || 
+            (rd[2] != wr[2]) || 
+            (rd[3] != wr[3])) {
+            LOG_WARNING ("QSFP    %2d : Error <%d> Setting byte 0x82-0x85 for high power mode",
+                        conn_id,
+                        rc);
+            return;
+        }
+    }
+    LOG_DEBUG ("QSFP    %2d : High power mode set.", conn_id);
+}
+
 bool bf_pm_qsfp_is_luxtera (int conn_id)
 {
     if (qsfp_needs_hi_pwr_init (conn_id)) {
diff --git a/drivers/src/bf_port_mgmt/bf_pm_sfp_mgmt.c b/drivers/src/bf_port_mgmt/bf_pm_sfp_mgmt.c
@@ -455,8 +455,12 @@ static int sfp_fsm_poll_los (bf_dev_id_t dev_id,
             if (platform_type_equal(AFN_X312PT) &&
                 1/* TBD, sfp_pres_mask is truely set */ &&
                 1/* TBD, error occured during PCA9548*/) {
-                bf_pltfm_mgr_ctx()->flags |= AF_PLAT_CTRL_HA_MODE;
-                return 0;
+                uint32_t lower_mask, upper_mask;
+                if (bf_sfp_get_transceiver_pres (&lower_mask,
+                                                 &upper_mask) != 0) {
+                    bf_pltfm_mgr_ctx()->flags |= AF_PLAT_CTRL_HA_MODE;
+                    return 0;
+                }
             }
             // Detect and latch the removal
             // state, so that can sfp-scan handle the rest.
diff --git a/drivers/src/bf_qsfp/bf_qsfp_cli.c b/drivers/src/bf_qsfp/bf_qsfp_cli.c
@@ -3017,6 +3017,7 @@ static int bf_pltfm_ucli_ucli__qsfp_module_show (
                     "%-30s = ±%.3f nm\n",
                     "Wavelength tolerance",
                     tolerance);
+        aim_printf (&uc->pvs, "\n");
     }
     bool ctrl_flag, tune_flag;
     /* returns the wavelength controllable and tramsmitter tunable flags */
@@ -4403,10 +4404,17 @@ bf_pltfm_ucli_ucli__qsfp_wavelength_get (
 
     bool is_cmis = bf_qsfp_is_cmis (port);
     bool is_passive_cu = bf_qsfp_is_passive_cu (port);
+    if (is_passive_cu) {
+        aim_printf (&uc->pvs,
+                    "Wavelength not available for module on port %d\n",
+                    port);
+        return 0;
+    }
+
     aim_printf (&uc->pvs,
                 "====================\n");
     aim_printf (&uc->pvs,
-                "Info for Wavelength:\n");
+                "Info for wavelength:\n");
     aim_printf (&uc->pvs,
                 "====================\n");
 
@@ -4439,6 +4447,7 @@ bf_pltfm_ucli_ucli__qsfp_wavelength_get (
                     "%-21s = %s\n",
                     "Wavelength tunable",
                     (tune_flag ? "True" : "False"));
+        aim_printf (&uc->pvs, "\n");
     }
 
     if (tune_flag) {
diff --git a/platforms/asterfusion-bf/src/bf_pltfm_uart/bf_pltfm_uart.c b/platforms/asterfusion-bf/src/bf_pltfm_uart/bf_pltfm_uart.c
@@ -312,7 +312,7 @@ uart_send (struct bf_pltfm_uart_ctx_t *ctx,
     size_t l = 0;
     int rc = 0;
 
-    if ((tx_len > 2) && ( tx_len != 20)) {
+    if ((tx_len > 2) && (cmd != 0x01) && (cmd != 0x0E)) {
         LOG_ERROR (
             "%s[%d], "
             "uart.send(%s)"
@@ -334,11 +334,19 @@ uart_send (struct bf_pltfm_uart_ctx_t *ctx,
         l = sprintf ((char *)&buf[0],
                      "uart_0x%02x_0x%02x", cmd,
                      tx_buf[0]);
+    } else if ((tx_len == 2) && (cmd == 0x01) && (tx_buf[0] == 0x00) && (tx_buf[1] == 0x01)) {
+        l = sprintf ((char *)&buf[0],
+                     "uart_0x%02x_0x%02x_0x%02x",
+                     cmd, tx_buf[0], tx_buf[1]);
+    } else if ((tx_len == 2) && (cmd == 0x01) && (tx_buf[1] != 0xaa)) {
+        l = sprintf ((char *)&buf[0],
+                     "uart_0x%02x_0x%02x_%s",
+                     cmd, tx_buf[0], &tx_buf[1]);
     } else if (tx_len == 2) {
         l = sprintf ((char *)&buf[0],
                      "uart_0x%02x_0x%02x_0x%02x",
                      cmd, tx_buf[0], tx_buf[1]);
-    } else if (tx_len == 20) {
+    } else {
         l = sprintf ((char *)&buf[0],
                      "uart_0x%02x_0x%02x_%s",
                      cmd, tx_buf[0], &tx_buf[1]);
diff --git a/platforms/asterfusion-bf/src/platform_mgr/platform_health_mntr.c b/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 * 6] = {0};
+    uint8_t buf[MAX_QSFP_PAGE_SIZE * 4] = {0};
     uint32_t flags = bf_pltfm_mgr_ctx()->flags;
 
     struct qsfp_ctx_t *qsfp, *qsfp_ctx;
@@ -491,14 +491,6 @@ 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;
@@ -508,33 +500,13 @@ static void bf_pltfm_onlp_mntr_transceiver()
                 buf + MAX_QSFP_PAGE_SIZE)) {
             continue;
         }
-        if (bf_qsfp_get_cached_info (
-                i, QSFP_PAGE1,
-                buf + MAX_QSFP_PAGE_SIZE * 2)) {
-            continue;
-        }
-        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 0
         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);
+            continue;
         }
+#endif
+        onlp_save (path, (char *)buf,
+                   MAX_QSFP_PAGE_SIZE * 2);
     }
     sprintf (path, ONLP_LOG_QSFP_PRES_PATH,
              "presence");
@@ -601,12 +573,12 @@ static void bf_pltfm_onlp_mntr_transceiver()
             continue;
         }
         if (bf_sfp_get_cached_info (i, 1,
-                                    buf + MAX_QSFP_PAGE_SIZE) ) {
+                                    buf + 2 * MAX_QSFP_PAGE_SIZE) ) {
             continue;
         }
         /* $ hexdump /var/asterfusion/qsfp_10_eeprom is helpful. */
         onlp_save (path, (char *)buf,
-                   MAX_QSFP_PAGE_SIZE * 2);
+                   MAX_QSFP_PAGE_SIZE * 4);
     }
     sprintf (path, ONLP_LOG_SFP_PRES_PATH,
              "presence");
diff --git a/platforms/asterfusion-bf/uart_util/uart_util.c b/platforms/asterfusion-bf/uart_util/uart_util.c
diff --git a/transceiver-cases.conf b/transceiver-cases.conf
