From patchwork Fri Mar 13 16:04:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1254500 X-Patchwork-Delegate: sr@denx.de 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; dmarc=none (p=none dis=none) header.from=prevas.dk 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=Meg1/hNS; 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 48f9Xk09Zlz9sPF for ; Sat, 14 Mar 2020 03:05:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2FE01814D6; Fri, 13 Mar 2020 17:05:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none 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="Meg1/hNS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 96CB0813CC; Fri, 13 Mar 2020 17:05:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on072c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe09::72c]) (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 BB8EC81269 for ; Fri, 13 Mar 2020 17:05:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none 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=PfAwOdik6tr56rbF9jPjaLrZe0JnX/x8PsuBqBSa76OzsJe63r+z4eeKheTM5nPXQ0ISrDo614elTWwXIZlmCPmnT/P02Grn26QJfy6eBFTkq2c/EscEFsVffvXjvDrBlcwXu3piWinju2KWOeqHUY/BcskjZh+IfmBzV5Iqqeh61SaZcxnRXp046a5Q0vp9S6OqZQfqKwT+9YXwiq8EPwHy4gOUZJAxqeMfNgNdpOxIcnbnjVGLIu2mnPePIdRPsD79JbD8v0L1hpZhUw1k/8gN15OFoKlWirrp4aAO3GffynoZGIV5r/0XeVcBUXTTWbwRD+1VJUFK2cPntWky9Q== 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=tlpnepcsyubmPpzu7VR21oFdKkp4BuCfO35SR0MF9tI=; b=CRJ7E0xE/68qMzmvFAxUP/wfaC8YmQAE3x/XDN6YqaS70ORK8E6I+JxEWOCr3aAw/mG7VAexkdcHuI6KUhrn6PRTtMWkK15ouVlNgxymraXuOmWw/EZ/6GilTuF3CiP7ADvVf+BQ5xi35JdNNn6s8Zh1dZqVYuy4A+UdRLXPQy/aygfn60Uu19yVR3Sa4Z/JHMiT9DnjeF+vSzpkW5b4RqrwoGAAGPY2NlRhtclkhCbYhFIB1KKohwQd7jV9LMbaQTwI3kYIslxc38BFszON/YagmAr/Had8CzvhMjJ6Bs/yAKkTPoPfMi+QK03PUOV4ApRfkLzwt5E8bo2ZlQuAoA== 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=tlpnepcsyubmPpzu7VR21oFdKkp4BuCfO35SR0MF9tI=; b=Meg1/hNSC3C1PjBs4xvpns36X/Gx+kV2/IgIORICqaxxwEBD+XiTLPC1F7RJXs4A91Cf7py8f9qcfDLU26rKN3IH1C1l5YBpY+FpebF3qLqaKbea6IpFK/MPSZIb1L8+ZCTi9/fobEoi1EMZQ93kuappOLYiI3aOd0czc7wCtVc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rasmus.villemoes@prevas.dk; Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (20.178.126.85) by VI1PR10MB3519.EURPRD10.PROD.OUTLOOK.COM (10.141.128.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.16; Fri, 13 Mar 2020 16:05:08 +0000 Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::e58f:1097:b71d:32c7]) by VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::e58f:1097:b71d:32c7%5]) with mapi id 15.20.2793.013; Fri, 13 Mar 2020 16:05:08 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Stefan Roese , Christophe Leroy , Chris Packham , Rasmus Villemoes Subject: [PATCH 1/3] watchdog: remove stale ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS from wdt.h Date: Fri, 13 Mar 2020 17:04:56 +0100 Message-Id: <20200313160458.19727-2-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200313160458.19727-1-rasmus.villemoes@prevas.dk> References: <39e2b876-6ba1-59b6-4ddd-068e120f9b4e@denx.de> <20200313160458.19727-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: AM6PR08CA0009.eurprd08.prod.outlook.com (2603:10a6:20b:b2::21) To VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e1::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prevas-ravi.prevas.se (5.186.114.43) by AM6PR08CA0009.eurprd08.prod.outlook.com (2603:10a6:20b:b2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.13 via Frontend Transport; Fri, 13 Mar 2020 16:05:07 +0000 X-Mailer: git-send-email 2.23.0 X-Originating-IP: [5.186.114.43] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb716570-19ac-41e5-7c56-08d7c7684ce0 X-MS-TrafficTypeDiagnostic: VI1PR10MB3519: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:169; X-Forefront-PRVS: 034119E4F6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(396003)(39850400004)(136003)(346002)(366004)(199004)(316002)(8936002)(8976002)(8676002)(478600001)(2906002)(107886003)(86362001)(6666004)(81166006)(81156014)(66556008)(52116002)(66476007)(54906003)(186003)(4326008)(1076003)(4744005)(6506007)(26005)(36756003)(5660300002)(66946007)(6916009)(16526019)(2616005)(956004)(6486002)(44832011)(6512007); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR10MB3519; H:VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; Received-SPF: None (protection.outlook.com: prevas.dk does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5xMdwio/c5TGD6VNu5AQkgMwKnhIY1l6kiPVbw3IrQd2a5HeMnSMBgI0geoupW6Bp60lo6CYzXeOzF3SQlvkrGALiHBVju+VAv1Sm/Lo0bNu+ae1UMifAa/GE5rSTiM8YQOBSyRoc52BsicHDrFuLKGaA3+HbdJWgeVoTr/7Fe2QPnnlJh5tTz+cmuwoNhVH4mKquZF/QawXYom8XFugGDaHPjQn1Bnq+cNWQyhCHo72hXjsCSIY9wQXdGGsmcgJF1L1y5q07n+bhYHDJ2V9ig0PbmW+PwG7oZ7YBTZiglSTgX2FKW90RxWBzH5Szq2O5XIpYuc7hynMp2X+/UUIce5FepqKHzCqxYF/y0H/Od3UBbGDvcYJ2DdGGL/aIf21OZ1lbSySEIcqkW7oURxXc0xE1aF8JhSjAMdMh9Yu3tlEEBVp3U4EELp/I21x1RDL X-MS-Exchange-AntiSpam-MessageData: NWjb0lekGHi4SYO5ZgKsYy/7XOgM/TG7AH0iayMScDZVv5wMuqSOb+MkN/JPkBaOxTt109067zexNR/tGvhs/3+484433r3pbFZT/2/ECpD3eOJVIjNnAPuHJ72mGlFSCS5CbdqLegjduRhZnDPxdA== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: cb716570-19ac-41e5-7c56-08d7c7684ce0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2020 16:05:07.8739 (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: VxXoboiwGvqjvP0Q/unrzAXBH9b6zExQekR5Qy/qeWXqusMM+BGvvV570l9M+/eWGO4XBWTRoLEsVCO22m/6uPrG7C4mGJOk0rFogjW89Mw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3519 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean Since WATCHDOG_TIMEOUT_MSECS was converted to Kconfig (commit ca51ef7c0c), CONFIG_WATCHDOG_TIMEOUT_MSECS has been guaranteed to be defined. So remove the dead fallback ifdeffery. Signed-off-by: Rasmus Villemoes Reviewed-by: Stefan Roese --- include/wdt.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/wdt.h b/include/wdt.h index 5bcff24ab3..e833d3a772 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -107,9 +107,6 @@ struct wdt_ops { }; #if CONFIG_IS_ENABLED(WDT) -#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS -#define CONFIG_WATCHDOG_TIMEOUT_MSECS (60 * 1000) -#endif #define WATCHDOG_TIMEOUT_SECS (CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000) static inline int initr_watchdog(void) From patchwork Fri Mar 13 16:04:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1254498 X-Patchwork-Delegate: sr@denx.de 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=prevas.dk 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=D28/GxnE; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48f9XN6GxMz9sQx for ; Sat, 14 Mar 2020 03:05:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1430380E9F; Fri, 13 Mar 2020 17:05:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none 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="D28/GxnE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 74C2F813C3; Fri, 13 Mar 2020 17:05:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on072c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe09::72c]) (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 B6A1E804CD for ; Fri, 13 Mar 2020 17:05:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none 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=DsNoUe2VRMf6c4A0t9xQRUNc/qNQVPkRADm+TvtL8x4DGWLqgpi07B1Oe8lH1CxoDsZ1z0GZORcPu+szelqozfwryTSSiMUrJlZ5/aKAR9Tpjx1T4B2Dhq9Mm4ul3TKwzmea3B0b+RqGD+JhDwnhCP4FxPgMht35af5yNt5kcVwfps73t/Ek5Ku1QTSMYkTdpzJ5vo++CtmDrj2iMBPOAmsqvNmBzCaWf8GqPNMvq89hUVwuH9uVC+VDH12hi+SpxP4Q6gh8xLT1CoGCUBZ8biTZKnQTGqWHjU8NPl1DvFRn07Wzvc8vDozZvJkZEXFumylcExm2f7uf0tp541PHhw== 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=iaenGfUPWcu+BdT4mu57lzyIarDLUy/4MLy2eP8Fztk=; b=RdBV+7UFxL97NgEi0Ha5UnZgVQH35+6yJPFjD9glgMQ7hb/IiNqppjBhsxQdYn+fhkZ27aMf2PJ4YGRFzCVsZ03onj0apP5syVfVcfYHG/uMGqOpNGZVOLLnLXRuPT2bQpe4jBgCTSXS0DzlNMHoxrpVwe2Pp3VfUSfQjt3OGid5OjHltftngsHh7yKuaeGPf5qhjwWbFdje+Blet4AcrW9ZYf07p3tvlQ4drc7nH4alslRzMlbxTDRwCbfvI4jk/Ks9pa+SzaCO4hHMYD9rINY8Xa1qE6Tw2ETkWCsPvSJVJ1MNyi/hNQq187wiVjJr37Oq3leH+sxHXaRIz53AQg== 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=iaenGfUPWcu+BdT4mu57lzyIarDLUy/4MLy2eP8Fztk=; b=D28/GxnEc0gtsYUOhCHn1JLQry563FDhDNeTpm5TW9a4iaCTj2r5P1Hm+2BiDftxZ6cvYpR+CMLux2s0Z6LSKTlP4rEjhGceAeI2k6wLQtMDUrGqEEvE87HnEa7hJomcedIqVCbC2gT8nkfL0kJjMEBT1KvgXJhQrLb2k2Ot/68= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rasmus.villemoes@prevas.dk; Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (20.178.126.85) by VI1PR10MB3519.EURPRD10.PROD.OUTLOOK.COM (10.141.128.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.16; Fri, 13 Mar 2020 16:05:08 +0000 Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::e58f:1097:b71d:32c7]) by VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::e58f:1097:b71d:32c7%5]) with mapi id 15.20.2793.013; Fri, 13 Mar 2020 16:05:08 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Stefan Roese , Christophe Leroy , Chris Packham , Rasmus Villemoes Subject: [PATCH 2/3] watchdog: move initr_watchdog() to wdt-uclass.c Date: Fri, 13 Mar 2020 17:04:57 +0100 Message-Id: <20200313160458.19727-3-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200313160458.19727-1-rasmus.villemoes@prevas.dk> References: <39e2b876-6ba1-59b6-4ddd-068e120f9b4e@denx.de> <20200313160458.19727-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: AM6PR08CA0009.eurprd08.prod.outlook.com (2603:10a6:20b:b2::21) To VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e1::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prevas-ravi.prevas.se (5.186.114.43) by AM6PR08CA0009.eurprd08.prod.outlook.com (2603:10a6:20b:b2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.13 via Frontend Transport; Fri, 13 Mar 2020 16:05:07 +0000 X-Mailer: git-send-email 2.23.0 X-Originating-IP: [5.186.114.43] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a6722e5a-1e17-40a0-6410-08d7c7684d42 X-MS-TrafficTypeDiagnostic: VI1PR10MB3519: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:826; X-Forefront-PRVS: 034119E4F6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(396003)(39850400004)(136003)(346002)(366004)(199004)(316002)(8936002)(8976002)(8676002)(478600001)(2906002)(107886003)(86362001)(6666004)(81166006)(81156014)(66556008)(52116002)(66476007)(54906003)(186003)(4326008)(1076003)(6506007)(26005)(36756003)(5660300002)(66946007)(6916009)(16526019)(2616005)(956004)(6486002)(44832011)(6512007); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR10MB3519; H:VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; Received-SPF: None (protection.outlook.com: prevas.dk does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +bqvayjDSKMBZZv//VqZ7fM32iTOd5guyWO4yUa7xBOJAkDuXl1mLpPHqGnBDtQzD3tk/RI4UHCMxurSNKXMvC4re8xV8KHEKe6+0rGvF9Ljzo14Astq5zqPHlhZDI3ifFvLCsd7kIAlu7FULsATTAtY8zT9KAeL/lzD+whBOSyAR4Nand2jY77HYmvSxzJ9CUOg/EtDGxtk2dVb6wAOANptHHRYSSAYAQ9oeL4zfQdDS+h7Q3DT70Ah7UxFRM8Qtuv7oQfMyqtpq352WtmQgJx7FXiADo1euDEG18fsiwVtrg1B5R7Xq8PWaeveJ1HTefmiHZyoVpoP91T4mN+Z9/u1tTJjT3gxIwoMAoKsXjVy0lxMsZQYjYlKGjR5e82EM1qcDRKJAynzK6L1iSq/XogCdWbsYfYzWAsS6fdaj0LgTNmTYriFUEAC8xlrW05i X-MS-Exchange-AntiSpam-MessageData: FmLLP6Ad2RMgUBJrZZrmsP0jnAeOh4bdDCR2EGMkdDd02+sbzBzNAr+QAA31ZRKmk29wUTk93F+6PT8W1NEyhBS+IYJQ/D5kuOI7xsSEpqmpUGGeA5nj0jLYTPlgQihzgKX832XV3/xUIilypOLv2g== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: a6722e5a-1e17-40a0-6410-08d7c7684d42 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2020 16:05:08.4736 (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: RIR1jke84s52t5dXijWIoXWvOh/nVgUrdZWwIRVzxeaUl+6BIkA8yiqE2fRIogQslhox3LLuDesKHlV4e8EuNqV+e8o/QWh0tXunJ/wn7Uk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3519 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean This function is a bit large for an inline function, and for U-Boot proper, it is called via a function pointer anyway (in board_r.c), so cannot be inlined. It will shortly set a global variable to be used by the watchdog_reset() function in wdt-uclass.c, so this also allows making that variable local to wdt-uclass.c. The WATCHDOG_TIMEOUT_SECS define is not used elsewhere. Signed-off-by: Rasmus Villemoes Reviewed-by: Stefan Roese --- drivers/watchdog/wdt-uclass.c | 33 +++++++++++++++++++++++++++++++++ include/wdt.h | 35 +---------------------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index 309a0e9c5b..fb3e247c5f 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -13,6 +13,39 @@ DECLARE_GLOBAL_DATA_PTR; +#define WATCHDOG_TIMEOUT_SECS (CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000) + +int initr_watchdog(void) +{ + u32 timeout = WATCHDOG_TIMEOUT_SECS; + + /* + * Init watchdog: This will call the probe function of the + * watchdog driver, enabling the use of the device + */ + if (uclass_get_device_by_seq(UCLASS_WDT, 0, + (struct udevice **)&gd->watchdog_dev)) { + debug("WDT: Not found by seq!\n"); + if (uclass_get_device(UCLASS_WDT, 0, + (struct udevice **)&gd->watchdog_dev)) { + printf("WDT: Not found!\n"); + return 0; + } + } + + if (CONFIG_IS_ENABLED(OF_CONTROL)) { + timeout = dev_read_u32_default(gd->watchdog_dev, "timeout-sec", + WATCHDOG_TIMEOUT_SECS); + } + + wdt_start(gd->watchdog_dev, timeout * 1000, 0); + gd->flags |= GD_FLG_WDT_READY; + printf("WDT: Started with%s servicing (%ds timeout)\n", + IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out", timeout); + + return 0; +} + int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) { const struct wdt_ops *ops = device_get_ops(dev); diff --git a/include/wdt.h b/include/wdt.h index e833d3a772..aea5abc768 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -106,39 +106,6 @@ struct wdt_ops { int (*expire_now)(struct udevice *dev, ulong flags); }; -#if CONFIG_IS_ENABLED(WDT) -#define WATCHDOG_TIMEOUT_SECS (CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000) - -static inline int initr_watchdog(void) -{ - u32 timeout = WATCHDOG_TIMEOUT_SECS; - - /* - * Init watchdog: This will call the probe function of the - * watchdog driver, enabling the use of the device - */ - if (uclass_get_device_by_seq(UCLASS_WDT, 0, - (struct udevice **)&gd->watchdog_dev)) { - debug("WDT: Not found by seq!\n"); - if (uclass_get_device(UCLASS_WDT, 0, - (struct udevice **)&gd->watchdog_dev)) { - printf("WDT: Not found!\n"); - return 0; - } - } - - if (CONFIG_IS_ENABLED(OF_CONTROL)) { - timeout = dev_read_u32_default(gd->watchdog_dev, "timeout-sec", - WATCHDOG_TIMEOUT_SECS); - } - - wdt_start(gd->watchdog_dev, timeout * 1000, 0); - gd->flags |= GD_FLG_WDT_READY; - printf("WDT: Started with%s servicing (%ds timeout)\n", - IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out", timeout); - - return 0; -} -#endif +int initr_watchdog(void); #endif /* _WDT_H_ */ From patchwork Fri Mar 13 16:04:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1254501 X-Patchwork-Delegate: sr@denx.de 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; dmarc=none (p=none dis=none) header.from=prevas.dk 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=gDDC9EzX; 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 48f9Xw6Dzgz9sPF for ; Sat, 14 Mar 2020 03:06:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 56AEC8152F; Fri, 13 Mar 2020 17:05:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none 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="gDDC9EzX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AE55E81439; Fri, 13 Mar 2020 17:05:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on072c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe09::72c]) (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 1456881333 for ; Fri, 13 Mar 2020 17:05:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none 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=JEKyUnXUzlqPpfGZYCZklq5TShT/VsvCLrwpyVcH72HhvCq4VkoXEWSuO0940PiUdTzXQhX4A0TQrF0iIuEOXeRUlu3ZO/m4wyXE6ZYUuRl8whLvyGKQLW/vCDs82NZN/e0cQog6JZiRPWzKEjgsT6e6fdRHWV+vYA+aC7lVHj+mQybozSvg5WH3CSv4sDGF7scVU6nBMdb1jOBvZyBEGcBBGz8aXiHav41mOcfqzYr47cYd+uneXXMX5dDkaMToqfbxZFQ8zN7RjbVs3cU8K7NJ228YCWSsKcj2TeHRPy+RK9J612mROmaEmVmYym/Etfqef7M2ufp+uOGlXb2QIQ== 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=QdQLwGWnKTPyXroDznz8Y9CKXmCLGahBgs/uezWfgSk=; b=TBvPwOG/49/H0oddf82LsSCXngADxpzPsL3cBXHhbG4+DTbC8q25szgHgHxrI8ouHZAplCAJHdHHsryW8rE7rkR5/S8c4dYrvQHhg6ntCJtkO2TXwd4UxWRJzHlJcXAnkkn9e7jr46SumkCd+bhH3nBZHXE1Fj36HPjDwci1pQkVPGm79IHS29gMndl3bjPnE4Obc6xSq74KYarYhrSnTY0aCeVYelbL2sdHoch63XH3P8RJ+0zdjprIYpk27rq5N3Y6QObuygD7FSuap9azkFXbxIUAPaCfiWtH3jiD2jffp99xjKOO/GvsdJfQ6oRUMx7n0YdwL3+ITn4ZvFnP+w== 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=QdQLwGWnKTPyXroDznz8Y9CKXmCLGahBgs/uezWfgSk=; b=gDDC9EzX14iUba4ex0E35WUrcS/zvWZyc+AI+TRVeEPm5hauoiXyhs243Rrv5ScLNzHvwjy/X1dm3fF+aPyTnSlDIRLwsTBUYTGKWACNuwWqKJJesbhoN/CVYSqvTEm06HJvmyzONCo8XIJtPenA1u2lcYS7IRe6L0o+w/Xdbx8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rasmus.villemoes@prevas.dk; Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (20.178.126.85) by VI1PR10MB3519.EURPRD10.PROD.OUTLOOK.COM (10.141.128.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.16; Fri, 13 Mar 2020 16:05:09 +0000 Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::e58f:1097:b71d:32c7]) by VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::e58f:1097:b71d:32c7%5]) with mapi id 15.20.2793.013; Fri, 13 Mar 2020 16:05:09 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Stefan Roese , Christophe Leroy , Chris Packham , Rasmus Villemoes Subject: [PATCH 3/3] watchdog: honour hw_margin_ms DT property Date: Fri, 13 Mar 2020 17:04:58 +0100 Message-Id: <20200313160458.19727-4-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200313160458.19727-1-rasmus.villemoes@prevas.dk> References: <39e2b876-6ba1-59b6-4ddd-068e120f9b4e@denx.de> <20200313160458.19727-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: AM6PR08CA0009.eurprd08.prod.outlook.com (2603:10a6:20b:b2::21) To VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e1::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prevas-ravi.prevas.se (5.186.114.43) by AM6PR08CA0009.eurprd08.prod.outlook.com (2603:10a6:20b:b2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.13 via Frontend Transport; Fri, 13 Mar 2020 16:05:08 +0000 X-Mailer: git-send-email 2.23.0 X-Originating-IP: [5.186.114.43] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07f8b7bb-8fa1-4487-d6b2-08d7c7684da3 X-MS-TrafficTypeDiagnostic: VI1PR10MB3519: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-Forefront-PRVS: 034119E4F6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(396003)(39850400004)(136003)(346002)(366004)(199004)(316002)(8936002)(8976002)(8676002)(478600001)(2906002)(107886003)(86362001)(6666004)(81166006)(81156014)(66556008)(52116002)(66476007)(54906003)(186003)(4326008)(1076003)(6506007)(26005)(36756003)(5660300002)(66946007)(6916009)(16526019)(2616005)(956004)(6486002)(44832011)(6512007); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR10MB3519; H:VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; Received-SPF: None (protection.outlook.com: prevas.dk does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fldSoOLtzy3x/isXo/iO0uRP6HT9KB5kKCly2UJx2vbZ53yAOL+tYceNa836Z/KbOpaY14gZJWluIkmhHQHKg3i80ciJsO/MIHiZq/pf50o6cz090mqsSKanCnMthnwjWnoA6iDOEBItY/6ih662gsvehgagpNzB4xQnwFwCU3+Rr0LRhOJt0yNcWJgENBA0Nx3prKooxkVwubR6AtIV5+YLC5QkhE5Azw2hOFCVYrAAxS9Uo9/2jWC+kQKWVmn4WAVNvtc9eLWzX2GvANwe1WOo2hs5cV2CVTlWNnSsVY5wFtLPbZkeNbiVgcSCcW9gbpokP0PETCyoWXRzk6G7cM0bKR/DIxwOflarj6fx+1sd0+ccwbzOkuJDPQG0Y6Lk9NILTnLzNyOYf6X2StmcuQMrcuxnKKh7oZOWuyEkS+tINc+UIimTnhxdULNIs3Uf X-MS-Exchange-AntiSpam-MessageData: ENDkilvj/AgArpe3ciQDGwVMk8rSHHlG7cwpFifHyeC3msT1wyUNtGzkfC82fA60tDnSSZCrqWqGszYpJNUthYM8etS5bzXciz34ceCuqQ7aCjwYlmL3W++RnusfinYk48o/8D9nMKBBZzQsOyZsTw== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 07f8b7bb-8fa1-4487-d6b2-08d7c7684da3 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2020 16:05:09.0802 (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: JW7axAkuvN88jFv/oQFTmS83jBFTzlYLKrb/NIkIOFmGLRZxOtbvl3ZAEiFnNQm5qipGSmcwj5yAeXjcOaIjupMk464WrY95R7/j5Bj6tOc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3519 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean Some watchdog devices, e.g. external gpio-triggered ones, must be reset more often than once per second, which means that the current rate-limiting logic in watchdog_reset() fails to keep the board alive. gpio-wdt.txt in the linux source tree defines a "hw_margin_ms" property used to specifiy the maximum time allowed between resetting the device. Allow any watchdog device to specify such a property, and then use a reset period of one quarter of that. We keep the current default of resetting once every 1000ms. Signed-off-by: Rasmus Villemoes Reviewed-by: Stefan Roese --- drivers/watchdog/wdt-uclass.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index fb3e247c5f..436a52fd08 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -15,6 +15,12 @@ DECLARE_GLOBAL_DATA_PTR; #define WATCHDOG_TIMEOUT_SECS (CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000) +/* + * Reset every 1000ms, or however often is required as indicated by a + * hw_margin_ms property. + */ +static ulong reset_period = 1000; + int initr_watchdog(void) { u32 timeout = WATCHDOG_TIMEOUT_SECS; @@ -36,6 +42,8 @@ int initr_watchdog(void) if (CONFIG_IS_ENABLED(OF_CONTROL)) { timeout = dev_read_u32_default(gd->watchdog_dev, "timeout-sec", WATCHDOG_TIMEOUT_SECS); + reset_period = dev_read_u32_default(gd->watchdog_dev, "hw_margin_ms", + 4*reset_period)/4; } wdt_start(gd->watchdog_dev, timeout * 1000, 0); @@ -117,7 +125,7 @@ void watchdog_reset(void) /* Do not reset the watchdog too often */ now = get_timer(0); if (time_after(now, next_reset)) { - next_reset = now + 1000; /* reset every 1000ms */ + next_reset = now + reset_period; wdt_reset(gd->watchdog_dev); } }