Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1248525imm; Wed, 26 Sep 2018 14:23:44 -0700 (PDT) X-Google-Smtp-Source: ACcGV62WdbsecnlAHXHzHZ85nUuCpm6dZOTRbIIGd2pkF0hGWdVCDJC/tIwpvm0wwDDxjTKLBxYi X-Received: by 2002:a17:902:74c7:: with SMTP id f7-v6mr7611013plt.45.1537997024060; Wed, 26 Sep 2018 14:23:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537997024; cv=none; d=google.com; s=arc-20160816; b=AR2MY6x1Zr5fK3u2cwRMpwCgj9e/qBRJ8LGmNAF/k7yH/vozbFHMpagFXZadu3xdSU aDM+HYvQ3jjJIMyyryCsM9Q/V7Rd4lqn1hC0i66MoSse6Efr3T73gPrwzmxvNA65Z5sr lLSvSXOFrkEHOERf65dJgggYj5q7As5BJyi18iFFn3tKO2cAw7D4Qr1nE2MLtXdiCICB 5mzlc9FbNU3ieTEOlESJ/CsPF4D1rbGXqe9kdaU3qPnNOfndwc9+Y1wLQKiXP9YEVpn6 MtpTDm7jAb0MI+/z1D0ekOFG2JwOaaQ0CRXSw5C25f2jcPP8jWVDWwXzevxXL24k98N2 b1AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=v1eNEX0eske0kp/b7/ueX1nxsvtLZMM4WHGN+mEXtTk=; b=IIlkQACAHDO6kd5pQbxuElx1v6VFCVnWdORpF7rcZx5EtpHbpc0mqdsh7n4xAC6mY0 fnh+CMVSBKkSvyj/Ai8OI6XGIgBf0p9rlLkobISD7EjYqzxNmoQzjPqmGKpNwFtHLVs7 BER8SFzdzWlJId0FjEUss7RBgL9AUxfgqTxgFlVDBuyL257PiEnbVCUgYX++BzcJOJGz R55z0vbNWm8nJvKrUnAd7122bQAOhniC/BCbmQKTWlukinlaZxeoUDIxM+B4GoWfV2r3 sitDNp3JtdKOoMblYbrGjKxJQdLZXFScs+peOY3fu8JBpn/i7IY7sjqDuvAaH2V1VugS uN8A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cb8-v6si70486plb.178.2018.09.26.14.23.28; Wed, 26 Sep 2018 14:23:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727203AbeI0DiN (ORCPT + 99 others); Wed, 26 Sep 2018 23:38:13 -0400 Received: from g4t3425.houston.hpe.com ([15.241.140.78]:54497 "EHLO g4t3425.houston.hpe.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726107AbeI0DiM (ORCPT ); Wed, 26 Sep 2018 23:38:12 -0400 Received: from g9t2301.houston.hpecorp.net (g9t2301.houston.hpecorp.net [16.220.97.129]) by g4t3425.houston.hpe.com (Postfix) with ESMTP id DC97BBD; Wed, 26 Sep 2018 21:23:18 +0000 (UTC) Received: from lxbuild.ftc.rdlabs.hpecorp.net (lxbuild.ftc.rdlabs.hpecorp.net [16.78.34.175]) by g9t2301.houston.hpecorp.net (Postfix) with ESMTP id 5418E4B; Wed, 26 Sep 2018 21:23:18 +0000 (UTC) From: Jerry Hoemann To: shuah@kernel.org, erosca@de.adit-jv.com Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Jerry Hoemann Subject: [V3 PATCH 2/2] selftests: watchdog: Add gettimeout and get|set pretimeout Date: Wed, 26 Sep 2018 15:23:09 -0600 Message-Id: <1537996989-13092-3-git-send-email-jerry.hoemann@hpe.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1537996989-13092-1-git-send-email-jerry.hoemann@hpe.com> References: <1537996989-13092-1-git-send-email-jerry.hoemann@hpe.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add command line arguments to call ioctl WDIOC_GETTIMEOUT, WDIOC_GETPRETIMEOUT and WDIOC_SETPRETIMEOUT. Signed-off-by: Jerry Hoemann --- tools/testing/selftests/watchdog/watchdog-test.c | 33 +++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c index 8429186..e29bc71 100644 --- a/tools/testing/selftests/watchdog/watchdog-test.c +++ b/tools/testing/selftests/watchdog/watchdog-test.c @@ -19,7 +19,7 @@ int fd; const char v = 'V'; -static const char sopts[] = "bdehp:t:"; +static const char sopts[] = "bdehp:t:Tn:N"; static const struct option lopts[] = { {"bootstatus", no_argument, NULL, 'b'}, {"disable", no_argument, NULL, 'd'}, @@ -27,6 +27,9 @@ {"help", no_argument, NULL, 'h'}, {"pingrate", required_argument, NULL, 'p'}, {"timeout", required_argument, NULL, 't'}, + {"gettimeout", no_argument, NULL, 'T'}, + {"pretimeout", required_argument, NULL, 'n'}, + {"getpretimeout", no_argument, NULL, 'N'}, {NULL, no_argument, NULL, 0x0} }; @@ -71,9 +74,13 @@ static void usage(char *progname) printf(" -h, --help Print the help message\n"); printf(" -p, --pingrate=P Set ping rate to P seconds (default %d)\n", DEFAULT_PING_RATE); printf(" -t, --timeout=T Set timeout to T seconds\n"); + printf(" -T, --gettimeout Get the timeout\n"); + printf(" -n, --pretimeout=T Set the pretimeout to T seconds\n"); + printf(" -N, --getpretimeout Get the pretimeout\n"); printf("\n"); printf("Parameters are parsed left-to-right in real-time.\n"); printf("Example: %s -d -t 10 -p 5 -e\n", progname); + printf("Example: %s -t 12 -T -n 7 -N\n", progname); } int main(int argc, char *argv[]) @@ -135,6 +142,30 @@ int main(int argc, char *argv[]) else printf("WDIOC_SETTIMEOUT error '%s'\n", strerror(errno)); break; + case 'T': + oneshot = 1; + ret = ioctl(fd, WDIOC_GETTIMEOUT, &flags); + if (!ret) + printf("WDIOC_GETTIMEOUT returns %u seconds.\n", flags); + else + printf("WDIOC_GETTIMEOUT error '%s'\n", strerror(errno)); + break; + case 'n': + flags = strtoul(optarg, NULL, 0); + ret = ioctl(fd, WDIOC_SETPRETIMEOUT, &flags); + if (!ret) + printf("Watchdog pretimeout set to %u seconds.\n", flags); + else + printf("WDIOC_SETPRETIMEOUT error '%s'\n", strerror(errno)); + break; + case 'N': + oneshot = 1; + ret = ioctl(fd, WDIOC_GETPRETIMEOUT, &flags); + if (!ret) + printf("WDIOC_GETPRETIMEOUT returns %u seconds.\n", flags); + else + printf("WDIOC_GETPRETIMEOUT error '%s'\n", strerror(errno)); + break; default: usage(argv[0]); goto end; -- 1.8.3.1