From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2C61C11F6A for ; Fri, 2 Jul 2021 12:46:13 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 204FE61413 for ; Fri, 2 Jul 2021 12:46:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 204FE61413 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=prevas.dk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 002DB82A29; Fri, 2 Jul 2021 14:45:36 +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="c5DyZjnl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7D28C829E7; Fri, 2 Jul 2021 14:45:29 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on071e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::71e]) (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 2192A828A1 for ; Fri, 2 Jul 2021 14:45:21 +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=TuJiZCbwkOv+kOf5o33uOzZNLFmNWUea+GuNZrc3ZF+HQhFrJRFDgD4+K5tLrhQMavEq3TkdRmVdgzxgUY98mIH+AV4vjbxHlQYtvteyzpNmyFR7///UWCXC2QpLXWaRmwVIGWIwZGtDybs1enzCRjyrQxG+RUxFsfJVWQhIRkmjFx58hLXn6ghVttjme2Vm4jQsWkrWjGGAvcDPp2a4HYMsna1Ixv/9CKEnadOaOmbod5MHIjU1hPww2f/HjQ+JgXoec9YMce4CZtMfi6fl780mRXF0VS6HFklYGYSLzJW3loB6YMpTOpZt1tNs68z9wknc+Lpl2YAk2NIdyu6J5w== 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=b1m5SwQKOG7iZ2HCK0uvow2GhfpfAqon3urIpfj+ed8=; b=UbDos7QNYfY4QMLDeBLWB78U9ydV/aD+LLd4qdsVW1599NAtqIPRmotEt5DZwlY9EOb6hO/cLpI6tCaIx3rWVnLgtFLE9DIIqCK0aMfAG6PCkjwkjoJkDAVSfMDhn/919V1a5t8C3RWRqfOGPAoPWltpHrL4UWxPLTE/6TAEVbFrb3iTJzR9alJuLo2Km66vvvRJ396mdowYcN3Wu6NUPRgJDNKbM62EhIM/CpW5to9a8BGY33MElm+vSQMraAWJvYRyjp4S/BUtygJzzGtIahuCZXdtzIFKSnvdyIa+Glv50Oi0F8Mj0GtSxvf5C7cgB53D13LfxxTyHTI0fM//dg== 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=b1m5SwQKOG7iZ2HCK0uvow2GhfpfAqon3urIpfj+ed8=; b=c5DyZjnl1gYJisOcwu4eQIm5G2K4nWi0WCQ3r5Dby21tVusMuQCiZGO5Yt/6CA+0XfXScmGg7t6VPCYCRCwTl0HB9gnsWJ00lWrBybZozM55rDTt1xFYzobrqzCxBuBkVu4dyAicMcx1wbawkGpke2WWrbpV6XFZdxpcpHZbc2w= 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 AM9PR10MB3990.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:1cf::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Fri, 2 Jul 2021 12:45:20 +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.4287.029; Fri, 2 Jul 2021 12:45:20 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Simon Glass , Stefan Roese , Tom Rini , Rasmus Villemoes Subject: [PATCH v3 04/10] watchdog: wdt-uclass.c: refactor initr_watchdog() Date: Fri, 2 Jul 2021 14:45:04 +0200 Message-Id: <20210702124510.124401-5-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210702124510.124401-1-rasmus.villemoes@prevas.dk> References: <20210702124510.124401-1-rasmus.villemoes@prevas.dk> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [80.208.64.110] X-ClientProxiedBy: AM4PR0501CA0065.eurprd05.prod.outlook.com (2603:10a6:200:68::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 (80.208.64.110) by AM4PR0501CA0065.eurprd05.prod.outlook.com (2603:10a6:200:68::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Fri, 2 Jul 2021 12:45:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b68b402-d63a-4872-c5d2-08d93d5740a2 X-MS-TrafficTypeDiagnostic: AM9PR10MB3990: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:486; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sJ2SA1N50VHb+luDLPp1OTEcpwggmDFxgFr+iWko8A7B2qVxLwhzZpgsktvNkibSMlW9QTd1yO9SiP7bWKExGBYJK8dU9tOmorfT8A0y+s9ZtYMNWtlZEI2E40leahL9Wd/Lx+LOosvFBU/bYEFDh6fSyt8NLeC/KzWwZe+mgVVaeiuSOeyVCwI8MlvQwXZzH3HlrqW711ZK0tfu5rksR7q4qPB9Cy4v6HPJIGilJWNV2GYrS3ZG/mH/nb7HFIgx1goc5D9N9Dgh5FiPChzOHYOD10NdhaWuAPhYf/6Y7LTRFA0Q1LfcbdLyncEqwQI/DD2bhPUV7dllSr4rtWjwLiwgLtOg5f1OT0kYpZxD85K76alwqfpKg6FguKTc/aczCGSj3Iqtd6fnHRS1VOgGBznrFQFA3BW9y287FWLasKjIE7Ena7qIZB5/UUV4YAvsAWJWfDRpj3p0JEeXubfK3PkIha9i3Z5jWzHcmRiBFYCKxHf80v8khijbLfZYbL/DZLo0TEMVKlHExr1qDSAeyCSG3xJPOEYyErgYgPMInmAijeIhdsXas1dDTHewmHODbkhZD1FM8WQqZeRt+XqhZFgr0ldquLauihsMXJJ10X5aIl3LvTNSgOo1xJhs3kuuzorEWl7VdnWsstOf+UKvveOIshstVrqv/3BkekjrdYNyFAqlkd0Zm3hwLP9aKVKERtaW72nq4Ib1vS/joo08vw== 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:(366004)(396003)(376002)(39850400004)(346002)(136003)(5660300002)(83380400001)(86362001)(8936002)(66946007)(6666004)(6506007)(66556008)(52116002)(6486002)(8976002)(8676002)(66476007)(6916009)(6512007)(186003)(38350700002)(54906003)(107886003)(16526019)(38100700002)(44832011)(36756003)(4326008)(316002)(26005)(2906002)(956004)(478600001)(1076003)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4aEGC7UpVR2N1w+q8nopUurxt9Bo6KFPgUkEJH9J3r3nuhkkX9P20ramuSKp?= =?us-ascii?Q?w0SH8N4ImcO9NraInFzyzODc5BZZNVRC16d7gjZR85SesPrzjoRZQlbTnTau?= =?us-ascii?Q?A7HjdIrmP/FFhQWKX8w18Ex7gy3TvfTXhrs7IrJyOYuP37lfEpHrG6r3xn8O?= =?us-ascii?Q?RweXVusvugwNyYgBJ1PJJsfHzB1Z5tUFj1e2hNBTSe9zTAfVWSpZ7u3PZ7co?= =?us-ascii?Q?/W+q8/s1HMMjxEYH051VIhUJd3gTO4XHCgsnqy9W4k9d5jEW3pnkho2Pr7i7?= =?us-ascii?Q?voFTLErziM5wKChj1SQj6afsVZvQkaLnHqXL1iznjgNZ+4SYiNydleNIjh8L?= =?us-ascii?Q?F/bj7H3WACD94AgPSIT3+bCarfHhjGJTl7t1iui/dv5tet9IpiaSLgbypTyZ?= =?us-ascii?Q?2cxA6kQyriTS5McPVLHOAprsYHwJmisTzu7C3Ix6yHmZFooQ5R0QhhruIAD5?= =?us-ascii?Q?X9wUZXygGR19YJE0JUe3KfYEHpFEVs44tM4+pykUpc6617o8lQu62Db5PXx2?= =?us-ascii?Q?vUHI7Oj1zRQIjR3a2tId80gN8QUgqABsUoAnm7ZjVBaHk35uf2BgedIbLA3X?= =?us-ascii?Q?57XoDJDbCE0OOaWuCvEjiOXWGqZXTErwl2vtY/ytFDxFMjZII+wp6jhrrpZw?= =?us-ascii?Q?ykuFn4EoOjmvB+w8EgbumsGPrEKeoEedccDOLWKgrabKsTxsjT2Y3Y8+EDUr?= =?us-ascii?Q?6SYlv4ebDTnsSAbS7mrc7XkkOike+TwUaacJStztG2uqxlu7v/N2XX2gFKpB?= =?us-ascii?Q?mTLjTr/7fnIT3ss/Qh2NHKluAbGUobwlsnIFHjBgg9VWi5SMI0WeBfJVr/vW?= =?us-ascii?Q?akMGKNjRNgUzmiCKDjQAFXrj6afhAfCEH7D5o4zmoX6OqRdslHCe5kMYxfET?= =?us-ascii?Q?423DVPrdRYHlfeaAB0gfrdHKz/lS5+x0DizrkSo5hhZXF220tJLD22VotkXb?= =?us-ascii?Q?FQufu90f5VfNbLd30hpn4UxJQmGheCm1bGQR0C11465QrgHZ9/5dsErZrngX?= =?us-ascii?Q?TJkjcmc0RFpVbylbFkTmH96IAcyWRvilkBt+mbBSqHP28qnW88yVKdgNo5Ip?= =?us-ascii?Q?xDJeEz0GdKNkAv3jfvTzdWN4JoeNwqtrbUJW+W/+2RefeXR9VEpbuDBsLBqR?= =?us-ascii?Q?PONedyNHHtrlipOKe07s5YZVuHHbcX6OLEnr1DpgxD783qKKaCGPtqp77gCl?= =?us-ascii?Q?+ilKdeTY+1JsmUxAFJQqomGz0sowhySEO3J3V9XU6ncie8eQlLcbppWTYExP?= =?us-ascii?Q?qPOYeD+xAV8Dvl+mNtHdTLRiusTy8Uod/ap72HVUvrLT+gDlGWvf5TUn4lD5?= =?us-ascii?Q?992xuNgGnDIPdJwypvV48pf8?= X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 8b68b402-d63a-4872-c5d2-08d93d5740a2 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2021 12:45:20.6623 (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: l/t9QbOm1jmRjpr/SN0TaOagyl8gj2TgxjqnItnyfHYMJKerhAXm10rGaqQsXbse47IKlene3PEl5Byyv7fC6Z/AZaSO3iOdNUTM7NuYQcY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB3990 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 In preparation for handling all DM watchdogs in watchdog_reset(), pull out the code which handles starting (or not) the gd->watchdog_dev device. Include the device name in various printfs. Reviewed-by: Simon Glass Reviewed-by: Stefan Roese Signed-off-by: Rasmus Villemoes --- drivers/watchdog/wdt-uclass.c | 37 ++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index 8ddba9b046..32f5b1d0f2 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -33,11 +33,30 @@ struct wdt_priv { ulong next_reset; }; -int initr_watchdog(void) +static void init_watchdog_dev(struct udevice *dev) { struct wdt_priv *priv; int ret; + priv = dev_get_uclass_priv(dev); + + if (!CONFIG_IS_ENABLED(WATCHDOG_AUTOSTART)) { + printf("WDT: Not starting %s\n", dev->name); + return; + } + + ret = wdt_start(dev, priv->timeout * 1000, 0); + if (ret != 0) { + printf("WDT: Failed to start %s\n", dev->name); + return; + } + + printf("WDT: Started %s with%s servicing (%ds timeout)\n", dev->name, + IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out", priv->timeout); +} + +int initr_watchdog(void) +{ /* * Init watchdog: This will call the probe function of the * watchdog driver, enabling the use of the device @@ -51,21 +70,7 @@ int initr_watchdog(void) return 0; } } - priv = dev_get_uclass_priv(gd->watchdog_dev); - - if (!CONFIG_IS_ENABLED(WATCHDOG_AUTOSTART)) { - printf("WDT: Not starting\n"); - return 0; - } - - ret = wdt_start(gd->watchdog_dev, priv->timeout * 1000, 0); - if (ret != 0) { - printf("WDT: Failed to start\n"); - return 0; - } - - printf("WDT: Started with%s servicing (%ds timeout)\n", - IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out", priv->timeout); + init_watchdog_dev(gd->watchdog_dev); return 0; } -- 2.31.1