24.06 2024.06.24

New features:
   - ONLP support for X732Q-T (a new onl plugin update required).
   - Support to build BSP via CMake.
Major bugfix.
   - Fix a bug of getting tx/rx power by bf_qsfp_get_transciever_info.
   - Fix a bug of misorder of PSU power in/out for X732Q-T.
   - Fix an issue of mixed-up LED colors on the X308P-T.
   - Fix a bug of linking libi2c on ubuntu

Author: hangtsi

CMakeLists.txt

@@ -4,41 +4,36 @@
 #
 # Hang Tsi (tsihang@asterfusion.com)
 #
-# Belowing shows how to build bf-bsp-lts via CMake.
-#
-# cd bf-bsp-lts
-# ./autogen.sh
-# mkdir build && cd build
-# cmake .. -DCMAKE_MODULE_PATH=`pwd`/../cmake -DCMAKE_INSTALL_PREFIX=$SDE_INSTALL
-# make -j4 install
-#
-#
 
 cmake_minimum_required(VERSION 3.5)
 
-option(STANDALONE  "Build outside of pkgsrc" ON)
-option(FORCE32            "Force a 32bit compile on 64bit" OFF)
+option(LASER_ON           "Force default laser enabled when modules plugged-in" OFF)
 option(THRIFT-DRIVER      "Build with thrift support" ON)
-option(COVERAGE           "Build with gcov" OFF)
-option(TOFINO             "Build for TOFINO" ON)
-option(TOFINO2            "Build for TOFINO2" OFF)
 option(ASTERFUSION-DIAGS  "Build Asterfusion Diags" OFF)
+option(FORCE32            "Force a 32bit compile on 64bit" OFF)
+option(COVERAGE           "Build with gcov" OFF)
 
+#
 # Pass OS_NAME/OS_VERSION/SDE_VERSION by cmake CLI. Take belowing as an example:
 # cmake .. -DCMAKE_MODULE_PATH=`pwd`/../cmake -DCMAKE_INSTALL_PREFIX=$SDE_INSTALL \
 #          -DOS_NAME=(Debian|Ubuntu)                                     \
-#          -DOS_VERSION=[(8|9|10|11|12),(14.04|16.04|18.04|20.04|22.04)] \
-#          -DSDE_VERSION=(900|911|933|954|975|991|9112|9133)
+#          -DOS_VERSION=[(8|9|10|11|12),(1404|1604|1804|2004|2204)] \
+#          -DSDE_VERSION=(900|911|933|954|975|991|9112|9133) \
+#          -DTRIFT-DRIVER=on \
+#          -DLASER_ON=off
+#
+# The defaut value of variables listed below if none of them passed by cmake CLI:
+# OS_NAME=Debian, OS_VERSION=9, SDE_VERSION=9133, THRIFT-DRIVER=on, LASER_ON=off.
 #
 message(STATUS "Supported -DOS_NAME=(Debian|Ubuntu)")
-message(STATUS "Supported -DOS_VERSION=[(8|9|10|11|12),(14.04|16.04|18.04|20.04|22.04)]")
+message(STATUS "Supported -DOS_VERSION=[(8|9|10|11|12),(1404|1604|1804|2004|2204)]")
 message(STATUS "Supported -DSDE_VERSION=(900|911|933|954|975|991|9112|9133)")
 cmake_host_system_information(RESULT HOST_NAME QUERY HOSTNAME)
 message(STATUS "${HOST_NAME}")
 
 if(NOT DEFINED SDE_VERSION)
   # Default SDE_VERSION
-  set(SDE_VERSION 9130)
+  set(SDE_VERSION 9133)
 endif()
 
 if(NOT DEFINED OS_VERSION)
@@ -61,13 +56,23 @@ endif()
 message(STATUS "Giving -DOS_NAME=${OS_NAME}")
 message(STATUS "Giving -DOS_VERSION=${OS_VERSION}")
 message(STATUS "Giving -DSDE_VERSION=${SDE_VERSION}")
