From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web11.5626.1573524588820263477 for ; Mon, 11 Nov 2019 18:09:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=aTbqn7PA; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: michael.a.kubacki@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Nov 2019 18:09:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,294,1569308400"; d="scan'208";a="252374695" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by FMSMGA003.fm.intel.com with ESMTP; 11 Nov 2019 18:09:48 -0800 Received: from fmsmsx153.amr.corp.intel.com (10.18.125.6) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 11 Nov 2019 18:09:47 -0800 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by FMSMSX153.amr.corp.intel.com (10.18.125.6) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 11 Nov 2019 18:09:47 -0800 Received: from NAM01-BN3-obe.outbound.protection.outlook.com (104.47.33.50) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 11 Nov 2019 18:09:47 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XQpB4BV5aBDDqvQmWF4TuFRzUeHGG5s69ia9oeimMHiktb7W4dnNapgANCBIELDXshaQtOOO1d4y6eLbudcBI+NcPySsCE/Cqgyi7G8pfH4DITLZZu7nhr5+Ro62zyKx68fn8BJ742F4NZ8qU3N3JQFYOTijOhcqd0N5bD3mujRy9K2EExKyUe5ix26iMoDbd8Mu8xY0AquAC/HoFzNWJOYrwPsaKw2cepgMH+l5QwKrWBgUY1NuVvozYzC87jnMD8926qwWOSRmVpyRgtg46wB7mGPKVIMSbn195tgSuJ747CwsYPQFCw6eKxNr3dfLlwUZUXc8sttGnNM6SwV1tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QogGAmz1/+9WMcWuxgXAVCBTfjyx8X9vZEsSzP/Ccmg=; b=N5jTMKlpp1aQTlu2V1oKkeZOs1V4Im/H+4JwPOkuvBFAV4QRJpU7TzZtO0tJwNy1D2VneOhrMhd/f7GMkZ0OQIqoefCt09Sa9Lprs+RPNeAcelgNhLwpc/ide0k/YcnWmdFFGJvaSzzDxc+YuHOePP3rVDSnWaNPYomwTSlqn3YAVwb+CjBe+fqcf6j4q/KFVYEjdsHiMtp/WkuMKXp4snun/b8vE9Nv3D+sKtGhdu+7RgrcAaaH+d3gXSz95B8zy+4BKcQ5eMYVty19xwpzC6eWGgPhekcnSS3sI8jMkOzMd2pFoKHJJBEM0vwMUqlJpierR9BqxwdnKI1HghOXcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QogGAmz1/+9WMcWuxgXAVCBTfjyx8X9vZEsSzP/Ccmg=; b=aTbqn7PA78sOP0YMj68lyD6uBik5YMeHbAXEOnPlVikEc+Qxiowgd69DrKGrsRmHkNmK2nvZ5Cw7CXq6EOE4PO19oz4TfAp/uTdooq0ftLQ7AmVq1Bq/HhyOOm7e3kNltPkz8Ssmqns0AgI9oGjzjSC5XM2vUzVIcByyOQxQnN0= Received: from BY5PR11MB4484.namprd11.prod.outlook.com (52.132.254.155) by BY5PR11MB4321.namprd11.prod.outlook.com (52.132.253.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2430.23; Tue, 12 Nov 2019 02:09:44 +0000 Received: from BY5PR11MB4484.namprd11.prod.outlook.com ([fe80::c1ef:6e0b:90c8:55e2]) by BY5PR11MB4484.namprd11.prod.outlook.com ([fe80::c1ef:6e0b:90c8:55e2%7]) with mapi id 15.20.2430.027; Tue, 12 Nov 2019 02:09:44 +0000 From: "Kubacki, Michael A" To: "devel@edk2.groups.io" , "Ni, Ray" , "Tsao, Ethan" CC: "Chaganty, Rangasai V" Subject: Re: [edk2-devel] [Patch V3] IntelSiliconPkg/Library:Add BaseConfigBlockLib Library Thread-Topic: [edk2-devel] [Patch V3] IntelSiliconPkg/Library:Add BaseConfigBlockLib Library Thread-Index: AQHVmFYzMGZX8cY/ZkGMErKCqKHD0aeFm3mAgAEuTaA= Date: Tue, 12 Nov 2019 02:09:44 +0000 Message-ID: References: <20191111060527.2536-1-ethan.tsao@intel.com> <734D49CCEBEEF84792F5B80ED585239D5C357AE4@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5C357AE4@SHSMSX104.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMDFhMGExY2ItNTFlNy00NjU4LWIwN2YtYTJkYTkyMTgyMDhiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiM1ZkbG9XQmExY0NLaWVlQlNiV2xnQTYzM1l0TXZkazViYW1CRFJXXC8xM1RUd1dSUDFPOHV0Q2d6RjE1KzdnQVEifQ== dlp-reaction: no-action dlp-version: 11.2.0.6 authentication-results: spf=none (sender IP is ) smtp.mailfrom=michael.a.kubacki@intel.com; x-originating-ip: [134.134.136.217] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 16c570a4-9392-4c98-a8b4-08d7671562d3 x-ms-traffictypediagnostic: BY5PR11MB4321: x-ms-exchange-purlcount: 3 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-forefront-prvs: 021975AE46 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(136003)(366004)(396003)(346002)(39860400002)(376002)(189003)(199004)(13464003)(19627235002)(30864003)(71190400001)(5660300002)(71200400001)(2501003)(478600001)(6246003)(11346002)(446003)(76176011)(6306002)(486006)(966005)(476003)(9686003)(81156014)(81166006)(4326008)(8936002)(305945005)(7736002)(229853002)(6636002)(107886003)(14454004)(8676002)(74316002)(52536014)(256004)(6116002)(66556008)(316002)(3846002)(66446008)(66476007)(64756008)(110136005)(76116006)(6436002)(33656002)(2906002)(7696005)(86362001)(99286004)(66066001)(53546011)(186003)(66946007)(6506007)(55016002)(26005)(102836004)(25786009);DIR:OUT;SFP:1102;SCL:1;SRVR:BY5PR11MB4321;H:BY5PR11MB4484.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: rUNMeZIpNv4nNYyMmRDLSG/wgNospTS2WGcvZ/oVClIzq13zgumq2YriSh9wSvj5YvaqRql/IDyH6wkARqfgN18eRoIteQ+A760lhkzxHQHk22qQ5IAey0UFc408IA6jPUKFjIc4iemmgD8ClObbbkc8Q9MSad/z3f0z+BzCOgx6zjsIPn6CmRqod/l1psjQGiGVBdbbANqoIlP4EWGoBd0gaBAqCbnXViwMYVXnA2Bimc54P1aqQ3GVyr65kJ601tCazEBnG8O6YPBEEubVHGUjA1+jWfyYls0gpLVAmN7sC/dLXk2vwumyhMCxUZTTatZ5dQcdYMbZA9xgMlewSHfuRHP0rNqCF4WqLLQPwDpVFdZ1lpImz/u6tE+6mw8yLt0GBHhtvAaAqYIV19iUUoxBX0QguOcJkI1rJn1ju7JQDr6QVxZJJY3Ikz/tSWKwe+pBrQdo2Wmo+QSyaUBqqG3CQEUNG+7Dyjnsh0jiZig= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 16c570a4-9392-4c98-a8b4-08d7671562d3 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Nov 2019 02:09:44.4308 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: LedMKqabj4AVvHNNxi1YaMPeWxU61hnrNqwCanuWujzXkP0sm9CeLwVKtS65+HFRi0lDm0sMuGaTziEHPxhgmZM6D40bCUldoDjocmtzVKM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4321 Return-Path: michael.a.kubacki@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This was committed and broke the build for almost all board packages that c= onsume this library: * KabylakeOpenBoardPkg/GalagoPro3 * KabylakeOpenBoardPkg/KabylakeRvp3 * WhiskeylakeOpenBoardPkg/WhiskeylakeURvp I am surprised that this patch series was approved with no thought to pack= age DSC file changes Needed for library consumers. I will submit a patch in the affected board = packages in edk2-platforms but please check impact more carefully in the future. Thanks, Michael > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Ni, Ray > Sent: Monday, November 11, 2019 12:00 AM > To: Tsao, Ethan ; devel@edk2.groups.io > Cc: Chaganty, Rangasai V > Subject: Re: [edk2-devel] [Patch V3] IntelSiliconPkg/Library:Add > BaseConfigBlockLib Library >=20 > Reviewed-by: Ray Ni >=20 > > -----Original Message----- > > From: Tsao, Ethan > > Sent: Monday, November 11, 2019 2:05 PM > > To: devel@edk2.groups.io > > Cc: Chaganty, Rangasai V ; Ni, Ray > > > > Subject: [Patch V3] IntelSiliconPkg/Library:Add BaseConfigBlockLib > > Library > > > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2318 > > > > Establish one copy of Config blocks library class and instance in > > IntelSiliconPkg and remove copies from other silicon packages , like > > KabyLakeSiliconPkg, CoffelakeSiliconPkg. > > > > Signed-off-by: Ethan Tsao > > Cc: Sai Chaganty > > Cc: Ray Ni > > --- > > > > > Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfig= Blo > > ckLib.c | 146 -----------------------------------= ---------------------------- > --- > > ---------------------------------------------------------------------- > > ---------- > > > > > Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfig= Blo > > ckLib.inf | 29 ----------------------------- > > Silicon/Intel/{KabylakeSiliconPkg =3D> > > IntelSiliconPkg}/Library/BaseConfigBlockLib/BaseConfigBlockLib.c | = 10 ++- > -- > > ----- > > Silicon/Intel/{KabylakeSiliconPkg =3D> > > IntelSiliconPkg}/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf | = 0 > > 4 files changed, 2 insertions(+), 183 deletions(-) > > > > diff --git > > a/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseConfigBlockLib/BaseCo > > nfigB > > lockLib.c > > b/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseConfigBlockLib/BaseCo > > nfig > > BlockLib.c > > deleted file mode 100644 > > index 369dab97ee..0000000000 > > --- > > a/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseConfigBlockLib/BaseCo > > nfigB > > lockLib.c > > +++ /dev/null > > @@ -1,146 +0,0 @@ > > -/** @file > > - Library functions for Config Block management. > > - > > - Copyright (c) 2019 Intel Corporation. All rights reserved.
> > - > > - SPDX-License-Identifier: BSD-2-Clause-Patent -**/ > > - > > -#include > > -#include > > -#include > > -#include -#include > > > > - > > -/** > > - Create config block table > > - > > - @param[in] TotalSize - Max size to be alloca= ted for the Config > > Block Table > > - @param[out] ConfigBlockTableAddress - On return, points to = a > pointer > > to the beginning of Config Block Table Address > > - > > - @retval EFI_INVALID_PARAMETER - Invalid Parameter > > - @retval EFI_OUT_OF_RESOURCES - Out of resources > > - @retval EFI_SUCCESS - Successfully created Config Block T= able at > > ConfigBlockTableAddress > > -**/ > > -EFI_STATUS > > -EFIAPI > > -CreateConfigBlockTable ( > > - IN UINT16 TotalSize, > > - OUT VOID **ConfigBlockTableAddress > > - ) > > -{ > > - CONFIG_BLOCK_TABLE_HEADER *ConfigBlkTblAddrPtr; > > - UINT32 ConfigBlkTblHdrSize; > > - > > - ConfigBlkTblHdrSize =3D (UINT32)(sizeof > (CONFIG_BLOCK_TABLE_HEADER)); > > - > > - if (TotalSize <=3D (ConfigBlkTblHdrSize + sizeof (CONFIG_BLOCK_HEAD= ER))) > { > > - DEBUG ((DEBUG_ERROR, "Invalid Parameter\n")); > > - return EFI_INVALID_PARAMETER; > > - } > > - > > - ConfigBlkTblAddrPtr =3D (CONFIG_BLOCK_TABLE_HEADER > *)AllocateZeroPool > > (TotalSize); > > - if (ConfigBlkTblAddrPtr =3D=3D NULL) { > > - DEBUG ((DEBUG_ERROR, "Could not allocate memory.\n")); > > - return EFI_OUT_OF_RESOURCES; > > - } > > - ConfigBlkTblAddrPtr->NumberOfBlocks =3D 0; > > - ConfigBlkTblAddrPtr->Header.GuidHob.Header.HobLength =3D TotalSize; > > - ConfigBlkTblAddrPtr->AvailableSize =3D TotalSize - > > ConfigBlkTblHdrSize; > > - > > - *ConfigBlockTableAddress =3D (VOID *)ConfigBlkTblAddrPtr; > > - > > - return EFI_SUCCESS; > > -} > > - > > -/** > > - Add config block into config block table structure > > - > > - @param[in] ConfigBlockTableAddress - A pointer to the begi= nning of > > Config Block Table Address > > - @param[out] ConfigBlockAddress - On return, points to = a pointer > to > > the beginning of Config Block Address > > - > > - @retval EFI_OUT_OF_RESOURCES - Config Block Table is full and > > cannot add new Config Block or > > - Config Block Offset Table is full an= d cannot add new Config > > Block. > > - @retval EFI_SUCCESS - Successfully added Config Block > > -**/ > > -EFI_STATUS > > -EFIAPI > > -AddConfigBlock ( > > - IN VOID *ConfigBlockTableAddress, > > - OUT VOID **ConfigBlockAddress > > - ) > > -{ > > - CONFIG_BLOCK *TempConfigBlk; > > - CONFIG_BLOCK_TABLE_HEADER *ConfigBlkTblAddrPtr; > > - CONFIG_BLOCK *ConfigBlkAddrPtr; > > - UINT16 ConfigBlkSize; > > - > > - ConfigBlkTblAddrPtr =3D (CONFIG_BLOCK_TABLE_HEADER > > *)ConfigBlockTableAddress; > > - ConfigBlkAddrPtr =3D (CONFIG_BLOCK *)(*ConfigBlockAddress); > > - ConfigBlkSize =3D ConfigBlkAddrPtr->Header.GuidHob.Header.HobLength= ; > > - DEBUG ((DEBUG_INFO, "Config Block GUID: %g / Config Block Size: > > 0x%x bytes\n", &(ConfigBlkAddrPtr->Header.GuidHob.Name), > > ConfigBlkSize)); > > - if ((ConfigBlkSize % 4) !=3D 0) { > > - DEBUG ((DEBUG_ERROR, "Config Block must be multiples of 4 > bytes\n")); > > - return EFI_INVALID_PARAMETER; > > - } > > - if (ConfigBlkTblAddrPtr->AvailableSize < ConfigBlkSize) { > > - DEBUG ((DEBUG_ERROR, "Config Block Table is full and cannot add n= ew > > Config Block.\n")); > > - DEBUG ((DEBUG_ERROR, "Available Config Block Size: 0x%x bytes / > > Requested Config Block Size: 0x%x bytes\n", ConfigBlkTblAddrPtr- > > >AvailableSize, ConfigBlkSize)); > > - return EFI_OUT_OF_RESOURCES; > > - } > > - > > - TempConfigBlk =3D (CONFIG_BLOCK *)((UINTN)ConfigBlkTblAddrPtr + > > (UINTN)(ConfigBlkTblAddrPtr->Header.GuidHob.Header.HobLength - > > ConfigBlkTblAddrPtr->AvailableSize)); > > - CopyMem (&TempConfigBlk->Header, &ConfigBlkAddrPtr->Header, > > sizeof(CONFIG_BLOCK_HEADER)); > > - > > - ConfigBlkTblAddrPtr->NumberOfBlocks++; > > - ConfigBlkTblAddrPtr->AvailableSize =3D > > ConfigBlkTblAddrPtr->AvailableSize - ConfigBlkSize; > > - > > - *ConfigBlockAddress =3D (VOID *) TempConfigBlk; > > - DEBUG ((DEBUG_INFO, "Config Block Address: 0x%x / Available Config > > Block Size: 0x%x bytes\n", (UINT32)(UINTN)*ConfigBlockAddress, > > ConfigBlkTblAddrPtr->AvailableSize)); > > - return EFI_SUCCESS; > > -} > > - > > -/** > > - Retrieve a specific Config Block data by GUID > > - > > - @param[in] ConfigBlockTableAddress - A pointer to the beg= inning of > > Config Block Table Address > > - @param[in] ConfigBlockGuid - A pointer to the GUI= D uses to > > search specific Config Block > > - @param[out] ConfigBlockAddress - On return, points to= a pointer > to > > the beginning of Config Block Address > > - > > - @retval EFI_NOT_FOUND - Could not find the Config Block > > - @retval EFI_SUCCESS - Config Block found and return > > -**/ > > -EFI_STATUS > > -EFIAPI > > -GetConfigBlock ( > > - IN VOID *ConfigBlockTableAddress, > > - IN EFI_GUID *ConfigBlockGuid, > > - OUT VOID **ConfigBlockAddress > > - ) > > -{ > > - UINT16 OffsetIndex; > > - CONFIG_BLOCK *TempConfigBlk; > > - CONFIG_BLOCK_TABLE_HEADER *ConfigBlkTblAddrPtr; > > - UINT32 ConfigBlkTblHdrSize; > > - UINT32 ConfigBlkOffset; > > - UINT16 NumOfBlocks; > > - > > - ConfigBlkTblHdrSize =3D (UINT32)(sizeof > (CONFIG_BLOCK_TABLE_HEADER)); > > - ConfigBlkTblAddrPtr =3D (CONFIG_BLOCK_TABLE_HEADER > > *)ConfigBlockTableAddress; > > - NumOfBlocks =3D ConfigBlkTblAddrPtr->NumberOfBlocks; > > - > > - ConfigBlkOffset =3D 0; > > - for (OffsetIndex =3D 0; OffsetIndex < NumOfBlocks; OffsetIndex++) { > > - if ((ConfigBlkTblHdrSize + ConfigBlkOffset) > (ConfigBlkTblAddrPt= r- > > >Header.GuidHob.Header.HobLength)) { > > - break; > > - } > > - TempConfigBlk =3D (CONFIG_BLOCK *)((UINTN)ConfigBlkTblAddrPtr + > > (UINTN)ConfigBlkTblHdrSize + (UINTN)ConfigBlkOffset); > > - if (CompareGuid (&(TempConfigBlk->Header.GuidHob.Name), > > ConfigBlockGuid)) { > > - *ConfigBlockAddress =3D (VOID *)TempConfigBlk; > > - return EFI_SUCCESS; > > - } > > - ConfigBlkOffset =3D ConfigBlkOffset + TempConfigBlk- > > >Header.GuidHob.Header.HobLength; > > - } > > - DEBUG ((DEBUG_ERROR, "Could not find the config block.\n")); > > - return EFI_NOT_FOUND; > > -} > > diff --git > > a/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseConfigBlockLib/BaseCo > > nfigB > > lockLib.inf > > b/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseConfigBlockLib/BaseCo > > nfig > > BlockLib.inf > > deleted file mode 100644 > > index a7def2481d..0000000000 > > --- > > a/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseConfigBlockLib/BaseCo > > nfigB > > lockLib.inf > > +++ /dev/null > > @@ -1,29 +0,0 @@ > > -## @file > > -# Component INF file for the BaseConfigBlock library. > > -# > > -# Copyright (c) 2019 Intel Corporation. All rights reserved.
-# > > -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -## > > - > > -[Defines] > > -INF_VERSION =3D 0x00010017 > > -BASE_NAME =3D BaseConfigBlockLib > > -FILE_GUID =3D 1EC07EA8-7808-4e06-9D79-309AE331D2D5 > > -VERSION_STRING =3D 1.0 > > -MODULE_TYPE =3D BASE > > -LIBRARY_CLASS =3D ConfigBlockLib > > - > > - > > -[Packages] > > -MdePkg/MdePkg.dec > > -CoffeelakeSiliconPkg/SiPkg.dec > > - > > -[Sources] > > -BaseConfigBlockLib.c > > - > > -[LibraryClasses] > > -DebugLib > > -BaseMemoryLib > > -MemoryAllocationLib > > diff --git > > a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConf > > igBlo > > ckLib.c > > b/Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigB > > lockLi > > b.c > > similarity index 84% > > rename from > > Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfig > > Block > > Lib.c > > rename to > > Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlo > > ckLib.c > > index b9bd6f3a48..77eb2244c2 100644 > > --- > > a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConf > > igBlo > > ckLib.c > > +++ > > b/Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigB > > lockLi > > b.c > > @@ -34,13 +34,11 @@ CreateConfigBlockTable ( > > ConfigBlkTblHdrSize =3D (UINT32)(sizeof > (CONFIG_BLOCK_TABLE_HEADER)); > > > > if (TotalSize <=3D (ConfigBlkTblHdrSize + sizeof (CONFIG_BLOCK_HEAD= ER))) > { > > - DEBUG ((DEBUG_ERROR, "Invalid Parameter\n")); > > return EFI_INVALID_PARAMETER; > > } > > > > ConfigBlkTblAddrPtr =3D (CONFIG_BLOCK_TABLE_HEADER > *)AllocateZeroPool > > (TotalSize); > > if (ConfigBlkTblAddrPtr =3D=3D NULL) { > > - DEBUG ((DEBUG_ERROR, "Could not allocate memory.\n")); > > return EFI_OUT_OF_RESOURCES; > > } > > ConfigBlkTblAddrPtr->NumberOfBlocks =3D 0; @@ -77,14 +75,11 @@ > > AddConfigBlock ( > > ConfigBlkTblAddrPtr =3D (CONFIG_BLOCK_TABLE_HEADER > > *)ConfigBlockTableAddress; > > ConfigBlkAddrPtr =3D (CONFIG_BLOCK *)(*ConfigBlockAddress); > > ConfigBlkSize =3D ConfigBlkAddrPtr->Header.GuidHob.Header.HobLength= ; > > - DEBUG ((DEBUG_INFO, "Config Block GUID: %g / Config Block Size: > > 0x%x bytes\n", &(ConfigBlkAddrPtr->Header.GuidHob.Name), > > ConfigBlkSize)); > > + > > if ((ConfigBlkSize % 4) !=3D 0) { > > - DEBUG ((DEBUG_ERROR, "Config Block must be multiples of 4 > bytes\n")); > > return EFI_INVALID_PARAMETER; > > } > > if (ConfigBlkTblAddrPtr->AvailableSize < ConfigBlkSize) { > > - DEBUG ((DEBUG_ERROR, "Config Block Table is full and cannot add n= ew > > Config Block.\n")); > > - DEBUG ((DEBUG_ERROR, "Available Config Block Size: 0x%x bytes / > > Requested Config Block Size: 0x%x bytes\n", ConfigBlkTblAddrPtr- > > >AvailableSize, ConfigBlkSize)); > > return EFI_OUT_OF_RESOURCES; > > } > > > > @@ -95,7 +90,6 @@ AddConfigBlock ( > > ConfigBlkTblAddrPtr->AvailableSize =3D > > ConfigBlkTblAddrPtr->AvailableSize - ConfigBlkSize; > > > > *ConfigBlockAddress =3D (VOID *) TempConfigBlk; > > - DEBUG ((DEBUG_INFO, "Config Block Address: 0x%x / Available Config > > Block Size: 0x%x bytes\n", (UINT32)(UINTN)*ConfigBlockAddress, > > ConfigBlkTblAddrPtr->AvailableSize)); > > return EFI_SUCCESS; > > } > > > > @@ -140,6 +134,6 @@ GetConfigBlock ( > > } > > ConfigBlkOffset =3D ConfigBlkOffset + TempConfigBlk- > > >Header.GuidHob.Header.HobLength; > > } > > - DEBUG ((DEBUG_ERROR, "Could not find the config block.\n")); > > + > > return EFI_NOT_FOUND; > > } > > diff --git > > a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConf > > igBlo > > ckLib.inf > > b/Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigB > > lockLi > > b.inf > > similarity index 100% > > rename from > > Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfig > > Block > > Lib.inf > > rename to > > Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlo > > ckLib.i > > nf > > -- > > 2.16.2.windows.1 >=20 >=20 >=20