From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 8E4A7740034 for ; Thu, 25 Jul 2024 20:21:29 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=dsOxlDwX+cutToDSwscZin+ItSadof5IMc3UPQ3ZduI=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:User-Agent:Subject:To:Cc:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1721938889; v=1; b=c8BjchEViusufqiKFpGF7/SqLuKxVcVRAEgf+nIc31+at4eJ2YiheFPZvbRoI9Od02KJYwdH F8R08cdHO3P47Y94xVTnb6BFwaa1e5dnvrMmHW/zSMGi5mYpE2YUt338XEYc6iIZDKKUgoTi9qn xyRUMS80iJMgFiLrmY0PbRqEMwEvYGYEFHSBiopyY2coTIGr+usPMiVb/djoBybx0jKvKTPB/5g d4ASYIrfTh1TSP4AN7JZXnjT6fjLdXzWeMdzKsB2VGskzEMBkRj5SqnFLuidagGSR0aHmQmA8Jn 4cISp8zFDjeZm9zejOyfh7lNaFyMo1/TmPRzN1hHJmySw== X-Received: by 127.0.0.2 with SMTP id MvAxYY7687511xRcYv95MMyP; Thu, 25 Jul 2024 13:21:28 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.46315.1721938882078201340 for ; Thu, 25 Jul 2024 13:21:22 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9B3AD1007; Thu, 25 Jul 2024 13:21:46 -0700 (PDT) X-Received: from [172.27.42.201] (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DF60C3F5A1; Thu, 25 Jul 2024 13:21:20 -0700 (PDT) Message-ID: <7d3a04a4-f33a-4095-8390-bc77229caf5e@arm.com> Date: Thu, 25 Jul 2024 15:21:20 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [edk2-devel] [PATCH edk2-platforms 5/5] Platform/RaspberryPi: Drop platform specific EfiResetSystemLib To: Leif Lindholm , Ard Biesheuvel Cc: devel@edk2.groups.io, Ard Biesheuvel References: <20240725104332.1675625-1-ardb+git@google.com> <20240725104332.1675625-6-ardb+git@google.com> From: "Jeremy Linton" In-Reply-To: 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 Resent-Date: Thu, 25 Jul 2024 13:21:22 -0700 Resent-From: jeremy.linton@arm.com Reply-To: devel@edk2.groups.io,jeremy.linton@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: qN2enpVJt0ELb6k9PzfyZGmcx7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=c8BjchEV; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io Hi, On 7/25/24 06:38, Leif Lindholm wrote: > On Thu, Jul 25, 2024 at 12:43:30 +0200, Ard Biesheuvel wrote: >> From: Ard Biesheuvel >> >> Drop the now unused EfiResetSystemLib implementation, which has been >> superseded by the generic one from EDK2. >> >> Signed-off-by: Ard Biesheuvel >> --- >> Platform/RaspberryPi/RaspberryPi.dec = | 1 - >> Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf= | 1 - >> Platform/RaspberryPi/Library/ResetLib/ResetLib.inf = | 45 ------ >> Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c = | 11 -- >> Platform/RaspberryPi/Library/ResetLib/ResetLib.c = | 151 -------------------- >> 5 files changed, 209 deletions(-) >> >> diff --git a/Platform/RaspberryPi/RaspberryPi.dec b/Platform/RaspberryPi= /RaspberryPi.dec >> index 6bd16a5ae9fd..a5fa1fb00c48 100644 >> --- a/Platform/RaspberryPi/RaspberryPi.dec >> +++ b/Platform/RaspberryPi/RaspberryPi.dec >> @@ -24,7 +24,6 @@ [Protocols] >> =20 >> [Guids] >> gRaspberryPiTokenSpaceGuid =3D {0xCD7CC258, 0x31DB, 0x11E6, {0x9F, 0= xD3, 0x63, 0xB0, 0xB8, 0xEE, 0xD6, 0xB5}} >> - gRaspberryPiEventResetGuid =3D {0xCD7CC258, 0x31DB, 0x11E6, {0x9F, 0x= D3, 0x63, 0xB4, 0xB4, 0xE4, 0xD4, 0xB4}} >> gConfigDxeFormSetGuid =3D {0xCD7CC258, 0x31DB, 0x22E6, {0x9F, 0x22, = 0x63, 0xB0, 0xB8, 0xEE, 0xD6, 0xB5}} >=20 > *loud sigh at looking those "GUIDs"* > But that's not this set's fault. The first couple are DCE time/mac UUIDs with the MAC address fuzzed, no?=20 Initially I assumed this coudn't be the case because I would have=20 expected the timestamp (2016-06-13 21:57:59, which looks almost=20 reasonable) to vary, but i'm guessing they were generated, and then=20 someone didn't want their mac in the pubic so they fuzzed it a couple=20 times rather than generating completely new IDs. Some of the others=20 though, maybe a BE/LE UUID/GUID manual conversion (or not) problem... Anyway, I will spin it up in a day or two on real hardware, but right=20 now its all torn down in boxes because i've moved. >=20 > For the series: > Reviewed-by: Leif Lindholm > Thanks! >=20 > / > Leif >=20 >> [PcdsFixedAtBuild.common] >> diff --git a/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockSer= viceDxe.inf b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServi= ceDxe.inf >> index 6456153fd3ab..53391466a77b 100644 >> --- a/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe= .inf >> +++ b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe= .inf >> @@ -52,7 +52,6 @@ [LibraryClasses] >> =20 >> [Guids] >> gEfiEventVirtualAddressChangeGuid >> - gRaspberryPiEventResetGuid >> gEfiEventReadyToBootGuid >> =20 >> [Protocols] >> diff --git a/Platform/RaspberryPi/Library/ResetLib/ResetLib.inf b/Platfo= rm/RaspberryPi/Library/ResetLib/ResetLib.inf >> deleted file mode 100644 >> index 9bdb94a52ebf..000000000000 >> --- a/Platform/RaspberryPi/Library/ResetLib/ResetLib.inf >> +++ /dev/null >> @@ -1,45 +0,0 @@ >> -#/** @file >> -# >> -# Reset System lib using PSCI hypervisor or secure monitor calls. >> -# Signals the gRaspberryPiEventResetGuid event group on reset. >> -# >> -# Copyright (c) 2018, Andrei Warkentin >> -# Copyright (c) 2014, Linaro Ltd. All rights reserved. >> -# Copyright (c) 2014, ARM Ltd. All rights reserved. >> -# Copyright (c) 2008, Apple Inc. All rights reserved. >> -# >> -# SPDX-License-Identifier: BSD-2-Clause-Patent >> -# >> -#**/ >> - >> -[Defines] >> - INF_VERSION =3D 0x0001001A >> - BASE_NAME =3D ResetLib >> - FILE_GUID =3D B9F59B69-A105-41C7-8F5A-2C60DD7FD7= AB >> - MODULE_TYPE =3D BASE >> - VERSION_STRING =3D 1.0 >> - LIBRARY_CLASS =3D EfiResetSystemLib >> - >> -[Sources] >> - ResetLib.c >> - >> -[Packages] >> - ArmPkg/ArmPkg.dec >> - MdePkg/MdePkg.dec >> - EmbeddedPkg/EmbeddedPkg.dec >> - Platform/RaspberryPi/RaspberryPi.dec >> - >> -[LibraryClasses] >> - DebugLib >> - BaseLib >> - ArmSmcLib >> - PcdLib >> - TimerLib >> - UefiLib >> - UefiRuntimeLib >> - >> -[Guids] >> - gRaspberryPiEventResetGuid >> - >> -[Pcd] >> - gRaspberryPiTokenSpaceGuid.PcdPlatformResetDelay ## CONSUMES >> diff --git a/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockSer= viceDxe.c b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockService= Dxe.c >> index 81dfb95e323c..04414b142c7e 100644 >> --- a/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe= .c >> +++ b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe= .c >> @@ -262,20 +262,9 @@ InstallDumpVarEventHandlers ( >> ) >> { >> EFI_STATUS Status; >> - EFI_EVENT ResetEvent; >> EFI_EVENT ReadyToBootEvent; >> EFI_RESET_NOTIFICATION_PROTOCOL *ResetNotify; >> =20 >> - Status =3D gBS->CreateEventEx ( >> - EVT_NOTIFY_SIGNAL, >> - TPL_CALLBACK, >> - DumpVarsOnEvent, >> - NULL, >> - &gRaspberryPiEventResetGuid, >> - &ResetEvent >> - ); >> - ASSERT_EFI_ERROR (Status); >> - >> Status =3D gBS->CreateEventEx ( >> EVT_NOTIFY_SIGNAL, >> TPL_CALLBACK, >> diff --git a/Platform/RaspberryPi/Library/ResetLib/ResetLib.c b/Platform= /RaspberryPi/Library/ResetLib/ResetLib.c >> deleted file mode 100644 >> index 2bcef8d4db2b..000000000000 >> --- a/Platform/RaspberryPi/Library/ResetLib/ResetLib.c >> +++ /dev/null >> @@ -1,151 +0,0 @@ >> -/** @file >> - * >> - * Support ResetSystem Runtime call using PSCI calls. >> - * Signals the gRaspberryPiEventResetGuid event group on reset. >> - * >> - * Copyright (c) 2018, Andrei Warkentin >> - * Copyright (c) 2014, Linaro Ltd. All rights reserved. >> - * Copyright (c) 2013-2015, ARM Ltd. All rights reserved. >> - * Copyright (c) 2008-2009, Apple Inc. All rights reserved. >> - * >> - * SPDX-License-Identifier: BSD-2-Clause-Patent >> - * >> - **/ >> - >> -#include >> - >> -#include >> -#include >> -#include >> -#include >> -#include >> -#include >> -#include >> -#include >> - >> -#include >> - >> - >> -/** >> - Disconnect everything. >> - Modified from the UEFI 2.3 spec (May 2009 version) >> - >> -**/ >> -STATIC >> -VOID >> -DisconnectAll ( >> - VOID >> - ) >> -{ >> - EFI_STATUS Status; >> - UINTN HandleCount; >> - EFI_HANDLE *HandleBuffer; >> - UINTN HandleIndex; >> - >> - /* >> - * Retrieve the list of all handles from the handle database >> - */ >> - Status =3D gBS->LocateHandleBuffer ( >> - AllHandles, >> - NULL, >> - NULL, >> - &HandleCount, >> - &HandleBuffer >> - ); >> - if (EFI_ERROR (Status)) { >> - return; >> - } >> - >> - for (HandleIndex =3D 0; HandleIndex < HandleCount; HandleIndex++) { >> - gBS->DisconnectController (HandleBuffer[HandleIndex], NULL, NULL); >> - } >> - >> - gBS->FreePool(HandleBuffer); >> -} >> - >> - >> -/** >> - Resets the entire platform. >> - >> - @param ResetType The type of reset to perform. >> - @param ResetStatus The status code for the reset. >> - @param DataSize The size, in bytes, of WatchdogData. >> - @param ResetData For a ResetType of EfiResetCold, EfiRes= etWarm, or >> - EfiResetShutdown the data buffer starts= with a Null-terminated >> - Unicode string, optionally followed by = additional binary data. >> - >> -**/ >> -EFI_STATUS >> -EFIAPI >> -LibResetSystem ( >> - IN EFI_RESET_TYPE ResetType, >> - IN EFI_STATUS ResetStatus, >> - IN UINTN DataSize, >> - IN CHAR16 *ResetData OPTIONAL >> - ) >> -{ >> - ARM_SMC_ARGS ArmSmcArgs; >> - UINT32 Delay; >> - >> - if (!EfiAtRuntime ()) { >> - /* >> - * Only if still in UEFI. >> - */ >> - EfiEventGroupSignal (&gRaspberryPiEventResetGuid); >> - >> - DisconnectAll (); >> - >> - Delay =3D PcdGet32 (PcdPlatformResetDelay); >> - if (Delay !=3D 0) { >> - DEBUG ((DEBUG_INFO, "Platform will be reset in %d.%d seconds...\n= ", >> - Delay / 1000000, (Delay % 1000000) / 100000)); >> - MicroSecondDelay (Delay); >> - } >> - } >> - DEBUG ((DEBUG_INFO, "Platform %a.\n", >> - (ResetType =3D=3D EfiResetShutdown) ? "shutdown" : "reset")); >> - >> - switch (ResetType) { >> - case EfiResetPlatformSpecific: >> - // Map the platform specific reset as reboot >> - case EfiResetWarm: >> - // Map a warm reset into a cold reset >> - case EfiResetCold: >> - // Send a PSCI 0.2 SYSTEM_RESET command >> - ArmSmcArgs.Arg0 =3D ARM_SMC_ID_PSCI_SYSTEM_RESET; >> - break; >> - case EfiResetShutdown: >> - // Send a PSCI 0.2 SYSTEM_OFF command >> - ArmSmcArgs.Arg0 =3D ARM_SMC_ID_PSCI_SYSTEM_OFF; >> - break; >> - default: >> - ASSERT (FALSE); >> - return EFI_UNSUPPORTED; >> - } >> - >> - ArmCallSmc (&ArmSmcArgs); >> - >> - // We should never be here >> - DEBUG ((DEBUG_ERROR, "%a: PSCI Reset failed\n", __FUNCTION__)); >> - CpuDeadLoop (); >> - return EFI_UNSUPPORTED; >> -} >> - >> -/** >> - Initialize any infrastructure required for LibResetSystem () to funct= ion. >> - >> - @param ImageHandle The firmware allocated handle for the EFI image= . >> - @param SystemTable A pointer to the EFI System Table. >> - >> - @retval EFI_SUCCESS The constructor always returns EFI_SUCCESS. >> - >> -**/ >> -EFI_STATUS >> -EFIAPI >> -LibInitializeResetSystem ( >> - IN EFI_HANDLE ImageHandle, >> - IN EFI_SYSTEM_TABLE *SystemTable >> - ) >> -{ >> - return EFI_SUCCESS; >> -} >> --=20 >> 2.46.0.rc1.232.g9752f9e123-goog >> -=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 (#120042): https://edk2.groups.io/g/devel/message/120042 Mute This Topic: https://groups.io/mt/107540912/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-