From nobody Sat May 4 11:19:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+78661+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+78661+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1628105494; cv=none; d=zohomail.com; s=zohoarc; b=iWlS4zd9kYBQ/xzXetttOqnpMqqMKZdANX4EHAugEY8mYRFNnW7C0kEKZ/JA0DOb9WRoUoPr8wPAtUZHXLmDVfYquu/uYvjdGm24RkocxosO9d7RcieicmMP9Ab1omQsquLisLX9J/mDEUiOsgI93ZIK2AV2SctNA+ohkHK55tk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628105494; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=UGHL1PZku+2phtAw3ut71gtqillj9TlYArQsBeU2y1g=; b=J9m8Qay/RQFrcJJA/sAQYVMuZCCR+QcZ/KELUN5ZpXlCndPBRoen4mkFrr4FLuqw4KnQCDXgc+89qmp3qBN1LD2IlvH3308OlOA+0TxR2n7ZFcbPkqX3wY24eEWqRbj0CKNpATcLzK3AgVTxUM+WaTBw12wIM5uaECVjm5k6HI0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+78661+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1628105494911268.9962065014688; Wed, 4 Aug 2021 12:31:34 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id z3aCYY1788612xNHA6uN4IwM; Wed, 04 Aug 2021 12:31:34 -0700 X-Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by mx.groups.io with SMTP id smtpd.web12.14085.1628105494002511365 for ; Wed, 04 Aug 2021 12:31:34 -0700 X-Received: by mail-qk1-f170.google.com with SMTP id z24so3874539qkz.7 for ; Wed, 04 Aug 2021 12:31:33 -0700 (PDT) X-Gm-Message-State: OvEdbOeU0p4GWGYHcYeSAPffx1787277AA= X-Google-Smtp-Source: ABdhPJykGbq576EKcgssxYDqkYHpsiXKsyytz1+Thi5TFyXLPvP/MMtRo6+VNafwk2Ip1ZYk6wX3Rw== X-Received: by 2002:a37:8044:: with SMTP id b65mr1086076qkd.150.1628105493060; Wed, 04 Aug 2021 12:31:33 -0700 (PDT) X-Received: from benjamind-benjamindomain.. ([2607:f2c0:e98c:24:3070:df1c:bdc9:1783]) by smtp.gmail.com with ESMTPSA id q11sm1738891qkm.56.2021.08.04.12.31.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Aug 2021 12:31:32 -0700 (PDT) From: "Benjamin Doron" To: devel@edk2.groups.io Cc: Jeremy Soller Subject: [edk2-devel] [edk2-platforms][PATCH v1] KabylakeOpenBoardPkg/GalagoPro3: Deduplicate PeiSiliconPolicyNotifyLib Date: Wed, 4 Aug 2021 15:31:22 -0400 Message-Id: <20210804193122.4415-1-benjamin.doron00@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,benjamin.doron00@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1628105494; bh=+Q6ibxgW5wEVH3RxIDuBbImK8yZlksr+L88b/YXW2tY=; h=Cc:Date:From:Reply-To:Subject:To; b=iWdAuNdD1+5+vrl6D+gu6jQWvdmWew4AzVZXvpGlQppImXvWBlgMGcsSOOEtkIwDabL Sw/Az55d4Qpft6sEHK2D0kOw4y21ZPVQvUi+sa+OOheNjLFURUIoONUUK03oCjCGAq+av VOqWEhu2AxMyjzowW86eqnne1KPJKMsnRCU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628105496448100001 Content-Type: text/plain; charset="utf-8" GalagoPro3 board has a duplicate copy of PeiSiliconPolicyNotifyLib. Remove it, and use the copy under KabylakeOpenBoardPkg/FspWrapper/ instead. Cc: Jeremy Soller Signed-off-by: Benjamin Doron Reviewed-by: Nate DeSimone --- Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSilic= onPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c | 104 ---------------= ----- Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSilic= onPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf | 44 --------- Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc = | 2 +- 3 files changed, 1 insertion(+), 149 deletions(-) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Libr= ary/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c b/Platform/= Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNo= tifyLib/PeiPreMemSiliconPolicyNotifyLib.c deleted file mode 100644 index 70a6b7e5d2a7..000000000000 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/Pei= SiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c +++ /dev/null @@ -1,104 +0,0 @@ -/** @file - This library implements constructor function to register notify call back - when policy PPI installed. - -Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ -#include -#include -#include -#include -#include -#include - -/** - Callback function to update policy when policy PPI installed. - - @param[in] PeiServices General purpose services available to ev= ery PEIM. - @param[in] NotifyDescriptor The notification structure this PEIM reg= istered on install. - @param[in] Ppi The memory discovered PPI. Not used. - - @retval EFI_SUCCESS Succeeds. - @retval Others Error code returned by sub-functions. -**/ -EFI_STATUS -EFIAPI -SiPreMemPolicyPpiNotify ( - IN EFI_PEI_SERVICES **PeiServices, - IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, - IN VOID *Ppi - ) -{ - EFI_STATUS Status; - SI_PREMEM_POLICY_PPI *SiPreMemPolicyPpi; - SA_MISC_PEI_PREMEM_CONFIG *MiscPeiPreMemConfig; - - DEBUG ((DEBUG_INFO, "SiPreMemPolicyPpiNotify() Start\n")); - - Status =3D PeiServicesLocatePpi ( - &gSiPreMemPolicyPpiGuid, - 0, - NULL, - (VOID **)&SiPreMemPolicyPpi - ); - ASSERT_EFI_ERROR (Status); - if (SiPreMemPolicyPpi !=3D NULL) { - // - // Get requisite IP Config Blocks which needs to be used here - // - Status =3D GetConfigBlock ((VOID *) SiPreMemPolicyPpi, &gSaMiscPeiPreM= emConfigGuid, (VOID *) &MiscPeiPreMemConfig); - ASSERT_EFI_ERROR (Status); - - // - // Update SpdAddressTable policy when it is installed. - // - if (MiscPeiPreMemConfig !=3D NULL) { - MiscPeiPreMemConfig->SpdAddressTable[0] =3D PcdGet8 (PcdMrcSpdAddres= sTable0); - DEBUG ((DEBUG_INFO, "MiscPeiPreMemConfig->SpdAddressTable[0] 0x%x\n"= , MiscPeiPreMemConfig->SpdAddressTable[0])); - MiscPeiPreMemConfig->SpdAddressTable[1] =3D PcdGet8 (PcdMrcSpdAddres= sTable1); - DEBUG ((DEBUG_INFO, "MiscPeiPreMemConfig->SpdAddressTable[1] 0x%x\n"= , MiscPeiPreMemConfig->SpdAddressTable[1])); - MiscPeiPreMemConfig->SpdAddressTable[2] =3D PcdGet8 (PcdMrcSpdAddres= sTable2); - DEBUG ((DEBUG_INFO, "MiscPeiPreMemConfig->SpdAddressTable[2] 0x%x\n"= , MiscPeiPreMemConfig->SpdAddressTable[2])); - MiscPeiPreMemConfig->SpdAddressTable[3] =3D PcdGet8 (PcdMrcSpdAddres= sTable3); - DEBUG ((DEBUG_INFO, "MiscPeiPreMemConfig->SpdAddressTable[3] 0x%x\n"= , MiscPeiPreMemConfig->SpdAddressTable[3])); - } - } - return Status; -} - -static EFI_PEI_NOTIFY_DESCRIPTOR mSiPreMemPolicyPpiNotifyList[] =3D { - { - EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMIN= ATE_LIST, - &gSiPreMemPolicyPpiGuid, - SiPreMemPolicyPpiNotify - } -}; - -/** - The library constructuor. - The function register a policy install notify callback. - - @param[in] ImageHandle The firmware allocated handle for the UEFI= image. - @param[in] SystemTable A pointer to the EFI system table. - - @retval EFI_SUCCESS The function always return EFI_SUCCESS for= now. - It will ASSERT on error for debug version. -**/ -EFI_STATUS -EFIAPI -PeiPreMemSiliconPolicyNotifyLibConstructor ( - IN EFI_PEI_FILE_HANDLE FileHandle, - IN CONST EFI_PEI_SERVICES **PeiServices - ) -{ - EFI_STATUS Status; - // - // Register call back after PPI produced - // - Status =3D PeiServicesNotifyPpi (mSiPreMemPolicyPpiNotifyList); - ASSERT_EFI_ERROR (Status); - - return EFI_SUCCESS; -} diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Libr= ary/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf b/Platfor= m/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicy= NotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf deleted file mode 100644 index 0fc857c41263..000000000000 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/Pei= SiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf +++ /dev/null @@ -1,44 +0,0 @@ -## @file -# Component information file for Silicon Policy Notify Library. -# This library implements constructor function to register notify call back -# when policy PPI installed. -# -# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.
-# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -## - -[Defines] - INF_VERSION =3D 0x00010005 - BASE_NAME =3D PeiPreMemSiliconPolicyNotifyLib - FILE_GUID =3D 6D231E12-C088-47C8-8B16-61F07293EEF8 - MODULE_TYPE =3D PEIM - VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D NULL - CONSTRUCTOR =3D PeiPreMemSiliconPolicyNotifyLibConstr= uctor - -[LibraryClasses] - BaseLib - -[Packages] - MdePkg/MdePkg.dec - KabylakeOpenBoardPkg/OpenBoardPkg.dec - KabylakeSiliconPkg/SiPkg.dec - IntelSiliconPkg/IntelSiliconPkg.dec - -[Sources] - PeiPreMemSiliconPolicyNotifyLib.c - -[Guids] - gSaMiscPeiPreMemConfigGuid - -[Ppis] - gSiPreMemPolicyPpiGuid - -[Pcd] - # SPD Address Table - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0 - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1 - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2 - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3 diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.ds= c b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc index 302cb679b5eb..7f276d351280 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc @@ -301,7 +301,7 @@ # # Hook a library constructor to update some policy fields when policy = is installed. # - NULL|$(PROJECT)/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMem= SiliconPolicyNotifyLib.inf + NULL|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/PeiSiliconPolicyNoti= fyLib/PeiPreMemSiliconPolicyNotifyLib.inf } $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMe= m.inf =20 --=20 2.31.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 (#78661): https://edk2.groups.io/g/devel/message/78661 Mute This Topic: https://groups.io/mt/84669971/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-