feat(master : nicsensor)version change to intest 1.7.5

nicsensor.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-SCRIPT_VERSION="1.7.4"
+SCRIPT_VERSION="1.7.5"
 # ---------------------------------------------------------
 # Project Feature Varible (Change as need)
 # ---------------------------------------------------------
@@ -133,7 +133,6 @@ INFO="Info"
 WARNING="Warning"
 ERROR="Error"
 log="/tmp/nicsensor_debug.log"
-
 # ---------------------------------------------------------
 #  Script Function Defination
 # ---------------------------------------------------------
@@ -163,6 +162,7 @@ print_usage(){
     echo "       - [slot]        : 0 1 2 3 4 5 ..."
     echo "       - [slave]       : chip slave address , please provide 7 bit address"
     echo "       - [command]     : The i2c command which will set to the chip"
+    echo "   3) E.G.             : ./nicsensor.sh pcie1 chip 0x10 'i2ctransfer -y 12 w1@0x10 0x00 r2'"
     echo ""
     echo "  Function 4 - FRU Read and Wirte"
     echo "   1) Command Format   : ./nicsensor.sh [slot] fru [slave] [option] [frudata]"
@@ -171,6 +171,9 @@ print_usage(){
     echo "       - [slave]       : chip slave address , please provide 7 bit address"
     echo "       - [option]      : read/write, default to read"
     echo "       - [frudata]     : fru bin file which will write to eeprom, only for write option"
+    echo "   3) E.G.             : ./nicsensor.sh pcie0 fru 0x57"
+    echo "                       : ./nicsensor.sh pcie0 fru 0x57 read"
+    echo "                       : ./nicsensor.sh pcie0 fru 0x57 write /tmp/fru.bin"
     echo ""
 }
 
@@ -391,24 +394,11 @@ set_configuration_5280m7(){
 
     # set pca9641 address && I2C BUS
     if [ $nic_type = "ocp" ];then
+    # Case - OCP
         is_have_pca9641=0
         pca9548_slave="0x70"
         i2c_bus=3
-    else
-        is_have_pca9641=1
-        if [ $slot_number -le 2 ];then
-            pca9641_slave="0x41"
-            pca9548_slave="0x72"
-            i2c_bus=12
-        else
-            pca9641_slave="0x42"
-            pca9548_slave="0x72"
-            i2c_bus=13
-        fi
-    fi
 
-    # set pca9548 switch channel
-    if [ $nic_type = "ocp" ];then
         if [ $slot_number -eq 0 ];then
             pca9548_channel="0x01"
         elif [ $slot_number -eq 1 ];then
@@ -419,6 +409,18 @@ set_configuration_5280m7(){
             format_print $WARNING "Unspecified card slot!"
         fi
     else
+    # Case - PCIe
+        is_have_pca9641=1
+        if [ $slot_number -le 2 ];then
+            pca9641_slave="0x41"
+            pca9548_slave="0x72"
+            i2c_bus=12
+        else
+            pca9641_slave="0x42"
+            pca9548_slave="0x72"
+            i2c_bus=13
+        fi
+
         if [ $slot_number -eq 0 ];then
             pca9548_channel="0x02"
         elif [ $slot_number -eq 1 ];then
@@ -439,14 +441,13 @@ set_configuration_5280m7(){
 
 set_configuration_5468m7(){
     if [ $nic_type = "ocp" ];then
+    # Case - OCP
         format_print $ERROR "Unsupport OCP Nic on $server_type"
         format_print $INFO "Please check if script has update version"
         exit 1
-    fi
-
+    else
+    # Case - PCIe
         is_have_pca9641=1
-
-    # set pca9641 address && I2C BUS
         if [ $slot_number -le 4 ];then
             pca9641_slave="0x31"
             pca9548_slave="0x70"
@@ -457,7 +458,6 @@ set_configuration_5468m7(){
             i2c_bus=14
         fi
 
-    # set pca9548 switch channel
         if [ $slot_number -eq 0 ];then
             pca9548_channel="0x01"
         elif [ $slot_number -eq 1 ];then
@@ -483,20 +483,20 @@ set_configuration_5468m7(){
         else
             format_print $WARNING "Unspecified card slot!"
         fi    
+    fi
 }
 
 set_configuration_donghu(){
     if [ $nic_type = "ocp" ];then
+    # Case - OCP
         format_print $ERROR "Unsupport OCP Nic on $server_type"
         format_print $INFO "Please check if script has update version"
         exit 1
-    fi
-
+    else
+    # Case - PCIe
         is_have_pca9641=0
-
         i2c_bus=3
         pca9548_slave="0x70"
-    # set pca9548 switch channel
         if [ $slot_number -eq 0 ];then
             pca9548_channel="0x80"
         elif [ $slot_number -eq 1 ];then
@@ -516,20 +516,19 @@ set_configuration_donghu(){
         else
             format_print $WARNING "Unspecified card slot!"
         fi
-
+    fi
 }
 
 set_configuration_yichun(){
     if [ $nic_type = "ocp" ];then
+    # Case - OCP
         format_print $ERROR "Unsupport OCP Nic on $server_type"
         format_print $INFO "Please check if script has update version"
         exit 1
-    fi
-
+    else
+    # Case - PCIe
         is_have_pca9641=0
         pca9548_slave="0x74"
-
-    # set pca9548 switch channel
         if [ $slot_number -eq 0 ];then
             i2c_bus=12
             pca9548_channel="0x02"
@@ -542,17 +541,18 @@ set_configuration_yichun(){
         else
             format_print $WARNING "Unspecified card slot!"
         fi
+    fi
 }
 
 set_configuration_qiandaohu(){
     if [ $nic_type = "ocp" ];then
+    # Case - OCP
         format_print $ERROR "Unsupport OCP Nic on $server_type"
         format_print $INFO "Please check if script has update version"
         exit 1
-    fi
-
+    else
+    # Case - PCIe
         is_have_pca9641=0
-
         if [ $slot_number -le 7 ];then
             i2c_bus=3
             pca9548_slave=0x70
@@ -560,8 +560,6 @@ set_configuration_qiandaohu(){
             i2c_bus=6
             pca9548_slave=0x71
         fi
-
-    # set pca9548 switch channel
         if [ $slot_number -eq 0 ];then
             pca9548_channel="0x08"
         elif [ $slot_number -eq 1 ];then
@@ -589,26 +587,25 @@ set_configuration_qiandaohu(){
         else
             format_print $WARNING "Unspecified card slot!"
         fi
+    fi    
 }
 
 set_configuration_5688m7(){
     if [ $nic_type = "ocp" ];then
+    # Case - OCP
         format_print $ERROR "Unsupport OCP Nic on $server_type"
         format_print $INFO "Please check if script has update version"
         exit 1
-    fi
-
+    else
+    # Case - PCIe
         is_have_pca9641=1
         pca9641_slave="0x31"
         i2c_bus=12
-
         if [ $slot_number -le 3 ];then
             pca9548_slave=0x71
         else
             pca9548_slave=0x72
         fi
-
-    # set pca9548 switch channel
         if [ $slot_number -eq 0 ];then
             pca9548_channel="0x01"
         elif [ $slot_number -eq 1 ];then
@@ -628,6 +625,7 @@ set_configuration_5688m7(){
         else
             format_print $WARNING "Unspecified card slot!"
         fi
+    fi
 }
 
 # Base on the server type, set i2c conf
@@ -741,9 +739,6 @@ read_emc1413_channel_value(){
 }
 
 process_emc1413(){
-    # emc1413 no need to init
-
-    # get chip emc1413 value
     read_emc1413_channel_value
 }
 
@@ -841,8 +836,6 @@ read_adc128_channel_value(){
 process_adc128(){
     # check if chip adc128 need init
     check_adc128_init
-
-    # get chip adc128 value
     read_adc128_channel_value 
 }
 
@@ -967,10 +960,6 @@ read_ina3221_channel_value(){
 }
 
 process_ina3221(){
-
-    # ina3221 no need to init first
-    
-    # get chip ina3221 value
     read_ina3221_channel_value
 }
 # ---------------------------------------------------------
@@ -1046,9 +1035,6 @@ read_tmp468_value(){
 }
 
 process_tmp468(){
-    # tmp112 no need to init firsts
-
-    # get chip tmp112 value
     read_tmp468_value
 }
 
@@ -1108,9 +1094,6 @@ read_tmp112_value(){
 }
 
 process_tmp112(){
-    # tmp112 no need to init firsts
-
-    # get chip tmp112 value
     read_tmp112_value
 }
 # ---------------------------------------------------------
@@ -1118,7 +1101,6 @@ process_tmp112(){
 # ---------------------------------------------------------
 # do a customization command
 write_read_chip(){
-    
     # Modify i2c cmd which write to cpld if need
     cmd_wr=$option_data
     res_wr=`$cmd_wr`
@@ -1129,9 +1111,6 @@ write_read_chip(){
 }
 
 process_chip(){
-
-    # cpld no need to init first
-
     # write and read cpld
     write_read_chip
 }
@@ -1246,8 +1225,6 @@ write_fru(){
 }
 
 process_fru(){
-    # fru no need to init first
-
     # write and read fru
     if [ "$option_data" = "write" ];then
         write_fru
@@ -1468,7 +1445,7 @@ debug_user_defined_detect(){
     format_print $INFO "Detect by user-defined"
 
     # default execute
-    format_print $INFO "Default detect on the current i2c"
+    format_print $INFO "Default detect on the default i2c: $i2c_bus"
     i2cdetect -y $i2c_bus
 }
 
@@ -1509,7 +1486,7 @@ start_detect_device(){
 }
 
 # ---------------------------------------------------------
-#  Start Execute Script
+#  Start Execute Script(main)
 # ---------------------------------------------------------
 
 pre_exec_hook