From: Abner Chang <abner.ch...@hpe.com> Use RISC-V FirmwareContext library to set and get the pointer of PeiService.
Cc: Sunil V L <suni...@ventanamicro.com> Cc: Daniel Schaefer <daniel.schae...@hpe.com> Signed-off-by: Abner Chang <abner.ch...@hpe.com> --- Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf | 4 ++-- Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerOpenSbi.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf b/Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf index f23272016b..fa9fe78518 100644 --- a/Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf +++ b/Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf @@ -4,7 +4,7 @@ # PEI Services Table Pointer Library implementation that retrieves a pointer to the # PEI Services Table from a RISC-V OpenSBI sbi_platform firmware context structure. # -# Copyright (c) 2019, Hewlett Packard Enterprise Development LP. All rights reserved.<BR> +# Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All rights reserved.<BR> # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -35,5 +35,5 @@ [LibraryClasses] DebugLib RiscVCpuLib - RiscVEdk2SbiLib + RiscVFirmwareContextLib diff --git a/Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerOpenSbi.c b/Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerOpenSbi.c index 0c1473e932..9aa74b4f9f 100644 --- a/Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerOpenSbi.c +++ b/Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerOpenSbi.c @@ -1,7 +1,7 @@ /** @file PEI Services Table Pointer Library. - Copyright (c) 2019 - 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR> + Copyright (c) 2019 - 2021, Hewlett Packard Enterprise Development LP. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -9,7 +9,7 @@ #include <PiPei.h> #include <Library/DebugLib.h> #include <Library/RiscVCpuLib.h> -#include <Library/RiscVEdk2SbiLib.h> +#include <Library/RiscVFirmwareContextLib.h> #include <Library/PeiServicesTablePointerLib.h> #include <sbi/sbi_scratch.h> #include <sbi/sbi_platform.h> @@ -32,8 +32,8 @@ SetPeiServicesTablePointer ( ) { EFI_RISCV_OPENSBI_FIRMWARE_CONTEXT *FirmwareContext; - SbiGetFirmwareContext (&FirmwareContext); + GetFirmwareContextPointer (&FirmwareContext); FirmwareContext->PeiServiceTable = (VOID *)(UINTN)PeiServicesTablePointer; DEBUG ((DEBUG_INFO, "Set PEI Service 0x%x at OpenSBI Firmware Context at 0x%x\n", @@ -61,8 +61,8 @@ GetPeiServicesTablePointer ( ) { EFI_RISCV_OPENSBI_FIRMWARE_CONTEXT *FirmwareContext; - SbiGetFirmwareContext (&FirmwareContext); + GetFirmwareContextPointer (&FirmwareContext); return (CONST EFI_PEI_SERVICES **)FirmwareContext->PeiServiceTable; } -- 2.33.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81537): https://edk2.groups.io/g/devel/message/81537 Mute This Topic: https://groups.io/mt/86117290/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-