Message ID | 20210802150016.588750-6-rasmus.villemoes@prevas.dk |
---|---|
State | Superseded |
Delegated to: | Stefan Roese |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=ONIMtrb8; 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 4Gdh6m4hcHz9sRR for <incoming@patchwork.ozlabs.org>; Tue, 3 Aug 2021 01:01:52 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ED01C83420; Mon, 2 Aug 2021 17:01:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="ONIMtrb8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5D87683421; Mon, 2 Aug 2021 17:00:53 +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=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0703.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::703]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BB6CD833FF for <u-boot@lists.denx.de>; Mon, 2 Aug 2021 17:00:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kG7L/q8ym9s2arQtbAkZbGoe8fMjgXAlAi4zD2rZ5Ups+oEHLmJkDnZtoQZizfAv3uyeG/yIdL1R7L5VYQzvDbJJRHLnsQISD7hUY8IlAIuvQPzs4MnveqTaFbrSiGI3TPNRcwowR1w6RPsCyS/1Apqj9pIXOSI1ojdcs6odRfm2dhDDpMW9MvqGCu/h2AEK3fKCsHEpde7m/qVWmC7esRt/qJx+sDgx+ULiva+5QN5yJfBgFccJM/ai6fYFzXsOqH0z9HwlUij/8zfGj2/cLrJP1thy6ZzwzJsK5Wxg3qarYu0ElW8K9uHkil32Td1cis8ShRfYBpkeqYVoUDgALA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BtxsfjLpmHKWdr4YTbHlO8mxfdxH82pSRJj/S0b/2OU=; b=odK3Enn0aXI/eyIYp2puFjSDCi4u/9FykB411QWbRzkTSI2ivfj6agL+zRGUvI671UZ9a42CpGfdLQ/yR/7zEp5PY5LKbtQjay333azESHuTlV4aT1xZO1awT+OwZVae4nnQE58SrrrZW5mAoIEljrLw03PZJsyH3/IeHITJdo8XdYWDL6e3soXLKxduVZnPmBo6ziH1Hr/58XoZir+ESeRqAVzpMZIW1/rqNOFsaZCpkLaz8J1I9Uw8+/C5PHgxjnb0o1M7aI/Hm62d0Mxs7C54TZiCTXAVWTo8TzYCnNFiZWgK8NJ9JmLutd4hCgoRTZ06FhZJRIoL9bEpVEp3mQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BtxsfjLpmHKWdr4YTbHlO8mxfdxH82pSRJj/S0b/2OU=; b=ONIMtrb8hezeq6fA1/A5fZdpVVF0/2V5Zwvp0n2tUdGDmHiZwaNZj0ylsEaTmyp9EiWHuy6tDQvg8mZ7kd/4dn6P4eFmtg4Y5CYQWoGiONIpvOYfqAZSpPqXgmf4VfY66/ApqlQrHG0NKHoMq4yWvFLJbY3z69+QNp5hm//rJbE= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=prevas.dk; Received: from AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:3f::10) by AM0PR10MB3220.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:182::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.17; Mon, 2 Aug 2021 15:00:32 +0000 Received: from AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM ([fe80::fc83:36a5:db02:3dbb]) by AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM ([fe80::fc83:36a5:db02:3dbb%7]) with mapi id 15.20.4373.026; Mon, 2 Aug 2021 15:00:32 +0000 From: Rasmus Villemoes <rasmus.villemoes@prevas.dk> To: u-boot@lists.denx.de Cc: Simon Glass <sjg@chromium.org>, Stefan Roese <sr@denx.de>, Tom Rini <trini@konsulko.com>, Rasmus Villemoes <rasmus.villemoes@prevas.dk> Subject: [PATCH v4 05/10] watchdog: wdt-uclass.c: keep track of each device's running state Date: Mon, 2 Aug 2021 17:00:11 +0200 Message-Id: <20210802150016.588750-6-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210802150016.588750-1-rasmus.villemoes@prevas.dk> References: <20210802150016.588750-1-rasmus.villemoes@prevas.dk> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: HE1PR05CA0257.eurprd05.prod.outlook.com (2603:10a6:3:fb::33) To AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:3f::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prevas-ravi.prevas.se (81.216.59.226) by HE1PR05CA0257.eurprd05.prod.outlook.com (2603:10a6:3:fb::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Mon, 2 Aug 2021 15:00:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 91b5ba10-54a9-4cbb-8bc1-08d955c64638 X-MS-TrafficTypeDiagnostic: AM0PR10MB3220: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <AM0PR10MB32203D124E7DFF3A937B79AE93EF9@AM0PR10MB3220.EURPRD10.PROD.OUTLOOK.COM> X-MS-Oob-TLC-OOBClassifiers: OLM:1201; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uLPARGAn8WrMvtt9zw7/GVZqDDDkYOrHVbCb94ay2S4HvGbkWkAlC3CyZCrukv0c8bqsiZnJitKRPsI7nMP6BHKZjnP2VnBdlgoy8TMTfMKH4jzeEcdn7ibLFJyO3h04EOnKDNe7ZbrgD9/ApxkorvsXeBVqfEJt1aegihbBV9RUahLuFmkO5o/KuFZ5JY4sTjeNca0p/fDOSjEkDNXyiY2nbijufgKhh3d+QwNJ1NdC8le/EgV/lSKUB+ZX/qsXgF7ZS5NND2N5wF/OLC7bWDxqBvx9oP/WhTGge+fymmESSrYiApTBR2ZZXjMqJoI1CWdTzFfwsq+Vr8+3JU8oieJjluQ2w/XjpOkuhmBlq6q+Zu2l67Xhy6blJqEQGdOr3QqPJr2ptRtSpy7ZwMRbGr3DrW6a+jXLxZ3L1gmUjtpftXksclQ+0pkRvzehsuM8bf6E3wQNXqEd+cEpLrspvOaxrI//sJqtgZrWZjsNwByCbL025/8WBMBsDkRDsHWkk39P+SnwPgdzHVjzpW3sB+i8HRxeRzCQc1vqubP9YfivhcseH2mUKSQZiqfZe5+DEHzl5H+w3EOP3B+rhpkEzcJbBHaQmm27dTcBoU13TPrQX9BJqJV3qzIjhrv5pfMI5nyUJexIDhiKbmnEGxklt+csenhyD9lGEvxfGKpcq+HUzLSx4EkKinTuBdbAhzc0rFLdrl9TTYfNUT+v4sbXnQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(346002)(39830400003)(136003)(376002)(396003)(366004)(26005)(107886003)(186003)(4326008)(6666004)(316002)(8976002)(8936002)(6512007)(6486002)(8676002)(38100700002)(956004)(2616005)(38350700002)(54906003)(36756003)(1076003)(52116002)(6506007)(86362001)(2906002)(44832011)(6916009)(5660300002)(66556008)(66476007)(66946007)(478600001)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: r4s1mKvLK0oSjXcn2U3wqGcF8TsyuZUc+RptuTCdSzhuLfEls1JXqAhP+vitEh6C+od8ZqijJmhCvHZ+FXBicLoiRtHsGcXIczPtKGVle/+3T5HxQEEEnRVWav9I3yYJxIiXRS9CVVfvDOGK+scSfAXD2/85FuD8XzqY2OSoUtsEvkU97YyM3poA8IaKl38pV5DE/x+iQoDxs+l0E7fE07cdN7wZ7IT4OOF7NRVChJvzm4EXcegbs95jiAUaKnQbqEFlruc0hF9qvJmQavsPuDxvYIhFroavD/jlQfGE5E4mV/p/PDrF6exm+88zZUu5NuZWX3zVy7MjMd9J2CSP04XmdgI8p2iiO8kGVDTp+/knmZY+/hUiV8bY30O8AAYbZFwndmDnmg/eJLxIHNpYk+DNYnTcBemBncewUY8SE+svpwbFkcJUSahjBvsOm7w6rkvewZxVnQjHN8Fu+Dr2liClAeS3P/8djthxkX6XPE6FOeuSrkD9dMp2RQTQ/PdkSf5gjg/nBGBoLzYiXMj5bMO5gX/9t+CCGZEsEcnm6Gsxt3CfWhQdte8Fp/SUCmGAsTHNukY1IIhj3LaXUefdpukb4h6g0Gq5xWJ7431ZhuLCwUziLOkauaeY64tmFu7igWD2HUuwSpJk+vpkWL3+2QM8phepZTSGx7/OPWb4K8Mh1QPERGujVQTLGfnbyFNkPbMB0fuZk6MTcQjNjJ2aYns5uSGkrLptPQG5hux0SuYm30yeI1TVzTtnXoLXhwVChXmk23vo/k4Apnyf8Jffps170jmiOwUPgu4ZR/0T7GfnGj6XZM+gk8zkd5uMG9Iq3rmfLuA/8t9hwXhTKQ4Bh53jbF6JnRz/At0O9O0QEkKrrtmiyj+dJvU6OXUyvb1llI3j9puj+0wk9kfvR3E2vz3jaFvEvQESBr8K/oOL3WcZRb1Zbf1YvHyeAWulx0cBxiJwzG1YHerb/juSv95OS9l+WJWgXbTU3518WkI1V0u94ZvuGtX2Qu67rjX+Rn8+2/RwtxpIRXA8rBTY2wtJ/quzNcjCT2/1sIhubW4FU1V5jw6vTF5lqFv9OoLgst6sMZ8I+sGN8cb3fBXMuSCly5TE+0hirexTwY+lxgOqXZD/RjNr2i5ydxkMddnCOZ6wbnXWO4uJp7I+r0MJxtWGyHeP22dIJkSIyWvY+VQoGL18QAGBHVjurulaNW6FSZK2hFGqdmsuUPKQ2eD/nzT35lvG4RnAC1TCRNUxi73Z3II46igmq7FKlX8hhkQapDy430C19oyGzhK087kGFJAFJAnzJYrwB3N9zsvhc7+ySBccWFm9lbxx+yiQwvazqnJw X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 91b5ba10-54a9-4cbb-8bc1-08d955c64638 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2021 15:00:32.1311 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6SkL3TnnfEIIj7Ns/Ivaa6woC1d7qIYj8xV+hNUqjkSrhDWbS6XeLd5xFkKVRRFUpkVn42guDngSvdM8hQ8IjwktW4z8MhXUOclfclxSmyg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3220 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
handling all DM watchdogs in watchdog_reset()
|
expand
|
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index 0a1f43771c..358fc68e27 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -33,6 +33,8 @@ struct wdt_priv { * ->reset(). */ ulong next_reset; + /* Whether watchdog_start() has been called on the device. */ + bool running; }; static void init_watchdog_dev(struct udevice *dev) @@ -74,6 +76,7 @@ int initr_watchdog(void) } init_watchdog_dev(gd->watchdog_dev); + gd->flags |= GD_FLG_WDT_READY; return 0; } @@ -86,8 +89,11 @@ int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) return -ENOSYS; ret = ops->start(dev, timeout_ms, flags); - if (ret == 0) - gd->flags |= GD_FLG_WDT_READY; + if (ret == 0) { + struct wdt_priv *priv = dev_get_uclass_priv(dev); + + priv->running = true; + } return ret; } @@ -101,8 +107,11 @@ int wdt_stop(struct udevice *dev) return -ENOSYS; ret = ops->stop(dev); - if (ret == 0) - gd->flags &= ~GD_FLG_WDT_READY; + if (ret == 0) { + struct wdt_priv *priv = dev_get_uclass_priv(dev); + + priv->running = false; + } return ret; } @@ -156,6 +165,9 @@ void watchdog_reset(void) dev = gd->watchdog_dev; priv = dev_get_uclass_priv(dev); + if (!priv->running) + return; + /* Do not reset the watchdog too often */ now = get_timer(0); if (time_after_eq(now, priv->next_reset)) {