From patchwork Mon Jun 28 13:45:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1497974 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=HwBJdJwX; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GD85025v9z9sTD for ; Mon, 28 Jun 2021 23:45:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D0D9D82DD8; Mon, 28 Jun 2021 15:45:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="HwBJdJwX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CD1B482DE3; Mon, 28 Jun 2021 15:45:30 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) (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 48DF181D48 for ; Mon, 28 Jun 2021 15:45:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ej1-x62c.google.com with SMTP id bg14so30034686ejb.9 for ; Mon, 28 Jun 2021 06:45:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5IuKSBnaj+lKJhzOvtU91+ZpuxHNuVIzZ06ivXjw4Wc=; b=HwBJdJwXgH6wsvYDlk0drXPdellLTu1YD+Zwb1R3oVC1KImr8xLviaHzcBaRkljGyh peXBhCyA1XlRx4mMX2PoiEa/7z7HKtxcBv54BBakudvyT9SWcMpyI+++whfYNlxkW5tI KSqCeOv+vEboNQB/Vy5QQZwViYSXjkYvQ043zorML3L2YKQGcOaW0OQflNJiTPi4e8mg aT+dzfroVH/lOmG13jv+MKayMJ1x7Yng79l3BsVh55KwqNY++Q4WMQr7hIUIEpQP+NGL qVG/vN0lwnfOQtexR2maMOz/suZrogilADVrbtH03iXHTP2FAVNcftXHMPyqT/EV2kGA 5ssw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=5IuKSBnaj+lKJhzOvtU91+ZpuxHNuVIzZ06ivXjw4Wc=; b=KLg/ykd9LBkifgTaonbET2VoY9x5aqunMMU97FkPRcwhk83ip055sAlOgrTcCMTAB3 qf/LIi4iXGfCyLMR8DMB9M7i3lL4Uwv9A34QG9t8n8DjlDbd/YCTBZ9v2Ri81N2zpW6T 3SFoLumGaSxqE/feFha/Eyjct9hF8lL7DYGTVY+4sA1HXdmlsWb16gqe4J+eupSzUFQZ 58kjRGxy5XLsKc6nqLS7+NgW87Ug3M/oRPW4zUle+EZYzmoqDO+3fFJbGCrPx4OZP58L umtr2KywuGFP3NU7mkxOEUg3W3+kqo4m/bBuXXUPfuLnYP7FfUJtU+jZ7pG+bYmrYLhh dcCA== X-Gm-Message-State: AOAM5313GNWW+1CYZvqCs0nboZVePtnvZ3hpRQyJfL0RfgJzspfxhhVa ORb/SIC2K0hKwsjPw9q9VlPNdjfGFaGQJh/E X-Google-Smtp-Source: ABdhPJycq1zbE2jqJgHaxfNzxkOXh5u+5q1C8qqduGCVtR+7kLdLI5QWkZcvNN8AGn/kMMEkgZth7g== X-Received: by 2002:a17:906:ece7:: with SMTP id qt7mr23989803ejb.194.1624887926775; Mon, 28 Jun 2021 06:45:26 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6:f666:9af6:3fed:e53b]) by smtp.gmail.com with ESMTPSA id n2sm9446090edi.32.2021.06.28.06.45.26 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Jun 2021 06:45:26 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Michal Simek , Simon Glass Subject: [PATCH] watchdog: cadence: Add expire_now method Date: Mon, 28 Jun 2021 15:45:20 +0200 Message-Id: <5e8e740265b6910d99339f23439b746e694fe62f.1624887918.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean It is working in a way that only minimal timeout is setup to reach expiration just right after it is setup. Please make sure that PMUFW is compiled with ENABLE_EM flag. On U-Boot prompt you can test it like: ZynqMP> wdt dev watchdog@fd4d0000 ZynqMP> wdt list watchdog@fd4d0000 (cdns_wdt) ZynqMP> wdt dev dev: watchdog@fd4d0000 ZynqMP> wdt expire (And reset should happen here) Signed-off-by: Michal Simek --- drivers/watchdog/cdns_wdt.c | 41 ++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c index 966d010e40d9..6dfdd31c8b8f 100644 --- a/drivers/watchdog/cdns_wdt.c +++ b/drivers/watchdog/cdns_wdt.c @@ -214,6 +214,45 @@ static int cdns_wdt_stop(struct udevice *dev) return 0; } +/** + * cdns_wdt_expire_now - Expire the watchdog. + * + * @dev: Watchdog device + * @flags: Driver flags + * + * Access WDT and configure with minimal counter value to expire ASAP. + * Expiration issues system reset. When DEBUG is enabled count should be + * bigger to at least see debug message. + * + * Return: Always 0 + */ +static int cdns_wdt_expire_now(struct udevice *dev, ulong flags) +{ + struct cdns_wdt_priv *priv = dev_get_priv(dev); + u32 data, count = 0; + +#if defined(DEBUG) + count = 0x40; /* Increase the value if you need more time */ + debug("%s: Expire wdt%u\n", __func__, dev_seq(dev)); +#endif + + cdns_wdt_writereg(&priv->regs->zmr, CDNS_WDT_ZMR_ZKEY_VAL); + + count = (count << 2) & CDNS_WDT_CCR_CRV_MASK; + + /* Write counter access key first to be able write to register */ + data = count | CDNS_WDT_REGISTER_ACCESS_KEY; + cdns_wdt_writereg(&priv->regs->ccr, data); + + data = CDNS_WDT_ZMR_WDEN_MASK | CDNS_WDT_ZMR_RSTEN_MASK | + CDNS_WDT_ZMR_ZKEY_VAL; + + cdns_wdt_writereg(&priv->regs->zmr, data); + cdns_wdt_writereg(&priv->regs->restart, CDNS_WDT_RESTART_KEY); + + return 0; +} + /** * cdns_wdt_probe - Probe call for the device. * @@ -247,7 +286,7 @@ static const struct wdt_ops cdns_wdt_ops = { .start = cdns_wdt_start, .reset = cdns_wdt_reset, .stop = cdns_wdt_stop, - /* There is no bit/reg/support in IP for expire_now functionality */ + .expire_now = cdns_wdt_expire_now, }; static const struct udevice_id cdns_wdt_ids[] = {