+message(STATUS "Giving -DTHRIFT_ENABLED=${THRIFT-DRIVER}")
+message(STATUS "Giving -DDEFAULT_LASER_ON=${LASER_ON}")
+message(STATUS "Giving -DASTERFUSION-DIAGS=${ASTERFUSION-DIAGS}")
+message(STATUS "Giving -DCOVERAGE=${COVERAGE}")
 
-# Please see drivers/include/bf_pltfm_types/bf_pltfm_types.h +34
+# Please see drivers/include/bf_pltfm_types/bf_pltfm_types.h +34 for reference.
 add_definitions(-DOS_NAME=${OS_NAME})
 add_definitions(-DOS_VERSION=${OS_VERSION})
 add_definitions(-DSDE_VERSION=${SDE_VERSION})
 # Unused
 add_definitions(-DDEVICE_IS_ASIC)
+if (LASER_ON)
+  # Please see drivers/include/bf_qsfp/bf_qsfp.h +45 for reference.
+  add_definitions(-DDEFAULT_LASER_ON)
+  #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}     -DDEFAULT_LASER_ON")
+  #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEFAULT_LASER_ON")
+endif()
 
 if(${SDE_VERSION} LESS 990)
   set(bfutils_lib "bfutils")
@@ -78,6 +83,18 @@ else()
 endif()
 message(STATUS "Linking ${bfutils_lib} ${bfsys_lib}")
 
+set(private_lib "cgos")
+
+# to avoid empty variable.
+set(i2c_lib "m")
+if((${OS_NAME} STREQUAL "Debian") AND (${OS_VERSION} GREATER 9))
+  set(i2c_lib "i2c")
+endif()
+if((${OS_NAME} STREQUAL "Ubuntu") AND (${OS_VERSION} GREATER 1604))
+  set(i2c_lib "i2c")
+endif()
+message(STATUS "Linking ${i2c_lib}")
+
 if(FORCE32)
   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -m32")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
@@ -100,10 +117,7 @@ set(C_CXX_FLAGS "-Wall -Wextra -Werror -Wundef -Wshadow -Wno-missing-field-initi
 if(COVERAGE)
   set(C_CXX_FLAGS "${C_CXX_FLAGS} --coverage")
 endif()
-if(FORCE32)
-  set(CMAKE_C_FLAGS   "-m32")
-  set(CMAKE_CXX_FLAGS "-m32")
-endif()
+
 set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   ${C_CXX_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${C_CXX_FLAGS}")
 
@@ -197,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} cgos)
+target_link_libraries(asterfusionbf_driver ${bfsys_lib} curl usb-1.0 ${bfutils_lib} ${private_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
@@ -233,9 +247,9 @@ set_target_properties(pltfm_mgr PROPERTIES VERSION 0.0.0 SOVERSION 0)
 #thrift
 if (THRIFT-DRIVER)
   add_subdirectory(platforms/asterfusion-bf/thrift)
-  target_link_libraries(pltfm_mgr PUBLIC pltfm_mgr_thrift ${bfsys_lib} curl usb-1.0)
+  target_link_libraries(pltfm_mgr PUBLIC pltfm_mgr_thrift ${bfsys_lib} curl usb-1.0 ${private_lib})
 else()
-  target_link_libraries(pltfm_mgr PUBLIC ${bfsys_lib} curl usb-1.0)
+  target_link_libraries(pltfm_mgr PUBLIC ${bfsys_lib} curl usb-1.0 ${private_lib})
 endif()
 
 add_library(asterfusion_bin_srcs_o OBJECT
@@ -254,22 +268,22 @@ add_executable(spi_i2c_util
   platforms/asterfusion-bf/tofino_spi_util/tofino_porting_spi.c
   $<TARGET_OBJECTS:asterfusion_bin_srcs_o>
 )
-target_link_libraries(spi_i2c_util ${bfsys_lib} usb-1.0 curl m ${bfutils_lib} cgos)
+target_link_libraries(spi_i2c_util ${bfsys_lib} usb-1.0 curl m ${bfutils_lib} ${private_lib} ${i2c_lib})
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/spi_i2c_util DESTINATION bin)
 
 add_executable(cp2112_util
   platforms/asterfusion-bf/cp2112_util/cp2112_util.c
   $<TARGET_OBJECTS:asterfusion_bin_srcs_o>
 )
-target_link_libraries(cp2112_util ${bfsys_lib} usb-1.0 curl m ${bfutils_lib} cgos)
+target_link_libraries(cp2112_util ${bfsys_lib} usb-1.0 curl m ${bfutils_lib} ${private_lib} ${i2c_lib})
 target_compile_options(cp2112_util PRIVATE -Wno-implicit-function-declaration -Wno-sign-compare)
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cp2112_util DESTINATION bin)
 
 add_executable(uart_util
   platforms/asterfusion-bf/uart_util/uart_util.c
   $<TARGET_OBJECTS:asterfusion_bin_srcs_o>
 )
-target_link_libraries(uart_util ${bfsys_lib} usb-1.0 curl m ${bfutils_lib} cgos)
+target_link_libraries(uart_util ${bfsys_lib} usb-1.0 curl m ${bfutils_lib} ${private_lib} ${i2c_lib})
 target_compile_options(uart_util PRIVATE -Wno-implicit-function-declaration -Wno-sign-compare)
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/uart_util DESTINATION bin)
 
