Merge pull request #75 from SW-CSA/cel_develop

Fix the but power command return fail after add CPU S0 status
SW-CSA · May 9, 2019 · 7b75a03 · 7b75a03
2 parents 5823b6a + 090c65b
commit 7b75a03
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/meta-celestica/meta-as58xx-cl/recipes-kernel/cpld-module/files/syscpld.c b/meta-celestica/meta-as58xx-cl/recipes-kernel/cpld-module/files/syscpld.c
@@ -396,11 +396,10 @@ static const i2c_dev_attr_st syscpld_attr_table_fishbone[] = {
 	  "0x1: SUS_S3_N\n"
 	  "0x2: SUS_S4_N\n"
 	  "0x4: SUS_S5_N\n"
-	  "0x8: SUS_STAT_N\n"
-	  "0x10: SUS_S0_N",
+	  "0x8: SUS_STAT_N",
 	  I2C_DEV_ATTR_SHOW_DEFAULT,
 	  NULL,
-	  0x22, 0, 5,
+	  0x22, 0, 4,
 	},
 	{
 	  "bios_cs",

diff --git a/meta-celestica/meta-as58xx-cl/recipes-plat/plat-utils/files/board-utils.sh b/meta-celestica/meta-as58xx-cl/recipes-plat/plat-utils/files/board-utils.sh
@@ -57,7 +57,7 @@ wedge_is_us_on() {
     ((val=$(cat $USRV_STATUS_SYSFS 2> /dev/null | head -n 1)))
 	if [ -z "$val" ]; then
         return $default
-	elif [ $val -eq 31 ]; then
+	elif [ $val -eq 15 ]; then
         return 0            # powered on
     elif [ $val -eq 8 ]; then
         return 1

diff --git a/meta-celestica/meta-as58xx-cl/recipes-plat/plat-utils/files/us_monitor.sh b/meta-celestica/meta-as58xx-cl/recipes-plat/plat-utils/files/us_monitor.sh
@@ -229,7 +229,8 @@ come_status_monitor() {
         if [ $st -gt 0 ]; then
             logger "COMe status arrive SUS_S3 status"
         fi
-        ((st=$val&0x10))
+        ((tmp=$(i2cget -f -y 0 0x0d 0x18 2> /dev/null | head -n 1)))
+        ((st=$tmp&0x08))
         if [ $st -gt 0 ]; then
             logger "COMe status arrive SUS_S0 status"
         fi