diff options
author | Matt Spinler <spinler@us.ibm.com> | 2017-12-05 15:31:19 -0600 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-12-13 13:54:30 +0000 |
commit | 46f96b63cca91cf90612cd7fb9cd6d4b32567659 (patch) | |
tree | 1972124e61f1a85755f55feda87d43314082c656 | |
parent | 4129192e7a517293dfcec2f789c662d3e2f84337 (diff) | |
download | talos-openbmc-46f96b63cca91cf90612cd7fb9cd6d4b32567659.tar.gz talos-openbmc-46f96b63cca91cf90612cd7fb9cd6d4b32567659.zip |
Delete unused Witherspoon VCS workaround files
Resolves openbmc/openbmc#2567
Change-Id: Ia64f359441cfe6e4fa64f2a2ff478db8f174b759
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
10 files changed, 0 insertions, 267 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post.bb deleted file mode 100644 index 96a6ebef6..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Witherspoon P9 power on" -DESCRIPTION = "Witherspoon power on workaround" -PR = "r1" - -inherit obmc-phosphor-systemd -inherit obmc-phosphor-license - -RDEPENDS_${PN} += "i2c-tools" - -PROVIDES += 'virtual/p9-vcs-workaround' -RPROVIDES_${PN} += 'virtual-p9-vcs-workaround' - -S = "${WORKDIR}" -SRC_URI += "file://vcs_off.sh \ - file://vcs_on.sh \ - file://ucd_disable_vcs.sh" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/vcs_off.sh ${D}${bindir}/vcs_off.sh - install -m 0755 ${WORKDIR}/vcs_on.sh ${D}${bindir}/vcs_on.sh - install -m 0755 ${WORKDIR}/ucd_disable_vcs.sh \ - ${D}${bindir}/ucd_disable_vcs.sh -} - -TMPL_OFF = "vcs_off@.service" -TMPL_OFF_PO = "vcs_off_poweroff@.service" -TMPL_ON = "vcs_on@.service" -TMPL_UCD = "ucd_disable_vcs@.service" -INSTFMT_OFF = "vcs_off@{0}.service" -INSTFMT_OFF_PO = "vcs_off_poweroff@{0}.service" -INSTFMT_ON = "vcs_on@{0}.service" -INSTFMT_UCD = "ucd_disable_vcs@{0}.service" -TGTFMT = "obmc-chassis-poweron@{0}.target" -TGTFMT_OFF= "obmc-chassis-poweroff@{0}.target" -FMT_OFF = "../${TMPL_OFF}:${TGTFMT}.requires/${INSTFMT_OFF}" -FMT_ON = "../${TMPL_ON}:${TGTFMT}.requires/${INSTFMT_ON}" -FMT_UCD = "../${TMPL_UCD}:${TGTFMT}.requires/${INSTFMT_UCD}" -FMT_OFF_PO = "../${TMPL_OFF_PO}:${TGTFMT_OFF}.requires/${INSTFMT_OFF_PO}" - -SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${TMPL_ON}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${TMPL_UCD}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_UCD', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${TMPL_OFF_PO}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF_PO', 'OBMC_CHASSIS_INSTANCES')}" - diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs.sh b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs.sh deleted file mode 100644 index 81cace30c..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# ############################################################# -# script to disable UCD VCS rails. -# This REQUIRES unaltered/original UCD cfg file. -# 10/28/16 PGR - -# 11/10/16 PGR - unbind/bind UCD driver - -ucd_retries=5 -ucd= - -# unbind ucd driver to permit i2cset -ucdpath="/sys/bus/i2c/drivers/ucd9000" -if [ -e $ucdpath ] -then - ucd=`ls -1 $ucdpath | grep 64` - if [ -n "$ucd" ] - then - echo $ucd > $ucdpath/unbind - fi -fi - -## program UCD to bypass VCS (DD1 issue) -## move memory enables to align with VDN (VDN to VDDR leakage issue) -## remove GPU PGOOD from system reset. -#GPO_CONFIG_1 (GPIO15) -i2cset -y 11 0x64 0xF7 0x00 i -i2cset -y 11 0x64 0xF8 0x15 0x6E 0x80 0x08 0x00 0x00 0x00 0x40 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 i -#GPO_CONFIG_2 (GPIO7) -i2cset -y 11 0x64 0xF7 0x01 i -i2cset -y 11 0x64 0xF8 0x15 0x16 0x80 0x08 0x00 0x00 0x20 0x40 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 i -#SYSTEM_RESET_CONFIG -i2cset -y 11 0x64 0xD2 0x09 0x3F 0xFF 0x27 0x0A 0x00 0x06 0x00 0x00 0x02 i -#ON_OFF_CONFIG rail 15 -i2cset -y 11 0x64 0x00 0x0E i -i2cset -y 11 0x64 0x02 0x1A i -#ON_OFF_CONFIG rail 16 -i2cset -y 11 0x64 0x00 0x0F i -i2cset -y 11 0x64 0x02 0x1A i -# change VDN delays based on UCD MFR_REVISION setting -REV=`i2cget -y 11 0x64 0x9B i 2|cut -f2 -d' '` -if [ "$REV" == "0x01" -o "$REV" == "0x02" ] ; then - # use 20ms delay for VDN - #TON_DELAY rail 8 - i2cset -y 11 0x64 0x00 0x07 i - i2cset -y 11 0x64 0x60 0x80 0xDA i - #TON_DELAY rail 9 - i2cset -y 11 0x64 0x00 0x08 i - i2cset -y 11 0x64 0x60 0x80 0xDA i -else - # use 70ms delay for VDN - #TON_DELAY rail 8 - i2cset -y 11 0x64 0x00 0x07 i - i2cset -y 11 0x64 0x60 0x30 0xEA i - #TON_DELAY rail 9 - i2cset -y 11 0x64 0x00 0x08 i - i2cset -y 11 0x64 0x60 0x30 0xEA i -fi - -# re-bind ucd driver only if we unbound it (i.e. ucd has been set with a value) -if [ -e $ucdpath -a -n "$ucd" ]; then - j=0 - until [ $j -ge $ucd_retries ] || [ -e $ucdpath/$ucd ]; do - j=$((j+1)) - echo $ucd > $ucdpath/bind || ret=$? - if [ $j -gt 1 ]; then - echo "rebinding UCD driver. Retry number $j" - sleep 1 - fi - done - if [ ! -e $ucdpath/$ucd ]; then exit $ret; fi -fi - diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service deleted file mode 100644 index edddee1f0..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Disable UCD VCS rails -Wants=obmc-power-start-pre@%i.target -Before=obmc-power-start-pre@%i.target -Conflicts=obmc-chassis-poweroff@%i.target -ConditionPathExists=!/run/openbmc/chassis@%i-on - -[Service] -ExecStart=/usr/bin/env ucd_disable_vcs.sh -SyslogIdentifier=ucd_disable_vcs.sh -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=obmc-chassis-poweron@%i.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off.sh b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off.sh deleted file mode 100644 index b21954631..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# use these commands to properly disable VCS before powering on -# A side -i2cset -y 4 0x70 0x00 0x01 b -i2cset -y 4 0x70 0x02 0x16 b #respond to OPERATION -i2cset -y 4 0x70 0x00 0x00 b -# B side -i2cset -y 5 0x70 0x00 0x01 b -i2cset -y 5 0x70 0x02 0x16 b #respond to OPERATION -i2cset -y 5 0x70 0x00 0x00 b diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service deleted file mode 100644 index 27f231d43..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Disable VCS before Witherspoon power on -Wants=obmc-power-start-pre@%i.target -Before=obmc-power-start-pre@%i.target -Conflicts=obmc-chassis-poweroff@%i.target -ConditionPathExists=!/run/openbmc/chassis@%i-on - -[Service] -ExecStart=/usr/bin/env vcs_off.sh -SyslogIdentifier=vcs_off.sh -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=obmc-chassis-poweron@%i.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service deleted file mode 100644 index cf318732a..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Disable VCS on a power off -Wants=op-wait-power-off@%i.service -After=op-wait-power-off@%i.service -Conflicts=obmc-chassis-poweron@%i.target - -[Service] -ExecStart=/usr/bin/env vcs_off.sh -SyslogIdentifier=vcs_off.sh -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=obmc-chassis-poweroff@%i.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on.sh b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on.sh deleted file mode 100644 index 5fbd81d89..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -# enable VCS rail with OPERATION -# A side -i2cset -y 4 0x70 0x00 0x01 b -i2cset -y 4 0x70 0x02 0x1A b #respond to OPERATION -i2cset -y 4 0x70 0x00 0x00 b -# B side -i2cset -y 5 0x70 0x00 0x01 b -i2cset -y 5 0x70 0x02 0x1A b #respond to OPERATION -i2cset -y 5 0x70 0x00 0x00 b - -# This causes CFAM operations to second processor to fail -# TODO openbmc/openbmc#2204 - -# unbind ucd driver to permit i2cset -#ucd_retries=5 -#ucd= - -#ucdpath="/sys/bus/i2c/drivers/ucd9000" -#if [ -e $ucdpath ] -#then -# ucd=`ls -1 $ucdpath | grep 64` -# if [ -n "$ucd" ] -# then -# echo $ucd > $ucdpath/unbind -# fi -#fi - -# re-enable VCS in system PGOOD -#sleep 1 -#SYSTEM_RESET_CONFIG -#i2cset -y 11 0x64 0xD2 0x09 0xFF 0xFF 0x27 0x0A 0x00 0x06 0x00 0x00 0x02 i - -# re-bind ucd driver only if we unbound it (i.e. ucd has been set with a value) -#if [ -e $ucdpath -a -n "$ucd" ]; then -# j=0 -# until [ $j -ge $ucd_retries ] || [ -e $ucdpath/$ucd ]; do -# j=$((j+1)) -# echo $ucd > $ucdpath/bind || ret=$? -# if [ $j -gt 1 ]; then -# echo "rebinding UCD driver. Retry number $j" -# sleep 1 -# fi -# done -# if [ ! -e $ucdpath/$ucd ]; then exit $ret; fi -#fi diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service deleted file mode 100644 index 24e5f175f..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Turn VCS on -Wants=vcs_workaround@%i.service -After=vcs_workaround@%i.service -Wants=obmc-host-start-pre@%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/env vcs_on.sh -SyslogIdentifier=vcs_on.sh -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=obmc-chassis-poweron@%i.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-off-bind@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-off-bind@.service deleted file mode 100644 index aa5a079a2..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-off-bind@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Power off mode bind ir35221 device driver devs -After=obmc-power-stop@%i.target -Wants=obmc-power-stop@i.target -After=vcs_off_poweroff@%i.service -Conflicts=obmc-chassis-poweron@%i.target - -[Service] -ExecStart=/usr/bin/ir35221-unbind-bind.sh bind -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=obmc-chassis-poweroff@%i.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-off-unbind@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-off-unbind@.service deleted file mode 100644 index ef461343c..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-off-unbind@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Power off mode unbind ir35221 device driver devs -After=obmc-host-stop-pre@%i.target -Before=vcs_off_poweroff@%i.service -Conflicts=obmc-chassis-poweron@%i.target - -[Service] -ExecStart=/usr/bin/ir35221-unbind-bind.sh unbind -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=obmc-chassis-poweroff@%i.target |