Bug 6462 - [1.6.1] watchdog doesn't work in beaglebone black
Summary: [1.6.1] watchdog doesn't work in beaglebone black
Status: VERIFIED FIXED
Alias: None
Product: BSPs
Classification: Build System, Metadata & Runtime
Component: bsps-meta-yocto (show other bugs)
Version: 1.6.1
Hardware: BeagleBone arm
: Medium normal
Target Milestone: 1.6.3
Assignee: Kevin Hao
QA Contact:
URL:
Whiteboard:
Depends on:
Blocks:
 
Reported: 2014-06-18 07:29 UTC by Yi Zhao
Modified: 2015-03-18 09:17 UTC (History)
5 users (show)

See Also:
OS type for building Yocto: ---
Type of Regression: ---
Verified:
Documentation change: No (bug/feature does not impact docs)


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Yi Zhao 2014-06-18 07:29:39 UTC
Image location: http://autobuilder.yoctoproject.org/pub/releases/yocto-1.6.1/machines/beaglebone/

Git rev: daisy/a43dba8c2904f9c1ce0425c53c5a7f4718121e6b

This issue had been fixed in master branch. But still exists in daisy branch.
Comment 1 Saul Wold 2014-06-18 15:52:16 UTC
Do you know what fixed it in the master branch for a backport?
Comment 2 Yi Zhao 2014-06-19 02:00:55 UTC
(In reply to comment #1)
> Do you know what fixed it in the master branch for a backport?

It's a kernel config path. In meta branch for repo linux-yocto-3.14:

commit 183622e8095545999a64bd72adedea2dffb6ec4b
Author: Kevin Hao <kexin.hao@windriver.com>
Date:   Fri May 23 14:41:35 2014 +0800

    beaglebone: enable the nowayout option for the watchdog
    
    The default watchdog behaviour is to stop the timer if the process
    managing it closes the file /dev/watchdog. The system would not reboot
    if watchdog daemon crashes due to a bug in it or get killed by other
    malicious code. So we prefer to enable nowayout option for the
    watchdong. With this enabled, there is no way of disabling the watchdog
    once it has been started. This option is also enabled in the predecessor
    of this BSP (beagleboard).
    
    Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

diff --git a/meta/cfg/kernel-cache/bsp/beaglebone/beaglebone.cfg b/meta/cfg/kernel-cache/bsp/beaglebone/beaglebone.cfg
index 6b25636..81f97d6 100644
--- a/meta/cfg/kernel-cache/bsp/beaglebone/beaglebone.cfg
+++ b/meta/cfg/kernel-cache/bsp/beaglebone/beaglebone.cfg
@@ -195,6 +195,7 @@ CONFIG_POWER_SUPPLY=y
 #
 # Watchdog Device Drivers
 #
+CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_TWL4030_WATCHDOG=y
Comment 3 Stephen K Jolley 2014-06-19 14:55:50 UTC
Information supplied
Comment 4 Saul Wold 2014-11-14 15:54:20 UTC
Did this get into any kernel branch such that it can be added to a kernel update for a 1.6.3?
Comment 5 Kevin Hao 2014-12-05 06:55:51 UTC
I will talk with Bruce to get this fix merged into 1.6.3
Comment 6 Kevin Hao 2015-01-22 11:10:58 UTC
The patch for this issue has been merged into daisy branch.
Comment 7 Yi Zhao 2015-03-18 09:17:18 UTC
Verified with 1.6.3 rc2
git rev: daisy/6b8f7999c3e86d6e834af95ffe4c33d0d53db34a