From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 8F124AC026E for ; Fri, 5 Jan 2024 05:14:59 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=TEhd6PxfzSlFOE8TFV5tPESVL9jDh04d6gAeMQIso2w=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1704431698; v=1; b=LJIDqFkXaTZzVyq5vvgn5zwOxlMd+FxOWlkcDqocf74gx6wAL0qN0tOtOeVA2hjem8rtkrA1 G4s7Zg1BMh1sgqJYEChbPwBFPNxw+6DnGHFewTRoLt6jlXvwEvaMRx2ywH9svsD5veHzpxLEKHj fE1si61MZoRzlJsgDFR6hIOU= X-Received: by 127.0.0.2 with SMTP id 0HPeYY7687511xW2vvTZBioR; Thu, 04 Jan 2024 21:14:58 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.119]) by mx.groups.io with SMTP id smtpd.web10.17602.1704431696899496959 for ; Thu, 04 Jan 2024 21:14:57 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dxDPQEvQw0rkJzgLnGTN45JVIsw5Ug103c3TDj7yUP9tDwQ3fLGoX2PZD9XPlGZQxtq/minTgeDtPALioqy2pwA4HRLLfMgK+DOtFPyvycSR1o2TsK5TkJhjGBlvUyi7gZH6NiUrm0Bq+Ev1X7P/+AB77L2dF+YyBSJsxE2deOZ66g1zXuapGnGS+Rj8qsLk/wO6zPRrVxad/3JLHzhAIe9I0JE6Z7KoR+bHfAgnRT46rIxCEbcQBJ2PRYrlUBjXCvjx6ofnCsamkEpL1qZ/XtHYb7wsDhzuyI2cI8o35ufXiq9kHlZ0LG+c/pzYQ+GY9a18QYTNHAT6K6nnluMrWg== 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=xwJ8IipegShrnoAdJdYvU9sKddOn4A+gUtKhprV26LM=; b=HGMbiYlYXnFsPFaMxQXF6puqG7oHqynVi85UMcfSr0RNcLSbQjGaWDwNYXFLjUAJRGMqfgZVwlwI+Gsq4B+lGm9WSgO9old18EX2B7qo8MruLghKITzU3SixaVH/gv3S+sXb86B5qBEfLlobenmFUkYEyCGrCQV3v72o6L96uFkZH4ZGOGjlhgRSQS3ujL1iW0h8DzX4PUjUREkISRqJsSVRDyn0dKdjsCf4+/laxiJKBxt9R8VIDWCFWLViouc+cKVVE2UctNz/scfobPyz92v+yYp1ZiCPn9hoKmpEFVx1cM8ywDjPT4YrNhW82DK4DfG7Erp1jtlCAvYRu6FYyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none X-Received: from LV3PR01MB8464.prod.exchangelabs.com (2603:10b6:408:1a3::7) by SA1PR01MB7294.prod.exchangelabs.com (2603:10b6:806:1f5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.15; Fri, 5 Jan 2024 05:14:54 +0000 X-Received: from LV3PR01MB8464.prod.exchangelabs.com ([fe80::7748:d4a3:bcd9:14c1]) by LV3PR01MB8464.prod.exchangelabs.com ([fe80::7748:d4a3:bcd9:14c1%6]) with mapi id 15.20.7159.013; Fri, 5 Jan 2024 05:14:54 +0000 From: "Rebecca Cran via groups.io" To: Leif Lindholm , Ard Biesheuvel , Sami Mujawar CC: Rebecca Cran , devel@edk2.groups.io Subject: [edk2-devel] [PATCH v3 2/3] ArmPkg: Introduce global mTimerPeriod and remove calculation Date: Thu, 4 Jan 2024 22:14:29 -0700 Message-ID: <20240105051430.465510-3-rebecca@os.amperecomputing.com> In-Reply-To: <20240105051430.465510-1-rebecca@os.amperecomputing.com> References: <20240105051430.465510-1-rebecca@os.amperecomputing.com> X-ClientProxiedBy: CH2PR02CA0027.namprd02.prod.outlook.com (2603:10b6:610:4e::37) To LV3PR01MB8464.prod.exchangelabs.com (2603:10b6:408:1a3::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV3PR01MB8464:EE_|SA1PR01MB7294:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a90ef2b-a3fa-44b5-b19d-08dc0dad40c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: uuqeaTIUP/JuuaNMz9nRisXhQhcn8qpYJ7WoaziXoMlOHsNVIrJNzIKrzfbH/aYpzhpK6L+eB4iXU0zv+k/a2/CP1LoAwPzxTfT424LyTHIsRZ6ZbX5B+LW/V+AMypSZDHG7G+TnUrOX31ArxSvyHfeX6tOtGB0Wd1UxAuvcKxKf8tApQm2UIpOQKgEwn/0yBmIDJthFIi0hAoYYFnZVqtjwC6vJj5N8FGkXacCsuxPB/MJ3PS06mkbgKvMdbqAakGQcSvZ5DaMlHW2ZUdox/+gL6AHudiaLTlS98Zu+J5hIHMuWAAzmLOfogTzXWxGL3mVbghJHsHf2x9fGaL64NGLmoAHzBvppb+vmTG398AKPBL+c8MM7jX3ARn9rweJceH1bboO0C/wWQnP/Q+lfarY31RbZHI3MtHzWceyf1s0dR1scGRtVUdXthhMaKu0SBItW6Kf+39fQAgvp1uUrwN+8kgMOfs1Zv629k6Gg1pdb/raiIVz1zZzSLibqWbq3GUnhFeRBIVgwtzIDO69cjJrEsznJqa5JjX+rOtAIp9yuAxfwO0qrAqT8Hn2IVsYuzfuFW6ph3qoa5fi26kxArUSIUeVkt2xRViMRSvyszkXQZZtEKcKY2e3/LYrA3nco X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2MP1j7t4lH4sJnzJMueCtw2kWrZ1G1VRpwhwdZ/y6YtyLBdZ6tH13otYVJa9?= =?us-ascii?Q?TyYT8GRwdaok4uLl8ZafSVBvTlcnQvDnXmphMyLx285LxLH9xQHyq35pkaY2?= =?us-ascii?Q?6a5VPUOyGupnb8w5dO9G/+YHHXCfwNPR0ij4P+PlLI4uFDMpkNPIki790MtT?= =?us-ascii?Q?xvcpVXjqX4WIidJWEDIPBZ4rpg7I144nIRYKD4pNLlHZynLeYtOmOq34gs1f?= =?us-ascii?Q?gopXWcBqcV3zNYC2dyIaP+lfgaxKgdxVua8wELAewgkKi8oMG+oJevtpQjKg?= =?us-ascii?Q?m+0wRezkuJGcNrjlfBctW45TVH0V2kIjhGFzaODcCtJ+1lwspreFpHAcog8H?= =?us-ascii?Q?bpaPOH+A62Q4Pn9xs8oFOoChAlaX7q7xcYiYmhpfryfQs/Sk4KUmLQU5Hzfq?= =?us-ascii?Q?XDUztX7TGBQiEn3ngiWPZ8EMxE19lsxrNZGu3QqFCTMnS/6meAg1uQ8r8Wld?= =?us-ascii?Q?CESOz2v7UQiBN5/YRw8K93eD5LNhgxyGGZYGE0bIcn1MDQfodoxQb5AGN1tt?= =?us-ascii?Q?PekHq1LvOJjkFXOx6Ban7/9c+VxSnb5lNIMcwcpwOUQM1Et2P2UCoUWVmZdm?= =?us-ascii?Q?oc4mlJfpfY7TCDQyfZgpqrLAlgYJd3+caa+oj7UbDSdPKS2by0JStF3/TnMj?= =?us-ascii?Q?P46bENWqylH2Z0wnelBVtrtpwCiGbENxWqAzxek0jV6CM63VzMYyJBXyWX5t?= =?us-ascii?Q?XB8qHuA/M2HXsnH6fzMDpOqPy4cs0TazZu35A8/LEZO5ZxBZkIowN6sUe98s?= =?us-ascii?Q?x4YJ87+zBms1udHoT5116pq8z9qJLALl238NaZ1aSdRx7o1UYSRsda8HVrKP?= =?us-ascii?Q?qXiayZVYTyGkUHc6dptlILFKBIQfxfYS26t11G2j//BQOBGO+4IPZ+SBDYn7?= =?us-ascii?Q?KTmOtWJMnTjpMf2AwGKDfOSaMfCbMvPu8BJOYAvtYAreCeogsIZkrODl2usy?= =?us-ascii?Q?wFxLDBwtfKRJ4E3mrCHEDhe8G9gu11o7LUkzgGTNWw2XlPTUrLuSf9DTNtLX?= =?us-ascii?Q?IZRn6gDaz39Uuvem3Smor0PirkbhtB9/3YZ9/FQ8XRUCo2ujhxhFu+jIbij4?= =?us-ascii?Q?dCRRdrg6oc1letUOi2dNyCPHy9eApT0QHhq/qnu3fqR0dv15d8P8XC6mfgdt?= =?us-ascii?Q?VyEMHfo3Zo+/LegzI28u35uUYTjE4cQVwJL1wqAXkyNIx4e1LzxTXX3r+xwE?= =?us-ascii?Q?EXizY7tyKaLm1wQsybGNErqjjCi5a7CRVR/I6toMU+WQMeki2HVTWm+hfbHc?= =?us-ascii?Q?sQy2fi+JMK9pR+FlNPnihdSVRh/dXOUtvcnChI9XzJsmlUSha4wTSEICgqsy?= =?us-ascii?Q?q98TGOfrsMe80axvydnqaF9rlx6tSV1cVhOOz1GziEKOUBLhFdy9IUVs4vmy?= =?us-ascii?Q?MNDJbVZtE9HDkI78KQPHt5at1YrjhF4d8VZoX398HSf8QKQ1g97vHeoUGZ+a?= =?us-ascii?Q?HOZuKttgN1gXlaEPHK2SxGsbRP+z2CvibWld0rp3iYD3Vwd7nEWzgt3BgdOM?= =?us-ascii?Q?fVQXlYrIXB2Ylm727WiwuvzIsCWUl/j15RMgZY28gzGqOz4o4rG+dkv0asKk?= =?us-ascii?Q?LbL+R2HhS/g4+84lxv93tWr/p/9nYm/TaO9jAdUBwcOrMT2OU/G8HtodEuRf?= =?us-ascii?Q?5b9jVOaON96yQ+FJtSCTFAk=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a90ef2b-a3fa-44b5-b19d-08dc0dad40c1 X-MS-Exchange-CrossTenant-AuthSource: LV3PR01MB8464.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2024 05:14:54.7679 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zLKDaNSfXbGGpE7XJSkKrSqk/RGizBVvRcQzNZMZx/ejqW2MTUHaCbx/8eegqCubHKOIgbzPHWyNiI0XPFSGIqYghwE6w2sxkNfcEodX8EovIMUdWi+wUP7snEe1rPfo X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR01MB7294 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@os.amperecomputing.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: rZlgKfPOfPjNZ7FVKB9eB6NFx7686176AA= Content-Transfer-Encoding: quoted-printable Content-Type: text/plain X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=LJIDqFkX; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=none; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io The calculation of the timer period was broken. Introduce a global mTimerPeriod so the calculation can be removed. Since mTimerFrequencyHz is only used in one place, remove the global and make it a local variable. Do the same with mNumTimerTicks. Signed-off-by: Rebecca Cran --- ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c | 36 ++++++++++++++= ---------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c b/ArmPk= g/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c index f8c39458a53a..78cee62a19d6 100644 --- a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c +++ b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c @@ -28,13 +28,10 @@ in a second */ #define TIME_UNITS_PER_SECOND 10000000 =20 -// Tick frequency of the generic timer basis of the generic watchdog. -STATIC UINTN mTimerFrequencyHz =3D 0; - /* In cases where the compare register was set manually, information about how long the watchdog was asked to wait cannot be retrieved from hardwa= re. It is therefore stored here. 0 means the timer is not running. */ -STATIC UINT64 mNumTimerTicks =3D 0; +STATIC UINT64 mTimerPeriod =3D 0; =20 #define MAX_UINT48 0xFFFFFFFFFFFFULL =20 @@ -91,7 +88,8 @@ WatchdogExitBootServicesEvent ( ) { WatchdogDisable (); - mNumTimerTicks =3D 0; + mTimerPeriod =3D 0; + mExitedBootServices =3D TRUE; } =20 /* This function is called when the watchdog's first signal (WS0) goes hig= h. @@ -106,7 +104,6 @@ WatchdogInterruptHandler ( ) { STATIC CONST CHAR16 ResetString[] =3D L"The generic watchdog timer ran = out."; - UINT64 TimerPeriod; =20 WatchdogDisable (); =20 @@ -119,8 +116,7 @@ WatchdogInterruptHandler ( // the timer period plus 1. // if (mWatchdogNotify !=3D NULL) { - TimerPeriod =3D ((TIME_UNITS_PER_SECOND / mTimerFrequencyHz) * mNumTim= erTicks); - mWatchdogNotify (TimerPeriod + 1); + mWatchdogNotify (mTimerPeriod + 1); } =20 gRT->ResetSystem ( @@ -200,22 +196,27 @@ WatchdogSetTimerPeriod ( IN UINT64 TimerPeriod // In 100ns un= its ) { - UINTN SystemCount; + UINTN SystemCount; + UINT64 TimerFrequencyHz; + UINT64 NumTimerTicks; =20 // if TimerPeriod is 0, this is a request to stop the watchdog. if (TimerPeriod =3D=3D 0) { - mNumTimerTicks =3D 0; + mTimerPeriod =3D 0; WatchdogDisable (); return EFI_SUCCESS; } =20 // Work out how many timer ticks will equate to TimerPeriod - mNumTimerTicks =3D (mTimerFrequencyHz * TimerPeriod) / TIME_UNITS_PER_SE= COND; + TimerFrequencyHz =3D ArmGenericTimerGetTimerFreq (); + ASSERT (TimerFrequencyHz !=3D 0); + mTimerPeriod =3D TimerPeriod; + NumTimerTicks =3D (TimerFrequencyHz * TimerPeriod) / TIME_UNITS_PER_SECO= ND; =20 /* If the number of required ticks is greater than the max the watchdog'= s offset register (WOR) can hold, we need to manually compute and set the compare register (WCV) */ - if (mNumTimerTicks > MAX_UINT48) { + if (NumTimerTicks > MAX_UINT48) { /* We need to enable the watchdog *before* writing to the compare regi= ster, because enabling the watchdog causes an "explicit refresh", which clobbers the compare register (WCV). In order to make sure this doe= sn't @@ -223,9 +224,9 @@ WatchdogSetTimerPeriod ( WatchdogWriteOffsetRegister (MAX_UINT48); WatchdogEnable (); SystemCount =3D ArmGenericTimerGetSystemCount (); - WatchdogWriteCompareRegister (SystemCount + mNumTimerTicks); + WatchdogWriteCompareRegister (SystemCount + NumTimerTicks); } else { - WatchdogWriteOffsetRegister (mNumTimerTicks); + WatchdogWriteOffsetRegister (NumTimerTicks); WatchdogEnable (); } =20 @@ -260,7 +261,7 @@ WatchdogGetTimerPeriod ( return EFI_INVALID_PARAMETER; } =20 - *TimerPeriod =3D ((TIME_UNITS_PER_SECOND / mTimerFrequencyHz) * mNumTime= rTicks); + *TimerPeriod =3D mTimerPeriod; =20 return EFI_SUCCESS; } @@ -327,9 +328,6 @@ GenericWatchdogEntry ( This will avoid conflicts with the universal watchdog */ ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiWatchdogTimerArchProtocolG= uid); =20 - mTimerFrequencyHz =3D ArmGenericTimerGetTimerFreq (); - ASSERT (mTimerFrequencyHz !=3D 0); - // Install interrupt handler Status =3D mInterruptProtocol->RegisterInterruptSource ( mInterruptProtocol, @@ -371,7 +369,7 @@ GenericWatchdogEntry ( ); ASSERT_EFI_ERROR (Status); =20 - mNumTimerTicks =3D 0; + mTimerPeriod =3D 0; WatchdogDisable (); =20 return EFI_SUCCESS; --=20 2.34.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113216): https://edk2.groups.io/g/devel/message/113216 Mute This Topic: https://groups.io/mt/103538116/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-