code sync

tool/plugin/autoauth.sh

@@ -0,0 +1 @@
+#!/bin/sh

tool/plugin/nicsensor.sh

@@ -96,7 +96,9 @@ conf_pre_check
 parse_slot_name
 
 i2c_bus=`connect_i2c`
+if [ $? -ne 0 ];then
+    $fmt_print "console" "Error" "An Error occured when build i2c connection with ${slot_name}"
+    exit 1
+fi
 
-start_sensor_reading
+start_sensor_reading
-
-

tool/plugin/platform_5280m7.sh

@@ -15,6 +15,17 @@ pca9548_channel=""
 
 is_have_pca9641=0
 
+record_i2c_status(){
+    $fmt_print "log" "Info" "[platform_5280m7] Start record i2c configuration"
+    $fmt_print "log" "Info" "Nic Type: $nic_type"
+    $fmt_print "log" "Info" "Nic slot: $slot_id"
+    $fmt_print "log" "Info" "i2c bus: $i2c_bus"
+    $fmt_print "log" "Info" "is have pca9641: $is_have_pca9641"
+    $fmt_print "log" "Info" "pca9641 slave: $is_have_pca9641"
+    $fmt_print "log" "Info" "pca9548 slave: $pca9548_slave"
+    $fmt_print "log" "Info" "pca9548 channel: $pca9548_channel"
+}
+
 set_i2c_config(){
     # set pca9641 address && I2C BUS
     if [ "${nic_type}" = "ocp" ];then
@@ -62,21 +73,24 @@ set_i2c_config(){
             $fmt_print "console" "Warning" "Unspecified card slot!"
         fi
     fi
-}
+    record_i2c_status
-
-record_i2c_status(){
-    $fmt_print "log" "Info" "[platform_5280m7] Start record i2c configuration"
-    $fmt_print "log" "Info" "Nic Type: $nic_type"
-    $fmt_print "log" "Info" "Nic slot: $slot_id"
-    $fmt_print "log" "Info" "i2c bus: $i2c_bus"
-    $fmt_print "log" "Info" "is have pca9641: $is_have_pca9641"
-    $fmt_print "log" "Info" "pca9641 slave: $is_have_pca9641"
-    $fmt_print "log" "Info" "pca9548 slave: $pca9548_slave"
-    $fmt_print "log" "Info" "pca9548 channel: $pca9548_channel"
 }
 
 get_pca9641_control(){
     $fmt_print "log" "Info" "[platform_5280m7] Start Get pca9641 control"
+
+    # Request 9641 lock
+    res_lock=`i2ctransfer -y $i2c_bus w2@$pca9641_slave 0x01 0x81 r1`
+    $fmt_print "log" "Info" "[platform_5280m7]After request 9641 lock, The REG value is $res_lock"
+
+    # Build 9641 Connection 
+    res_build=`i2ctransfer -y $i2c_bus w2@$pca9641_slave 0x01 0x85 r1`
+    $fmt_print "log" "Info" "[platform_5280m7]After Build 9641 connection, The REG value is $res_build"
+
+    if [ "$res_build" != "0x87" ];then
+        $fmt_print "log" "Error" "Cannot establish connection with pca9641 !!!"
+        exit 1
+    fi
 }
 
 select_pca9548_channel(){
@@ -87,7 +101,6 @@ select_pca9548_channel(){
 build_i2c_connect(){
     $fmt_print "log" "Info" "[platform_5280m7] Start build i2c connect"
     set_i2c_config
-    record_i2c_status
 
     if [ $is_have_pca9641 -eq 1 ];then
         get_pca9641_control
@@ -97,8 +110,47 @@ build_i2c_connect(){
     echo "$i2c_bus"
 }
 
+# switch pca9548 channels then do i2cdetect one times
+# @Param1 i2c bus number
+# @Param2 pca9548 slave address
+# @Param3 pca9548 channel hex value
+# @Param4 pca9548 channel 
+# @Param5 pcie slot number
+do_i2c_detect(){
+    if [ $nic_type == "ocp" ];then
+        $fmt_print "log" "Info" "OCP slot $5 : bus$1 9548channel$4"
+    else
+        $fmt_print "log" "Info" "PCIe slot $5 : bus$1 9548channel$4"
+    fi
+    i2ctransfer -y $1 w1@$2 $3
+    i2cdetect -y $1
+}
+
 detect_on_server(){
-    $fmt_print "log" "Info" "[platform_5280m7] Start i2c detect"
+    $fmt_print "console" "Info" "[platform_5280m7] Start i2c detect"
+
+    if [ "${nic_type}" = "ocp" ];then
+        i2c_bus=3
+        do_i2c_detect 3 0x70 0x01 0 0
+        do_i2c_detect 3 0x70 0x02 1 1
+        do_i2c_detect 3 0x70 0x04 2 2
+    else
+        i2c_bus=12
+        pca9641_slave="0x41"
+        get_pca9641_control
+
+        do_i2c_detect 12 0x72 0x02 1 0
+        do_i2c_detect 12 0x72 0x04 2 1
+        do_i2c_detect 12 0x72 0x08 3 2
+
+        i2c_bus=13
+        pca9641_slave="0x42"
+        get_pca9641_control
+        
+        do_i2c_detect 13 0x72 0x02 1 3
+        do_i2c_detect 13 0x72 0x04 2 4
+        do_i2c_detect 13 0x72 0x08 3 5
+    fi
 }
 
 # ---------------------------------------------------