From b7f7419cc225a84f141310f160b2ef70bffa8e40 Mon Sep 17 00:00:00 2001 From: Vishwanatha Subbanna Date: Tue, 13 Jun 2017 14:11:06 +0530 Subject: 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 --- .../debug/openpower-debug-collector.bb | 22 +++++++++++++++++----- .../openpower-debug-collector-checkstop@.service | 8 ++++++++ .../openpower-debug-collector-watchdog@.service | 8 ++++++++ .../openpower-debug-collector@.service | 8 -------- 4 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service create mode 100644 meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service delete mode 100644 meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector@.service 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-checkstop@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service new file mode 100644 index 000000000..67f314bfb --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-checkstop@.service @@ -0,0 +1,8 @@ +[Unit] +Description=OpenPOWER debug data collector for host checkstop +Before=obmc-host-quiesce@%i.target + +[Service] +ExecStart={sbindir}/checkstop_app +Type=oneshot +Restart=no 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 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@.service deleted file mode 100644 index 9ed37e3d8..000000000 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=OpenPOWER debug data collector -Before=obmc-host-quiesce@%i.target - -[Service] -ExecStart={sbindir}/checkstop_app -Type=oneshot -Restart=no -- cgit v1.2.1