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 EB52E740040 for ; Tue, 30 Jul 2024 15:08:26 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=aPl6UH9mpLJxn0cu3xnGhtMyaytuG03j+078TaA3QC0=; c=relaxed/simple; d=groups.io; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From:To:Cc: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; s=20240206; t=1722352106; v=1; b=mwUdMg9G/KQ+ZPcnKt+KoDDj6Kn/OSS0cvRESEAjaTLy/twnpymocCaTMrGVerAb6Kej3bay PwQR15s9ayVKy0z7JXGr9J8BkeuA4UqHp4yTvo33gee2J/VOGoERNZC+YfdXCOL3H/In8BUSTor V8W/V1e8yOH4R5bJ27+LHBn2DwyOe7EwFWII+SuAP8o2ccYdL3nXGvZ8ZgMyocwlJv/1I+a36OH EZZ1HPN9YKcYrJLW8kgKIxmwjZN9vmuyQwZhQJeU5KySdn/Zkp/iNaEgFQO2IS+x9Q41QNUMHh6 1maovIkr0YKK1D/8TrVmHexBUYYLOK/xD8pXP13gXoaiQ== X-Received: by 127.0.0.2 with SMTP id tKIzYY7687511xb7DbbAgvgf; Tue, 30 Jul 2024 08:08:25 -0700 X-Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by mx.groups.io with SMTP id smtpd.web10.42105.1722199501086790661 for ; Sun, 28 Jul 2024 13:45:01 -0700 X-Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4280b4a34c8so12649775e9.1 for ; Sun, 28 Jul 2024 13:45:00 -0700 (PDT) X-Gm-Message-State: 2tPYO1wAxH37uXkLeRrofa43x7686176AA= X-Google-Smtp-Source: AGHT+IFkdkRXj6YPgKPIjXW2b3ykt1hhPeNlX81njxXI1AsapPkmpQz2B8NV8feaRaLvEbylsBmb2fvP X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:600c:1da5:b0:428:f22:b780 with SMTP id 5b1f17b1804b1-42811d85601mr122785e9.1.1722199498904; Sun, 28 Jul 2024 13:44:58 -0700 (PDT) Date: Sun, 28 Jul 2024 22:44:35 +0200 In-Reply-To: <20240728204437.4064847-1-ardb+git@google.com> Mime-Version: 1.0 References: <20240728204437.4064847-1-ardb+git@google.com> Message-ID: <20240728204437.4064847-9-ardb+git@google.com> Subject: [edk2-devel] [PATCH edk2-platforms v2 8/8] Platform/RaspberryPi: Drop platform specific EfiResetSystemLib From: "Ard Biesheuvel via groups.io" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Jeremy Linton 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: Tue, 30 Jul 2024 08:08:18 -0700 Resent-From: ardb+git@google.com Reply-To: devel@edk2.groups.io,ardb+git@google.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Type: text/plain; charset="UTF-8" X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=mwUdMg9G; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io From: Ard Biesheuvel Drop the now unused EfiResetSystemLib implementation, which has been superseded by the generic one from EDK2. Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Platform/RaspberryPi/RaspberryPi.dec | 1 - Platform/RaspberryPi/RPi3/RPi3.dsc | 1 - Platform/RaspberryPi/RPi4/RPi4.dsc | 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 -------------------- 7 files changed, 211 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}} [PcdsFixedAtBuild.common] diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc index 5b6b2782f297..f8cb82f9e2e6 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dsc +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc @@ -125,7 +125,6 @@ [LibraryClasses.common] TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf - ArmHvcLib|ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf # Dual serial port library diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc index 58b3d6643382..113d08bc8448 100644 --- a/Platform/RaspberryPi/RPi4/RPi4.dsc +++ b/Platform/RaspberryPi/RPi4/RPi4.dsc @@ -125,7 +125,6 @@ [LibraryClasses.common] TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf - ArmHvcLib|ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf # Dual serial port library diff --git a/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf index 665cd7dd062d..d15671af7260 100644 --- a/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf +++ b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf @@ -54,7 +54,6 @@ [LibraryClasses] [Guids] gEdkiiNvVarStoreFormattedGuid ## PRODUCES ## PROTOCOL 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 26d4b41f94b0..bc8ab2270423 100644 --- a/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c +++ b/Platform/RaspberryPi/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c @@ -264,20 +264,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 (#120108): https://edk2.groups.io/g/devel/message/120108 Mute This Topic: https://groups.io/mt/107628982/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-