Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E1100C001DF for ; Sun, 30 Jul 2023 17:14:30 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4F661868D6; Sun, 30 Jul 2023 19:14:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="r2N2GRE7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 21A8886900; Sun, 30 Jul 2023 19:14:27 +0200 (CEST) Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EAF72868D1 for ; Sun, 30 Jul 2023 19:14:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=saproj@gmail.com Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b95d5ee18dso54665681fa.1 for ; Sun, 30 Jul 2023 10:14:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690737264; x=1691342064; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NqycHX1bl1N6+btE/OWRK3shAxYynSCfbJWx08j4w44=; b=r2N2GRE7oGhbq7k6iGyNpJfI8OwIO9V14r6PfRWlvGcRyb3i9l+6r/O9QpUYETuT/C IkVJnfq2zh1bwJZzu6BLGhWdlcODIL6iJaH4WB0rPeaprq27+9mFUoFBZYykH1Fp6X4f psJQVSVAsjEZZ8ZNn601fMuegEB5NphRaLNf1oP1520fJZMKh4uRZqHJYCp5HCdfnKvo nu+j0XoOMhK2/CnD8tgv+8aINmUX67+6QSR53hpAaKKFiclQrmNnK4ZmBzTJaKLyUn4N Eb1N3jg0viYluUwgoPp3OCJgM4wmx19OStDsh5rgBWZAQcn11+cyh+8gbdzuu9LloZLl mQDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690737264; x=1691342064; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NqycHX1bl1N6+btE/OWRK3shAxYynSCfbJWx08j4w44=; b=Ct/iV7TiHKrxNmKaMxxQC0TJTxsmyCGr6oo3iWR3W7MTO5eHPeEmLCqiYmia9LwK3m R4ROYzr8nGW9M4gR2I7ELpeM6MK3sSroeww3TYPthD/myfiFgjrgiudOdv4ezKs8H98T u3HMVTbxqhZqchmAKCaYWl8k73VxyghqI6z7khYkPVpDq6LsbuwHFG1GlybxLmOXNQfe j/z3lkjw2gypj5tqWx6h5VeXcb3bKhU69aRds8baNDt4dqzpzgwLrD7PI/StFI4JHHbQ JU/idHnoEKjyhiMuHPZBuKWZjicUxf30rro0m4y79mwvcFXlt/J57axw4fgbCrWbRTM2 Gkog== X-Gm-Message-State: ABy/qLbsb71rxLtGxonaJYcDdH1RFcRg4g6X7ijlSsinp9iUEG78MWdO cS7tY0pg3dl9vh69vsjThq8/hzxSjQ8= X-Google-Smtp-Source: APBJJlFp9AqAPL8+1eqNVVNt9YJRiAoHYUxwAs3O3IGZEkHFerhJ4lqE3S+cDwf0aQ2sjs2GcgTebg== X-Received: by 2002:a2e:86c8:0:b0:2b9:4805:a039 with SMTP id n8-20020a2e86c8000000b002b94805a039mr4337579ljj.51.1690737263868; Sun, 30 Jul 2023 10:14:23 -0700 (PDT) Received: from saproj-Latitude-5501.yandex.net ([2a02:6b8:0:51e:788:6f8f:4433:f435]) by smtp.gmail.com with ESMTPSA id x11-20020a2e9dcb000000b002b6c8cf48bfsm2089282ljj.104.2023.07.30.10.14.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jul 2023 10:14:23 -0700 (PDT) From: Sergei Antonov To: u-boot@lists.denx.de, sr@denx.de Cc: Sergei Antonov Subject: [PATCH] watchdog: ftwdt010: need to reset watchdog in ftwdt010_wdt_start() Date: Sun, 30 Jul 2023 20:14:16 +0300 Message-Id: <20230730171416.1568607-1-saproj@gmail.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean ftwdt010_wdt_start() has to call ftwdt010_wdt_reset() after setting-up the timeout in the same fashion ftwdt010_wdt_expire_now() does it. Without this patch the "wdt start " command does not actually start the watchdog timer until the "wdt reset" command is executed. Signed-off-by: Sergei Antonov --- drivers/watchdog/ftwdt010_wdt.c | 40 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/drivers/watchdog/ftwdt010_wdt.c b/drivers/watchdog/ftwdt010_wdt.c index a6b33b17209d..1f5f301b1251 100644 --- a/drivers/watchdog/ftwdt010_wdt.c +++ b/drivers/watchdog/ftwdt010_wdt.c @@ -25,8 +25,27 @@ struct ftwdt010_wdt_priv { struct ftwdt010_wdt __iomem *regs; }; +static int ftwdt010_wdt_reset(struct udevice *dev) +{ + struct ftwdt010_wdt_priv *priv = dev_get_priv(dev); + struct ftwdt010_wdt *wd = priv->regs; + + debug("Reset WDT..\n"); + + /* clear control register */ + writel(0, &wd->wdcr); + + /* Write Magic number */ + writel(FTWDT010_WDRESTART_MAGIC, &wd->wdrestart); + + /* Enable WDT */ + writel(FTWDT010_WDCR_RST | FTWDT010_WDCR_ENABLE, &wd->wdcr); + + return 0; +} + /* - * Set the watchdog time interval. + * Set the watchdog time interval and start the timer. * Counter is 32 bit. */ static int ftwdt010_wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) @@ -52,24 +71,7 @@ static int ftwdt010_wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) writel(reg, &wd->wdload); - return 0; -} - -static int ftwdt010_wdt_reset(struct udevice *dev) -{ - struct ftwdt010_wdt_priv *priv = dev_get_priv(dev); - struct ftwdt010_wdt *wd = priv->regs; - - /* clear control register */ - writel(0, &wd->wdcr); - - /* Write Magic number */ - writel(FTWDT010_WDRESTART_MAGIC, &wd->wdrestart); - - /* Enable WDT */ - writel((FTWDT010_WDCR_RST | FTWDT010_WDCR_ENABLE), &wd->wdcr); - - return 0; + return ftwdt010_wdt_reset(dev); } static int ftwdt010_wdt_stop(struct udevice *dev) -- 2.37.2