From patchwork Sat Oct 7 08:21:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xing Tong Wu X-Patchwork-Id: 149540 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp809582vqo; Sat, 7 Oct 2023 01:23:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHs3yf0dg8bYqfhB/4oOlVPmp3GQ3P23r7VsShwdzrQXWQm1cR8ngRWUT0gAZGql2Bf7P8L X-Received: by 2002:a17:90a:7bcf:b0:279:e19:86db with SMTP id d15-20020a17090a7bcf00b002790e1986dbmr11510544pjl.8.1696666992443; Sat, 07 Oct 2023 01:23:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696666992; cv=none; d=google.com; s=arc-20160816; b=i3KeUx1L4jHi3UDlIo44JtV9Fq4CqXxB1qqpRNZDKQCPSaduaw9trG/zwbc8dsiXCf n+PoQXPJY9rLwyYlqUmR4c1JF/I6Z9TNYu9oR/prL4z22UHTvszXktZlhyn9I66XQwP8 HyJF5vsdXIUv2Rp68Ra2r1bGoGrpTdF11n4HAttXfDEln8XPET8eEGZiZ/g8kv2NjmYY 3W8TAL5tClZI4r6g3PqDBmGqQahc1b81+SiLivQO6XV28VvNLQrG0HVairsq74BxWztt Hfu6TcRmTlNSoqwMgue8JRH4uULcJYfYKsI8M8zIUCQ5cviTehd5LSFH9XV4AoRNdLbV DYTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=jpLE4H32ThsJyUmBiuptNCfeV0xPsEphlDRUqHMRYvc=; fh=g4vZG3NVoG9d2Qh9+kk9HLcWb8EEDG9aXkmI7VExqjw=; b=YPdBH7+Lr9g4FLsAP/q4Cakglbt2qqkGi0Fv7om/5mSxpS4eToyag0Tv4QDwlHu7RS pbOLJw8Z9pNmD3694MXcucSiH7u1mbaqO/6uO69rQk5EXrXT0CUP3qOH7GBXHt1RKGNX sT81r7MCSszYo5vXl97HnGX+zTkaPmSlo+IujoAlznVr0hAcKI1ofgfi9vL3dTXA+yxe z7mTrPsBt+MbD+pUYlCD6TwA4WD21RJLi82qR5i9Bf0SwPoORfHM9uxJ2xpSZ4PWoqlZ vGKyKCqle7ow+pFxfsEKmi7v8r02r2IlDO0ye9lMl5ExG9zSzeRPEZ9oQn1RV7t2kqEc bBzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=Ujga6X0T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id v18-20020a17090a521200b002791edaee33si7158299pjh.77.2023.10.07.01.23.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 01:23:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=Ujga6X0T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 16ED48095DBE; Sat, 7 Oct 2023 01:22:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234145AbjJGIWA (ORCPT + 18 others); Sat, 7 Oct 2023 04:22:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230011AbjJGIV7 (ORCPT ); Sat, 7 Oct 2023 04:21:59 -0400 Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.219]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A38B9B9; Sat, 7 Oct 2023 01:21:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=jpLE4 H32ThsJyUmBiuptNCfeV0xPsEphlDRUqHMRYvc=; b=Ujga6X0Th/MtrUeG0zEFw LZs5JZ8JfQjoPhg3XGGsiE05UceS6VG8rRMTqAJNuBn8nsFPo1JxK8pH5plfNLeU AZE6rmwnbK/5ttj9z0RoIchKjZ24YvFzHn1HoPhSAEi8/cS6oTcoREIuBmrbS3t6 8xIVTEl+XuseLNpiflp5jI= Received: from localhost.localdomain (unknown [39.144.138.241]) by zwqz-smtp-mta-g2-2 (Coremail) with SMTP id _____wA3cIwFFSFls7Y9EA--.51861S2; Sat, 07 Oct 2023 16:21:26 +0800 (CST) From: Xing Tong Wu To: Wim Van Sebroeck , Guenter Roeck , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, xingtong.wu@siemens.com Cc: jan.kiszka@siemens.com, tobias.schaffner@siemens.com, cedric.hombourger@siemens.com, gerd.haeussler.ext@siemens.com Subject: [PATCH] watchdog: wdat_wdt: Add timeout value as a param in ping method Date: Sat, 7 Oct 2023 16:21:25 +0800 Message-Id: <20231007082125.4699-1-xingtong_wu@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wA3cIwFFSFls7Y9EA--.51861S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxJrW3uFW8XrWrKw47GFyDWrg_yoW8GrWfpr Wjkr15CryUtr48CFWxJwn7G39rCwnrZrW7XFykCw1Fv3s8KF15Ja1kt3srK34DKrZ3GFyY ga4xKry8Aayjyr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jhyCJUUUUU= X-Originating-IP: [39.144.138.241] X-CM-SenderInfo: p0lqw35rqjs4rx6rljoofrz/1tbiOwsC0GC5nsxYpwAAsW X-Spam-Status: No, score=3.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_SBL_CSS, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sat, 07 Oct 2023 01:22:35 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779084288337703531 X-GMAIL-MSGID: 1779084288337703531 From: Xing Tong Wu According to the WDAT spec that states about WATCHDOG_ACTION_SET_COUNTDOWN_PERIOD: "This action is required if WATCHDOG_ACTION_RESET does not explicitly write a new countdown value to a register during a reset." And that implies, WATCHDOG_ACTION_RESET may write a countdown value, thus may come with a WATCHDOG_INSTRUCTION_WRITE_COUNTDOWN, thus need the timeout value as parameter or would otherwise write 0. The watchdog for SIONCT6126 need a entry WATCHDOG_INSTRUCTION_WRITE_COUNTDOWN for WATCHDOG_ACTION_RESET action, I send this patch to support it. Signed-off-by: Xing Tong Wu Reviewed-by: Guenter Roeck --- drivers/watchdog/wdat_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c index 0ba99bed59fc..650fdc7996e1 100644 --- a/drivers/watchdog/wdat_wdt.c +++ b/drivers/watchdog/wdat_wdt.c @@ -269,7 +269,7 @@ static int wdat_wdt_stop(struct watchdog_device *wdd) static int wdat_wdt_ping(struct watchdog_device *wdd) { - return wdat_wdt_run_action(to_wdat_wdt(wdd), ACPI_WDAT_RESET, 0, NULL); + return wdat_wdt_run_action(to_wdat_wdt(wdd), ACPI_WDAT_RESET, wdd->timeout, NULL); } static int wdat_wdt_set_timeout(struct watchdog_device *wdd,