diff options
author | Sergey Solomin <sergey.solomin@us.ibm.com> | 2016-11-28 15:03:24 -0600 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-12-16 21:11:39 +0000 |
commit | aac4adf831eebc74d97076e94125ebf5b6d5da48 (patch) | |
tree | 0b3ed6b9682a74a086e1a52b074854781611e3fd /meta-openbmc-machines/meta-openpower/common | |
parent | 370c28d56f3421d54d74cf23f89a184f3408b1ac (diff) | |
download | talos-openbmc-aac4adf831eebc74d97076e94125ebf5b6d5da48.tar.gz talos-openbmc-aac4adf831eebc74d97076e94125ebf5b6d5da48.zip |
Add recipes for Witherspoon VCS workaround
Create vcs-workaround machine feature p9.inc
Add new recipe vcs-pre-post.bb
Add new recipe p9-vcs-workaround.bb
Add new recipe start_host.bb
Create preferred providers
Create host control machine/distro/image feature
Add dependencies
Partially resolves openbmc/openbmc#647
Change-Id: I285cafc81afda20977fdf360ad8ad34d15e38685
Signed-off-by: Sergey Solomin <sergey.solomin@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/common')
5 files changed, 63 insertions, 3 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host@.service index 6b291100d..dbf6021e3 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host@.service @@ -5,7 +5,7 @@ After=vcs_on@.service Conflicts=obmc-chassis-stop@%i.target [Service] -ExecStart={bindir}/start_host.sh +ExecStart={bindir}/start_host.sh {MACHINE} Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service index e15d2cf3b..6b4d4255e 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround@.service @@ -5,7 +5,7 @@ After=obmc-power-on@%i.target Conflicts=obmc-chassis-stop@%i.target [Service] -ExecStart={bindir}/vcs_workaround.sh +ExecStart={bindir}/vcs_workaround.sh {MACHINE} Type=oneshot RemainAfterExit=yes diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb new file mode 100644 index 000000000..3f7bf2bf0 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-host-start.bb @@ -0,0 +1,32 @@ +SUMMARY = "POWER9 start host" +DESCRIPTION = "Service to start POWER9 IPL through SBE" +PR = "r1" + +inherit obmc-phosphor-systemd +inherit obmc-phosphor-license + +FILESEXTRAPATHS_prepend := "${THISDIR}/op-pdbg-host-control:" + +PROVIDES += 'virtual/obmc-host-ctl' +RPROVIDES_${PN} += 'virtual-obmc-host-ctl' + +RDEPENDS_${PN} += "pdbg \ + p9-vcs-workaround" + +S = "${WORKDIR}" +SRC_URI += "file://start_host.sh" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/start_host.sh \ + ${D}${bindir}/start_host.sh +} + +TMPL = "start_host@.service" +INSTFMT = "start_host@{0}.service" +TGTFMT = "obmc-chassis-start@{0}.target" +FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" + +SYSTEMD_SERVICE_${PN} += "${TMPL}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_SUBSTITUTIONS += "MACHINE:${MACHINE}:${TMPL}" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb new file mode 100644 index 000000000..530085bbb --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/p9-vcs-workaround.bb @@ -0,0 +1,29 @@ +SUMMARY = "POWER9 VCS workaround" +DESCRIPTION = "Apply fixes over FSI to POWER9 CPUs prior to host power on" +PR = "r1" + +inherit obmc-phosphor-systemd +inherit obmc-phosphor-license + +FILESEXTRAPATHS_prepend := "${THISDIR}/op-pdbg-host-control:" + +RDEPENDS_${PN} += "pdbg \ + virtual-p9-vcs-workaround" + +S = "${WORKDIR}" +SRC_URI += "file://vcs_workaround.sh" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/vcs_workaround.sh \ + ${D}${bindir}/vcs_workaround.sh +} + +TMPL = "vcs_workaround@.service" +INSTFMT = "vcs_workaround@{0}.service" +TGTFMT = "obmc-chassis-start@{0}.target" +FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" + +SYSTEMD_SERVICE_${PN} += "${TMPL}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_SUBSTITUTIONS += "MACHINE:${MACHINE}:${TMPL}" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index 268caf5ba..40b6b6fb1 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -41,7 +41,6 @@ RDEPENDS_${PN}-chassis = " \ obmc-op-control-power \ obmc-pcie-detect \ obmc-watchdog \ - obmc-op-control-host \ obmc-control-led \ " |