Merge remote-tracking branch 'up/main'

Author: jafingerhut

README.md

@@ -40,7 +40,8 @@ Some things not included, that one must get from Intel:
 + BSPs (Board Support Packages) that enable the SDE to access and
   configure hardware on a physical board, e.g. configuring physical
   Ethernet ports and manage related components, such as repeaters,
-  retimers, SFPs, QSFPs, etc.
+  retimers, SFPs, QSFPs, etc. Reach out to Intel 
+  ([email protected]) for the BSP package.
 + ASIC-specific Serdes drivers.  These are not necessary for running
   the simulation model, but essential for running the code on the real
   ASICs.  See instructions in the directory `hw`.  The necessary code

hw/rdc_setup.sh

@@ -32,19 +32,25 @@ rdc_setup(){
     cp $RDC_BFD/$SUBDIR/CMakeLists.txt $OS_BFD/$SUBDIR/CMakeLists.txt
 
     SUBDIR="src"
-    DIRS=("alphawave" "credo" "firmware" "microp")
+    DIRS=("alphawave" "credo" "avago" "microp")
     replace "$SUBDIR" 1 "${DIRS[@]}" 
     cp $RDC_BFD/$SUBDIR/CMakeLists.txt $OS_BFD/$SUBDIR/CMakeLists.txt
 
+    cp $RDC_BFD/libavago* $OS_BFD
+
+    SUBDIR="include/avago"
+    FILES=("aapl.h" "avago_aapl.h" "avago_dox.h")
+    replace "$SUBDIR" 0 "${FILES[@]}"
+
     SUBDIR="src/port_mgr"
     # If port_mgr_dev.c or port_mgr_physical_dev.c are modified by the open source community, those changes must be merged manually by the user
-    FILES=("CMakeLists.txt" "bf_ll_umac3_if.c" "bf_ll_umac_4_if.c" "port_mgr_dev.c" "post_mgr_physical_dev.c" "port_mgr_umac_access.c" "t3-csr/tf3-csr-gen.py")
-    DIRS=("csr" "crdo" "aw-gen")
+    FILES=("CMakeLists.txt" "bf_ll_umac3_if.c" "bf_ll_umac4_if.c" "port_mgr_dev.c" "port_mgr_physical_dev.h" "port_mgr_umac_access.c")
+    DIRS=("csr" "crdo" "aw-gen" "t3-csr")
     replace "$SUBDIR" 1 "${DIRS[@]}"
     replace "$SUBDIR" 0 "${FILES[@]}"
 
     SUBDIR="src/port_mgr/port_mgr_tof1"
-    FILES=("bf_serdes_if.c" "comira_reg_access_autogen.c" "comira_reg_access_autogen.h" "comira_reg_def_autogen.h" "comira_reg_strs.h" "port_mgr_av_sd.c" "port_mgr_av_sd_an.c" "port_mgr_mac.c" "port_mgr_port_diag.c" "port_mgr_serdes.c" "port_mgr_serdes_diag.c" "port_mgr_serdes_sbus_map.c" "port_mgr_ucli.c")
+    FILES=("bf_serdes_if.c" "comira_reg_access_autogen.c" "comira_reg_access_autogen.h" "comira_reg_def_autogen.h" "comira_reg_strs.h" "port_mgr_av_sd.c" "port_mgr_av_sd.h" "port_mgr_av_sd_an.c" "port_mgr_av_sd_an.h" "port_mgr_mac.c" "port_mgr_port_diag.c" "port_mgr_serdes.c" "port_mgr_serdes_diag.c" "port_mgr_serdes_sbus_map.c" "port_mgr_ucli.c" "bf_fsm_hdlrs.c" )
     replace "$SUBDIR" 0 "${FILES[@]}"
 
     SUBDIR="src/port_mgr/port_mgr_tof2"
@@ -54,7 +60,7 @@ rdc_setup(){
     SUBDIR="src/port_mgr/port_mgr_tof3"
     # If aw_if.h, aw_mss.h, or bf_tof3_serdes_utils.h are modified by the open source community, those changes must be merged manually by the user
     FILES=("aw_driver_sim.c" "aw_driver_sim.h" "aw_if.h" "aw_io.c" "aw_io.h" "aw_mss.h" "aw_reg_dbg.c" "aw_reg_dbg.h" "aw_types.h" "aw_vector_types.h" "bf_aw_pmd.c" "bf_aw_vfld_pmd.c" "bf_ll_tof3_eth400g_app_rspec_if.c" "bf_ll_tof3_eth400g_app_rspec_if.h" "bf_ll_tof3_eth400g_mac_rspec_if.c" "bf_ll_tof3_eth400g_mac_rspec_if.h" "bf_ll_tof3_eth400g_sys_rspec_if.c" "bf_ll_tof3_eth400g_sys_rspec_if.h" "bf_tof3_serdes_if.c" "bf_tof3_serdes_utils.c" "bf_tof3_serdes_utils.h" "port_mgr_tof3.c" "port_mgr_tof3_dev.c" "port_mgr_tof3_map.c" "port_mgr_tof3_microp.c" "port_mgr_tof3_port.c" "port_mgr_tof3_serdes.c" "port_mgr_tof3_serdes_map.c" "port_mgr_tof3_tmac.c" "svdpi.c" "svdpi.h" "tmac_access.c" "tmac_access.h" "tof3-autogen-required-headers.h" "tof3_eth400g_app_rspec_access.c" "tof3_eth400g_app_rspec_access.h" "tof3_eth400g_mac_rspec_access.c" "tof3_eth400g_mac_rspec_access.h" "tof3_eth400g_sys_rspec_access.c" "tof3_eth400g_sys_rspec_access.h" "vfld_vec_name.h" "vfld_vec_type.h")
-    DIRS=("aw-reg-gen" "aw_16ln")
+    DIRS=("aw-reg-gen" "aw_16ln" "aw_4ln")
     replace "$SUBDIR" 1 "${DIRS[@]}"
     replace "$SUBDIR" 0 "${FILES[@]}"
 }

p4studio/workspace/sde_workspace.py

@@ -71,7 +71,7 @@ def bsp_path(self) -> Optional[Path]:
 
     def _sde_version(self) -> Optional[str]:
         manifest_possible_file_paths = glob(str(self.root_path / "bf-sde-*.manifest"))
-        if manifest_possible_file_paths == 0:
+        if len(manifest_possible_file_paths) == 0:
             return None
         manifest_filename = Path(manifest_possible_file_paths[0]).name
         regex = r"bf-sde-(?P<version>\d+\.\d+\.\d+(?:\.\d+)*(?:-cpr|-pr)?).manifest"

pkgsrc/ptf-modules/bf-pktpy/bf_pktpy/ptf/packet_pktpy.py

@@ -19,6 +19,7 @@
 see PTF documentation (section "Pluggable packet manipulation module").
 """
 import bf_pktpy.packets
+import bf_pktpy.commands
 from bf_pktpy.all import hexdump as bf_pktpy_hexdump, ls as bf_pktpy_ls
 from ptf import config
 
@@ -119,3 +120,20 @@ def get_erspan_alternative():
 # bf_pktpy implementation of hexdump
 hexdump = bf_pktpy_hexdump
 ls = bf_pktpy_ls
+
+# The names below are assigned here so that, like the other names
+# above, they can be used by importers of the ptf.packet module as if
+# they were defined inside of ptf.packet, and they are commonly
+# available as ptf.packet.<name> regardless whether you use scapy or
+# bf-pktpy as the packet manipulation module.
+
+send = bf_pktpy.commands.send
+sendp = bf_pktpy.commands.sendp
+sr = bf_pktpy.commands.sr
+sr1 = bf_pktpy.commands.sr1
+srp = bf_pktpy.commands.srp
+srp1 = bf_pktpy.commands.srp1
+srloop = bf_pktpy.commands.srloop
+srploop = bf_pktpy.commands.srploop
+sniff = bf_pktpy.commands.sniff
+bridge_and_sniff = bf_pktpy.commands.bridge_and_sniff