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 A0F2B94116C for ; Fri, 5 Jan 2024 05:15:01 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=D9e0Gy69UPJduR/w3+cU75iZ2/qRE7pkcYcGfcAoANs=; 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=1704431700; v=1; b=v7rJcQFmamDxzPcKXD9pVkF+k9UpvL0Cl3h2jjRBPLS7BbpzGFWf8cjYsaS9MKEoBE92GpsL fi19ojFFM+yleJU/kWYK5SBbQt19WS+Hvze6UiUvQy1ZnxV7IotAmOxoBWsIB5v1YHIhlI1hcCi 3DFym9SiIA4jGOjXdh/9Jy0I= X-Received: by 127.0.0.2 with SMTP id MDk0YY7687511xwyOKPYJkeo; Thu, 04 Jan 2024 21:15:00 -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:58 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hqCKqqpjHVVd2Y1ef50P8IfQMsP2RdJEH6RvZfUn1zWqDrkEdf9FZa1sRKwFjCRMUFfrbXrvVmWY84eRIl13AaKag7TJxpzXyhEeKIlNHDHGU0NZQmbWSHcbCWGaeoFdwbl+5GY1RaaRDyI/flZR3S9CygQZy66FFyEibrB1KwL+RJbQo3i6yzmv4Gsf+fOnm0htDILAOmUBaV79QYvE8yWwY2uP6FIU4MnIqQJDhVOVthAaNeYsVVvq2UOAUPj40haDqtAkwIJ7+yu0CbH0rOMvSWlQc3OaUvHYBGKBW0/nbv2qiBsrbf0aOqNfUihAsQ9y2RJ/ARNYozk0aI0ziw== 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=NCQ2xLtwaKaVKiDURV98sV3nPPTVujU1McqJ/o49M5A=; b=hKpqRF4Ix8fjg4S8MbZVRBzk9680PKOf5bDCb1F5DeFwo625UX18zV1gKx62H1jxMwDpp7dZ2HP9kFx6MtcUgAHDmeN7B7Ahzs30xs40O+BP+cbSC26d+ZYj/2QP2xlr+D0XH7j9PMvDa/Xbxb0Q7VjMSWWnm2VImku0DHwI0jBgNEqUj2UtMs8zfJS+fYx+I1w3AaMt8NkLmPtrmw9UcjPVD2j5qyq9v84FY2y6byYC2AOd7eaLJh2K4ORsPTLUq5+ipKcn5VBM1u1dqpO9zcM824rbVeJxtwnwb7YVUltsfDabjSyNamriizSG5lE2nd5N5IgYgZOvyWHLNcvV0A== 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:55 +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:55 +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 3/3] ArmPkg: Disable watchdog interaction after exiting boot services Date: Thu, 4 Jan 2024 22:14:30 -0700 Message-ID: <20240105051430.465510-4-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: a93ca050-08d3-4fa5-fe20-08dc0dad410d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: ebC9TvHEWBv/8OQnhGVzyQbgAI+/CkGBXx3hejlr4GWuW0c9KaF/ESsYK9ovpRQ9dTTGc4iVRK9rntQ577nZDk3nKxuE2onOuNKiPENQo5N3FkAhIlLEUGkHIpmK829gQylBC7S4TMTGJ1pSNJ+f7Hqn+nQYLugcY4XvaThn6cAA96zuYDHngJMBb88+kEQQKfdw7qg+6VaC3Kd2rcjTvDtRPd5Gs1SR34bEdeVkY0OmlovmSYywa8yWZnuKy2SrjX66d8bSJ2OUnisvvGAPTyxvGcdM1PQV2LzsmugMfi1nChAMUXLCchFp5yb7ZPeJkwcA+iU7px5RiuLEMzomh2tr8P2EzR0GyrNuDma09ovLShczIorgRtglm70n/Q/61jrYKaSV2hya1xcPvuiNpzTeJb1HEBEXb3DwD5QyNlE8gGjIBSaWuSRzswcjnYAwjdqqvCH9hCXVici9FGe+w1fsXLdbG/bRpxyjWmusmpHFksVO0iSBrrfMNh1gcthAvsLLqHE/wgcGrBYo/v639VWjfrBNjycz4Blev2q4GNEWSLZnswZo31k0mUcixVcdSDpspnZaqbcACCmbXrntJhygeK9YE+kcK339dHIlnymfgDQJmfURlkYjWTrAu7dB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EOB6/cQeSSyHYTgEadm4EU6y8VKKhLftprev02xVLLn/zgpKOE3CmjufCzN8?= =?us-ascii?Q?t0FnSeXlXA1WbDu4SSXwNKTenNzeR+SizK/Cbl/LPtTzi4M109u97zU1I4xT?= =?us-ascii?Q?Zd2LQMLl1BwGytmhMn947IoW8Roz5LhHyKgzLtc2bC1v8CNZeL0CWSlEzzly?= =?us-ascii?Q?Dv6PO3ABkqXfXBThAWR9putS8nGTxosDcfWE+JHPGQLQW4NETAOewXkLP80g?= =?us-ascii?Q?u2hmqZs9HYNIyFsi29om+2LwovwORItH0MbwXJ6Qj30QBRBgRvQLHlHmppzs?= =?us-ascii?Q?jXtK6VA9Ww4t3sDOON3WbqxvZfGxTsMRNBW9Zhk8fJYZnN6d+b6CExji0NEd?= =?us-ascii?Q?ACJLw+tok1ZJjFRavlsMhtYccuOHkYFvxcvr6b0n++qdL7fQp6KbLXqpc4S3?= =?us-ascii?Q?UqkbU3SpFkEk2H4//autrFqMadGh6ylcZMtzNeB+UVBddZq0BoQPbAaI526B?= =?us-ascii?Q?2l/dJ8ZWL9jS8HXGHhmoP1AaZNlpxzDkeBK9vF1udQX/q+fEbxu96TvG6kWA?= =?us-ascii?Q?AUU79lofUUSJ7pLEPeV/DISP3n5/Wj+rD9UNy5cnQeBWxgADh9q3k0/HSuH2?= =?us-ascii?Q?vvtDqgBTKnMmzOmLZ/1vfdeIZPjP5nr88o1AUVN9b7u1ngxFSUzjn39T3kuL?= =?us-ascii?Q?Zb9UUhTT71M68TLvI4NhVt8tDVWG4eXm/qiCULQ0SlyhI+HLSZt00+v8B0Rx?= =?us-ascii?Q?aSyWEOD9vLmgpUHKh+ryol2BJzegkfaGOEI+b20xttd8RFt86g1D+go+KRbB?= =?us-ascii?Q?Rafqnit8/tCsT6RUw0b2aDqPsjbrHDvNb+XmaQ4gxvNmDcxirqlx/MPnvBZ2?= =?us-ascii?Q?3SgBMjRi5nmcPyXJrMOSWUH/P9ieKY+Vaoe9n+KBkXOxQgsxE1xFna5e7NId?= =?us-ascii?Q?OkBcHFj9K7c6UGe4R493W8d56VOv5Kzwx6kb9REsjpYotoT54dW5hvpWXdDg?= =?us-ascii?Q?BIOyTSIJTqLkX+uBCP+Xs6HhB+yqyJhV8fjdeyH+y2RDnUDsX6ZBeE7ck2hj?= =?us-ascii?Q?0EaKmyN9USX1QJgq/snOyFdd/Vka1Mj37+FIe95Igv5TixMF1FajrG2ZDQYs?= =?us-ascii?Q?lnuDjJ0UwB479e9g7pRy4fxwnbXyM8f4Y3spe7kbzGdyxNzfEvxmEpR1DLS3?= =?us-ascii?Q?/f9eUgNp3WoCe0Xcohw/h+PhiNdgegCgtmRP1vgFbC3uGSlub53vUjr/rxx9?= =?us-ascii?Q?sBUeVNPC/WfaN8xKvNxTxUm2ftRfRffGAZ8TvYm0x9gHMansXyXh44dMheR+?= =?us-ascii?Q?l4yVx8BUr/wdZkp/3cKaAy/Ziss3sPJ62D7LaR6Jj1mGVOH0Ni1OWbLYxAR7?= =?us-ascii?Q?O9JwrQkwg5CyuezryKNf2R0BHcHkOT5OGtwlBh5sVCw/7KNPyL6VuAAtlPgr?= =?us-ascii?Q?q4/X6V919SP9rBUBei6uBw/CEfU42nYiyJ42szWAeDNBNCTIzOAt/k1ORhQs?= =?us-ascii?Q?8hzMYokxRIfwu1mHqzfadQ9LuIP273mpMtn+Yp3CzYE9yMkqLkxTZ3YeNTOk?= =?us-ascii?Q?1xchD9v1K5f2782rA3u6E7E9fHyNdraVCHeR7FqwLeqiyn7/QSK6n+X6TkYD?= =?us-ascii?Q?C18Dkx1pYtkmiMkrPVS60aULIKSv1WNgkb6w1Tp43H+nr6n1qzXKo4Xw03d6?= =?us-ascii?Q?ij2R0aj6sPUAySaFj4sxSk4=3D?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: a93ca050-08d3-4fa5-fe20-08dc0dad410d 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:55.2652 (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: 7M5rWR5UdO8Zt62ARY6NxbaYu57EfdEO6YRsmjCMTrmMJ+xvZho3dIYi84lkqHx6BowBCCB0dmt78ij9CUfEza28IpNYZrAHmCZXVdO4STQvfAExxlczemEnSZY/8QUz 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: ek5Tkw4VXHNoCkqt7zm4dTgKx7686176AA= 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=v7rJcQFm; 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 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, 11 insertions(+), 3 deletions(-) diff --git a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c b/ArmPk= g/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c index 78cee62a19d6..ddf131660f9d 100644 --- a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c +++ b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c @@ -33,10 +33,14 @@ It is therefore stored here. 0 means the timer is not running. */ STATIC UINT64 mTimerPeriod =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 @@ -200,7 +204,13 @@ WatchdogSetTimerPeriod ( UINT64 TimerFrequencyHz; UINT64 NumTimerTicks; =20 - // if TimerPeriod is 0, this is a request to stop the watchdog. + // If we've exited Boot Services but TimerPeriod isn't zero, this + // indicates that the caller is doing something wrong. + if (mExitedBootServices && (TimerPeriod !=3D 0)) { + return EFI_DEVICE_ERROR; + } + + // If TimerPeriod is 0 this is a request to stop the watchdog. if (TimerPeriod =3D=3D 0) { mTimerPeriod =3D 0; WatchdogDisable (); @@ -304,8 +314,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 (#113218): https://edk2.groups.io/g/devel/message/113218 Mute This Topic: https://groups.io/mt/103538118/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-