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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B22E0ECAAD4 for ; Mon, 29 Aug 2022 07:50:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7831D84382; Mon, 29 Aug 2022 09:50:42 +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="RsEgguak"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BA0D484609; Mon, 29 Aug 2022 09:50:40 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60110.outbound.protection.outlook.com [40.107.6.110]) (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 2B2DB84382 for ; Mon, 29 Aug 2022 09:50:38 +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=Y6DWSq4xSRVbA0yv1DSMG0ocVpT4pTVms8nygnySWHY7+oIJ0/vA3eHMQEHZN0IGmc1VJ4kHVUP64h06M5jVA4hpiOof4/W/R9L36nvy7OOZ8YKMtJyrkxTWBrEMWmTV3VeU7Bs4ERwavB/e/FA0MN0YMYbS0sznmDyb5vdAW6a2u/ywDUYNKS3rgmkPLmSKBfzcHabTZjhdRuR2RQ1OGoLvg+rki+ldUHjzwpSvA0MwTy64bXcQ/9qOpW2JrqSZ7CoEh3a0fKkV/5G5rI9IO5NiXfDG2O6E+93j/JpW4Fg3KRqjQaDWTd9BtAz/joi87YyH7Ky6DsnWj2TzS8EwbA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=92eoIvvDujT4P/BEwCyaCAqMqh3LsMDQ5fBOXbmblkc=; b=IjV8Mazy0NVLsPKqLqCDUTssR130ZBVSU44dYPUglDaSGAxuwQoBiptnigh2vhNeWcDhP076SRYgKlxzGXKDQvr4u33kITEfQMQTqrQRJPeeb8wCp89S5hiJR37qyugDykm8ZiKUAajX0N2lgseNixcl0HIvxogDxgFwOb9vGVq2+jDOLXuA3uABfUKM++jjmXlGHT0tk5THc+tzFBTkbVsDeNqSh5nAFdyBgOrFzJU6qoi9aPPYoKTcg6nOX0RQAp/FMENU6PtehgE9LDNc9En5+ig3hdyk5j22ArZGpxTFMO5DIubQXl7MyiTdNSznE0IbC1dAHvc0Ey6U6EmeGA== 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=92eoIvvDujT4P/BEwCyaCAqMqh3LsMDQ5fBOXbmblkc=; b=RsEgguakvx7144x9E6CCF/BDjh2vcT0vaORmhJQKVc5b5JnmZePNTJyg2C2R2vMq/2Goztwp9arRYadZbyqwgeIYquh39B6jiWiqPmWbls/fg59Hk3CX4saCCOjlAyFvjNXH5t6sQAB49XPUVhYpqbaPOKoId58eC3wyXD44vSo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DU0PR10MB5266.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34a::22) by AM5PR1001MB1154.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:203:8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Mon, 29 Aug 2022 07:50:33 +0000 Received: from DU0PR10MB5266.EURPRD10.PROD.OUTLOOK.COM ([fe80::84cd:fa2:ffc0:456e]) by DU0PR10MB5266.EURPRD10.PROD.OUTLOOK.COM ([fe80::84cd:fa2:ffc0:456e%8]) with mapi id 15.20.5566.021; Mon, 29 Aug 2022 07:50:33 +0000 Message-ID: <7a12c12a-4003-80f7-c6b5-6c19cf16d943@prevas.dk> Date: Mon, 29 Aug 2022 09:50:31 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [RFC PATCH 5/8] watchdog: Get rid of ASSEMBLY hacks Content-Language: en-US To: Stefan Roese , u-boot@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org References: <20220829062313.32654-1-sr@denx.de> <20220829062313.32654-6-sr@denx.de> From: Rasmus Villemoes In-Reply-To: <20220829062313.32654-6-sr@denx.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: MM0P280CA0068.SWEP280.PROD.OUTLOOK.COM (2603:10a6:190:8::35) To DU0PR10MB5266.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:34a::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc50d42b-af2f-4d39-7896-08da89932725 X-MS-TrafficTypeDiagnostic: AM5PR1001MB1154:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QaHlHChZIQOeo9hM44bUFI7H4Q7m1B1xqcTSJlqzYL0wOrPMuCPTw9ARlmIiyheBw7WfMWKwp6Q7kQL4U9F9Y02KhyWFHu+qqPjpn2ZEsKAWbkZlJVPW5yLmZo+IyRSaHyROR0EZC0nGgoF0kg3Ss+kAELpL5AjOy3+uvGFhkkSZAzGGGwbkzLQYVu32bwULPSvL67uT7l/qwHj3xfueDes+u/xk4PVqrQLgFfJmb/PzsxvOn1r+K5J5ZOwRlU7TjyWfbkPCjmr35OMT86zfmrgAHVWxoiB6JEV9IIY43C9MfqHYlgvY4W0y4NRhncJa52mJLUcx4btAh8BlhSusSsmEyMJPQOGhx6dyShKXAq7TzqcscyXynGvTUyQXRg+ODEyR3Xt3ziRobfSwlmjYuOl19QqX7tXwjE4PTneT+8ymJCn524T5ZfAWpiVSGvIMKYCR7pjSXOERHcl1V4YUKBT7qTVJT8M9YK+ADMjFPBJfjOE1iojEEKUmv0NWIRPBb98DV2dQiFWIAfL5GDc8lrC9WiMTAQkK2YVRO+yktPVosT/9dzvsJ8OiBIGFcvemmB23C2yD+peQQG9EXQkRQPMg7Bee87GxFwcGe/mKBcDMvs91RFKFIHg9X1LpBYbZ5gcTKyynCDo8g7d9uaBRrgk0yXbaeCRAK9IS21qK0IoCfs/IFZQZJ+WkTFEN6z0rUr2edyDm8A0+PQVMxk/ymUdlvzc4zCmsbOxiYMqnNveLWwZuCAJzMT1TJshb0l9p9m2IjDQ+0Qx44j6UI5lyWTYLUgtZFm0YQ5Bg1XAyQZN7ck4/KhMtKA9bwpV5+usz/mSs/qjmiRTmUZy0O20mVE0MxACPcP6/l4femk+X8wB9VWzHLTB1EFiD1L1vHrpO X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR10MB5266.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230016)(39840400004)(376002)(346002)(396003)(136003)(366004)(6506007)(38100700002)(83380400001)(2906002)(44832011)(38350700002)(2616005)(52116002)(6512007)(186003)(26005)(8676002)(6486002)(4326008)(86362001)(31696002)(66476007)(66556008)(66946007)(316002)(31686004)(36756003)(8936002)(41300700001)(8976002)(478600001)(5660300002)(26583001)(21314003)(43740500002)(45980500001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TFNZZ0RCMmJ5WjNUYUxleWlXUUJDZXFPRGdseDdhWHZCQkR3TjJ0aGt2Sll6?= =?utf-8?B?bmNqNTNpL3VHZGtBV0haUjFEOStIRm84UjIzVFlqZmlsdzAydTF1RlBaaldh?= =?utf-8?B?TnMwQ0NSd2Zaa3NlekxQK1EyenFEQWtxcHpmbnVUTVNxdVNqVzRLVUQrLytT?= =?utf-8?B?ai9WMC8rL3JPT1NFN3hwSjZxaThhM2srWHk4dEhwUTBpYmVxWnROTnhXNG93?= =?utf-8?B?UGpjTjZQS2ZicVRSS3BnVTlJUEJ6cEI1MVBiakxiZE5KSHpKTU9ocUw5aklS?= =?utf-8?B?MXFDbGVUK050VzZiY0tPdFRFQlpkWVVMcUFmS0Q0QVBHUzRWbStYY0ppUXMz?= =?utf-8?B?VDNYM2hpMUZtUFUrbW1VU2Y1YitTb1lrWi9LUFFsMVc1ZmYyL3ZsQnkvWk5B?= =?utf-8?B?bHkxcGtLQkVjZ25vMEtySFpSSzJoNDdEa3VTV0VkcUxnMVQvMXphM2V5d2hR?= =?utf-8?B?UjhCMnRmbmUyb0NmcVZTS0o3SXJBc2pJSlVhTVRRc093MVMzVVRzbUVFVFlN?= =?utf-8?B?WTA5M29MR3F1SHdSWDRObDVjdDgxSWlCZUppbTNQVnczaXUzR0xoQzlrSDlB?= =?utf-8?B?Q1diK2RxOXh4QUNOeGRGUUg0dGVvY25nR2V6aHg4SmdRSFhMZWQ5MlhqdldO?= =?utf-8?B?M0kzcTh4MkJVajYvb2xyY0Z3bXU2K2prS0hmUjdEUWx5bHdUTjZQT0E2T2Ir?= =?utf-8?B?MWx4UkdaZmF6eXRPbUcyMTRiaWNQcEFtZmRyV05CSjhXQ1Z3OVlrZkZ5ekNp?= =?utf-8?B?aVZCRVJIL2wyMUJtMk5kZ09hb043OWtabHZrS2JnYVFHMlZCUEJ6Tnp5eUJS?= =?utf-8?B?QzBvN2xQUTdvWmo4emgrM0RCWFVoTTdiajB3UUtlYWxFRjZhOHNQdU5PMFkx?= =?utf-8?B?SDFwc0NMWW5SY3Q0d2dvV1RxZHRTOWZRSnZ2L01nL1VRME1kcXJjRWw1VFNO?= =?utf-8?B?L3grT0lMQVk4Tnd3STR4ZmYxMlY3cm9aaDZUbDl3bGs5am9yamlMV0FmVHFs?= =?utf-8?B?TkkxeG9UREVIOFpuYWRQTytQNVNCc2FvMDM4emQwU21OZzMyRGsyKzBKdUpQ?= =?utf-8?B?VUFRTkRVN1VOeGdRK1NvZ1VJdWR0cVdIK0dyNDdmZEk4cE9lT0FKNy9iSUZF?= =?utf-8?B?aDRmNVFHVlIzSThHUWtINkVseFF0R0ZsQVMvcUpDRlFzdFBkNEJ2QzRGdUVy?= =?utf-8?B?UXR3dGZRS1VXM3gyTUd5MkxaZUpUM0FGNWk1Y3JPODN3WUtEeFlBamMvNFBQ?= =?utf-8?B?SVdiOWdVeWFzSzhZRUVEaG5oVWw4ZGxtQXRaTXJmaXcvSWtkWWVmanJTc1Rh?= =?utf-8?B?aWlLcjduZWN3V1JnRmQ5WW5VZDVIazFEaUUzUXhlNEJ2bjJ0K2lWZVgxSjRC?= =?utf-8?B?N1l6NlhXUGFzbUxNNUhHTDdGUVZZeHBrOXUrL3FkbUY0UlNQTm9obVY0SCt3?= =?utf-8?B?VVF1Y0N2UnJYZ3phRHZEekFxMmwvdnArZWtydUh0SjBmZXhYWWNwb3YzMHlZ?= =?utf-8?B?SEpLYWV1cmp4anQvekd0LzJhd3pQemZ5N2M2MTFJOXF1QXBMVUJ6c0hseXVS?= =?utf-8?B?ZENaQ3gxR2hGWHk2VE4vblFBVGZsMWpKSjFKN3dTU2FLRWpORlNzcVVyMytC?= =?utf-8?B?bUM0QVZiaFJDWkF4OTVkRldaUE9lU0ViczNlWmhLMThwR1U2cmt1cjhZSk43?= =?utf-8?B?aHFrUU9KK1lYUFozTTdXOWo1aXlSYVJweE9PRmQ0Q21IZm1TUTNUZkx0RjNq?= =?utf-8?B?NjQ2WFZuNHQrOGhGazZQamVXam1vd1VxdVRqa0VUb0p5WEhUZXMyTXRtZkdv?= =?utf-8?B?dVNkaWxOaHJ4VHExR2hGSTVNQlBvUFBORDI0YlQyRzlsbWM5MWpuNlo4TFN0?= =?utf-8?B?TU9EU0VQUlhOWWx3c2ErUVZtYlgvczBvVWs3TVd3Nlh0aHEvSHRuWTBBVkg0?= =?utf-8?B?UEhhNWRvZlZhOWRuSmRoZlR4RHVmSVpad245cU0zNlE1WVM4aHIzWTVSVFNH?= =?utf-8?B?a3h3YWxmOXRtUVNZU3RvbW5oMk92cEFIb0VSUWVlekJFQytFUURFOGthRGFV?= =?utf-8?B?QlR2elNVMGdOZk1ETW5UczVwMW42cytob0ZObEo1aGc0SGJ3TVpmTkp2cCtM?= =?utf-8?B?QkF3OU52c0pwdmlEbWlUZ3Y1dmlNc2s3c0FQZnJ3RE93ZEt6YW9Ld2pickc4?= =?utf-8?B?RUE9PQ==?= X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: cc50d42b-af2f-4d39-7896-08da89932725 X-MS-Exchange-CrossTenant-AuthSource: DU0PR10MB5266.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2022 07:50:33.7395 (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: 34Ah7In4TcYC6AGclHUWaPFX5NRhXf7rF/VBXypZE6UmtA2PncgfFw+FlUIBzocgstp5ojnaKEgDqDUYTmzyrAuQjZTY5iEsKY4bfcFv0kw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR1001MB1154 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.6 at phobos.denx.de X-Virus-Status: Clean On 29/08/2022 08.23, Stefan Roese wrote: > Only one occurance of WATCHDOG_RESET is left in one assembler file. > This patch changes this occurance to a direct call to watchdog_reset Well... > and then removes all the ASSEMBLY ifdef'ery in watchdog.h, as it's not > needed any more to clean this mess a bit up. > > Signed-off-by: Stefan Roese > --- > arch/powerpc/lib/ticks.S | 5 ++-- > include/watchdog.h | 50 +++++++++++++--------------------------- > 2 files changed, 19 insertions(+), 36 deletions(-) > > diff --git a/arch/powerpc/lib/ticks.S b/arch/powerpc/lib/ticks.S > index c487f938fa8d..8647d77cc9ad 100644 > --- a/arch/powerpc/lib/ticks.S > +++ b/arch/powerpc/lib/ticks.S > @@ -9,7 +9,6 @@ > #include > #include > #include > -#include > > /* > * unsigned long long get_ticks(void); > @@ -42,7 +41,9 @@ wait_ticks: > addc r14, r4, r14 /* Compute end time lower */ > addze r15, r3 /* and end time upper */ > > - WATCHDOG_RESET /* Trigger watchdog, if needed */ > +#if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG) > + bl schedule /* Trigger watchdog, if needed */ ...you actually change it to a call to schedule(), which AFAICT doesn't always exist (at least as a function with external linkage). Or does it if either one of those conditions are met? Side note: Oh gosh do I hope this can put an end to the CONFIG_WATCHDOG v CONFIG_HW_WATCHDOG silliness; what is a watchdog if not a piece of HW. > #if defined(CONFIG_WATCHDOG) > - #if defined(__ASSEMBLY__) > - /* Don't require the watchdog to be enabled in SPL */ > - #if defined(CONFIG_SPL_BUILD) && \ > - !defined(CONFIG_SPL_WATCHDOG) > - #define WATCHDOG_RESET /*XXX DO_NOT_DEL_THIS_COMMENT*/ Yes please. I strongly suspect that comment is some ancient leftover from some none-complying preprocessor or whatnot. Rasmus