lkml.org 
[lkml]   [2019]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 2/2] selftests: watchdog: Add command line option to show watchdog_info
From
Date
On 9/7/19 2:58 AM, Eugeniu Rosca wrote:
> From: "George G. Davis" <george_davis@mentor.com>
>
> A side of affect of commit "selftests: watchdog: Add optional file
> argument" is that arbitrary files may be opened for watchdog testing, e.g.
> /dev/null. To prevent watchdog-test from operating on non-watchdog device
> files, commit "selftests: watchdog: Validate optional file argument" was
> added to validate that a file is indeed a watchdog device via an
> ioctl(WDIOC_GETSUPPORT) call. Since the watchdog_info is available as a
> result of the ioctl(WDIOC_GETSUPPORT) call, add a command line option to
> show the watchdog_info.
>
> Suggested-by: Eugeniu Rosca <erosca@de.adit-jv.com>
> Signed-off-by: George G. Davis <george_davis@mentor.com>
> Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
> ---
> v1: Applied/tested on commit ce54eab71e210f ("kunit: fix failure to build without printk") of
> https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/log/?h=next
>
> tools/testing/selftests/watchdog/watchdog-test.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c
> index 6ed822dc2222..f45e510500c0 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:Tn:NLf:";
> +static const char sopts[] = "bdehp:t:Tn:NLf:i";
> static const struct option lopts[] = {
> {"bootstatus", no_argument, NULL, 'b'},
> {"disable", no_argument, NULL, 'd'},
> @@ -32,6 +32,7 @@ static const struct option lopts[] = {
> {"getpretimeout", no_argument, NULL, 'N'},
> {"gettimeleft", no_argument, NULL, 'L'},
> {"file", required_argument, NULL, 'f'},
> + {"info", no_argument, NULL, 'i'},
> {NULL, no_argument, NULL, 0x0}
> };
>
> @@ -72,6 +73,7 @@ static void usage(char *progname)
> printf("Usage: %s [options]\n", progname);
> printf(" -f, --file\t\tOpen watchdog device file\n");
> printf("\t\t\tDefault is /dev/watchdog\n");
> + printf(" -i, --info\t\tShow watchdog_info\n");
> printf(" -b, --bootstatus\tGet last boot status (Watchdog/POR)\n");
> printf(" -d, --disable\t\tTurn off the watchdog timer\n");
> printf(" -e, --enable\t\tTurn on the watchdog timer\n");
> @@ -216,6 +218,18 @@ int main(int argc, char *argv[])
> case 'f':
> /* Handled above */
> break;
> + case 'i':
> + /*
> + * watchdog_info was obtained as part of file open
> + * validation. So we just show it here.
> + */
> + oneshot = 1;
> + printf("watchdog_info:\n");
> + printf(" identity:\t\t%s\n", info.identity);
> + printf(" firmware_version:\t%u\n",
> + info.firmware_version);
> + printf(" options:\t\t%08x\n", info.options);
> + break;
>
> default:
> usage(argv[0]);
>

I would like to see these combined. Please don't add another argument.
Combine patch and 1&2.

thanks,
-- Shuah

\
 
 \ /
  Last update: 2019-09-16 15:27    [W:0.073 / U:0.288 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site