24.07 2024.08.01.

    New features:
       - None.
    Major bugfix.
       - Port link stability for X732Q-T.

Author: hangtsi

CMakeLists.txt

@@ -7,9 +7,9 @@
 
 cmake_minimum_required(VERSION 3.5)
 
-option(LASER_ON           "Force default laser enabled when modules plugged-in" OFF)
 option(THRIFT-DRIVER      "Build with thrift support" ON)
-option(ASTERFUSION-DIAGS  "Build Asterfusion Diags" OFF)
+option(LASER_ON           "Build for forcely enabling laser when modules plugged-in" OFF)
+option(ASTERFUSION-DIAGS  "Build Asterfusion Diags <TBD>" OFF)
 option(FORCE32            "Force a 32bit compile on 64bit" OFF)
 option(COVERAGE           "Build with gcov" OFF)
 
@@ -211,7 +211,7 @@ add_library(asterfusionbf_driver_o OBJECT
 )
 add_library(asterfusionbf_driver SHARED $<TARGET_OBJECTS:asterfusionbf_driver_o>)
 set_target_properties(asterfusionbf_driver PROPERTIES VERSION 0.0.0 SOVERSION 0)
-target_link_libraries(asterfusionbf_driver ${bfsys_lib} curl usb-1.0 ${bfutils_lib} ${private_lib})
+target_link_libraries(asterfusionbf_driver ${bfsys_lib} curl usb-1.0 ${bfutils_lib} ${private_lib} ${i2c_lib})
 add_library(pltfm_driver_o OBJECT
   drivers/src/bf_bd_cfg/bf_bd_cfg_intf.c
   drivers/src/bf_bd_cfg/bf_bd_cfg_intf_ucli.c
@@ -300,13 +300,13 @@ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/syseeprom_util DESTINATION bin)
 
 include_directories(platforms/asterfusion-bf/diags)
 if(ASTERFUSION-DIAGS)
-  add_library(accton_mav_diags SHARED
-    platforms/asterfusion-bf/diags/mavericks/diag_server.c
-    platforms/asterfusion-bf/diags/mavericks/diag_handler.c
-    platforms/asterfusion-bf/diags/mavericks/diag_ucli.c
+  add_library(asterfusion_diags SHARED
+    platforms/asterfusion-bf/diags/xt/diag_server.c
+    platforms/asterfusion-bf/diags/xt/diag_handler.c
+    platforms/asterfusion-bf/diags/xt/diag_ucli.c
   )
-  install(FILES platforms/asterfusion-bf/diags/mavericks/swutil DESTINATION bin)
-  configure_file(platforms/asterfusion-bf/diags/mavericks/targets/tofino/mav_diag.conf.in tofino/mav_diag.conf)
+  install(FILES platforms/asterfusion-bf/diags/xt/swutil DESTINATION bin)
+  configure_file(platforms/asterfusion-bf/diags/xt/targets/tofino/mav_diag.conf.in tofino/mav_diag.conf)
   install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tofino DESTINATION share/p4/targets)
 endif()
 install(PROGRAMS platforms/asterfusion-bf/utils/tofino_pci_bringup.sh DESTINATION bin)
@@ -320,10 +320,11 @@ install(PROGRAMS platforms/asterfusion-bf/utils/xt-clean.sh DESTINATION bin)
 install(PROGRAMS platforms/asterfusion-bf/utils/xt-diags.sh DESTINATION bin)
 install(PROGRAMS platforms/asterfusion-bf/utils/xt-setup.sh DESTINATION bin)
 
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/platforms/asterfusion-bf/src/board-maps/
-  DESTINATION share/platforms/board-maps/accton
+# It is also done to install pltfm_bd_map_*.json to $SDE_INSTALL/share/platforms/board-maps/asterfusion by autogen.sh.
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/platforms/asterfusion-bf/src/platform_mgr/
+  DESTINATION share/platforms/board-maps/asterfusion
   FILES_MATCHING
-  PATTERN "board_lane_map*.json"
+  PATTERN "pltfm_bd_map_*.json"
   PATTERN "*.py" EXCLUDE
   PATTERN "*.csv" EXCLUDE
 )

README.md

