summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLei YU <mine260309@gmail.com>2017-02-15 11:47:57 +0800
committerPatrick Williams <patrick@stwcx.xyz>2017-02-24 16:55:47 +0000
commit7ba9e3ef54306da88d1c361dd1143c5b89fc4598 (patch)
tree75e2ce6c4c238730ab9c9e9042e4f855e0d0fca9
parentec642c44cc62166de182b62dec51919999a3a97e (diff)
downloadtalos-openbmc-7ba9e3ef54306da88d1c361dd1143c5b89fc4598.tar.gz
talos-openbmc-7ba9e3ef54306da88d1c361dd1143c5b89fc4598.zip
meta-romulus: Make avsbus-workaround run after power on
Romulus power on workarounds requires power is on, otherwise the i2c devices are not accessible. Changing avsbus-workaround to run after power on achieves the goal, that all the power on sequence followed by avsbus-workaround are run after power is on. Note: During the period between power is on and CPLD trigger, PGOOD is not asserted, which seems to break the op-power-start and op-wait-power-on. Change-Id: I0379b0adee53606f18fe64ce39c0acfe11c51622 Signed-off-by: Lei YU <mine260309@gmail.com>
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service2
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service4
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service2
3 files changed, 2 insertions, 6 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
index c31d389c3..850da2101 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
@@ -2,8 +2,6 @@
Description=Enable the AVS bus on VRMs
Wants=vrm-control@%i.service
After=vrm-control@%i.service
-Wants=obmc-power-start-pre@%i.target
-Before=obmc-power-start-pre@%i.target
Conflicts=obmc-power-chassis-off@%i.target
[Service]
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
index c98e7587a..ea18e16b0 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
@@ -1,7 +1,7 @@
[Unit]
Description=Perform AVS bus workaround on VRMs
-Wants=obmc-power-start-pre@%i.target
-Before=obmc-power-start-pre@%i.target
+Wants=op-power-start@.service
+After=op-power-start@.service
Before=avsbus-disable@%i.service
Conflicts=obmc-power-chassis-off@%i.target
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service
index bc7e5a5a8..a2b5397ea 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service
@@ -1,7 +1,5 @@
[Unit]
Description=Run VCS workaround on host%i
-Wants=obmc-host-start-pre@%i.target
-Before=obmc-host-start-pre@%i.target
Wants=avsbus-enable@%i.service
After=avsbus-enable@%i.service
Conflicts=obmc-power-chassis-off@%i.target
OpenPOWER on IntegriCloud