| commit | a8a764a53c9e3b3ba6ef724b37ba3c18ab96f1e6 | [log] [tgz] |
|---|---|---|
| author | Thang Tran <thuutran@amperecomputing.com> | Thu Mar 17 13:43:39 2022 +0700 |
| committer | Thang Tran <thuutran@amperecomputing.com> | Thu Mar 17 15:26:57 2022 +0700 |
| tree | f777ae5e8d553a510e03665c5167795cc4baf702 | |
| parent | f1bae575184345e6d0297449fda3d97fcc01268a [diff] |
meta-ampere: fix parameters in power control services
When HOST is turned on/off, ampere-gpio-poweroff/on@.service is called.
They should not call op-wait-power-off/on@.service, just wait for them.
Remove redundant "Requires" and "Wants" in service files.
Add timeout to obmc-flash-host-bios@.service to avoid blocking power
control.
Tested:
1. Turn on/off the HOST power.
2. Check journalctl log to ensure that op-wait-power-off/on@.service
are not called by ampere-gpio-poweroff/on@.service.
Signed-off-by: Thang Tran <thuutran@amperecomputing.com>
Change-Id: If9403891b2e57c73c4fd8e0ea1b24314b7b0c3f8
diff --git a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service index 036b789..d71cd47 100644 --- a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service +++ b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service
@@ -5,3 +5,4 @@ Type=oneshot RemainAfterExit=no ExecStart=/usr/sbin/firmware_update.sh /tmp/images/%I +TimeoutSec=300
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service index fe776a5..ce59894 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service
@@ -1,7 +1,6 @@ [Unit] Description=Ampere set GPIOs before power off -Requires=op-wait-power-off@%i.service -After=op-wait-power-off@%i.service +Before=op-wait-power-off@%i.service Conflicts=obmc-chassis-poweron@%i.target [Service]
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service index 09aa588..e7131a1 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service
@@ -1,7 +1,7 @@ [Unit] Description=Ampere set GPIOs before power on -Requires=op-wait-power-on@%i.service Before=op-wait-power-on@%i.service +After=obmc-power-start-pre@%i.target Conflicts=obmc-chassis-poweroff@%i.target [Service]