From patchwork Wed Apr 14 07:18:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1466031 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=m+bhMET9; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FKv4N0y0Gz9sVv for ; Wed, 14 Apr 2021 17:19:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B481681D48; Wed, 14 Apr 2021 09:19:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (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=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="m+bhMET9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CB81681D48; Wed, 14 Apr 2021 09:19:26 +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.0 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-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on070d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::70d]) (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 3705F81D3B for ; Wed, 14 Apr 2021 09:19:18 +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=bT+6bg53fvEn5kTqxwUZQc01rfTZ0c2ZUYcRdwxY47cKXByb0WA1Q0fvwk2pSyrTq7kfev2Xk3Vab8u4MqWiuUpWj+yHmyLOWnYvOIWbvkwwaJRmr4zMADKYZ8NR62enn+Ay7y61rRAFp0ShbYXtCZonwMwSGCJBTqkP9yiSwUCj2xVvaaA6DnTj1NauJU7VrGFXto68S0Q3qATKel+KWkB2g2qAS528v3sGoNIDmyDPF/qt4yQCTVMg7hiF0okO1vdjP94eXjc4pACPuYql50XQNbpFE0IrAubqzFHHkwBlgUwXoa35mGp3MhI+RkoHJ4jOiuE76mbbH8YeEPeCjg== 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=O7SPwpEOBMuqkRkqAVlMNq3ZM9bvkypYrDprCgoplB4=; b=JDB6XtCx1sTJqnvoHwtfgKoQigQagKRHtxWP3UYWzAum/VGav7bDtvx+2BIwOjXZ2HwlQMZNn2Rhtc2WW5ZVOePJnsrKnG5j6tO60vpTgSm1gw0dNWVE+gMHDsOvO6OEEZT2kmmWjNThqVNPWRQteQJLli6rq9JV199OUfcTHZ4eJSRcmVTVWyCkWn8lpDWCy6CNuKPGl9r3Qv1CQ79s6QgD5eL/oQSTc4LqydjHEVHHxZnoKO+phLpWT1boOfxRpSCrZrL3THMOCWFl9qpJg4tPM98F6a/vaMG+5mvxhYCMfsjTSfJpEJg2IrueYmFFwKJL0C8wnXnnUogkFciWuw== 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=O7SPwpEOBMuqkRkqAVlMNq3ZM9bvkypYrDprCgoplB4=; b=m+bhMET9PT92y+p7zfSHVZ4cHgppBCBpsFqd5PsnC8wfdSVIEIpc3fEqso0JYtOmDpC0jhfdwLMAhYm4i6u7sTI+DrWfeXAJ2AOXaJADeJ5/S8/7mMyvVZctHzwMN7ju4KZSC0Wu5/Edff3pduzjTEYVMC5/8OZqicsj19rSbsA= 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 AM0PR10MB3521.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:159::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Wed, 14 Apr 2021 07:19:17 +0000 Received: from AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM ([fe80::edba:45:89f8:b31f]) by AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM ([fe80::edba:45:89f8:b31f%7]) with mapi id 15.20.4020.023; Wed, 14 Apr 2021 07:19:17 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Wolfgang Denk , Huan Wang , Tom Rini , Christophe Leroy , Mario Six , Rasmus Villemoes Subject: [PATCH v4 1/2] timer: mpc83xx_timer: fix build with CONFIG_{HW_, }WATCHDOG Date: Wed, 14 Apr 2021 09:18:21 +0200 Message-Id: <20210414071822.2707440-2-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210414071822.2707440-1-rasmus.villemoes@prevas.dk> References: <20210414071822.2707440-1-rasmus.villemoes@prevas.dk> X-Originating-IP: [81.216.59.226] X-ClientProxiedBy: HE1PR07CA0019.eurprd07.prod.outlook.com (2603:10a6:7:67::29) 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 HE1PR07CA0019.eurprd07.prod.outlook.com (2603:10a6:7:67::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.6 via Frontend Transport; Wed, 14 Apr 2021 07:19:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff8dee1c-e7e2-45fb-ad50-08d8ff159d4a X-MS-TrafficTypeDiagnostic: AM0PR10MB3521: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vaREk7BHV9nfwaPcH34cZygTNMCAtnafKW4FAuvXXeLChCvgKHDIMf2QeNXnlwMMtQm3Fh+RGpskD37pXsgx5MHgg8BWHQmZNoBCHfiiW06IhHf82HmyeTycLMuUK8mJu7VUa3/B6Aghfqy7/dGhFDKc8/UuvyoqEUo/slysaKNQ86zXpo3AxiFRqZaQ0IrXaH8xC7MXM7/GnqUsWEHobLSRc6wDnTH2ROS+P6cyqis7gnJp+mNz2eq8Zl6QOnJGyXooKNM5zFMUMhAVPJBOvtQ5oNtNFyQJfknYhyf7LZ0iNyHL3c0xDjznyl5bz6c3lw8fuyVsGt+/PWyylENxCNsuup650W8Yz7PH/3zYc3Pu1akXkIykoTZVdkPAdNDnSeC37Bk92akMOOnWrhkxOKOTX1E9yv4+B7II3Z3PVziLkfz7pCwifnjv/t+gRq5QKES+GK7u01n9oW0XS7B+LLZq8C6K04e8N6iDnAyDlA2G86ZIXJ6UvNW/bjyWAwnCc6XRop52fogH5Fdjoeps2EkmIn3sVj7T+hPW59Nur0clHaNW1bPiGKbLz4mz2fgN7W11A5W98AwuM8A9iiP6JhR4HclA9gFUYeZe9vVmwBWA93AsPyrTZizMi+LlIhr2CGgY7E6M8+59+2xTvVlfPbR7DV6NDdkDcSulrrEiytQ= 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:(396003)(136003)(366004)(39840400004)(376002)(346002)(4326008)(1076003)(6916009)(83380400001)(186003)(6486002)(52116002)(86362001)(54906003)(66556008)(66946007)(66476007)(6512007)(6666004)(6506007)(38350700002)(316002)(107886003)(44832011)(36756003)(38100700002)(2616005)(5660300002)(956004)(8676002)(8976002)(8936002)(478600001)(16526019)(2906002)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Ag9YaTh5cNn82NF4VItchER2WWqZnhEpR3mq2I6QdXsgHFCN4O3kcKvyipXrYDpYvFaGS/h8dOwfhDx6vqya2PH0yRMGuQp7yN+qlXvGiglUoQYhr03ig90jG2unONBfXZxeqCu84O1YxYHGgpKD7rwiXeefKZMFNSByoq/YXQ44e70kTv14Uug6EFdPgok63EPzIUaGPUVh2N8iNcLgITiGg9nJ2XJoQGJAa4V83zIRGfSxTjC9AP7xKuc31GGhtoz5/bb/WmP+PgUODEkbh5eSrtatn0JLk+NvCIYAFDbcYf35zBsWQNJniOw67TEycj+cxpiAU18tJnyBI2gFbEf9mS0MCJZMfNijpBu7dufcKeCSjQrOsKN+wqD0cJ4JpzNTBd7uyOT+Y8PDPlslldU1wij/YSyBakC3psTV+qdHab6n/h97Q7EulBWXtmnGUAxVMfXy3LjPDSjEJwzLfRu0rkLizenT7ZI5KEx/DH5Bt/aEgz6fVr5+nxAX2EtPt3lFCdOK54Q0/yMdVK1PPLIov6jIArhxP8K2v+/nvgqFmeCxjI5Bg92XMLErhfyc/vMk7DMcVYuJqiarK/cnSh+WPi4uZti63DxwCq54MEPfGPzDWyNKkvIsgTkD8P+iBATbPI47d3goJKn3UFuOHp6kZCJSsIS/kT5HiaLDhWBF309Nf96Vq7GqcMF3teqgzRiGO+9cQAapBcDVgiCku8gX+A2S8emoPfmEmgK+JH3JV78pqCbLsWGmiLdlzfUFbjR3cFa3KoWv45oXWVQKP7wFkVsjBoqFaON4owdjeqKZ/bYuaHY6m/i3otwcNrQR9rHwcxYLdI8whzdpEAzca//yems1mP3SOkZipAjTuGniFMhjxwSQM5WZSgU0pJLGo2QHuNnv3j9l1itoIbFRsOWywY0nVQLX+XWlVSCaK/PnIAMXBKrVtRVdS3YnlKb8/b8chjRmbAubtch2KuU5eaUyPdPJO9QcGHh+HI9g/bS/R7lC/MWMt3y132YEE+ykQ24ATAy/nRCyb/z/aNbEjykRdleoccrY5BgAS2nzKRUm8UHNNSf/GnUYu5PYwUCp1lsev/H2GMTUZ7eBX5hvD8o7U3cXfxf1Sp5KIdBmfY6IFH97dIGJJQXKyWx+EIOgITTyWbhwcjxs/FW058P087RirjFuYxrueAowDvOw+q+YWgigqxkurkAjPT0sVBQyxivWW9LrQBDU6mfcrKerS7UygkUL07rYpli46eA7iN8tDiPITOsc7iQLpvD3PRD2pDUgt/gdl1OYomLROinuE6cCF69paTxRYs2I3PAGk+9O8zRrovQ7utFKkU1/UB8Z X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: ff8dee1c-e7e2-45fb-ad50-08d8ff159d4a X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2021 07:19:17.4666 (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: ZK4C0oLR765VV2BSK+UlCL3EdDyHjq8gGtO/Tj0ljdAaUfgMLEchc881z8Fy4rbDcxIvqASCDX/dUbZLV1iLqAYjUjIP6KFQztWDFfwFFBo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3521 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.102.4 at phobos.denx.de X-Virus-Status: Clean The code, which is likely copied from arch/powerpc/lib/interrupts.c, lacks a fallback definition of CONFIG_SYS_WATCHDOG_FREQ and refers to a non-existing timestamp variable - obviously priv->timestamp is meant. Signed-off-by: Rasmus Villemoes --- drivers/timer/mpc83xx_timer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c index f4f6e90387..9adb4b4cab 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -20,6 +20,10 @@ DECLARE_GLOBAL_DATA_PTR; +#ifndef CONFIG_SYS_WATCHDOG_FREQ +#define CONFIG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2) +#endif + /** * struct mpc83xx_timer_priv - Private data structure for MPC83xx timer driver * @decrementer_count: Value to which the decrementer register should be re-set @@ -171,7 +175,7 @@ void timer_interrupt(struct pt_regs *regs) priv->timestamp++; #if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG) - if ((timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0) + if ((priv->timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0) WATCHDOG_RESET(); #endif /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */