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 EB74C7803CE for ; Thu, 25 Jul 2024 11:38:53 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=nrGlTOX817yIAXQ6Yho9pHEgvL80QEyuIzsm9MlrIVE=; c=relaxed/simple; d=groups.io; h=Date:From:To:CC:Subject:Message-ID:References:MIME-Version: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-Type:Content-Disposition; s=20240206; t=1721907533; v=1; b=eva0cxvWlLfkUJ3Am9ihPt+SKbQK3AgJc2mGVoMLMIlDZrbNOLBdYXxiFCjoSEK4Bh7LCxjh YdUqyCaekop3CPf/AI3VFy4It5u1nTXMVmeVv1yF39DjgnDiuWP1M0zqVQe/ZQBa61K7D6dhcAJ 086g7Mt8k6MNFGZIcR0f1I5y7jm0+aA+JHfaQO1qhX7Z7KlEoQJn9F8rbY1Ev5WiG7KSj5smPmd GNxafdV6UZ9m991CeaKGdwbLBpoGV5gGmPkspI68zpvy8PFHEtXH+LFKrX+s2kO/M0By8y6SLU1 bWFQTmkEton6tDjqi6bbwTqckAFiuHRLxkWUyRp67Acwg== X-Received: by 127.0.0.2 with SMTP id fG85YY7687511xmoryaYPr5B; Thu, 25 Jul 2024 04:38:52 -0700 X-Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web10.34191.1721907531260377224 for ; Thu, 25 Jul 2024 04:38:51 -0700 X-Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46P9EtmD007911; Thu, 25 Jul 2024 11:38:48 GMT X-Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 40g4jh511e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 Jul 2024 11:38:48 +0000 (GMT) X-Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA03.qualcomm.com (8.17.1.19/8.17.1.19) with ESMTPS id 46PBclcQ018449 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 Jul 2024 11:38:47 GMT X-Received: from qc-i7.hemma.eciton.net (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Thu, 25 Jul 2024 04:38:45 -0700 Date: Thu, 25 Jul 2024 12:38:42 +0100 From: "Leif Lindholm" To: Ard Biesheuvel CC: , Ard Biesheuvel , Jeremy Linton Subject: Re: [edk2-devel] [PATCH edk2-platforms 5/5] Platform/RaspberryPi: Drop platform specific EfiResetSystemLib Message-ID: References: <20240725104332.1675625-1-ardb+git@google.com> <20240725104332.1675625-6-ardb+git@google.com> MIME-Version: 1.0 In-Reply-To: <20240725104332.1675625-6-ardb+git@google.com> X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-ORIG-GUID: -olMGr52c09_w1QiZxbjV444_PUiPLF1 X-Proofpoint-GUID: -olMGr52c09_w1QiZxbjV444_PUiPLF1 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 04:38:51 -0700 Resent-From: quic_llindhol@quicinc.com Reply-To: devel@edk2.groups.io,quic_llindhol@quicinc.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: nQXdu0fe5dUvCnHIzR3Gj4ffx7686176AA= Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=eva0cxvW; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=quicinc.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 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] > > [Guids] > gRaspberryPiTokenSpaceGuid = {0xCD7CC258, 0x31DB, 0x11E6, {0x9F, 0xD3, 0x63, 0xB0, 0xB8, 0xEE, 0xD6, 0xB5}} > - gRaspberryPiEventResetGuid = {0xCD7CC258, 0x31DB, 0x11E6, {0x9F, 0xD3, 0x63, 0xB4, 0xB4, 0xE4, 0xD4, 0xB4}} > gConfigDxeFormSetGuid = {0xCD7CC258, 0x31DB, 0x22E6, {0x9F, 0x22, 0x63, 0xB0, 0xB8, 0xEE, 0xD6, 0xB5}} *loud sigh at looking those "GUIDs"* But that's not this set's fault. For the series: Reviewed-by: Leif Lindholm Thanks! / Leif > [PcdsFixedAtBuild.common] > diff --git a/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf > index 6456153fd3ab..53391466a77b 100644 > --- a/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf > +++ b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf > @@ -52,7 +52,6 @@ [LibraryClasses] > > [Guids] > gEfiEventVirtualAddressChangeGuid > - gRaspberryPiEventResetGuid > gEfiEventReadyToBootGuid > > [Protocols] > diff --git a/Platform/RaspberryPi/Library/ResetLib/ResetLib.inf b/Platform/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 = 0x0001001A > - BASE_NAME = ResetLib > - FILE_GUID = B9F59B69-A105-41C7-8F5A-2C60DD7FD7AB > - MODULE_TYPE = BASE > - VERSION_STRING = 1.0 > - LIBRARY_CLASS = 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/VarBlockServiceDxe.c b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.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; > > - Status = gBS->CreateEventEx ( > - EVT_NOTIFY_SIGNAL, > - TPL_CALLBACK, > - DumpVarsOnEvent, > - NULL, > - &gRaspberryPiEventResetGuid, > - &ResetEvent > - ); > - ASSERT_EFI_ERROR (Status); > - > Status = 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 = gBS->LocateHandleBuffer ( > - AllHandles, > - NULL, > - NULL, > - &HandleCount, > - &HandleBuffer > - ); > - if (EFI_ERROR (Status)) { > - return; > - } > - > - for (HandleIndex = 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, EfiResetWarm, 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 = PcdGet32 (PcdPlatformResetDelay); > - if (Delay != 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 == 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 = ARM_SMC_ID_PSCI_SYSTEM_RESET; > - break; > - case EfiResetShutdown: > - // Send a PSCI 0.2 SYSTEM_OFF command > - ArmSmcArgs.Arg0 = 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 function. > - > - @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; > -} > -- > 2.46.0.rc1.232.g9752f9e123-goog > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#120037): https://edk2.groups.io/g/devel/message/120037 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] -=-=-=-=-=-=-=-=-=-=-=-