From 9508b34f42c5676c4ad9e078fdcb78ef66196ac2 Mon Sep 17 00:00:00 2001 From: Charles Boyer Date: Thu, 4 Nov 2021 10:37:14 -0500 Subject: meta-fii/meta-kudo: Remove MON_BMC_ALIVE assertions The other system components are not using this the MON_BMC_ALIVE signal, so it no longer requires assertion. Signed-off-by: Charles Boyer Change-Id: Ieedc2650d230dc3eff8c2d76d2f1ce70b68919cb --- .../recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot') diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh index 8231e3de8..b87f12d0a 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh @@ -35,10 +35,6 @@ if [[ $boardver -lt 64 ]]; then # Power control # S0_BMC_OK, GPIO 69 set_gpio_ctrl 69 out 1 - - # MON_BMC_ALIVE, GPIO 10(EVT), GPIO137(DVT) - set_gpio_ctrl 137 out 0 # setting unused GPIO - set_gpio_ctrl 10 out 1 else echo "DVT or PVT system" # sleep so that FRU and all ipmitool Devices are ready before HOST OS @@ -49,11 +45,7 @@ else # Power control # S0_BMC_OK, GPIO 69 set_gpio_ctrl 69 out 1 - - # MON_BMC_ALIVE GPIO137(DVT) - set_gpio_ctrl 10 out 0 # setting unused GPIO - set_gpio_ctrl 137 out 1 -fi +fi # Disable CPU 1 CLK when cpu not detected # echo init_once cpu $CPU1_STATUS > /dev/ttyS0 -- cgit v1.2.3 From a3dc550e57470746a049356c99e3d6df0ed096c7 Mon Sep 17 00:00:00 2001 From: Charles Boyer Date: Fri, 29 Oct 2021 16:39:16 -0500 Subject: meta-fii/meta-kudo: Add power button support Adds support for Power On for power button press and Power Off when holding the power button. This is a temporary and rudimentary method to handle button presses. The intention is to eventually use phosphor-buttons with Nuvoton support. Signed-off-by: Charles Boyer Change-Id: Iede64f89c716102a688880280c11ff7f3068021b --- .../recipes-kudo/host/files/ampere_power_util.sh | 24 +++++++++++++++++++++- .../kudo-sys-utility/kudo-boot/init_once.sh | 3 +++ 2 files changed, 26 insertions(+), 1 deletion(-) (limited to 'meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot') diff --git a/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh b/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh index 905c7f23a..511c1217e 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh +++ b/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh @@ -4,7 +4,7 @@ source /usr/sbin/kudo-lib.sh # Usage of this utility function usage() { - echo "usage: power-util mb [on|off|graceful_shutdown|force_reset|shutdown_ack|hotswap]"; + echo "usage: power-util mb [on|off|graceful_shutdown|force_reset|shutdown_ack|hotswap|power_button]"; } hotswap() { @@ -91,6 +91,26 @@ shutdown_ack() { fi } +power_button() { + echo "Power button trigger event." + current_time="$(timestamp)" + if [ -f "/run/openbmc/power-button" ]; then + echo "Power button released" + press_time="$(cat /run/openbmc/power-button)" + if [[ "$current_time" -le "(($press_time + 1))" ]]; then + power_on + elif [[ "$current_time" -ge "(($press_time + 5))" ]]; then + power_off + else + echo "Button press did not match interval. + fi + rm "/run/openbmc/power-button" + else + echo "Power button pressed" + echo "$(timestamp)" > "/run/openbmc/power-button" + fi +} + if [ $# -lt 2 ]; then echo "Total number of parameter=$#" echo "Insufficient parameter" @@ -125,6 +145,8 @@ elif [ $2 == "force_reset" ]; then force_reset elif [ $2 == "shutdown_ack" ]; then shutdown_ack +elif [ $2 == "power_button" ]; then + power_button else echo "Invalid parameter2=$2" usage; diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh index b87f12d0a..55661df80 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh @@ -64,3 +64,6 @@ if [[ $CPU1_STATUS_N == 1 ]]; then i2cset -y -a -f 16 0x6a 11 1 0x01 i i2cset -y -a -f 17 0x67 1 2 0x3f 0x0c i fi + +# Create /run/openbmc for system power files +mkdir "/run/openbmc" -- cgit v1.2.3 From b4e4716b712ed12612b85493a3a964e02a8c9b81 Mon Sep 17 00:00:00 2001 From: Charles Boyer Date: Thu, 4 Nov 2021 11:04:09 -0500 Subject: meta-fii/meta-kudo: Support bios verify Adds support for BIOS verification process to execute before issuing a host reset and boot from AC power. Signed-off-by: Charles Boyer Change-Id: I31c019a5ea8cb296749f671df15c658a7e2a3b9f --- .../recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service | 2 ++ .../recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service | 2 ++ 2 files changed, 4 insertions(+) (limited to 'meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot') diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service index 0b32aa158..3e03e07df 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service @@ -2,6 +2,8 @@ Description=Ampere Computing LLC power cycle service Conflicts=obmc-host-start@0.target OnFailure=obmc-chassis-powerreset@0.target +Wants=kudo-bios-verify.service +After=kudo-bios-verify.service [Service] RemainAfterExit=no diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service index 54c7c7aa1..8a8d46f14 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/host-powerctrl.service @@ -2,6 +2,8 @@ Description = Host Power Control Sequence Wants=ssifbridge.service After=ssifbridge.service +Wants=kudo-bios-verify.service +After=kudo-bios-verify.service [Service] Restart=no -- cgit v1.2.3