From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 05 Feb 2024 12:53:09 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rWxX9-004E9i-2O for lore@lore.pengutronix.de; Mon, 05 Feb 2024 12:53:09 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rWxXA-0002jx-EG for lore@pengutronix.de; Mon, 05 Feb 2024 12:53:08 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=oS1ppOaj6dlT3Q6pzn9JNs6ls9YHftELPy0Xwr+upbg=; b=LLbiYnCxyYB33W9Epe9hoQZzh3 I0z+m7nJlnYvP5Yie3pde2+Jk85AKFSG2Pu3v0t7OLc2+wMSU9AqAY4RVw+q7DCUI0iH3EBpy1x6s H3YITOmakIfyRJR7Z79dSfskepgLtyNQm/yb9NOjT6jxe2m3BKFL9mk868M5yvyzIZeUE6VOrRuK9 dXm+K5jlanRvyG7P4B98jMmfkLChFbfHHMQlinjJskDpxmEay6BIHNd+A/Xib/GAaK5q62MulecL7 9BjrH+x1JmQZxwcmto8Mtl+7BPs9WtSqOodCTYQHw2IRYn40bNfw1RzEZcCfKpE5bGxu+IlGRXh1l X2thv4cw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rWxWb-000000033jd-42yq; Mon, 05 Feb 2024 11:52:33 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rWxWZ-000000033j9-1RgY for barebox@lists.infradead.org; Mon, 05 Feb 2024 11:52:32 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rWxWX-0002gM-Kw; Mon, 05 Feb 2024 12:52:29 +0100 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rWxWV-004cb0-H9; Mon, 05 Feb 2024 12:52:27 +0100 Received: from localhost ([::1] helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1rWxWV-00ACgR-1N; Mon, 05 Feb 2024 12:52:27 +0100 From: Sascha Hauer To: Barebox List Date: Mon, 5 Feb 2024 12:52:26 +0100 Message-Id: <20240205115226.2432028-1-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240205_035231_398331_9D712A18 X-CRM114-Status: GOOD ( 11.82 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH] watchdog: restart handler: hang when watchdog cannot restart the machine X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) The __builtin_unreachable() in watchdog_restart_handle() is bogus, because when the watchdog doesn't work we will run into __builtin_unreachable() and behaviour is undefined. Drop the call to __builtin_unreachable(), print a big fat warning and hang() the machine which makes sure we don't return from watchdog_restart_handle(). Signed-off-by: Sascha Hauer --- drivers/watchdog/wd_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c index 89e4f1d1ea..f39a8f4522 100644 --- a/drivers/watchdog/wd_core.c +++ b/drivers/watchdog/wd_core.c @@ -179,7 +179,9 @@ static void __noreturn watchdog_restart_handle(struct restart_handler *this) BUG_ON(ret); mdelay(2000); - __builtin_unreachable(); + + pr_emerg("Watchdog failed to reset the machine\n"); + hang(); } static struct restart_handler restart_handler = { -- 2.39.2