diff options
author | Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com> | 2017-06-13 14:11:06 +0530 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-06-15 04:48:13 +0000 |
commit | b7f7419cc225a84f141310f160b2ef70bffa8e40 (patch) | |
tree | 3e0f9e23b9f2a5c5bb646eebc3378da1bf0db2b4 /meta-openbmc-machines | |
parent | 98e2ba3e37499b619cb222aa0b7e335afada8014 (diff) | |
download | talos-openbmc-b7f7419cc225a84f141310f160b2ef70bffa8e40.tar.gz talos-openbmc-b7f7419cc225a84f141310f160b2ef70bffa8e40.zip |
openpower-debug-collector: Define checkstop and watchdog services
openpower-debug-collector had the checkstop service which was
getting invoked in host checkstop scenario. Now there is a need
to get debug data in case of host watchdog timeout scenarios and
this commit adds that support.
Fixes openbmc/openbmc#1634
Change-Id: Iadb7ba516cbdd2d8010c66912bdcd647800aa198
Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
Diffstat (limited to 'meta-openbmc-machines')
-rw-r--r-- | meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb | 22 | ||||
-rw-r--r-- | meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service (renamed from meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector@.service) | 2 | ||||
-rw-r--r-- | meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service | 8 |
3 files changed, 26 insertions, 6 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb index 757ca3163..21737de4e 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector.bb @@ -21,11 +21,23 @@ RDEPENDS_${PN} += " \ S = "${WORKDIR}/git" +# This provides below 2 applications that are called into in case +# of host checkstop and host watchdog timeout respectively. +APPS = "checkstop watchdog" + +DEBUG_TMPL = "openpower-debug-collector-{0}@.service" +SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'DEBUG_TMPL', 'APPS')}" + # This needs to be executed as part of host crash -DEBUG_TMPL = "openpower-debug-collector@.service" +CHECKSTOP_TMPL = "openpower-debug-collector-checkstop@.service" CRASH_TGTFMT = "obmc-host-crash@{0}.target" -DEBUG_INSTFMT = "openpower-debug-collector@{0}.service" -CRASH_DEBUG_FMT = "../${DEBUG_TMPL}:${CRASH_TGTFMT}.wants/${DEBUG_INSTFMT}" +CHECKSTOP_INSTFMT = "openpower-debug-collector-checkstop@{0}.service" +CRASH_CHECKSTOP_FMT = "../${CHECKSTOP_TMPL}:${CRASH_TGTFMT}.wants/${CHECKSTOP_INSTFMT}" + +# For now, just create a watchdog symlink in base +WDOG_TMPL = "openpower-debug-collector-watchdog@.service" +WDOG_INSTFMT = "openpower-debug-collector-watchdog@{0}.service" +LINK_FMT = "${WDOG_TMPL}:${WDOG_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${DEBUG_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CRASH_DEBUG_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CRASH_CHECKSTOP_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service index 9ed37e3d8..67f314bfb 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector@.service +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service @@ -1,5 +1,5 @@ [Unit] -Description=OpenPOWER debug data collector +Description=OpenPOWER debug data collector for host checkstop Before=obmc-host-quiesce@%i.target [Service] diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service new file mode 100644 index 000000000..0bb2221a7 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service @@ -0,0 +1,8 @@ +[Unit] +Description=OpenPOWER debug data collector for host watchdog timeout +Before=obmc-host-quiesce@%i.target + +[Service] +ExecStart={sbindir}/watchdog_timeout +Type=oneshot +Restart=no |