recode syncd_init_common.sh to support physyncd

sonic-net · Jun 24, 2020 · 4d93ea9 · 4d93ea9
1 parent 8695a23
commit 4d93ea9
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 114 deletions.
diff --git a/syncd/scripts/physyncd_init_common.sh b/syncd/scripts/physyncd_init_common.sh
diff --git a/syncd/scripts/physyncd_start.sh b/syncd/scripts/physyncd_start.sh
@@ -4,9 +4,9 @@
 #
 
 # Source the file that holds common code for systemd and supervisord
-. /usr/bin/physyncd_init_common.sh
+. /usr/bin/syncd_init_common.sh -p
 
-config_physyncd
+config_syncd_phy
 
 exec "/usr/bin/physyncd_startup.py"
 
diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh
@@ -1,6 +1,20 @@
 #!/usr/bin/env bash
 
-CMD_SYNCD=/usr/bin/syncd
+CHIP_TYPE="npu"
+
+while getopts p option
+do
+case "${option}"
+in
+p) CHIP_TYPE="phy";;
+esac
+done
+
+if [ x"$CHIP_TYPE" == x"phy" ]; then
+    CMD_SYNCD=/usr/bin/physyncd
+else
+    CMD_SYNCD=/usr/bin/syncd
+fi
 
 # dsserve: domain socket server for stdio
 CMD_DSSERVE=/usr/bin/dsserve
@@ -11,6 +25,7 @@ ENABLE_SAITHRIFT=0
 PLATFORM_DIR=/usr/share/sonic/platform
 HWSKU_DIR=/usr/share/sonic/hwsku
 
+
 SONIC_ASIC_TYPE=$(sonic-cfggen -y /etc/sonic/sonic_version.yml -v asic_type)
 
 if [ -x $CMD_DSSERVE ]; then
@@ -71,6 +86,14 @@ function set_start_type()
     fi
 }
 
+config_syncd_phy()
+{
+    if [ ${ENABLE_SAITHRIFT} == 1 ]; then
+        CMD_ARGS+=" -r -m $HWSKU_DIR/port_config.ini"
+    fi
+
+    [ -r $PLATFORM_DIR/physyncd.conf ] && . $PLATFORM_DIR/physyncd.conf
+}
 
 config_syncd_bcm()
 {
@@ -175,35 +198,43 @@ config_syncd()
 {
     check_warm_boot
 
-    if [ "$SONIC_ASIC_TYPE" == "broadcom" ]; then
-        config_syncd_bcm
-    elif [ "$SONIC_ASIC_TYPE" == "mellanox" ]; then
-        config_syncd_mlnx
-    elif [ "$SONIC_ASIC_TYPE" == "cavium" ]; then
-        config_syncd_cavium
-    elif [ "$SONIC_ASIC_TYPE" == "centec" ]; then
-        config_syncd_centec
-    elif [ "$SONIC_ASIC_TYPE" == "marvell" ]; then
-        config_syncd_marvell
-     elif [ "$SONIC_ASIC_TYPE" == "barefoot" ]; then
-         config_syncd_barefoot
-    elif [ "$SONIC_ASIC_TYPE" == "nephos" ]; then
-        config_syncd_nephos
-    elif [ "$SONIC_ASIC_TYPE" == "vs" ]; then
-        config_syncd_vs
-    elif [ "$SONIC_ASIC_TYPE" == "innovium" ]; then
-        config_syncd_innovium
+    if [ x"$CHIP_TYPE" == x"npu" ]; then
+        if [ "$SONIC_ASIC_TYPE" == "broadcom" ]; then
+            config_syncd_bcm
+        elif [ "$SONIC_ASIC_TYPE" == "mellanox" ]; then
+            config_syncd_mlnx
+        elif [ "$SONIC_ASIC_TYPE" == "cavium" ]; then
+            config_syncd_cavium
+        elif [ "$SONIC_ASIC_TYPE" == "centec" ]; then
+            config_syncd_centec
+        elif [ "$SONIC_ASIC_TYPE" == "marvell" ]; then
+            config_syncd_marvell
+        elif [ "$SONIC_ASIC_TYPE" == "barefoot" ]; then
+            config_syncd_barefoot
+        elif [ "$SONIC_ASIC_TYPE" == "nephos" ]; then
+            config_syncd_nephos
+        elif [ "$SONIC_ASIC_TYPE" == "vs" ]; then
+            config_syncd_vs
+        elif [ "$SONIC_ASIC_TYPE" == "innovium" ]; then
+            config_syncd_innovium
+        else
+            echo "Unknown ASIC type $SONIC_ASIC_TYPE"
+            exit 1
+        fi
     else
-        echo "Unknown ASIC type $SONIC_ASIC_TYPE"
-        exit 1
+        config_syncd_phy
     fi
-
+    
     set_start_type
 
     if [ ${ENABLE_SAITHRIFT} == 1 ]; then
         CMD_ARGS+=" -r -m $HWSKU_DIR/port_config.ini"
     fi
 
-    [ -r $PLATFORM_DIR/syncd.conf ] && . $PLATFORM_DIR/syncd.conf
+    if [ x"$CHIP_TYPE" == "npu" ]; then
+        [ -r $PLATFORM_DIR/syncd.conf ] && . $PLATFORM_DIR/syncd.conf
+    else
+        [ -r $PLATFORM_DIR/physyncd.conf ] && . $PLATFORM_DIR/physyncd.conf
+    fi
 }