meta-facebook: yosemite4: state: revise MGM CPLD IOE i2c bus for PVT
Since the i2c bus of CPLD IOE on management board is changed to 34 on
PVT stage.
Revised the function so that BMC could inform MGM CPLD the 12V status
of slots correctly when doing 12V power control on any stage.
Tested:
Run chassis-poweron/chassis-poweroff/chassis-powercycle pass on any
stage.
Change-Id: I47fa4d34277ee7248dd03c6023cd38401404312b
Signed-off-by: Ricky CX Wu <ricky.cx.wu.wiwynn@gmail.com>
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle
index b6fca40..c7bb965 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle
@@ -18,13 +18,12 @@
IO_EXP_SLOT_12V_STATUS=$((CHASSIS_ID + 23))
MANAGEMENT_BOARD_VERSION=$(get_product_version Management_Board)
-GPIOCHIP_IO_EXP_SLOT_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$SPIDER_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLOT_PWR_CTRL_ADDR/"*gpiochip*)
if [ -z "$MANAGEMENT_BOARD_VERSION" ]; then
echo "Failed to check management board fru info, sled cycle keep default setting"
-elif [ "$MANAGEMENT_BOARD_VERSION" = "DVT" ] || [ "$MANAGEMENT_BOARD_VERSION" = "EVT" ]; then
- GPIOCHIP_IO_EXP_SLED_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$MANAGEMENT_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLED_PWR_CTRL_ADDR/"*gpiochip*)
fi
+GPIOCHIP_IO_EXP_SLOT_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$SPIDER_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLOT_PWR_CTRL_ADDR/"*gpiochip*)
+GPIOCHIP_IO_EXP_SLED_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$MANAGEMENT_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLED_PWR_CTRL_ADDR/"*gpiochip*)
#GPIOCHIP_IO_EXP_BIC_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$IO_EXP_SLOT_PWR_STATUS-00$IO_EXP_BIC_PWR_CTRL_ADDR/"*gpiochip*)
is_nuvoton_board="$(check_nuvoton_board)"
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd
index c20fa34..62a9395 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd
@@ -1,9 +1,12 @@
#!/bin/bash
+# shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions
+source /usr/libexec/yosemite4-common-functions
+
export STATE_OFF=0
export STATE_ON=1
export STATE_UNKNOWN=-1
-export MANAGEMENT_BOARD_IO_EXP_BUS_NUM="13"
+export MANAGEMENT_BOARD_IO_EXP_BUS_NUM="34"
export SPIDER_BOARD_IO_EXP_BUS_NUM="28"
export IO_EXP_SLOT_PWR_CTRL_ADDR="21"
export IO_EXP_SLED_PWR_CTRL_ADDR="21"
@@ -15,6 +18,11 @@
export CHASSIS_ON_PROPERTY="xyz.openbmc_project.State.Chassis.PowerState.On"
export CHASSIS_OFF_PROPERTY="xyz.openbmc_project.State.Chassis.PowerState.Off"
+MANAGEMENT_BOARD_VERSION=$(get_product_version Management_Board)
+if [ "$MANAGEMENT_BOARD_VERSION" = "DVT" ] || [ "$MANAGEMENT_BOARD_VERSION" = "EVT" ]; then
+ MANAGEMENT_BOARD_IO_EXP_BUS_NUM="13"
+fi
+
gpio_get()
{
RETRY=3