From patchwork Tue Jul 30 02:15:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Balantzyan X-Patchwork-Id: 11064825 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 88AE914E5 for ; Tue, 30 Jul 2019 02:15:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CC272866D for ; Tue, 30 Jul 2019 02:15:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BAD1286EE; Tue, 30 Jul 2019 02:15:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1427C2866D for ; Tue, 30 Jul 2019 02:15:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730929AbfG3CPv (ORCPT ); Mon, 29 Jul 2019 22:15:51 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:42068 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730481AbfG3CPv (ORCPT ); Mon, 29 Jul 2019 22:15:51 -0400 Received: by mail-pf1-f194.google.com with SMTP id q10so28960924pff.9; Mon, 29 Jul 2019 19:15:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7mVc3FHf9lbiZFRinrco4upcwRY0rhMFqs7bl6W7dgo=; b=Mp5BN0E6mU9E5mKatvwD5fi7X+PeAZze2NC0l5eieJmP8IRKVJZeSjO5toAuPZbMVl y1Y9gShrJhF7x74w2RrHkyO2nClA5H/nC8T3VobzpcK2nosnMOpDPUih0XSGN60VEKDx zgi6W+12P0Oipe1F1q7b9ymh1Zz8Ft0hC9BFinyyszDOcPwGjqKfRRTn60c6vuysZpth 3XXRjSc0uJHN6m7kRgV7Aw0hqik5k8e3OgORzf4JEUWAvJ7F6UN+ujZPV5otmY8RCUdI 7dS2Y7VEzOmdtXbRWWIQ4OPjD6KbJLnmDLMELit3xk22TWvDj91pHWyt8W+WLJEa3Abj Kwow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7mVc3FHf9lbiZFRinrco4upcwRY0rhMFqs7bl6W7dgo=; b=LnyD0/haOpGGS8VN1JCzugXWrKdVCpUJJqwDH3Vdwk0AsiOQ21Nwhd8EyRb7q0Ru+n Bc/Lb4OkH4uEZU8PDPppzu2DMC1ucPq6xpzOsuZU8M1e7UNVuFL+3FxydxZYuBsCOgw/ 072ZtdtwPdGZ0igoZCtd+QFDvI4MtXIrBUgO94qkRMAkBhGH1BOm4oj+tqLD1KKmS/ay lyYaJXrYjG1e2d0GthUmwl+ExZ4p5Mpy6bKc8nEMoz6wtixSX6YWIr+xP5Iz1y46QcR7 SqSbaukUyLwdKYafU4tkYgGtuN5/Fl0Yvv2gMppnwJR1maMIPnsurLHlZQSmoL923Jft vUbQ== X-Gm-Message-State: APjAAAUNA9t/PL8ckkhpfJSo30cW5djQoTRBGtf7IsVtFf4hOy+pcQwx 0bbDlM4LTZHSO1e8qQpgBDM= X-Google-Smtp-Source: APXvYqxW1tfaC3ldmkhaNM76awxXyWJgwD8IWqtUZWPy32HLQm1y9DeygvanVcUYeGtccRxuYvPBJQ== X-Received: by 2002:a63:2b8e:: with SMTP id r136mr73243802pgr.216.1564452950448; Mon, 29 Jul 2019 19:15:50 -0700 (PDT) Received: from localhost.localdomain (d206-116-172-62.bchsia.telus.net. [206.116.172.62]) by smtp.gmail.com with ESMTPSA id x13sm66561133pfn.6.2019.07.29.19.15.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 19:15:49 -0700 (PDT) From: Mark Balantzyan To: linux@roeck-us.net Cc: wim@linux-watchdog.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, andrianov@ispras.ru, Mark Balantzyan Subject: [PATCH 1/4] watchdog device drivers:pc87413_wdt:Rewriting of pc87413_wdt driver to utilize common watchdog interface Date: Mon, 29 Jul 2019 19:15:37 -0700 Message-Id: <20190730021540.66579-1-mbalant3@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is a potential for the variable swc_base_addr in the call chain of the driver initialization function (init) to be used before initialization. This brought up the need for, by rewriting the driver to use the common watchdog interface, ensuring to have all resources in place. This patch addresses this need by rewriting into common watchdog interface utilization for the driver. Signed-off-by: Mark Balantzyan --- drivers/media/pci/tw686x/Kconfig | 1 + drivers/watchdog/pc87413_wdt.c | 92 +++++++++++++++----------------- 2 files changed, 45 insertions(+), 48 deletions(-) diff --git a/drivers/media/pci/tw686x/Kconfig b/drivers/media/pci/tw686x/Kconfig index da8bfee7..079d7464 100644 --- a/drivers/media/pci/tw686x/Kconfig +++ b/drivers/media/pci/tw686x/Kconfig @@ -5,6 +5,7 @@ config VIDEO_TW686X select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_DMA_SG select SND_PCM + select WATCHDOG_CORE help Support for Intersil/Techwell TW686x-based frame grabber cards. diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c index 06a892e3..4c330ee5 100644 --- a/drivers/watchdog/pc87413_wdt.c +++ b/drivers/watchdog/pc87413_wdt.c @@ -22,12 +22,10 @@ #include #include -#include #include #include #include #include -#include #include #include #include @@ -65,7 +63,6 @@ static char expect_close; /* is the close expected? */ static DEFINE_SPINLOCK(io_lock); /* to guard us from io races */ -static bool nowayout = WATCHDOG_NOWAYOUT; /* -- Low level function ----------------------------------------*/ @@ -216,9 +213,9 @@ static inline void pc87413_disable_sw_wd_trg(void) /* -- Higher level functions ------------------------------------*/ -/* Enable the watchdog */ +/* Enable/start the watchdog */ -static void pc87413_enable(void) +static void pc87413_start(void) { spin_lock(&io_lock); @@ -231,9 +228,9 @@ static void pc87413_enable(void) spin_unlock(&io_lock); } -/* Disable the watchdog */ +/* Disable/stop the watchdog */ -static void pc87413_disable(void) +static void pc87413_stop(void) { spin_lock(&io_lock); @@ -245,9 +242,9 @@ static void pc87413_disable(void) spin_unlock(&io_lock); } -/* Refresh the watchdog */ +/* Refresh/keepalive the watchdog */ -static void pc87413_refresh(void) +static void pc87413_keepalive(struct watchdog_device *wdd) { spin_lock(&io_lock); @@ -260,6 +257,8 @@ static void pc87413_refresh(void) pc87413_enable_sw_wd_trg(); spin_unlock(&io_lock); + + return 0; } /* -- File operations -------------------------------------------*/ @@ -278,9 +277,6 @@ static int pc87413_open(struct inode *inode, struct file *file) if (test_and_set_bit(0, &timer_enabled)) return -EBUSY; - if (nowayout) - __module_get(THIS_MODULE); - /* Reload and activate timer */ pc87413_refresh(); @@ -331,7 +327,6 @@ static int pc87413_status(void) /** * pc87413_write: - * @file: file handle to the watchdog * @data: data buffer to write * @len: length in bytes * @ppos: pointer to the position to write. No seeks allowed @@ -345,26 +340,25 @@ static ssize_t pc87413_write(struct file *file, const char __user *data, { /* See if we got the magic character 'V' and reload the timer */ if (len) { - if (!nowayout) { - size_t i; - - /* reset expect flag */ - expect_close = 0; - - /* scan to see whether or not we got the - magic character */ - for (i = 0; i != len; i++) { - char c; - if (get_user(c, data + i)) - return -EFAULT; - if (c == 'V') - expect_close = 42; - } + size_t i; + + /* reset expect flag */ + expect_close = 0; + + /* scan to see whether or not we got the + magic character */ + for (i = 0; i != len; i++) { + char c; + if (get_user(c, data + i)) + return -EFAULT; + if (c == 'V') + expect_close = 42; } + } /* someone wrote to us, we should reload the timer */ - pc87413_refresh(); - } + pc87413_refresh(); + return len; } @@ -417,7 +411,7 @@ static long pc87413_ioctl(struct file *file, unsigned int cmd, retval = 0; } if (options & WDIOS_ENABLECARD) { - pc87413_enable(); + pc87413_start(); retval = 0; } return retval; @@ -466,31 +460,32 @@ static int pc87413_notify_sys(struct notifier_block *this, { if (code == SYS_DOWN || code == SYS_HALT) /* Turn the card off */ - pc87413_disable(); + pc87413_stop(); return NOTIFY_DONE; } /* -- Module's structures ---------------------------------------*/ -static const struct file_operations pc87413_fops = { - .owner = THIS_MODULE, - .llseek = no_llseek, - .write = pc87413_write, - .unlocked_ioctl = pc87413_ioctl, - .open = pc87413_open, - .release = pc87413_release, -}; -static struct notifier_block pc87413_notifier = { +static struct notifier_block pc87413wdt_notifier = { .notifier_call = pc87413_notify_sys, }; -static struct miscdevice pc87413_miscdev = { - .minor = WATCHDOG_MINOR, - .name = "watchdog", - .fops = &pc87413_fops, +static struct watchdog_ops pc87413wdt_ops = { + .owner = THIS_MODULE, + .start = pc87413wdt_start, + .stop = pc87413wdt_stop, + .ping = pc87413wdt_keepalive, + .set_timeout = pc87413wdt_set_heartbeat, +}; + +static struct watchdog_device pc87413wdt_wdd = { + .info = &pc87413wdt_ident, + .ops = &pc87413wdt_ops, + .status = WATCHDOG_NOWAYOUT_INIT_STATUS }; + /* -- Module init functions -------------------------------------*/ /** @@ -515,7 +510,7 @@ static int __init pc87413_init(void) if (ret != 0) pr_err("cannot register reboot notifier (err=%d)\n", ret); - ret = misc_register(&pc87413_miscdev); + ret = watchdog_register_device(&pc87413wdt_wdd); if (ret != 0) { pr_err("cannot register miscdev on minor=%d (err=%d)\n", WATCHDOG_MINOR, ret); @@ -533,13 +528,14 @@ static int __init pc87413_init(void) goto misc_unreg; } - pc87413_enable(); + pc87413_start(); release_region(io, 2); + pc87413_keepalive(&pc87413wdt_wdd); return 0; misc_unreg: - misc_deregister(&pc87413_miscdev); + watchdog_unregister_device(&pc87413wdt_wdd) reboot_unreg: unregister_reboot_notifier(&pc87413_notifier); release_region(io, 2);