Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Meng Li <Meng.Li@windriver.com>
To:     wim@linux-watchdog.org, linux@roeck-us.net,
        linux-watchdog@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org, meng.li@windriver.com
Subject: [PATCH] watchdog: core: stop watchdog when executing poweroff command
Date:   Fri, 30 Jun 2023 13:39:12 +0800
Message-Id: <20230630053912.28205-1-Meng.Li@windriver.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?shkUgEXNNGIoGiWmY9hQ6vwMzJHN3/ja8bW81qXUvB+C/d4IwEtVluTGSOtL?=
 =?us-ascii?Q?3DJu15yiLdlhAiR8Q1my3g70P7TRM1MNAe5kKjUyWb1Fs3233MUIjlbMMlch?=
 =?us-ascii?Q?mPLtKWS/cMixXR4iBscI9m3fE+WLyLlWJgDc01Y2qlEaLhgBxCzZavZeUGw+?=
 =?us-ascii?Q?RHHRhoVpW/FN2X4DhvA/bITCuwKx8EgWyPhiDyc5mFW+DyvjhoJ5C/AOi6Xe?=
 =?us-ascii?Q?BF73lOT7xbkjk9ft1k7YKD/880xHBCzCeQz2DkHDYQEoi711vblTLjUASGYS?=
 =?us-ascii?Q?cwc2HCNbY1ZZtlvgWZzw6pDGv/W2YGKzyW/Wxzeck4lvTwijHnRSwNUd5s1J?=
 =?us-ascii?Q?MUrJ2uFH2MJDSNMLZEOEmoyogA9lnwKxLfme3QRPkL/ZQ0RAyrRFVmgAUP2D?=
 =?us-ascii?Q?1U1F01R4cDdXhU+mfrAmBtcbU0+qvmYAVsL3sUIkzvg00CYDijCwg5WVAysM?=
 =?us-ascii?Q?xYPA/MW0LUFf1XOkbUkadoFWzPheYnR4V68PC9cHTMZfFOSWRTfG7q9yRM1b?=
 =?us-ascii?Q?fIn13enffCtnIv3G5qzM07vQ49zQdZ9+bDK+l7cn7aS+Bg6XXwCOmxvGppYo?=
 =?us-ascii?Q?LQWoioTFwjtHffWRXXQSwKgsyfQHiFeszrN4SuMnBZ3RUgJx4QvxzJgUKek9?=
 =?us-ascii?Q?ZPvSOXzdl0daQ4hoEHEguVZlSvxHaIurfFQnW29XCwT3Ezh1qZMvMVK0y12m?=
 =?us-ascii?Q?/AXNP6YCV4lohL1PxDdBkY3tTLPrWSK1+hFcHDHTzO+KuNyIKpbQkxVhPg64?=
 =?us-ascii?Q?CO0tZoZqL4PyyIBMcuLL87dvXWFlveG32kfLws7eBYRE6k+w8OD9PRNGmL7V?=
 =?us-ascii?Q?iK6MjXdLNQXJCTGPIbfOxFG4ER6HJYKdwS67KnJJxoM1eI3SuszBAuViztC9?=
 =?us-ascii?Q?lRuMqP5fjo7XgkZBg81zN58v6gfuVPHQhOgSt2AlT0FRH5CUv1KTNUyvXBM7?=
 =?us-ascii?Q?w5EOkrJikUgtiOdwjE/Fk/PKjCH6lHc9PHG9zf6TyM9FQl8VgpQ5MNE670h3?=
 =?us-ascii?Q?GS6xSOGkSl7EUOVtgpgZ1Oiew0ZY8ZOyQAc/fuKAZa2PGipiYTXoYiHBi466?=
 =?us-ascii?Q?DgAU21zPYKKcIyKyLYSHWnX90C5rl9n0tk44zw23JKSg9Wh4wz5glgr7stsK?=
 =?us-ascii?Q?MaT6WzXVArr0ldiXAWBFgw7wk8NY3DU9JEj/D5h8be0snGrMwKLTRfldKC9G?=
 =?us-ascii?Q?SBzHYAb6bp688yBjv4/99DtVbuO5Oa7/dhpfyB72sOjwFc+e06vtJtiq9+Ps?=
 =?us-ascii?Q?ItPuPMEfxq98tLK6sY4fEzlMxkvKZhHeO9OemPkSQ20p7JATYq7yor7lrpRV?=
 =?us-ascii?Q?xHxeF9sQWgoHrSgj9mKEXYVe1zFOoApgI4gj3+No6XxLAjy61dyeEu11UrZj?=
 =?us-ascii?Q?Uxx+ndsne5r1sILHnF8TQKbh/C7nSe12lrnU1HXZ77F3B/aNHN++LOZRXoop?=
 =?us-ascii?Q?5jpPL0Y1FRKiULO5gdffS9TM4E16cUbEZeCsYx09n6DcvylyyfuHCcUuSFVN?=
 =?us-ascii?Q?OBBX1l5lL2919SU0OXEhAvub+8viNe1JFXSfyNmG/w7P+UEAEpjuYyNo7ZkA?=
 =?us-ascii?Q?Pp1dCyujk0qS7/LvzGrWKfzgdVNAV9nD+HmdUhR9?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 65d84118-b2ab-427c-97b3-08db792c617f
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5191.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 05:39:33.0755
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Sm+XXQwJ/AClnd0OYOrVDpv39nrg3oB99C7pwCWtSRCrdQGQU2rVxHXsXSWb9+ZhzwZvQcPEmqYf2Ki+BAf4JQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB6099
X-Proofpoint-GUID: H04wvppI2e1hbbetamkj1KsVxL0XK_bG
X-Proofpoint-ORIG-GUID: H04wvppI2e1hbbetamkj1KsVxL0XK_bG
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-06-30_02,2023-06-27_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 spamscore=0
 clxscore=1011 priorityscore=1501 lowpriorityscore=0 phishscore=0
 bulkscore=0 impostorscore=0 mlxscore=0 suspectscore=0 malwarescore=0
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.19.0-2305260000 definitions=main-2306300048
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Meng Li <meng.li@windriver.com>

On some platforms, for example, Intel SoC FPGA platform, the watchdog is
started in from u-boot, and so kernel will create a timer and work to
keep watchdog alive. .But when user executes commands "poweroff" or
"shutdown -h", the system is reset when watchdog triggers timeout even
if WDOG_STOP_ON_REBOOT is set in watchdog driver. The root cause is
that the watchdog not stopped properly because the SYS_POWER_OFF case
is not supported in nofify callback function. So, add this case to stop
watchdog when executing poweroff command.

Signed-off-by: Meng Li <Meng.Li@windriver.com>
---
 drivers/watchdog/watchdog_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
index d4c5a736fdcb..5b55ccae06d4 100644
--- a/drivers/watchdog/watchdog_core.c
+++ b/drivers/watchdog/watchdog_core.c
@@ -161,7 +161,7 @@ static int watchdog_reboot_notifier(struct notifier_block *nb,
 	struct watchdog_device *wdd;
 
 	wdd = container_of(nb, struct watchdog_device, reboot_nb);
-	if (code == SYS_DOWN || code == SYS_HALT) {
+	if (code == SYS_DOWN || code == SYS_HALT || code == SYS_POWER_OFF) {
 		if (watchdog_hw_running(wdd)) {
 			int ret;
 
-- 
2.17.1