Merge branch 'master' of ssh://github.com/openbmc/openbmc into intel

5 files changed, 48 insertions, 18 deletions

diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh
index 1228ff945..61d8516bc 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh
@@ -1,18 +1,18 @@
-#!/bin/sh

-# For each AVSBus attached rail go back to using VOUT_COMMAND (PMBus voltage)

-# instead of AVSBus and do *not* update VOUT_COMMAND with last voltage sent via

-# AVSBus. This should be run after power-down. This is platform specific

-# settings  that must be updated/removed if not Swift.

-

-i2cset -y 9 0x70 0x00 0x00 b    # VDD 0  - PAGE set

-i2cset -y 9 0x70 0x01 0x80 b    # VDD 0

-i2cset -y 9 0x71 0x00 0x01 b    # VCS 0  - PAGE set

-i2cset -y 9 0x71 0x01 0x80 b    # VCS 0

-i2cset -y 9 0x71 0x00 0x00 b    # VDN 0  - PAGE set

-i2cset -y 9 0x71 0x01 0x80 b    # VDN 0

-i2cset -y 10 0x70 0x00 0x00 b    # VDD 1  - PAGE set

-i2cset -y 10 0x70 0x01 0x80 b    # VDD 1

-i2cset -y 10 0x71 0x00 0x01 b    # VCS 1  - PAGE set

-i2cset -y 10 0x71 0x01 0x80 b    # VCS 1

-i2cset -y 10 0x71 0x00 0x00 b    # VDN 1  - PAGE set

-i2cset -y 10 0x71 0x01 0x80 b    # VDN 1

+#!/bin/sh
+# For each AVSBus attached rail go back to using VOUT_COMMAND (PMBus voltage)
+# instead of AVSBus and do *not* update VOUT_COMMAND with last voltage sent via
+# AVSBus. This should be run after power-down. This is platform specific
+# settings  that must be updated/removed if not Swift.
+
+i2cset -y 9 0x70 0x00 0x00 b    # VDD 0  - PAGE set
+i2cset -y 9 0x70 0x01 0x80 b    # VDD 0
+i2cset -y 9 0x71 0x00 0x01 b    # VCS 0  - PAGE set
+i2cset -y 9 0x71 0x01 0x80 b    # VCS 0
+i2cset -y 9 0x71 0x00 0x00 b    # VDN 0  - PAGE set
+i2cset -y 9 0x71 0x01 0x80 b    # VDN 0
+i2cset -y 10 0x70 0x00 0x00 b    # VDD 1  - PAGE set
+i2cset -y 10 0x70 0x01 0x80 b    # VDD 1
+i2cset -y 10 0x71 0x00 0x01 b    # VCS 1  - PAGE set
+i2cset -y 10 0x71 0x01 0x80 b    # VCS 1
+i2cset -y 10 0x71 0x00 0x00 b    # VDN 1  - PAGE set
+i2cset -y 10 0x71 0x01 0x80 b    # VDN 1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable@.service
new file mode 100644
index 000000000..fbab180ce
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable@.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Disable the AVS bus on the VRMs
+Before=vrm-control@%i.service
+Conflicts=obmc-chassis-poweroff@%i.target
+ConditionPathExists=!/run/openbmc/chassis@%i-on
+
+[Service]
+ExecStart=/usr/bin/env avsbus-disable.sh
+SyslogIdentifier=avsbus-disable.sh
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds@.service
new file mode 100644
index 000000000..0926e033b
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds@.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Perform power workarounds on VRMs after PGOOD is up
+Wants=obmc-power-on@%i.target
+After=obmc-power-on@%i.target
+Before=obmc-host-start-pre@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
+ConditionPathExists=!/run/openbmc/chassis@%i-on
+
+[Service]
+ExecStart=/usr/bin/power-workarounds.sh
+SyslogIdentifier=power-workarounds.sh
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable@.service
index 859f42883..859f42883 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable@.service
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds@.service
index 74d8e4bfc..74d8e4bfc 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds@.service