@@ -280,7 +294,7 @@ add_executable(syseeprom_util
   $<TARGET_OBJECTS:asterfusion_bin_srcs_o>
 )
 set_target_properties(syseeprom_util PROPERTIES COMPILE_FLAGS -DNO_MAIN)
-target_link_libraries(syseeprom_util ${bfsys_lib} usb-1.0 curl m ${bfutils_lib} cgos)
+target_link_libraries(syseeprom_util ${bfsys_lib} usb-1.0 curl m ${bfutils_lib} ${private_lib} ${i2c_lib})
 target_compile_options(syseeprom_util PRIVATE -Wno-error)
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/syseeprom_util DESTINATION bin)
 

README.md

@@ -6,7 +6,7 @@ Table of Contents
   - [Environment Variables](#environment-variables)
   - [Build BSP](#build-bsp)
     - [Clone repo](#clone-repo)
-    - [Build BSP via CMAKE](#build-bsp-via-cmake)
+    - [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)
@@ -89,22 +89,29 @@ root@localhost:~/bf-bsp-lts#
 
 There're `2 ways` to build BSP.
 
-#### <a name="build-bsp-via-cmake"></a>Build BSP via CMAKE
+#### <a name="build-bsp-via-cmake"></a>Build BSP via CMake
 The `1st` (also recommended) one is by cmake:
 ```
 root@localhost:~/bf-bsp-lts# ./autogen.sh
 root@localhost:~/bf-bsp-lts# mkdir build && cd build/
-root@localhost:~/bf-bsp-lts/build# cmake .. \
-                      -DCMAKE_MODULE_PATH=`pwd`/../cmake  \
-                      -DCMAKE_INSTALL_PREFIX=$SDE_INSTALL \
-                      -DOS_NAME=Debian                    \
-                      -DOS_VERSION=9                      \
-                      -DSDE_VERSION=9130
+root@localhost:~/bf-bsp-lts/build# cmake .. -DCMAKE_MODULE_PATH=`pwd`/../cmake  \
+                                            -DCMAKE_INSTALL_PREFIX=$SDE_INSTALL \
+                                            -DOS_NAME=Debian                    \
+                                            -DOS_VERSION=9                      \
+                                            -DSDE_VERSION=9133
 root@localhost:~/bf-bsp-lts/build# make -j15 install
 ```
-The defaut value of variables listed below if none of them passed by cmake CLI:
+The defaut value of supported variables are listed below if none of them passed by CMake CLI:
 
-`OS_NAME=Debian`, `OS_VERSION=9`, `SDE_VERSION=9130`
+`OS_NAME=Debian`,
+
+`OS_VERSION=9`,
+
+`SDE_VERSION=9133`,
+
+`THRIFT-DRIVER=on`,
+
+`LASER_ON=off`
 
 #### <a name="build-bsp-via-an-outdated-way"></a>Build BSP via an Outdated Way
 

autogen.sh

@@ -66,5 +66,5 @@ else
 EOF
 fi
 
-exec autoreconf -fi -v
+#exec autoreconf -fi -v
 

drivers/include/bf_pltfm_types/bf_pltfm_types.h

@@ -161,8 +161,18 @@ extern "C" {
 #define AF_LOG_MSG_SIZE 512
 #define AF_LOG_EXT(...)                                                         \
     do {                                                                        \
+        FILE *xfp = fopen (BF_DRIVERS_LOG_EXT, "r");                            \
+        if (xfp == NULL) {                                                      \
+            if (bf_pltfm_mgr_ctx()->extended_log_hdl) {                         \
+                fclose(bf_pltfm_mgr_ctx()->extended_log_hdl);                   \
+                bf_pltfm_mgr_ctx()->extended_log_hdl = NULL;                    \
+            }                                                                   \
+        } else {                                                                \
+            fclose(xfp);                                                        \
+        }                                                                       \
         if (bf_pltfm_mgr_ctx()->extended_log_hdl == NULL) {                     \
-            bf_pltfm_mgr_ctx()->extended_log_hdl = fopen (BF_DRIVERS_LOG_EXT, "a+");\
+            bf_pltfm_mgr_ctx()->extended_log_hdl =                              \
+                                            fopen (BF_DRIVERS_LOG_EXT, "a+");   \
         }                                                                       \
         if (bf_pltfm_mgr_ctx()->extended_log_hdl) {                             \
             fflush (bf_pltfm_mgr_ctx()->extended_log_hdl);                      \
@@ -189,8 +199,7 @@ extern "C" {
             fprintf (bf_pltfm_mgr_ctx()->extended_log_hdl, "%s\n", ____info);   \
             fflush (bf_pltfm_mgr_ctx()->extended_log_hdl);                      \
         }                                                                       \
-    } while (0);/*\
-    //LOG_WARNING(__VA_ARGS__);*/
+    } while (0);
 
 #define MAX_CHAN_PER_CONNECTOR 8
 

drivers/include/bf_qsfp/bf_qsfp.h

@@ -32,8 +32,16 @@ extern "C" {
  * remote for some kind of cases. Also, this feature can be implemented
  * to a transceiver as well by clearing flags BF_TRANS_CTRLMASK_LASER_OFF
  * in /etc/transceiver-cases.conf if you know its Vendor and PN.
- * .
- * by tsihang, 2023/09/01. */
+ *
+ * by tsihang, 2023/09/01.
+ *
+ *
+ * This macro can be optionally given by CMake CLI with '-DLASER_ON=on'
+ * To be highlighted, please make clean & make install to make sure all sources
+ * fully compiled after -DLASER_ON flags changed.
+ *
+ * by tsihang, 2024/06/17.
+ */
 //#define DEFAULT_LASER_ON
 
 /* Control word added by tsihang for /etc/transceiver-cases.conf, 2023/05/05. */

drivers/src/bf_qsfp/bf_qsfp_comm.c

@@ -3194,6 +3194,8 @@ bool bf_qsfp_get_chan_tx_bias (int port,
                                qsfp_channel_t *chn)
 {
     uint8_t data[16];
+    uint8_t scaleValue;
+    double scale;
     int i;
     int chmask = bf_qsfp_chmask_get (port);
 
@@ -3216,17 +3218,36 @@ bool bf_qsfp_get_chan_tx_bias (int port,
 
     /* Update cache. */
     if (bf_qsfp_is_cmis (port)) {
-        /* TBD */
+        /* CMIS */
+        /* Support for CMIS since 2024-06-19. */
+        bf_qsfp_module_read (
+            port, QSFP_BANKNA, QSFP_PAGE1, 160, 1,
+            &scaleValue);
+
+        scale = pow(2.0, (scaleValue >> 3) & 3);
+
+        for (i = 0; i < 16; i++) {
+            bf_qsfp_info_arr[port].page17[i + 170 - MAX_QSFP_PAGE_SIZE] = data[i];
+        }
+
+        for (i = 0; i < bf_qsfp_get_media_ch_cnt(port) &&
+             i < MAX_CHAN_PER_CONNECTOR;
+             i++) {
+            uint16_t val = data[i * 2] << 8 | data[ (i * 2) +
+                                                    1];
+            chn[i].sensors.tx_bias.value = scale * (131.0 * val) / 65535;
+            chn[i].sensors.tx_bias._isset.value = true;
+        }
     } else {
         /* SFF-8636 */
         /* Currently only update the first eight bytes to support SFF-8636.
          * Support for CMIS will be added in the future.
          * by sunzheng, 2023-08-04. */
-        for (i=0; i < 8; i++) {
+        for (i = 0; i < 8; i++) {
             bf_qsfp_info_arr[port].idprom[i + 42] = data[i];
         }
 
-        for (i = 0; i < bf_qsfp_info_arr[port].num_ch &&
+        for (i = 0; i < bf_qsfp_get_media_ch_cnt(port) &&
              i < MAX_CHAN_PER_CONNECTOR;
              i++) {
             uint16_t val = data[i * 2] << 8 | data[ (i * 2) +
@@ -3262,24 +3283,27 @@ bool bf_qsfp_get_chan_tx_pwr (int port,
         return false;
     }
 
+    for (i = 0; i < bf_qsfp_get_media_ch_cnt(port) &&
+         i < MAX_CHAN_PER_CONNECTOR;
+         i++) {
+        uint16_t val = data[i * 2] << 8 | data[ (i * 2) +
+                                                1];
+        /* Convert to dBm. */
+        chn[i].sensors.tx_pwr.value = ((val == 0) ? (-40 * 1.0) : (get_pwr (val)));
+        chn[i].sensors.tx_pwr._isset.value = true;
+    }
+
     /* Update cache. */
     if (bf_qsfp_is_cmis (port)) {
-        /* TBD */
+        /* CMIS */
+        for (i = 0; i < 16; i++) {
+            bf_qsfp_info_arr[port].page17[i + 154 - MAX_QSFP_PAGE_SIZE] = data[i];
+        }
     } else {
         /* SFF-8636 */
         for (i=0; i < 8; i++) {
             bf_qsfp_info_arr[port].idprom[i + 50] = data[i];
         }
-
-        for (i = 0; i < bf_qsfp_info_arr[port].num_ch &&
-             i < MAX_CHAN_PER_CONNECTOR;
-             i++) {
-            uint16_t val = data[i * 2] << 8 | data[ (i * 2) +
-                                                    1];
-            /* Convert to dBm. */
-            chn[i].sensors.tx_pwr.value = ((val == 0) ? (-40 * 1.0) : (get_pwr (val)));
-            chn[i].sensors.tx_pwr._isset.value = true;
-        }
     }
     return true;
 }
@@ -3308,25 +3332,29 @@ bool bf_qsfp_get_chan_rx_pwr (int port,
         return false;
     }
 
+    for (i = 0; i < bf_qsfp_get_media_ch_cnt(port) &&
+         i < MAX_CHAN_PER_CONNECTOR;
+         i++) {
+        uint16_t val = data[i * 2] << 8 | data[ (i * 2) +
+                                                1];
+        /* Convert to dBm. */
+        chn[i].sensors.rx_pwr.value = ((val == 0) ? (-40 * 1.0) : (get_pwr (val)));
+        chn[i].sensors.rx_pwr._isset.value = true;
+    }
+
     /* Update cache. */
     if (bf_qsfp_is_cmis (port)) {
-        /* TBD */
+        /* CMIS */
+        for (i = 0; i < 16; i++) {
+            bf_qsfp_info_arr[port].page17[i + 186 - MAX_QSFP_PAGE_SIZE] = data[i];
+        }
     } else {
         /* SFF-8636 */
         for (i=0; i < 8; i++) {
             bf_qsfp_info_arr[port].idprom[i + 34] = data[i];
         }
-
-        for (i = 0; i < bf_qsfp_info_arr[port].num_ch &&
-             i < MAX_CHAN_PER_CONNECTOR;
-             i++) {
-            uint16_t val = data[i * 2] << 8 | data[ (i * 2) +
-                                                    1];
-            /* Convert to dBm. */
-            chn[i].sensors.rx_pwr.value = ((val == 0) ? (-40 * 1.0) : (get_pwr (val)));
-            chn[i].sensors.rx_pwr._isset.value = true;
-        }
     }
+
     return true;
 }