From nobody Sat Nov 16 19:55:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XrPkw4pMKz5dkvL; Sat, 16 Nov 2024 19:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XrPkw3vztz4dpq; Sat, 16 Nov 2024 19:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731786936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p2z4E90GMSWBTYnOV76duE07O+vC4oTd5M1nvVExvdo=; b=dHpRnNRxQbj+IQ/7hiw5ieFooUOWQKz0xAfEowiMgfxhXAJvvuW1cp360cH3m9RsCyPDGB 5oI7FdY2Zspi/BBpl1pH5pH0O3UWUpFhz03rFLod2lIMqd3NWN/0ez9MsYQx6V8ewhgyEf sW8ivwPUmUd4O6KsW3pxxvB9T2yN91T5tVLWJ3+6zQVaZZI4MxSz6INd0NaRcmIluEcD4Z O3mEtXEdhB0B8FnljxXDeflgrabnd1vBG9zzWESz49vOu+xdOo1w6v3FRf8sP6n9m8luzm 1/jEI7BZeZAMTGzhhoaaWWmfNb3yxT3eE0BsL26+SkulcdC50D3RcirGB8Q9zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731786936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p2z4E90GMSWBTYnOV76duE07O+vC4oTd5M1nvVExvdo=; b=K1LZe5gVY3sEDJZLHWG2JNA4o2qUHAq3CpoWKbFDEmEq6NWmKenE3ooeNxkHJbRACgXQLV BqIWm1FAsAzNf0nExHQzx7KJgYc2aOkkJpq/AX4otVcj4MYy5n3FJxUDTB2e05/igIvBV3 O3+Wjgt9p2/IrEbo46dSitnZsZT1vb/xgOz6gRL3JVagHU2qr4TywzsvicIHwfiaZIgIYG cg3IWeefCgTCs6u5t1aIQe7TQKDpXWg+HbdPAAw9giRhAUKor49gEW0MGaisA+8HMjMlRI aGpRTmVBR7eJf0enev7FaDKdwQxqJ3Eu2dKJxchVF5fRm5Ud+6y5laJcXFZJtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731786936; a=rsa-sha256; cv=none; b=Mpu1css1dkRcgfNhv8//dyy+pgmLXHi09knOyD/SlYiCRITJ16rX118Ff1nEhQEfiTy/10 9YGMLVWoQv3YBxpoGermjLM/DUlkxvmdIv/WVSHKUeJ7qOai2ytd363/id1+SvHi09sMhf adFTuOUqvVeA5SNAFGLBiJeoaMDFUNKNo0CrkpIrlasVAe7j6smg00RFYi37q0kP8bc1fd UNgtOkqTF2VR86mB8msFhXufio42o9ETYNHNsbjt5Cu+KNIsQ0kCdxpWO/4wtNyGkvOLJM +xqea5/JHGZW1kFB+QxsMuJ6072HRkWszHlfupnhKIrylyOlL+g4FsPkhjqyHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XrPkw38QvzLSC; Sat, 16 Nov 2024 19:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AGJtaq1014015; Sat, 16 Nov 2024 19:55:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AGJtaLl014012; Sat, 16 Nov 2024 19:55:36 GMT (envelope-from git) Date: Sat, 16 Nov 2024 19:55:36 GMT Message-Id: <202411161955.4AGJtaLl014012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 4b4e88d9425b - main - aw_wdog: disable timer on attach List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b4e88d9425b59a377a71ffeb553376b1c60a80e Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4b4e88d9425b59a377a71ffeb553376b1c60a80e commit 4b4e88d9425b59a377a71ffeb553376b1c60a80e Author: Mitchell Horne AuthorDate: 2024-11-16 19:54:46 +0000 Commit: Mitchell Horne CommitDate: 2024-11-16 19:55:27 +0000 aw_wdog: disable timer on attach Otherwise it may cause system reset before the watchdog can be pat. This is consistent with other watchdog drivers. Tested on Allwinner D1. Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47517 --- sys/arm/allwinner/aw_wdog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/arm/allwinner/aw_wdog.c b/sys/arm/allwinner/aw_wdog.c index 5c087464c9e1..acfbdd8fe6d0 100644 --- a/sys/arm/allwinner/aw_wdog.c +++ b/sys/arm/allwinner/aw_wdog.c @@ -202,6 +202,9 @@ aw_wdog_attach(device_t dev) EVENTHANDLER_REGISTER(shutdown_final, aw_wdog_shutdown_fn, sc, SHUTDOWN_PRI_LAST - 1); + /* Disable watchdog for now. */ + WRITE(sc, sc->wdog_mode, sc->wdog_mode_key); + return (0); }