From nobody Fri May 17 03:54:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+113106+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+113106+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1704314665054584.9849820444987; Wed, 3 Jan 2024 12:44:25 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=GRbWjn6l6lci0zOmxMTcSLyxWCrLlvivWnMOmcOH3MA=; 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=1704314664; v=1; b=qtaOhjNrmLf6RJ/xkwEiR2qhkZDNxZXcSbVzCG3Lz98PK4TpLRnDF8Ab/n13UhfxNGB8W7E7 elVd8TqG7y7POK1GQi7aASus2kcuSAmis3RjgXWotq0QhPEidgLXBJgQXLXqmHIb6kN1nFmBNZE fmEwfN7nG+YeQF9AxDJUdpl8= X-Received: by 127.0.0.2 with SMTP id zEccYY1788612xNYI0A7Y90A; Wed, 03 Jan 2024 12:44:24 -0800 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.131]) by mx.groups.io with SMTP id smtpd.web10.28992.1704314663228833425 for ; Wed, 03 Jan 2024 12:44:23 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kcQ3blsgBg3QZkJY0/07chHPZ/TX35eUnBwPIvDT0mWXv0ltlfHL+F8R2CWztznRgN2Z5ntXO23/rnCGh1S+hyT7AfOJarTfBLaLxHZG5vz7mFWuQVQpEpC+ePg3s1YNYILoFBfiWHdEJqbOjGwbUKsY2dlW+4w+0T79RR+yT3b2IR2eCeNdRzB7NOka5SEO6dXC3/JJrG7mNlcChVSiSdCz62VBj5Gut7YMdXzpyzA+nGyzninlP7dW8JsuxLTO4rg84r+l7KSDaRWGrZWo6w8jT41qCUEKzjnAhDKZB96zhAd4VWEQcv57cl9+KpDhY3kMuCPzFPwKgqw0XJHB6w== 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=Wd5JkH9YSpIWnkm5yxU9AS8Z3jOXPQqhe82w4++AFYk=; b=DR4o/uKnnftAfrTH+R/fImNVyRYemhvF2H/l/fPzhf+Amc1z+F1Iwo/XVZLDnZQX/JZss9JaB7rEg0XH2XmP5d2onrP2kQfJngWA4TLDzDCtoUerpwHV5x43o/lU/d1EMIVq4nPkH3KxA9o5ByAA/M48GYXbLQNik208RDzq56gvA3ez2BAH+JYmSJuwdTLipbpsWII4SbiWCS+TAsAVZ/B1r9dckK/PujWucGeJs2F3QMxj/X+zSwZfnhd6X+8+zl494l5bEwH856RKlCXouy7iiGLaxEjgQLN9ezbulI+FNln0sUqRreRWpbOrJ71B8wdLWn+1+Rp/8jiYqgeTZw== 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 CH0PR01MB7139.prod.exchangelabs.com (2603:10b6:610:f6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25; Wed, 3 Jan 2024 20:44:17 +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; Wed, 3 Jan 2024 20:44:16 +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 1/3] ArmPkg: Update GenericWatchdogDxe to allow setting full 48-bit offset Date: Wed, 3 Jan 2024 13:43:51 -0700 Message-ID: <20240103204353.361541-2-rebecca@os.amperecomputing.com> In-Reply-To: <20240103204353.361541-1-rebecca@os.amperecomputing.com> References: <20240103204353.361541-1-rebecca@os.amperecomputing.com> X-ClientProxiedBy: CH2PR18CA0049.namprd18.prod.outlook.com (2603:10b6:610:55::29) To LV3PR01MB8464.prod.exchangelabs.com (2603:10b6:408:1a3::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV3PR01MB8464:EE_|CH0PR01MB7139:EE_ X-MS-Office365-Filtering-Correlation-Id: b3d284d5-815e-4246-cbd2-08dc0c9cc0b7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: brqJZKs9obfnrBoKmQSO/XbQfWd7qmRi9H3ax36kupXSHipl5ppTIjPpfjdEp73IfAbI7Hvm1nIMJ3ZzAfnQvL5aPbsZFjTpIAVx+aqtR4q0pfbRHczvQb0oUchJ9esuRcUpfM0BiBesztEyYKMARk8qxHU5gaGQfALvu1glMZzIKf2r8KlnNLEIKI6h7wokbU+GJ4txRgybBDiBDti+uVi60AKfpgYrz30LaxsXoP/pgANVv+y8dQ616PUU1ug6jBFzBoUoxG3vIrxncccDkR0O3GBVqitZVt0DDDf4glmq/QEaOxKK/00FslWS5fppqPGcAaHCp7Un3QNGheTuWxejFhCF7ug7BiiTH1si/aPfwheD2jWcp4J1KjtkIU9uPsRuooLlfKeKMwuZeXO7BomsIupLq2E+ll1ygKQyM1UJKmjq74phYtKAKy3mWlWLp1RCF46Fzk7r24uiTNdeaiwkb3MIAQg6W9KPiumUL+KWQu0CDQ2KOSa+2DrNnrhzW9u0P4+lqIdybSJBhsXdThvkLuRQY1dlxM4cB+tv9yaMdVbnzq9piDJVgzBILlw3GzAuWIsrAe9K3yE78RQbdCgpYfd/hmSbGXPjyukct18kpdVOyifS5KasQdlfRAPe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?W57ZMkFTWHCJfL8O5YPuGGUG5Z5S1STfaQGlkV/DnNh6dMNvm214oWQO8hf7?= =?us-ascii?Q?w4O5qzZ+d2lcFtqKZj+xEhETBIlEfKi0wTXFJC9IuIB6NoIRHi+hhelGjSaT?= =?us-ascii?Q?dBGIeXD6Fku2QQw1JrLapkfq4bkPdlFPhwkTIF0c2+/5PY6K1bmqpyBWZxNA?= =?us-ascii?Q?hSxJlSVefs9yIxSoNdHRtVg3bhMPBRerSIqgNHYyIMshaz7DlGRNXfh5khaB?= =?us-ascii?Q?CyEar8SNU1ElwKEU3TwBMMhuqGKIXdHsA96p1pJa4jyV2ULMevMbtb/phHLk?= =?us-ascii?Q?2/rcQKf9BYaLDT7sPo2NiiYCAotrK+1ole4nr8I0Ni4lzFhhF+C2pQVY/fvy?= =?us-ascii?Q?s/XxcjB+zPZK6+oK8+H+ohyP9FHPEu/0bire40714ez9Mp1AGgv52oJBtQg5?= =?us-ascii?Q?a8HtCxCZH+xWmxriDoO8hJFeQxgeGCvHjlHYA7E80oVMRUaZ/swZqxswe8/i?= =?us-ascii?Q?BfSYab9bCopIaaJ257IXTK+s0ir/N2DUvC3a/7uXM344RHUEV+nPXy4gunf4?= =?us-ascii?Q?qPFTUaShkkHlGvxX8YNAU52Cj8VJPiU/8J1ZLfJSnQVecM14sCWjRhVhhSMT?= =?us-ascii?Q?oteYXP85vnq1cTqOlvDjoNGIfilHdc52PucjJjBhhDE/m2ha8tlfKp0dLjcE?= =?us-ascii?Q?bWBdmmA8WWsZMwZgH+1XSp8tXA0/hFBdnhbfiCfB9T5c/PQou8FJXf/ksCJ7?= =?us-ascii?Q?PXm1Dg/DK2ARkmDKBJIkitUBQD+MVBcy4M8Shwt2qD+Yah4khKBl/1KNuyex?= =?us-ascii?Q?MiFNDtozxMaN7Ztlv/VC6ywGcl9zz2hhXaVblA8e7c9zA1lUgMJwC3BxFUbu?= =?us-ascii?Q?39LEnKqJ6wSw7tMDuiBGpi/VHL1mOyqNqHEKrsHTEkAJJ1o9BtLVKR6keT7Z?= =?us-ascii?Q?s3anXfHp443F06RM/GY2QuyD5wMOqyFKBXhH+deS9PJfh6PwsjPApuyxoZXn?= =?us-ascii?Q?kMU1helZ/XBdM+Kplk7E/3DPVEhiXw0Qdzg2cy6f0voJyOcESSbIb3wzvii+?= =?us-ascii?Q?RV5i15Sy0JuMFJGvoM5idYslA8rCk9ijjp3CVhoxwkXPMZRJg5wckKyJhsJw?= =?us-ascii?Q?Mbtc+L8SwTd2AuDACJU8xrFHXsQ92EFdVy3JnB8oSSV/2dU9njT36w5VY1+c?= =?us-ascii?Q?nPz0pXMFotpxx0G3aklm9S7cXREIN8dl7z5acbXu1UMt1ZL7KSDE+EgHWeOz?= =?us-ascii?Q?2bVUaNE8rnYuvqwSpONELo98m6qxGkqhcy3goarHB7t1kEr7xk63IlgZLVjJ?= =?us-ascii?Q?kvmA5Z1YbiiozQ9DhJRzz6XOwuI7fCDbvX11680QINDdQ0DFXALphgcyM8LX?= =?us-ascii?Q?BgowqCp8FL4HuD3vN2TdwyS56GVfKOhFcWIvIeJoJOGKEdhdAhXVzapJhRrJ?= =?us-ascii?Q?gaRkukKlpaKvnLpb84uSzBr5xdtnQbjBjFJm+auXrKJtS4vQsAujNyCt1p2/?= =?us-ascii?Q?8kYT3IYrS6CXUCZEBvPssVfzuExYbhwi8MP7zeTHgGQLmPzNfXdCZ2VurQf8?= =?us-ascii?Q?Xo3NVm2EU9CAme+3GRKojN05iY6HFKlvQORuLSFR9vXXOA47cLLHA+7Hq0Rd?= =?us-ascii?Q?Fi+/HvEkOHNI5WOdy7RCIrMM7kzH/tWyMDp8ECQ7swwiQQF5A81luT+juvsk?= =?us-ascii?Q?h7GHwS/XEukovw/WkhTCYKQ=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3d284d5-815e-4246-cbd2-08dc0c9cc0b7 X-MS-Exchange-CrossTenant-AuthSource: LV3PR01MB8464.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 20:44:16.8618 (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: S6VrsUa4d4UnB2vVKuIGSO4lCGtgwrXFsEgPvFqveLXD3tCmLe5kRJmcB5J7Q/BNjpvmZwA34GjmdXNzMd1/W/XyvZgVefpDarmeXA6UoC9lkaxAPZcM1Yun6MOLYnrp X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR01MB7139 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: CgTYmQtL7i9tmRmJ1gFiYGeZx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1704314665623100007 Content-Type: text/plain; charset="utf-8" The generic watchdog offset register is 48 bits wide, and can be set by performing two 32-bit writes. Add support for writing the high 16 bits of the offset register and update the signature of the WatchdogWriteOffsetRegister function to take a UINT64 value. Signed-off-by: Rebecca Cran --- ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h | 4 +++- ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c | 14 +++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h b/ArmPkg/D= rivers/GenericWatchdogDxe/GenericWatchdog.h index 9bc3bf47047c..504bc4cacb33 100644 --- a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h +++ b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h @@ -1,5 +1,6 @@ /** @file * +* Copyright (c) 2023, Ampere Computing LLC. All rights reserved.
* Copyright (c) 2013-2017, ARM Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent @@ -14,7 +15,8 @@ =20 // Control Frame: #define GENERIC_WDOG_CONTROL_STATUS_REG ((UINTN)FixedPcdGet64 (PcdGen= ericWatchdogControlBase) + 0x000) -#define GENERIC_WDOG_OFFSET_REG ((UINTN)FixedPcdGet64 (PcdGen= ericWatchdogControlBase) + 0x008) +#define GENERIC_WDOG_OFFSET_REG_LOW ((UINTN)FixedPcdGet64 (PcdGen= ericWatchdogControlBase) + 0x008) +#define GENERIC_WDOG_OFFSET_REG_HIGH ((UINTN)FixedPcdGet64 (PcdGen= ericWatchdogControlBase) + 0x00C) #define GENERIC_WDOG_COMPARE_VALUE_REG_LOW ((UINTN)FixedPcdGet64 (PcdGen= ericWatchdogControlBase) + 0x010) #define GENERIC_WDOG_COMPARE_VALUE_REG_HIGH ((UINTN)FixedPcdGet64 (PcdGen= ericWatchdogControlBase) + 0x014) =20 diff --git a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c b/ArmPk= g/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c index 66c6c37c08b0..05df101d5f4b 100644 --- a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c +++ b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c @@ -1,5 +1,6 @@ /** @file * +* Copyright (c) 2023, Ampere Computing LLC. All rights reserved.
* Copyright (c) 2013-2018, ARM Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent @@ -35,16 +36,19 @@ STATIC UINTN mTimerFrequencyHz =3D 0; It is therefore stored here. 0 means the timer is not running. */ STATIC UINT64 mNumTimerTicks =3D 0; =20 +#define MAX_UINT48 0xFFFFFFFFFFFFULL + STATIC EFI_HARDWARE_INTERRUPT2_PROTOCOL *mInterruptProtocol; STATIC EFI_WATCHDOG_TIMER_NOTIFY mWatchdogNotify; =20 STATIC VOID WatchdogWriteOffsetRegister ( - UINT32 Value + UINT64 Value ) { - MmioWrite32 (GENERIC_WDOG_OFFSET_REG, Value); + MmioWrite32 (GENERIC_WDOG_OFFSET_REG_LOW, Value & MAX_UINT32); + MmioWrite32 (GENERIC_WDOG_OFFSET_REG_HIGH, (Value >> 32) & MAX_UINT32); } =20 STATIC @@ -211,17 +215,17 @@ WatchdogSetTimerPeriod ( /* 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_UINT32) { + if (mNumTimerTicks > 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 trigger an interrupt, set the offset to max. */ - WatchdogWriteOffsetRegister (MAX_UINT32); + WatchdogWriteOffsetRegister (MAX_UINT48); WatchdogEnable (); SystemCount =3D ArmGenericTimerGetSystemCount (); WatchdogWriteCompareRegister (SystemCount + mNumTimerTicks); } else { - WatchdogWriteOffsetRegister ((UINT32)mNumTimerTicks); + WatchdogWriteOffsetRegister (mNumTimerTicks); WatchdogEnable (); } =20 --=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 (#113106): https://edk2.groups.io/g/devel/message/113106 Mute This Topic: https://groups.io/mt/103510103/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 17 03:54:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+113105+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+113105+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1704314664638216.5246533968956; Wed, 3 Jan 2024 12:44:24 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=qp9Qz9Hc/oEVuGl5G7cKMYHiY4Pv+NlPfyc4cmbH1Wo=; 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=1704314664; v=1; b=fAO7ejLvkZKZQ53e3f3JiKnQfdgyToVvISiG8hnm15g5IzgEcilkOOFwTGUncghr6l7zMZDh dQuwpN+ZRMIsa3MXWCyI8Y9ODlYRVjLDZH887RVEXFaADR6MY7mqLmXQKi0bE5rL2Sa7QmEyHrB YElIlQpokOpy3Pd+mABF68+s= X-Received: by 127.0.0.2 with SMTP id ZGFRYY1788612xzb9rgDOf4L; Wed, 03 Jan 2024 12:44:24 -0800 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.131]) by mx.groups.io with SMTP id smtpd.web10.28992.1704314663228833425 for ; Wed, 03 Jan 2024 12:44:23 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lqUImN15M0i6Ofl/uXM08kIELdxWHXsvvfqIPfAUidjcea89l3tCfIL8udWEJIWlZY1euLSuyroTke6DlW0aSu7nUChUMefqIGsQiVSX1R/gZlxFfuEAdw7QWIcW6+dK1k9AU0G7yaAkb/XBtiEbP847GxTjaDZIXtaJWwQH5wEuGVa/G3ONfL38bwWabXyZwYS5D1zghknlBOoLf8LVo6q7NedMCuGwfaiFIeWCk43kzR/yPmW+pGvfLEifANC6rC3TZyqk6Z7CDFiqx1Of0glidh/+q46V7EwIAAJ0cmLlLCMPTza+GW1nf6QhHwh3CjB8j/zQG3LE3XIZjXVb1Q== 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=Ro0qlsPs73pPBMuFIUQBrFwpvOc+BSit078kFtnbZFo=; b=k44R5wVvhsPxc0qsD1ruwP68kxEXJux3CsmtOBHgP245t+wbcfoIWngxQs1XPt4ucuCoBz2i7fcidDgih1PnO4bKhjCfTxITeQwd20FKAcsbtkWstYiVdX3pmz+kbNORdf2Uzucm0YZHnvQsTM4iuJCLnYvYcnOJTTZL2w2DV9/gIi/LaghI3IkaqtWBNpb9KlDXSaCNTDVKR3JqkF2eu5Tk0w4wHGiY8M7kewlYmaC3Vgy1j+rg4tFPKnSFkG1zzGyLovF5bdwI5BNy21/+mrLwh0oIe2u9i1psM6zXb2AZkEUUJkCpAObqwY/g6sDTJzueo5pd/8yhy3OIBX5wpg== 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 CH0PR01MB7139.prod.exchangelabs.com (2603:10b6:610:f6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25; Wed, 3 Jan 2024 20:44:17 +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; Wed, 3 Jan 2024 20:44:17 +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 2/3] ArmPkg: Fix the calculation of the timer period in GenericWatchdogDxe Date: Wed, 3 Jan 2024 13:43:52 -0700 Message-ID: <20240103204353.361541-3-rebecca@os.amperecomputing.com> In-Reply-To: <20240103204353.361541-1-rebecca@os.amperecomputing.com> References: <20240103204353.361541-1-rebecca@os.amperecomputing.com> X-ClientProxiedBy: CH2PR18CA0049.namprd18.prod.outlook.com (2603:10b6:610:55::29) To LV3PR01MB8464.prod.exchangelabs.com (2603:10b6:408:1a3::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV3PR01MB8464:EE_|CH0PR01MB7139:EE_ X-MS-Office365-Filtering-Correlation-Id: ad05560c-ac23-4f13-a1cb-08dc0c9cc10d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: +oT8O4JJKDR3/v85QbeGhohSL/JaePuXGhy8n9OTv9gwUbfqfm/YIsRqyI/iyZt9tFM/B/8j0lX7SL06DmxBZ4melSt5XEl3FogZP96xka+eE33PF0EfjmgF9xkb+Qt0jvftOqrByDxojUOUl5nlONasAh00twjedt2ajlAgAxdgb7OpyyYK/AhoAE2vv5pGhPutjw1IT8BIrScMA7ws44wGFTFjK7rABcq6UTqk/aZ9529XayHcL5RUZi6k55TKo6PS4wm/e61hNBF5v4NjwwiocUtOVulKT3FgKP6UqGr/ab/HGWJaTLGQ26eDuSpG0e/jibZh+agZAzsWM+pBL04Ax1IYetGy89VeBYS8X58cTYnFa55brwZ5W20xApYiYReD1eGUxwK1YjkWs6y5gujZ7FHMgu+2AMrENawEHDt7N/CxYT6tqvpwTSPC0tEc3UZZRx9ZA06r5JUunq2gt/QkGjxk7IGeEM9Ns9TFlcWqHwRpswKAIhIc9KZ/B8WACsxdKQCegOB0t7ZZM3B69Jlm62asJXYyOczApaffYVB6Ef2xrPQ4S2vARQVPjJwX9AEnCcQoH1ALwxB7NUkmeD7SoGbuxelWZ5jfCx3dcM8/POkpsPIIwHDdK7vtLmSf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jogttwMUbxXnI/igr4D6e+8TjSACyAQTEl8X5AvznrVRM+RIcOOYg7ETK4e7?= =?us-ascii?Q?AqGCcgqGuzYQGpxKHIqv8tUrg9znLJrERx17BwMIcicUl1h6l379tuOoKK+/?= =?us-ascii?Q?4qszbFPUK4b5ZBBb51wpr/TfzDfZEtK9MVqko5DZn7N+EQoGszi7hb2IoEPK?= =?us-ascii?Q?N0YULHzNfOAK4ij4gOsv/U+Pa4qVPyIGtUH5eg/JPk8uTr7XQ/QTLk/HzrNt?= =?us-ascii?Q?+cDHv6bvLKJEwcTs8qocBu1PeCj71cE/X99J3xToLmd76hnmk3bhgAy8SxhP?= =?us-ascii?Q?Ze98Voy9rnGbV144p0/f6U+zuVANzkWFqlMO5/H+tWt2mYrR53nyPuAyLAHB?= =?us-ascii?Q?FzXV9MR4Wa77FF7KhlNhgBFnypzY4kWCne+Mh7qJKOpHN7fWGXHM81Hgpl/K?= =?us-ascii?Q?dZn0jKp3ANLERxuYcjG3ynv1VZ7T6X3KK4PLHCc7VtCfJ4Mzw+ImsSe7LR0h?= =?us-ascii?Q?dvgOi8A/Tn7uZJ4R8mIK16kroBomiKJgb7vnVb1jEkWFx6dTdjDTi+nWdd8b?= =?us-ascii?Q?/xmtZaM0Ln2bT/QPAAFMI7GeOGH1uG1XjLuZfPqB4gyVBOMK0Yfmu/GwFHMk?= =?us-ascii?Q?J2K7H96+KdZ9Y+3XMbOLE7UtuQvpPwj3ja9Ph33LgOVrNu6uIKMfItTuha6V?= =?us-ascii?Q?UNw0j2kDt4ZsJd0GsXoITAutDT14BuAMKnUZMK/J1iwvDUylhSNN+Zj3TRkH?= =?us-ascii?Q?fC0fskzwKemq/CJ5cq6GcQnt9oVsRncLoG33VnIz2Zbkz/y/USTdkPd0kaCz?= =?us-ascii?Q?+qw4LUDn4fQJQeiyqLqOpiUeCgbQwjIQ+o7mvA1q2SxYtL+S+vVR3eE+sZj6?= =?us-ascii?Q?aBtVk1XTUA3vZzf7E/XicSlTMhdUVM5qZrWNo2A3juuGFq3N7f72b0Q+4TEa?= =?us-ascii?Q?3yiBPSgakgLarJnl/VAXgbw4wX3yQl0VBExL8OcJK3NO79099uJgk4N1cAvN?= =?us-ascii?Q?Ob+Z5tDQoDPkdKUNs2uQV/kmb2f3u622cGQQ8suT9eAnWmb8uLvXaWU4a7Qh?= =?us-ascii?Q?XFoXJvslH2ETZWlym9wBZVuAtndCcJHRfi+xrW8tm1L5NQn5txJJm2Q6cvTS?= =?us-ascii?Q?MUjVUIOAnTpUt3hEGvhanpVqKKMuR3OvIMRWag4j7dNNA3wPqxskT1qBAyvr?= =?us-ascii?Q?4qb88vNQk5XFwvUlcknZq9Bc6ec6Am16Q2muxtmldC24im9pOCCE2CNy9pzF?= =?us-ascii?Q?MkxqoZcSBF+2nGtSWvhJLDwPoM5AcS3fzK/exKKrw0prJ2mcj4c9gijX0dqh?= =?us-ascii?Q?ehoyWsvz8rwhPK3t/TQf23lUayW/0PTJnTkxqT9RxSM011yCEOcOxG1KLd4O?= =?us-ascii?Q?sQ/4yocJ5rwZ+vTQhIUX2C0XlQU2C7L8/+Leifqkq2SAsQqpWQPU/Ko1nxKo?= =?us-ascii?Q?FqmqEss8eiqQR9lC90r7a67DiOZqCavJoXDOTWV5Z4WbCbsjUDbvj2I07gga?= =?us-ascii?Q?wxZWCSAU49Asw5geYVdsdb/aoxNLYRQlWy5WWCw7f2aeZPaJnu+Xd5br24Zy?= =?us-ascii?Q?ju44uyiltMB2Tash5JesuhKwwpArQs5QRHOpHSyMpQ76+8rKxSwsjcxe/iL/?= =?us-ascii?Q?iNnkASrqwMzeY/DCLdrFljC4o34/2C6vpwkUrdEi5DhbjKjQ9ngJDbdqdGzw?= =?us-ascii?Q?Jk/Dlz4nrTw5OxbM4tMrnv4=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad05560c-ac23-4f13-a1cb-08dc0c9cc10d X-MS-Exchange-CrossTenant-AuthSource: LV3PR01MB8464.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 20:44:17.4644 (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: TMljhhDpsgQA5k2XBo3q/Ip2Vz3NH0SsMcTA4Q7omDXkFLfxG94cHF2dX3uHDQ7pf77LDpD7+Bi3Ft1xSQEt3Zt4l/ZhY2rwQoIGWFmTj4YK4Wf9bpDdWm/GBiX6YZdv X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR01MB7139 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: u1WgIdMvqUEJeunjxNC06tjpx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1704314665608100006 Content-Type: text/plain; charset="utf-8" Fix the calculation of the timer period in GenericWatchdogDxe: we need to multiply before dividing to keep the values as integers. Signed-off-by: Rebecca Cran --- ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c b/ArmPk= g/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c index 05df101d5f4b..8f02f38c64e3 100644 --- a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c +++ b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c @@ -119,7 +119,7 @@ WatchdogInterruptHandler ( // the timer period plus 1. // if (mWatchdogNotify !=3D NULL) { - TimerPeriod =3D ((TIME_UNITS_PER_SECOND / mTimerFrequencyHz) * mNumTim= erTicks); + TimerPeriod =3D ((TIME_UNITS_PER_SECOND * mNumTimerTicks) / mTimerFreq= uencyHz); mWatchdogNotify (TimerPeriod + 1); } =20 @@ -260,7 +260,7 @@ WatchdogGetTimerPeriod ( return EFI_INVALID_PARAMETER; } =20 - *TimerPeriod =3D ((TIME_UNITS_PER_SECOND / mTimerFrequencyHz) * mNumTime= rTicks); + *TimerPeriod =3D ((TIME_UNITS_PER_SECOND * mNumTimerTicks) / mTimerFrequ= encyHz); =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 (#113105): https://edk2.groups.io/g/devel/message/113105 Mute This Topic: https://groups.io/mt/103510102/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 17 03:54:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+113107+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+113107+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1704314665615242.1254499705916; Wed, 3 Jan 2024 12:44:25 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=JdD9BJL9m6FlY2FSr4NIzWK/AaLBRVSeplydsJ5MmrY=; 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=1704314665; v=1; b=f0NBR53jrvijaj7Gme87ArVVIULRqLDNAgQZOAXco0q34sOVhVYXDp8i2IaKX5NLvrN5xUe1 p//PaYNGNnS68tM34LCxfrS6HGngfegtEgX7xxjtvG7QZeItSFW4MgNLzcWjHD6wjIab12X0OEo rXoom2C7EFPPF+jI33/nsF4E= X-Received: by 127.0.0.2 with SMTP id 41N3YY1788612x5bAW7GtHNP; Wed, 03 Jan 2024 12:44:25 -0800 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.131]) by mx.groups.io with SMTP id smtpd.web10.28992.1704314663228833425 for ; Wed, 03 Jan 2024 12:44:23 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gDuv/BgzFi9gqIFVkxJIC0899hijVPKYxmlyrymRNTMsQZnw+cjY03Ju0Ts2Ghi2CEBc3Yp7agf4W9vCXfNZahINX1u/0zFhSO4Cp/gb0l69s002aIEF/PyCNVYuAac821cAYUbqrR+UPYwr+Pk8I/spM6QKsTwqn4n9yY0IxhJshZanJInv5S89QtRSPiEQXnqxLkaP8xLQgOjBUwqXQ6kGZ1ZIThoGt/o7wvA+VUzlg6l31pyQDVRAe4jhoBq1FDOznHL0lL+pH1378seWLBVChgwCyBs27A5glVOMk2PpgjvzSjp7aTJRCWbnHE2c/8fTHkovNJCvLXGUXNyMuQ== 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=htnfs9Y23/ZulbNSacvPrbICvAb50OxPMqdLQYS2eaY=; b=NwxJXo5gYJPoZdiwJxqboXBXImfV++NkOgboJ9FI07JxXYynfUYkFY1sbhvaGReL2FcsxixVSva59DVxBJn8qLiGqnE6wPHlpwvqoGKLq5INyuv3T7NpWXmeH6uM36hQLJIuPSwCqk63c1AEgaHa9BJknua7bL50nP7jr2PHZZ12SHFhcIkOWU26ympwwBl0qVOw0eGJJkBewNjKRtnpskN3IIxOYiFbpVm7gvwO86D+W8waK9JFksRJXiGfIs+ipXWwPN2NgAk0tE6xQg/NbrUodxc2PwIGmZrzD890uXL855HrDNJttIcqkqKZ6jlu5RhfNT5yDmliEadvHulH6Q== 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 CH0PR01MB7139.prod.exchangelabs.com (2603:10b6:610:f6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25; Wed, 3 Jan 2024 20:44:18 +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; Wed, 3 Jan 2024 20:44:18 +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 3/3] ArmPkg: Disable watchdog interaction after exiting boot services Date: Wed, 3 Jan 2024 13:43:53 -0700 Message-ID: <20240103204353.361541-4-rebecca@os.amperecomputing.com> In-Reply-To: <20240103204353.361541-1-rebecca@os.amperecomputing.com> References: <20240103204353.361541-1-rebecca@os.amperecomputing.com> X-ClientProxiedBy: CH2PR18CA0049.namprd18.prod.outlook.com (2603:10b6:610:55::29) To LV3PR01MB8464.prod.exchangelabs.com (2603:10b6:408:1a3::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV3PR01MB8464:EE_|CH0PR01MB7139:EE_ X-MS-Office365-Filtering-Correlation-Id: 39a57ee2-6b74-4455-4e78-08dc0c9cc19a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: Rd3wyLdIemfIVk0LJW2MBSaYOTtNPXooFmlZEw876AyrYX7ETFsgrifW0hwLUq+xKSkwOIbT2KhpUhxbLrQaGeH0rsHx5XAfw+htNbi+2i8/7SSmqs8cjYgMaSzjVFWTRxxCBS0C781tZKpdvsicucghoewN/SG4nT8WKimP9KXKpF9L+IpAVcV5qc6L1AQFG3cnWwK4HWJFVaEjz5zPWguKFVqPrSJ99i/rA2y05oU07zgutzpqqhJ65QrbjullA0et30gp7bSTHFYhjQCyQuiLSZSElJw2KWQyih7AL2IKnE96BZ1qeeN47MBAxnv/UTIZ2bpe/0NEgQNuQq5i+CoztYeipDmK6pCD88PwGf6cATaDt9FMV01KKYrI7c8yyO89KwkuCTikHK4a5PMtZ5Mchj0UdfTe++yZsO59U1iy5la2dCIDnTcI0ihQ6AKLfrXEx52b0iHzUDcO3JqVtaqbQG/pHWjJNfF467/qEAOfRxeEvaBDJLOfmfyr7kr8dy06sWPqNfwZ/mfrlOQEUSiyHS3pflveVFTFKYkuXut50//RbJJ8gqNQc3Gf1pD5l9Qu47FujveTrZ9buUWkwVpFyk+zaN3spvb6oH8S796QsRqXBdMgqVhsBOCmAVl3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hyPrYge9wqvfk9o9UNPlYHQJN/+wfbzP3KmnmudGAzCdZ+NR6pt6vuZp1tlH?= =?us-ascii?Q?+13XZoTy7qEG0KPqIXOBuIRCZ4vd/Z/fxw6/venoKmmsPr0PaTMPSM8RhO86?= =?us-ascii?Q?9sU0y0vFvFKSWBpjB/kxzjkwvsWlxXt2B3CU87bFZKSnTihHZ6SbXrw/Ijka?= =?us-ascii?Q?oErqWPc8s5GtG9HiVYzCUjPZau+rUbcKL+HK0XemzCz/Ap2vEBTOTzwVhQWT?= =?us-ascii?Q?9ODTJvf0qgB5X6smSAE4pqWYnV82Amz1r9k5YE+Q51E2xtyJNUksQ+XWzi0N?= =?us-ascii?Q?iuSdYC9AQWRXyWeXPV6Ui6EteNyCewEUzqxK1F71Qo5Bx462Cj105xS1RrFm?= =?us-ascii?Q?uT7rwswgYHMNO0a+NzTJdT7VHy2GDcy4v0QITZ3wiTM5gEXiuE1cpINpKeBg?= =?us-ascii?Q?MEuLA+FIMMhRP13Yvpg6ogRoQk0wTIeC8ZQfEkgrh2HjhzHDfxMJFLSQlR7P?= =?us-ascii?Q?BpDDgSR6YUspwvyef5KcVOOxXb/zDap6NvL/8q7yIQvGsBekLlW4btHTOafQ?= =?us-ascii?Q?7D4mfES2E31egdqkd8ytzQpmP6KFV0Zq4P0cbsHyyAfna80KKovvikqWEHPR?= =?us-ascii?Q?XyyrTIHdH9yOaWMR6HFux25c3zfWA8B55pIROIYFRlQswgOXqz1r9ICIkbKj?= =?us-ascii?Q?lKEmo2HcS+Z7ZQ7EoBRvIgG2G4Z50mFxNux5+twD7qL+AMfGPbvKvPnbC24j?= =?us-ascii?Q?RHifXICNEZbJEanQws1t6K/QVfvZ2F4n7b8Ebu4NJkBwrmxbUIMudj/qjXAG?= =?us-ascii?Q?c5ms/zLqKV4/qG9t1+LCHRAJBuBvQ5z7DMFLwir9IzN0Yi1x42z0J1teMbAc?= =?us-ascii?Q?8fYxAYf1s2Aigj9TCWbfJMujrCR3Jkt4AR3Z8nI61QwJZVmvYXRzBKp4HzZ3?= =?us-ascii?Q?n8grzKZHRPJLDmw21IFAjdGZ8KfTdcEgzUTZsy104kEAW30T88HeUvB4VguO?= =?us-ascii?Q?F3wWLefQwPmR9eRNUDDCaFhJ9KKlroMk3lOvgOba+aE6yNMeDLUwGxqIvnF5?= =?us-ascii?Q?HJEYxfpC5RqlCwOnqenatN3TAV0wb6NynFzdRU0iOHdyjjbgSDkwtK6yR9kK?= =?us-ascii?Q?B2+n3VVXrjOwaPxxSB4HNnGJYjnvpvGzuKNCnfb2g0AmpYtySVcLrDM78yoF?= =?us-ascii?Q?KdmPUeIRgLOQrZwDpXUJkGTcfB/qfvcBe/G4WS4SZZ+C9wHY1TgArKGhnAM8?= =?us-ascii?Q?1vPJAT8gHH7Xz9ySjpaQRFZTE5UfVlp9gRqjWF6YtKH11yvD2Cthzh7KdZPI?= =?us-ascii?Q?Df682aEUrZP+TJtDBR8wQrJFzJqFsY/WcGYfpB4OvRjXVn5OTHM5d4rEtLhU?= =?us-ascii?Q?UUS/f8mcOQBGdvy39yeS9LJ2u09doYijeGB+WqH9WvQEhN52RADE+2lnf5MR?= =?us-ascii?Q?yb0PmK8YI2Hmq4/yZNBW2Q5bgt0wueCh8lUCTfng0kWcGZuZtFa0bm0sLoq0?= =?us-ascii?Q?LAz6sQbUmgpnxCH9CIXX/fNooVcCQMi0cSkViLA49foAwivdaPSFSt9IEnzH?= =?us-ascii?Q?5RE9UwahmiEkp8BN4tG+34px3in9soAh1SITtNSgVDCb3o3W2wiGMqyKIi8Q?= =?us-ascii?Q?efCaF+I8twcN+98ghIEcc2K+RrYUYlsZ3l5P5I38i18NKhZUdWbmeppuMRgC?= =?us-ascii?Q?qugPJ3uR4CysCYXI60IfSDk=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39a57ee2-6b74-4455-4e78-08dc0c9cc19a X-MS-Exchange-CrossTenant-AuthSource: LV3PR01MB8464.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 20:44:18.3290 (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: i0/+7TduqHKF5d+fgt3Bp+EryJ36vrTf3ozX+VOVN7/NC195HGCF48CpVx6vKa4S34egxg/jf00KXAvLmsDXkG3UTJqkxHIGO0vk3osE/VQaOahOcfY1J38XwzslXOYS X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR01MB7139 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: oDnx65EWdaYdAV6U4QQ2fY1sx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1704314667439100015 Content-Type: text/plain; charset="utf-8" Update GenericWatchdogDxe to disable watchdog interaction after exiting boot services. Also, move the mEfiExitBootServicesEvent event to the top of the file with the other static variables. Signed-off-by: Rebecca Cran --- ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c b/ArmPk= g/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c index 8f02f38c64e3..912106eb6ad2 100644 --- a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c +++ b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c @@ -36,10 +36,14 @@ STATIC UINTN mTimerFrequencyHz =3D 0; It is therefore stored here. 0 means the timer is not running. */ STATIC UINT64 mNumTimerTicks =3D 0; =20 +/* disables watchdog interaction after Exit Boot Services */ +STATIC BOOLEAN mExitedBootServices =3D FALSE; + #define MAX_UINT48 0xFFFFFFFFFFFFULL =20 STATIC EFI_HARDWARE_INTERRUPT2_PROTOCOL *mInterruptProtocol; STATIC EFI_WATCHDOG_TIMER_NOTIFY mWatchdogNotify; +STATIC EFI_EVENT mEfiExitBootServicesEvent; =20 STATIC VOID @@ -91,7 +95,8 @@ WatchdogExitBootServicesEvent ( ) { WatchdogDisable (); - mNumTimerTicks =3D 0; + mNumTimerTicks =3D 0; + mExitedBootServices =3D TRUE; } =20 /* This function is called when the watchdog's first signal (WS0) goes hig= h. @@ -202,8 +207,9 @@ WatchdogSetTimerPeriod ( { UINTN SystemCount; =20 - // if TimerPeriod is 0, this is a request to stop the watchdog. - if (TimerPeriod =3D=3D 0) { + // if TimerPeriod is 0 or we've exited boot services, + // this is a request to stop the watchdog. + if (TimerPeriod =3D=3D 0 || mExitedBootServices) { mNumTimerTicks =3D 0; WatchdogDisable (); return EFI_SUCCESS; @@ -303,8 +309,6 @@ STATIC EFI_WATCHDOG_TIMER_ARCH_PROTOCOL mWatchdogTimer= =3D { WatchdogGetTimerPeriod }; =20 -STATIC EFI_EVENT mEfiExitBootServicesEvent; - EFI_STATUS EFIAPI GenericWatchdogEntry ( --=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 (#113107): https://edk2.groups.io/g/devel/message/113107 Mute This Topic: https://groups.io/mt/103510105/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-