@@ -7,7 +7,6 @@ Table of Contents
   - [Build BSP](#build-bsp)
     - [Clone repo](#clone-repo)
     - [Build BSP via CMake](#build-bsp-via-cmake)
-    - [Build BSP via an Outdated Way](#build-bsp-via-an-outdated-way)
   - [Launch](#launch)
     - [Generate Launching Variables](#generate-launching-variables)
     - [Launch X-T Platforms](#launch-x-t-platforms)
@@ -87,10 +86,9 @@ root@localhost:~# cd bf-bsp-lts
 root@localhost:~/bf-bsp-lts#
 ```
 
-There're `2 ways` to build BSP.
 
 #### <a name="build-bsp-via-cmake"></a>Build BSP via CMake
-The `1st` (also recommended) one is by cmake:
+The proccedure of building bsp by cmake is texted below:
 ```
 root@localhost:~/bf-bsp-lts# ./autogen.sh
 root@localhost:~/bf-bsp-lts# mkdir build && cd build/
@@ -113,34 +111,13 @@ The defaut value of supported variables are listed below if none of them passed
 
 `LASER_ON=off`
 
-#### <a name="build-bsp-via-an-outdated-way"></a>Build BSP via an Outdated Way
-
-Skip to `Generate Configuration Variables` if `1st` building method is choosed. Otherwise, the `2nd` one, which will be disabled at `the end of July 2024`, is:
+Finally, `libasterfusionbf*`, `libplatform_thrift*`, `libpltfm_driver*`, `libpltfm_mgr*` will be installed to `$SDE_INSTALL/lib`, and all headers exposed by bsp will be installed to `$SDE_INSTALL/include`.
 
-Optionally changes to fit your SDE manually:
-```
-root@localhost:~/bf-bsp-lts# vi drivers/include/bf_pltfm_types/bf_pltfm_types.h +34
-Modify SDE_VERSION  to value '990','9110','9120'or '9130' ...
-```
 TIPS: In order to be compatible with different SDE versions and different base systems, we have introduced two macro variables in the BSP, one is `SDE_VERSION` and the other is `OS_VERSION`.
-They are defined in `$BSP/drivers/include/bf_pltfm_types/bf_pltfm_type.h`. Amend `SDE_VERSION` to the one you're using.
-
-
-Build and Install
-```
-root@localhost:~/bf-bsp-lts# ./autogen.sh
-root@localhost:~/bf-bsp-lts# ./configure --prefix=$SDE_INSTALL --enable-thrift
-root@localhost:~/bf-bsp-lts# make -j7 install
-```
+They are defined in `$BSP/drivers/include/bf_pltfm_types/bf_pltfm_type.h`.
 
-To be highlighted, during the evolution of SDE, the installation paths of the third party dependencies have been changed, so did the generated dependencies. Therefore, a minor changes in bsp sources must be done to accommodate those changes. For SDE version equal with  or higher than `9.9.x`, the changes as following:
-```
-root@localhost:~# mkdir /usr/local/include
-root@localhost:~# ln -s $SDE_INSTALL/include/thrift/ /usr/local/include/thrift
-```
 
 
-Finally, `libasterfusionbf*`, `libplatform_thrift*`, `libpltfm_driver*`, `libpltfm_mgr*` will be installed to `$SDE_INSTALL/lib`, and all headers exposed by bsp will be installed to `$SDE_INSTALL/include`.
 
 ### <a name="launch"></a>Launch
 

drivers/include/bf_qsfp/sff.h

@@ -414,6 +414,8 @@ typedef enum {
     HOST_TYPE_RESERVED_0x1E_0x24 = 0x1E,
     HOST_TYPE_RESERVED_0x24_0x1E = 0x24,
     /* 0x25 - 0x40 for other kind of ethernet */
+    HOST_TYPE_IB_EDR = 0x30,
+    HOST_TYPE_IB_HDR = 0x31,
     HOST_TYPE_CAUI_4_C2M_NO_FEC = 0x41,
     HOST_TYPE_CAUI_4_C2M_RS_FEC = 0x42,
     HOST_TYPE_50GBASE_CR2_RS_FEC = 0x43,
@@ -460,6 +462,7 @@ typedef enum {
     MEDIA_TYPE_MMF_200GBASE_VR2 = 0x1E,
     MEDIA_TYPE_MMF_400GBASE_VR4 = 0x1F,
 
+    QSFPDD_200GBASE_SR4 = MEDIA_TYPE_MMF_200GBASE_SR4,
     QSFPDD_400GBASE_SR8 = MEDIA_TYPE_MMF_400GBASE_SR8,
     QSFPDD_400GBASE_SR4 = MEDIA_TYPE_MMF_400GBASE_SR4,
 } Module_MMF_media_interface_code;

drivers/src/bf_port_mgmt/bf_pm_intf_tf2.c

@@ -710,16 +710,18 @@ static void bf_pm_interface_fsm_run(bf_pm_intf_cfg_t *icfg,
     int module_chan, rc;
     bool rx_los_flag, rx_lol_flag, rx_lol_sup, rx_los_sup;
     int delay_ms = 0;
+    bf_pm_port_dir_e dir_mode = PM_PORT_DIR_DEFAULT;
 
     if ((!icfg) || (!intf) || (!qsfp_info)) return;
 
     port_hdl.conn_id = icfg->conn_id;
     port_hdl.chnl_id = icfg->channel;
     next_st = st = pm_intf_fsm_st[port_hdl.conn_id][port_hdl.chnl_id];
 
+    bf_pm_port_direction_get (icfg->dev_id, &port_hdl, &dir_mode);
     // handle qsfp-removal in any state
     if ((!bf_bd_is_this_port_internal(icfg->conn_id, icfg->channel)) &&
-            (!qsfp_info->is_present) && !bf_pltfm_pm_is_ha_mode()) {
+            (!qsfp_info->is_present) && !bf_pltfm_pm_is_ha_mode() && (dir_mode != PM_PORT_DIR_TX_ONLY)) {
         bf_pm_handle_intf_disable(icfg, intf, qsfp_info);
         // since fsm-runs only on admin-enabled, move state to init
         if (icfg->admin_up) {
@@ -738,6 +740,9 @@ static void bf_pm_interface_fsm_run(bf_pm_intf_cfg_t *icfg,
             next_st = PM_INTF_FSM_MEDIA_DETECTED;
         } else if (bf_pltfm_pm_is_ha_mode()) {
             next_st = PM_INTF_FSM_HA_WAIT_LINK_ST;
+        } else if((!qsfp_info->is_present) && (dir_mode == PM_PORT_DIR_TX_ONLY)){
+            bf_pal_pm_front_port_ready_for_bringup(icfg->dev_id, &port_hdl, true);
+            next_st = PM_INTF_FSM_WAIT_LINK_ST;
         }
         break;
     case PM_INTF_FSM_MEDIA_DETECTED:
@@ -785,8 +790,21 @@ static void bf_pm_interface_fsm_run(bf_pm_intf_cfg_t *icfg,
             bf_pm_pltfm_front_port_eligible_for_autoneg(
                 icfg->dev_id, &port_hdl, false);
             bf_pal_pm_front_port_ready_for_bringup(icfg->dev_id, &port_hdl, true);
+            bf_pm_port_direction_get (icfg->dev_id, &port_hdl, &dir_mode);
             if (!bf_pltfm_pm_is_ha_mode()) {
-                next_st = PM_INTF_FSM_WAIT_SERDES_TX_INIT;
+                if (dir_mode == PM_PORT_DIR_TX_ONLY) {
+                    module_chan =
+                        bf_bd_first_conn_ch_get(port_hdl.conn_id) + port_hdl.chnl_id;
+                    // Tell the qsfp_ch_fsm that its ok to enable the lanes in this link.
+                    // Loop through all lanes since we only run the pm_intf_fsm
+                    // for head channels
+                    for (ch = 0; ch < icfg->intf_nlanes; ch++) {
+                        qsfp_fsm_ch_enable(icfg->dev_id, port_hdl.conn_id, module_chan + ch);
+                    }
+                    next_st = PM_INTF_FSM_WAIT_LINK_ST;
+                } else {
+                    next_st = PM_INTF_FSM_WAIT_SERDES_TX_INIT;
+                }
             } else {
                 // Wait for link-state notification from SDK for next action
                 next_st = PM_INTF_FSM_HA_WAIT_LINK_ST;
@@ -830,9 +848,14 @@ static void bf_pm_interface_fsm_run(bf_pm_intf_cfg_t *icfg,
     case PM_INTF_FSM_WAIT_SERDES_TX_INIT:
         // Wait for the SERDES TX init to complete
         // This state is only used for optical cables
-        bf_pm_port_serdes_tx_ready_get(
-            icfg->dev_id, &port_hdl, &asic_serdes_tx_ready);
+        bf_pm_port_direction_get (icfg->dev_id, &port_hdl, &dir_mode);
 
+        if (dir_mode == PM_PORT_DIR_RX_ONLY) {
+            asic_serdes_tx_ready = true;
+        } else {
+            bf_pm_port_serdes_tx_ready_get(
+                icfg->dev_id, &port_hdl, &asic_serdes_tx_ready);
+        }
         if (!asic_serdes_tx_ready) {  // keep waiting
             break;
         }
@@ -920,7 +943,7 @@ static void bf_pm_interface_fsm_run(bf_pm_intf_cfg_t *icfg,
         next_st = PM_INTF_FSM_LINK_UP;
         break;
     case PM_INTF_FSM_WAIT_MEDIA_RX_LOS:
-        if (!bf_pltfm_pm_is_ha_mode()) {
+        if ((!bf_pltfm_pm_is_ha_mode()) && qsfp_info->is_present) {
             rx_los_sup = false;
             rx_los_flag = true;
             module_chan =
@@ -947,7 +970,7 @@ static void bf_pm_interface_fsm_run(bf_pm_intf_cfg_t *icfg,
         }
         break;
     case PM_INTF_FSM_WAIT_MEDIA_RX_LOL:
-        if (!bf_pltfm_pm_is_ha_mode()) {
+        if ((!bf_pltfm_pm_is_ha_mode()) && qsfp_info->is_present) {
             rx_lol_sup = false;
             rx_lol_flag = true;
             module_chan =
@@ -970,7 +993,7 @@ 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()) {
+        if ((!bf_pltfm_pm_is_ha_mode()) && qsfp_info->is_present) {
             /* 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_qsfp/bf_qsfp_comm.c

@@ -663,6 +663,8 @@ cmis_app_host_if_speed_map[] = {
     {HOST_TYPE_100GBASE_CR2,      BF_SPEED_100G, "100GBASE-CR2     2 x 26.5625Gbd PAM4"},
     {HOST_TYPE_200GBASE_CR4,      BF_SPEED_200G, "200GBASE-CR4     4 x 26.5625Gbd PAM4"},
     {HOST_TYPE_400GBASE_CR8,      BF_SPEED_400G, "400GBASE-CR8     8 x 26.5625Gbd PAM4"},
+    {HOST_TYPE_IB_EDR,            BF_SPEED_400G, "IB EDR  1,2,4,8,12 x 25.78125Gbd NRZ"}, /* by SunZheng, 2024/07/02. */
+    {HOST_TYPE_IB_HDR,            BF_SPEED_100G, "IB HDR  1,2,4,8,12 x 26.5625Gbd PAM4"}, /* by SunZheng, 2024/07/02. */
     {HOST_TYPE_CAUI_4_C2M_NO_FEC, BF_SPEED_100G, "CAUI-4 NO FEC    4 x 25.78125Gbd NRZ"}, /* by Hang Tsi, 2024/01/23. */
     {HOST_TYPE_CAUI_4_C2M_RS_FEC, BF_SPEED_100G, "CAUI-4 RS FEC    4 x 25.78125Gbd NRZ"}, /* by Hang Tsi, 2024/02/26. */
     {HOST_TYPE_100GBASE_CR1,      BF_SPEED_100G, "100GBASE-CR1     1 x 53.125GBd PAM4"},
@@ -4809,7 +4811,7 @@ static int cmis_calc_application_count (int port,
             bf_qsfp_field_read_onebank (port,
                                         APSEL9_HOST_ID,
                                         0,
-                                        ((*app_count - 9) * BYTES_PER_APP),
+                                        ((*app_count - 8) * BYTES_PER_APP),
                                         1,
                                         &host_id);
             (*app_count)++;
@@ -6790,6 +6792,8 @@ const char *bf_cmis_get_media_type_string (
                     return "400G-SR8";
                 case QSFPDD_400GBASE_SR4:
                     return "400G-SR4";
+                case QSFPDD_200GBASE_SR4:
+                    return "200G-SR4";
             }
             break;
         case MEDIA_TYPE_SMF:
@@ -7754,7 +7758,8 @@ void bf_pltfm_qsfp_load_conf ()
 
         length = sprintf (entry, "%-16s   %-16s   %-8x\n", "Asterfusion", "14060165-1", 0x00030000);
         fwrite (entry, 1, length, fp);
-
+        length = sprintf (entry, "%-16s   %-16s   %-8x\n", "XSL", "OM3660FX102", 0x00010000);
+        fwrite (entry, 1, length, fp);
         fflush(fp);
     }