From nobody Fri Dec 27 20:32:17 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1496699074707569.7850754424513; Mon, 5 Jun 2017 14:44:34 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 4BFA82095CC72; Mon, 5 Jun 2017 14:43:27 -0700 (PDT) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 8D73E21A6F105 for ; Mon, 5 Jun 2017 14:43:25 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B39CC344; Mon, 5 Jun 2017 14:44:31 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9F67F3F25D; Mon, 5 Jun 2017 14:44:30 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Mon, 5 Jun 2017 22:43:45 +0100 Message-Id: <1496699034-4186-2-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> References: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 01/10] BaseTools: Tools change to support PI v1.5 Specification. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao , leif.lindholm@arm.com, ard.biesheuvel@linaro.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" PI specification v1.6 defines the following new file types: This patch adds the new file type EFI_FV_FILETYPE_SMM_STANDALONE in GenFfs tool. *_SMM_* regex instead of *_MM_* is used to preserve backwards compatibility. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao Signed-off-by: Supreeth Venkatesh --- BaseTools/Source/C/GenFfs/GenFfs.c | 6 ++++-- BaseTools/Source/C/Include/Common/PiFirmwareFile.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs= /GenFfs.c index c5d657b..2eae2b0 100644 --- a/BaseTools/Source/C/GenFfs/GenFfs.c +++ b/BaseTools/Source/C/GenFfs/GenFfs.c @@ -43,8 +43,9 @@ STATIC CHAR8 *mFfsFileType[] =3D { "EFI_FV_FILETYPE_SMM", // 0x0A "EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE",// 0x0B "EFI_FV_FILETYPE_COMBINED_SMM_DXE", // 0x0C - "EFI_FV_FILETYPE_SMM_CORE" // 0x0D - }; + "EFI_FV_FILETYPE_SMM_CORE", // 0x0D + "EFI_FV_FILETYPE_SMM_STANDALONE", // 0x0E +}; =20 STATIC CHAR8 *mAlignName[] =3D { "1", "2", "4", "8", "16", "32", "64", "128", "256", "512", @@ -130,6 +131,7 @@ Returns: EFI_FV_FILETYPE_DRIVER, EFI_FV_FILETYPE_APPLICATIO= N,\n\ EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER,\n\ EFI_FV_FILETYPE_SMM, EFI_FV_FILETYPE_SMM_CORE,\n\ + EFI_FV_FILETYPE_SMM_STANDALONE,\n\ EFI_FV_FILETYPE_COMBINED_SMM_DXE, \n\ EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE.\n"); fprintf (stdout, " -g FileGuid, --fileguid FileGuid\n\ diff --git a/BaseTools/Source/C/Include/Common/PiFirmwareFile.h b/BaseTools= /Source/C/Include/Common/PiFirmwareFile.h index 2984860..aea03a8 100644 --- a/BaseTools/Source/C/Include/Common/PiFirmwareFile.h +++ b/BaseTools/Source/C/Include/Common/PiFirmwareFile.h @@ -52,6 +52,7 @@ typedef UINT8 EFI_FFS_FILE_STATE; #define EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE 0x0B #define EFI_FV_FILETYPE_COMBINED_SMM_DXE 0x0C #define EFI_FV_FILETYPE_SMM_CORE 0x0D +#define EFI_FV_FILETYPE_SMM_STANDALONE 0x0E #define EFI_FV_FILETYPE_OEM_MIN 0xc0 #define EFI_FV_FILETYPE_OEM_MAX 0xdf #define EFI_FV_FILETYPE_DEBUG_MIN 0xe0 --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Fri Dec 27 20:32:17 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1496699081953890.769280368759; Mon, 5 Jun 2017 14:44:41 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8724B2095CC71; Mon, 5 Jun 2017 14:43:34 -0700 (PDT) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 0608821A6F105 for ; Mon, 5 Jun 2017 14:43:33 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2D8B0344; Mon, 5 Jun 2017 14:44:39 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 178EA3F25D; Mon, 5 Jun 2017 14:44:37 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Mon, 5 Jun 2017 22:43:46 +0100 Message-Id: <1496699034-4186-3-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> References: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 02/10] BaseTools: Tools change to support PI v1.5 Specification. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao , leif.lindholm@arm.com, ard.biesheuvel@linaro.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" PI v1.6 Specification Volume 4 defines Management Mode Core Interface. In order to support Management Mode Core Interface, Module Types MM_STANDALONE, MM_CORE_STANDALONE are needed. This patch ensures that SMM_STANDALONE, SMM_CORE_STANDALONE Modules are treated as EFI Boot Service Driver in GenFw tool. *_SMM_* regex instead of *_MM_* is used to preserve backwards compatibility. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao Signed-off-by: Supreeth Venkatesh --- BaseTools/Source/C/GenFw/GenFw.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/Ge= nFw.c index 22e4e72..74d323d 100644 --- a/BaseTools/Source/C/GenFw/GenFw.c +++ b/BaseTools/Source/C/GenFw/GenFw.c @@ -181,6 +181,7 @@ Returns: PEI_CORE, PEIM, DXE_CORE, DXE_DRIVER, UEFI_APPLICA= TION,\n\ SEC, DXE_SAL_DRIVER, UEFI_DRIVER, DXE_RUNTIME_DRIV= ER,\n\ DXE_SMM_DRIVER, SECURITY_CORE, COMBINED_PEIM_DRIVE= R,\n\ + SMM_STANDALONE, SMM_CORE_STANDALONE,\n\ PIC_PEIM, RELOCATABLE_PEIM, BS_DRIVER, RT_DRIVER,\= n\ APPLICATION, SAL_RT_DRIVER to support all module t= ypes\n\ It can only be used together with --keepexceptiont= able,\n\ @@ -2009,7 +2010,9 @@ Returns: stricmp (ModuleType, "DXE_DRIVER") =3D=3D 0 || stricmp (ModuleType, "DXE_SMM_DRIVER") =3D=3D 0 || stricmp (ModuleType, "UEFI_DRIVER") =3D=3D 0 || - stricmp (ModuleType, "SMM_CORE") =3D=3D 0) { + stricmp (ModuleType, "SMM_CORE") =3D=3D 0 || + stricmp (ModuleType, "SMM_STANDALONE") =3D=3D 0 || + stricmp (ModuleType, "SMM_CORE_STANDALONE") =3D=3D 0) { Type =3D EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER; VerboseMsg ("Efi Image subsystem type is efi boot service driver= ."); =20 --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Fri Dec 27 20:32:17 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1496699087314783.0196481278; Mon, 5 Jun 2017 14:44:47 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C1EFC21AE30D0; Mon, 5 Jun 2017 14:43:39 -0700 (PDT) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 652DC21AE30D1 for ; Mon, 5 Jun 2017 14:43:39 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8CAE6344; Mon, 5 Jun 2017 14:44:45 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7527D3F25D; Mon, 5 Jun 2017 14:44:44 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Mon, 5 Jun 2017 22:43:47 +0100 Message-Id: <1496699034-4186-4-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> References: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 03/10] BaseTools: Tools change to support PI v1.5 Specification. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao , leif.lindholm@arm.com, ard.biesheuvel@linaro.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch adds changes to auto generate SMM_CORE_STANDALONE and SMM_STANDALONE Entry Point templates. Also, it adds changes to help auto generate dependency expressions for SMM_STANDALONE modules. PI Specification v1.6 specifies Management Mode System Table (MMST) which is a collection of common services for managing MMRAM allocation and providing basic I/O services. MMST is similar to the UEFI System Table. Some of auto generated SMM_CORE_STANDALONE and SMM_STANDALONE template APIs use MMST as parameter. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao Signed-off-by: Supreeth Venkatesh --- BaseTools/Source/Python/AutoGen/GenC.py | 148 ++++++++++++++++++++++++= +++- BaseTools/Source/Python/AutoGen/GenDepex.py | 17 +++- 2 files changed, 162 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Pyt= hon/AutoGen/GenC.py index 67aaef7..d42dd45 100644 --- a/BaseTools/Source/Python/AutoGen/GenC.py +++ b/BaseTools/Source/Python/AutoGen/GenC.py @@ -237,6 +237,100 @@ ProcessModuleEntryPointList ( ${END} """) =20 +## SMM_CORE_STANDALONE Entry Point Templates +gSmmCoreStandaloneEntryPointPrototype =3D TemplateString(""" +${BEGIN} +EFI_STATUS +EFIAPI +${Function} ( + IN VOID *HobStart + ); +${END} +""") + +gSmmCoreStandaloneEntryPointString =3D TemplateString(""" +${BEGIN} +const UINT32 _gSmmRevision =3D ${PiSpecVersion}; + +VOID +EFIAPI +ProcessModuleEntryPointList ( + IN VOID *HobStart + ) +{ + ${Function} (HobStart); +} +${END} +""") + +## SMM_STANDALONE Entry Point Templates +gSmmStandaloneEntryPointPrototype =3D TemplateString(""" +${BEGIN} +EFI_STATUS +EFIAPI +${Function} ( + IN EFI_HANDLE ImageHandle, + IN EFI_SMM_SYSTEM_TABLE2 *SmmSystemTable + ); +${END} +""") + +gSmmStandaloneEntryPointString =3D [ +TemplateString(""" +GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 _gSmmRevision =3D ${PiSpecVersi= on}; + +EFI_STATUS +EFIAPI +ProcessModuleEntryPointList ( + IN EFI_HANDLE ImageHandle, + IN EFI_SMM_SYSTEM_TABLE2 *SmmSystemTable + ) + +{ + return EFI_SUCCESS; +} +"""), +TemplateString(""" +GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 _gSmmRevision =3D ${PiSpecVersi= on}; +${BEGIN} +EFI_STATUS +EFIAPI +ProcessModuleEntryPointList ( + IN EFI_HANDLE ImageHandle, + IN EFI_SMM_SYSTEM_TABLE2 *SmmSystemTable + ) + +{ + return ${Function} (ImageHandle, SmmSystemTable); +} +${END} +"""), +TemplateString(""" +GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 _gSmmRevision =3D ${PiSpecVersi= on}; + +EFI_STATUS +EFIAPI +ProcessModuleEntryPointList ( + IN EFI_HANDLE ImageHandle, + IN EFI_SMM_SYSTEM_TABLE2 *SmmSystemTable + ) + +{ + EFI_STATUS Status; + EFI_STATUS CombinedStatus; + + CombinedStatus =3D EFI_LOAD_ERROR; +${BEGIN} + Status =3D ${Function} (ImageHandle, SmmSystemTable); + if (!EFI_ERROR (Status) || EFI_ERROR (CombinedStatus)) { + CombinedStatus =3D Status; + } +${END} + return CombinedStatus; +} +""") +] + ## DXE SMM Entry Point Templates gDxeSmmEntryPointPrototype =3D TemplateString(""" ${BEGIN} @@ -580,6 +674,15 @@ ${Function} ( IN EFI_SYSTEM_TABLE *SystemTable );${END} """), + +'SMM' : TemplateString("""${BEGIN} +EFI_STATUS +EFIAPI +${Function} ( + IN EFI_HANDLE ImageHandle, + IN EFI_SMM_SYSTEM_TABLE2 *SmmSystemTable + );${END} +"""), } =20 gLibraryStructorCall =3D { @@ -597,6 +700,11 @@ gLibraryStructorCall =3D { Status =3D ${Function} (ImageHandle, SystemTable); ASSERT_EFI_ERROR (Status);${END} """), + +'SMM' : TemplateString("""${BEGIN} + Status =3D ${Function} (ImageHandle, SmmSystemTable); + ASSERT_EFI_ERROR (Status);${END} +"""), } =20 ## Library Constructor and Destructor Templates @@ -644,6 +752,21 @@ ${BEGIN} EFI_STATUS Status; ${FunctionCall}${END} } """), + +'SMM' : TemplateString(""" +${BEGIN}${FunctionPrototype}${END} + +VOID +EFIAPI +ProcessLibrary${Type}List ( + IN EFI_HANDLE ImageHandle, + IN EFI_SMM_SYSTEM_TABLE2 *SmmSystemTable + ) +{ +${BEGIN} EFI_STATUS Status; +${FunctionCall}${END} +} +"""), } =20 gBasicHeaderFile =3D "Base.h" @@ -661,6 +784,8 @@ gModuleTypeHeaderFile =3D { "UEFI_DRIVER" : ["Uefi.h", "Library/BaseLib.h", "Library/Debu= gLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiDriverEntryPoin= t.h"], "UEFI_APPLICATION" : ["Uefi.h", "Library/BaseLib.h", "Library/Debu= gLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiApplicationEntr= yPoint.h"], "SMM_CORE" : ["PiDxe.h", "Library/BaseLib.h", "Library/Debu= gLib.h", "Library/UefiDriverEntryPoint.h"], + "SMM_STANDALONE" : ["PiSmm.h", "Library/BaseLib.h", "Library/Debu= gLib.h", "Library/SmmDriverStandaloneEntryPoint.h"], + "SMM_CORE_STANDALONE" : ["PiSmm.h", "Library/BaseLib.h", "Library/Debu= gLib.h", "Library/SmmCoreStandaloneEntryPoint.h"], "USER_DEFINED" : [gBasicHeaderFile] } =20 @@ -1266,6 +1391,9 @@ def CreateLibraryConstructorCode(Info, AutoGenC, Auto= GenH): 'DXE_SAL_DRIVER','UEFI_DRIVER','UEFI_APPLI= CATION','SMM_CORE']: ConstructorPrototypeString.Append(gLibraryStructorPrototype['D= XE'].Replace(Dict)) ConstructorCallingString.Append(gLibraryStructorCall['DXE'].Re= place(Dict)) + elif Lib.ModuleType in ['SMM_STANDALONE','SMM_CORE_STANDALONE']: + ConstructorPrototypeString.Append(gLibraryStructorPrototype['S= MM'].Replace(Dict)) + ConstructorCallingString.Append(gLibraryStructorCall['SMM'].Re= place(Dict)) =20 if str(ConstructorPrototypeString) =3D=3D '': ConstructorPrototypeList =3D [] @@ -1291,6 +1419,8 @@ def CreateLibraryConstructorCode(Info, AutoGenC, Auto= GenH): elif Info.ModuleType in ['DXE_CORE','DXE_DRIVER','DXE_SMM_DRIVER',= 'DXE_RUNTIME_DRIVER', 'DXE_SAL_DRIVER','UEFI_DRIVER','UEFI_APPL= ICATION','SMM_CORE']: AutoGenC.Append(gLibraryString['DXE'].Replace(Dict)) + elif Info.ModuleType in ['SMM_STANDALONE','SMM_CORE_STANDALONE']: + AutoGenC.Append(gLibraryString['SMM'].Replace(Dict)) =20 ## Create code for library destructor # @@ -1323,6 +1453,9 @@ def CreateLibraryDestructorCode(Info, AutoGenC, AutoG= enH): 'DXE_SAL_DRIVER','UEFI_DRIVER','UEFI_APPLI= CATION', 'SMM_CORE']: DestructorPrototypeString.Append(gLibraryStructorPrototype['DX= E'].Replace(Dict)) DestructorCallingString.Append(gLibraryStructorCall['DXE'].Rep= lace(Dict)) + elif Lib.ModuleType in ['SMM_STANDALONE','SMM_CORE_STANDALONE']: + DestructorPrototypeString.Append(gLibraryStructorPrototype['SM= M'].Replace(Dict)) + DestructorCallingString.Append(gLibraryStructorCall['SMM'].Rep= lace(Dict)) =20 if str(DestructorPrototypeString) =3D=3D '': DestructorPrototypeList =3D [] @@ -1348,6 +1481,8 @@ def CreateLibraryDestructorCode(Info, AutoGenC, AutoG= enH): elif Info.ModuleType in ['DXE_CORE','DXE_DRIVER','DXE_SMM_DRIVER',= 'DXE_RUNTIME_DRIVER', 'DXE_SAL_DRIVER','UEFI_DRIVER','UEFI_APPL= ICATION','SMM_CORE']: AutoGenC.Append(gLibraryString['DXE'].Replace(Dict)) + elif Info.ModuleType in ['SMM_STANDALONE','SMM_CORE_STANDALONE']: + AutoGenC.Append(gLibraryString['SMM'].Replace(Dict)) =20 =20 ## Create code for ModuleEntryPoint @@ -1377,7 +1512,7 @@ def CreateModuleEntryPointCode(Info, AutoGenC, AutoGe= nH): 'UefiSpecVersion': UefiSpecVersion + 'U' } =20 - if Info.ModuleType in ['PEI_CORE', 'DXE_CORE', 'SMM_CORE']: + if Info.ModuleType in ['PEI_CORE', 'DXE_CORE', 'SMM_CORE', 'SMM_CORE_S= TANDALONE']: if Info.SourceFileList <> None and Info.SourceFileList <> []: if NumEntryPoints !=3D 1: EdkLogger.error( @@ -1396,6 +1531,9 @@ def CreateModuleEntryPointCode(Info, AutoGenC, AutoGe= nH): elif Info.ModuleType =3D=3D 'SMM_CORE': AutoGenC.Append(gSmmCoreEntryPointString.Replace(Dict)) AutoGenH.Append(gSmmCoreEntryPointPrototype.Replace(Dict)) + elif Info.ModuleType =3D=3D 'SMM_CORE_STANDALONE': + AutoGenC.Append(gSmmCoreStandaloneEntryPointString.Replace(Dict)) + AutoGenH.Append(gSmmCoreStandaloneEntryPointPrototype.Replace(Dict= )) elif Info.ModuleType =3D=3D 'PEIM': if NumEntryPoints < 2: AutoGenC.Append(gPeimEntryPointString[NumEntryPoints].Replace(= Dict)) @@ -1413,7 +1551,13 @@ def CreateModuleEntryPointCode(Info, AutoGenC, AutoG= enH): AutoGenC.Append(gDxeSmmEntryPointString[0].Replace(Dict)) else: AutoGenC.Append(gDxeSmmEntryPointString[1].Replace(Dict)) - AutoGenH.Append(gDxeSmmEntryPointPrototype.Replace(Dict)) =20 + AutoGenH.Append(gDxeSmmEntryPointPrototype.Replace(Dict)) + elif Info.ModuleType =3D=3D 'SMM_STANDALONE': + if NumEntryPoints < 2: + AutoGenC.Append(gSmmStandaloneEntryPointString[NumEntryPoints]= .Replace(Dict)) + else: + AutoGenC.Append(gSmmStandaloneEntryPointString[2].Replace(Dict= )) + AutoGenH.Append(gSmmStandaloneEntryPointPrototype.Replace(Dict)) elif Info.ModuleType =3D=3D 'UEFI_APPLICATION': if NumEntryPoints < 2: AutoGenC.Append(gUefiApplicationEntryPointString[NumEntryPoint= s].Replace(Dict)) diff --git a/BaseTools/Source/Python/AutoGen/GenDepex.py b/BaseTools/Source= /Python/AutoGen/GenDepex.py index 5923a75..9d3002f 100644 --- a/BaseTools/Source/Python/AutoGen/GenDepex.py +++ b/BaseTools/Source/Python/AutoGen/GenDepex.py @@ -42,6 +42,8 @@ gType2Phase =3D { "UEFI_DRIVER" : "DXE", "UEFI_APPLICATION" : "DXE", "SMM_CORE" : "DXE", + "SMM_STANDALONE" : "SMM", + "SMM_CORE_STANDALONE" : "SMM", } =20 ## Convert dependency expression string into EFI internal representation @@ -98,6 +100,19 @@ class DependencyExpression: "FALSE" : 0x07, "END" : 0x08, "SOR" : 0x09 + }, + + "SMM" : { + "BEFORE": 0x00, + "AFTER" : 0x01, + "PUSH" : 0x02, + "AND" : 0x03, + "OR" : 0x04, + "NOT" : 0x05, + "TRUE" : 0x06, + "FALSE" : 0x07, + "END" : 0x08, + "SOR" : 0x09 } } =20 @@ -289,7 +304,7 @@ class DependencyExpression: return =20 # don't generate depex if all operands are architecture protocols - if self.ModuleType in ['UEFI_DRIVER', 'DXE_DRIVER', 'DXE_RUNTIME_D= RIVER', 'DXE_SAL_DRIVER', 'DXE_SMM_DRIVER'] and \ + if self.ModuleType in ['UEFI_DRIVER', 'DXE_DRIVER', 'DXE_RUNTIME_D= RIVER', 'DXE_SAL_DRIVER', 'DXE_SMM_DRIVER', 'SMM_STANDALONE'] and \ Op =3D=3D 'AND' and \ self.ArchProtocols =3D=3D set([GuidStructureStringToGuidString(= Guid) for Guid in AllOperand]): self.PostfixNotation =3D [] --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Fri Dec 27 20:32:17 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1496699092276578.2528299460047; Mon, 5 Jun 2017 14:44:52 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 0535B21AE30D7; Mon, 5 Jun 2017 14:43:45 -0700 (PDT) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 5ED5021AE30D5 for ; Mon, 5 Jun 2017 14:43:44 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8648B344; Mon, 5 Jun 2017 14:44:50 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6F16D3F25D; Mon, 5 Jun 2017 14:44:49 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Mon, 5 Jun 2017 22:43:48 +0100 Message-Id: <1496699034-4186-5-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> References: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 04/10] BaseTools: Tools change to support PI v1.5 Specification. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao , leif.lindholm@arm.com, ard.biesheuvel@linaro.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch adds SUP_MODULE_SMM_STANDALONE and SUP_MODULE_SMM_CORE_STANDALONE data types and includes it in SUP_MODULE_LIST. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao Signed-off-by: Supreeth Venkatesh --- BaseTools/Source/Python/Common/DataType.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/= Python/Common/DataType.py index 6edc0c0..ab64553 100644 --- a/BaseTools/Source/Python/Common/DataType.py +++ b/BaseTools/Source/Python/Common/DataType.py @@ -70,10 +70,12 @@ SUP_MODULE_UEFI_DRIVER =3D 'UEFI_DRIVER' SUP_MODULE_UEFI_APPLICATION =3D 'UEFI_APPLICATION' SUP_MODULE_USER_DEFINED =3D 'USER_DEFINED' SUP_MODULE_SMM_CORE =3D 'SMM_CORE' +SUP_MODULE_SMM_STANDALONE =3D 'SMM_STANDALONE' +SUP_MODULE_SMM_CORE_STANDALONE =3D 'SMM_CORE_STANDALONE' =20 SUP_MODULE_LIST =3D [SUP_MODULE_BASE, SUP_MODULE_SEC, SUP_MODULE_PEI_CORE,= SUP_MODULE_PEIM, SUP_MODULE_DXE_CORE, SUP_MODULE_DXE_DRIVER, \ SUP_MODULE_DXE_RUNTIME_DRIVER, SUP_MODULE_DXE_SAL_DRIVE= R, SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_UEFI_DRIVER, \ - SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_USER_DEFINED, S= UP_MODULE_SMM_CORE] + SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_USER_DEFINED, S= UP_MODULE_SMM_CORE, SUP_MODULE_SMM_STANDALONE, SUP_MODULE_SMM_CORE_STANDALO= NE] SUP_MODULE_LIST_STRING =3D TAB_VALUE_SPLIT.join(l for l in SUP_MODULE_LIST) =20 EDK_COMPONENT_TYPE_LIBRARY =3D 'LIBRARY' --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Fri Dec 27 20:32:17 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1496699097749238.51177240718857; Mon, 5 Jun 2017 14:44:57 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3C1C021AE30D5; Mon, 5 Jun 2017 14:43:50 -0700 (PDT) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 3057221967BF3 for ; Mon, 5 Jun 2017 14:43:49 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 57AD5344; Mon, 5 Jun 2017 14:44:55 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 41EDA3F25D; Mon, 5 Jun 2017 14:44:54 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Mon, 5 Jun 2017 22:43:49 +0100 Message-Id: <1496699034-4186-6-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> References: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 05/10] BaseTools: Tools change to support PI v1.5 Specification. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao , leif.lindholm@arm.com, ard.biesheuvel@linaro.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch adds support for FdfParser tool to parse SMM_STANDALONE and SMM_CORE_STANDALONE modules. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao Signed-off-by: Supreeth Venkatesh --- BaseTools/Source/Python/Common/FdfParserLite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/Common/FdfParserLite.py b/BaseTools/So= urce/Python/Common/FdfParserLite.py index a8cce26..4f3b159 100644 --- a/BaseTools/Source/Python/Common/FdfParserLite.py +++ b/BaseTools/Source/Python/Common/FdfParserLite.py @@ -2823,7 +2823,7 @@ class FdfParser(object): "DXE_SMM_DRIVER", "DXE_RUNTIME_DRIVER", \ "UEFI_DRIVER", "UEFI_APPLICATION", "USER_DEFI= NED", "DEFAULT", "BASE", \ "SECURITY_CORE", "COMBINED_PEIM_DRIVER", "PIC= _PEIM", "RELOCATABLE_PEIM", \ - "PE32_PEIM", "BS_DRIVER", "RT_DRIVER", "SAL_R= T_DRIVER", "APPLICATION", "ACPITABLE", "SMM_CORE"): + "PE32_PEIM", "BS_DRIVER", "RT_DRIVER", "SAL_R= T_DRIVER", "APPLICATION", "ACPITABLE", "SMM_CORE", "SMM_STANDALONE", "SMM_C= ORE_STANDALONE"): raise Warning("Unknown Module type At line ", self.FileName, s= elf.CurrentLineNumber) return self.__Token =20 @@ -2867,7 +2867,7 @@ class FdfParser(object): =20 Type =3D self.__Token.strip().upper() if Type not in ("RAW", "FREEFORM", "SEC", "PEI_CORE", "PEIM",\ - "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLI= CATION", "FV_IMAGE", "SMM", "SMM_CORE"): + "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLI= CATION", "FV_IMAGE", "SMM", "SMM_CORE", "SMM_STANDALONE"): raise Warning("Unknown FV type At line ", self.FileName, self.= CurrentLineNumber) =20 if not self.__IsToken("=3D"): --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Fri Dec 27 20:32:17 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1496699101983119.27967405248569; Mon, 5 Jun 2017 14:45:01 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 71B4C2095CC76; Mon, 5 Jun 2017 14:43:54 -0700 (PDT) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id CD6EE21967BF3 for ; Mon, 5 Jun 2017 14:43:52 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EBB93344; Mon, 5 Jun 2017 14:44:58 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D455E3F25D; Mon, 5 Jun 2017 14:44:57 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Mon, 5 Jun 2017 22:43:50 +0100 Message-Id: <1496699034-4186-7-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> References: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 06/10] BaseTools: Tools change to support PI v1.5 Specification. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao , leif.lindholm@arm.com, ard.biesheuvel@linaro.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch registers SMM_STANDALONE and SMM_CORE_STANDALONE module types with CommonClass and PackageIncludePkgHeaderClass in CommonDataClass. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao Signed-off-by: Supreeth Venkatesh --- BaseTools/Source/Python/CommonDataClass/CommonClass.py | 6 +++--- BaseTools/Source/Python/CommonDataClass/PackageClass.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/Python/CommonDataClass/CommonClass.py b/BaseT= ools/Source/Python/CommonDataClass/CommonClass.py index 5e908a6..c520799 100644 --- a/BaseTools/Source/Python/CommonDataClass/CommonClass.py +++ b/BaseTools/Source/Python/CommonDataClass/CommonClass.py @@ -174,7 +174,7 @@ class IncludeStatementClass(object): # @var GuidTypeList: To store value for GuidTypeList, selection scope is= in below list # DATA_HUB_RECORD | EFI_EVENT | EFI_SYSTEM_CONFIGURAT= ION_TABLE | EFI_VARIABLE | GUID | HII_PACKAGE_LIST | HOB | TOKEN_SPACE_GUID # @var SupModuleList: To store value for SupModuleList, selection scope i= s in below list -# BASE | SEC | PEI_CORE | PEIM | DXE_CORE | DXE_DRIVE= R | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | UEFI_DRIVER | UE= FI_APPLICATION | USER_DEFINED | SMM_CORE +# BASE | SEC | PEI_CORE | PEIM | DXE_CORE | DXE_DRIVE= R | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | UEFI_DRIVER | UE= FI_APPLICATION | USER_DEFINED | SMM_CORE | SMM_STANDALONE | SMM_CORE_STANDA= LONE # class GuidProtocolPpiCommonClass(CommonClass): def __init__(self): @@ -202,7 +202,7 @@ class GuidProtocolPpiCommonClass(CommonClass): # @var RecommendedInstance: To store value for RecommendedInstance= , selection scope is in below list # DATA_HUB_RECORD | EFI_EVENT | EFI_SYST= EM_CONFIGURATION_TABLE | EFI_VARIABLE | GUID | HII_PACKAGE_LIST | HOB | TOK= EN_SPACE_GUID # @var SupModuleList: To store value for SupModuleList, sele= ction scope is in below list -# BASE | SEC | PEI_CORE | PEIM | DXE_COR= E | DXE_DRIVER | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | UEF= I_DRIVER | UEFI_APPLICATION | USER_DEFINED | SMM_CORE +# BASE | SEC | PEI_CORE | PEIM | DXE_COR= E | DXE_DRIVER | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | UEF= I_DRIVER | UEFI_APPLICATION | USER_DEFINED | SMM_CORE | SMM_STANDALONE | SM= M_CORE_STANDALONE # class LibraryClassClass(CommonClass, DefineClass): def __init__(self): @@ -354,7 +354,7 @@ class PcdErrorClass(object): # @var SkuInfoList: To store value for SkuInfoList # It is a set structure as { [SkuIdName] : Sk= uInfoClass }=20 # @var SupModuleList: To store value for SupModuleList, selection= scope is in below list -# BASE | SEC | PEI_CORE | PEIM | DXE_CORE | D= XE_DRIVER | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | UEFI_DRI= VER | UEFI_APPLICATION | USER_DEFINED | SMM_CORE +# BASE | SEC | PEI_CORE | PEIM | DXE_CORE | D= XE_DRIVER | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | UEFI_DRI= VER | UEFI_APPLICATION | USER_DEFINED | SMM_CORE | SMM_STANDALONE | SMM_COR= E_STANDALONE # class PcdClass(CommonClass): def __init__(self, CName =3D '', Token =3D '', TokenSpaceGuidCName =3D= '', DatumType =3D '', MaxDatumSize =3D '', DefaultValue =3D '', ItemType = =3D '', ValidUsage =3D None, SkuInfoList =3D None, SupModuleList =3D None): diff --git a/BaseTools/Source/Python/CommonDataClass/PackageClass.py b/Base= Tools/Source/Python/CommonDataClass/PackageClass.py index 82e7394..b63e05d 100644 --- a/BaseTools/Source/Python/CommonDataClass/PackageClass.py +++ b/BaseTools/Source/Python/CommonDataClass/PackageClass.py @@ -62,7 +62,7 @@ class PackageIndustryStdHeaderClass(CommonClass): # # @var IncludeHeader: To store value for IncludeHeader # @var ModuleType: To store value for ModuleType, it is a set structur= e as -# BASE | SEC | PEI_CORE | PEIM | DXE_CORE | DXE_DRIVE= R | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | TOOL | UEFI_DRIV= ER | UEFI_APPLICATION | USER_DEFINED | SMM_CORE +# BASE | SEC | PEI_CORE | PEIM | DXE_CORE | DXE_DRIVE= R | DXE_RUNTIME_DRIVER | DXE_SAL_DRIVER | DXE_SMM_DRIVER | TOOL | UEFI_DRIV= ER | UEFI_APPLICATION | USER_DEFINED | SMM_CORE | SMM_STANDALONE | SMM_CORE= _STANDALONE # class PackageIncludePkgHeaderClass(object): def __init__(self): --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Fri Dec 27 20:32:17 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1496699105054164.9229085176121; Mon, 5 Jun 2017 14:45:05 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A426F2095CC7B; Mon, 5 Jun 2017 14:43:57 -0700 (PDT) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 38A3121945DD1 for ; Mon, 5 Jun 2017 14:43:56 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 603FE344; Mon, 5 Jun 2017 14:45:02 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 499193F25D; Mon, 5 Jun 2017 14:45:01 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Mon, 5 Jun 2017 22:43:51 +0100 Message-Id: <1496699034-4186-8-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> References: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 07/10] BaseTools: Tools change to support PI v1.5 Specification. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao , leif.lindholm@arm.com, ard.biesheuvel@linaro.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch verifies SMM_CORE_STANDALONE module compatibility with PI specification version. Also, it registers SMM_STANDALONE/SMM_CORE_STANDALONE modules with FdfParser class and provides mapping between SMM_STANDALONE and SMM_CORE_STANDALONE module type in FDF with EFI_FV_FILETYPE_SMM_STANDALONE and EFI_FV_FILETYPE_SMM_CORE file types in GenFfs. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao Signed-off-by: Supreeth Venkatesh --- BaseTools/Source/Python/GenFds/FdfParser.py | 4 ++-- BaseTools/Source/Python/GenFds/Ffs.py | 7 +++++-- BaseTools/Source/Python/GenFds/FfsInfStatement.py | 3 +++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source= /Python/GenFds/FdfParser.py index a1825ba..a291c03 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -3672,7 +3672,7 @@ class FdfParser: "DXE_SMM_DRIVER", "DXE_RUNTIME_DRIVER", \ "UEFI_DRIVER", "UEFI_APPLICATION", "USER_DEFI= NED", "DEFAULT", "BASE", \ "SECURITY_CORE", "COMBINED_PEIM_DRIVER", "PIC= _PEIM", "RELOCATABLE_PEIM", \ - "PE32_PEIM", "BS_DRIVER", "RT_DRIVER", "SAL_R= T_DRIVER", "APPLICATION", "ACPITABLE", "SMM_CORE"): + "PE32_PEIM", "BS_DRIVER", "RT_DRIV= ER", "SAL_RT_DRIVER", "APPLICATION", "ACPITABLE", "SMM_CORE", "SMM_STANDALO= NE", "SMM_CORE_STANDALONE"): raise Warning("Unknown Module type '%s'" % self.__Token, self.= FileName, self.CurrentLineNumber) return self.__Token =20 @@ -3716,7 +3716,7 @@ class FdfParser: =20 Type =3D self.__Token.strip().upper() if Type not in ("RAW", "FREEFORM", "SEC", "PEI_CORE", "PEIM",\ - "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLI= CATION", "FV_IMAGE", "SMM", "SMM_CORE"): + "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLI= CATION", "FV_IMAGE", "SMM", "SMM_CORE", "SMM_STANDALONE"): raise Warning("Unknown FV type '%s'" % self.__Token, self.File= Name, self.CurrentLineNumber) =20 if not self.__IsToken("=3D"): diff --git a/BaseTools/Source/Python/GenFds/Ffs.py b/BaseTools/Source/Pytho= n/GenFds/Ffs.py index c8c5a6e..3a44f1c 100644 --- a/BaseTools/Source/Python/GenFds/Ffs.py +++ b/BaseTools/Source/Python/GenFds/Ffs.py @@ -34,7 +34,9 @@ class Ffs(FDClassObject): 'DXE_RUNTIME_DRIVER': 'EFI_FV_FILETYPE_DRIVER', 'UEFI_DRIVER' : 'EFI_FV_FILETYPE_DRIVER', 'UEFI_APPLICATION' : 'EFI_FV_FILETYPE_APPLICATION', - 'SMM_CORE' : 'EFI_FV_FILETYPE_SMM_CORE' + 'SMM_CORE' : 'EFI_FV_FILETYPE_SMM_CORE', + 'SMM_STANDALONE' : 'EFI_FV_FILETYPE_SMM_STANDALONE', + 'SMM_CORE_STANDALONE' : 'EFI_FV_FILETYPE_SMM_CORE', } =20 # mapping between FILE type in FDF and file type for GenFfs @@ -50,7 +52,8 @@ class Ffs(FDClassObject): 'RAW' : 'EFI_FV_FILETYPE_RAW', 'PEI_DXE_COMBO' : 'EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER', 'SMM' : 'EFI_FV_FILETYPE_SMM', - 'SMM_CORE' : 'EFI_FV_FILETYPE_SMM_CORE' + 'SMM_CORE' : 'EFI_FV_FILETYPE_SMM_CORE', + 'SMM_STANDALONE' : 'EFI_FV_FILETYPE_SMM_STANDALONE', } =20 # mapping between section type in FDF and file suffix diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/= Source/Python/GenFds/FfsInfStatement.py index e9517a4..38701bb 100644 --- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py @@ -224,6 +224,9 @@ class FfsInfStatement(FfsInfStatementClassObject): if self.ModuleType =3D=3D 'SMM_CORE' and int(self.PiSpecVersion, 1= 6) < 0x0001000A: EdkLogger.error("GenFds", FORMAT_NOT_SUPPORTED, "SMM_CORE modu= le type can't be used in the module with PI_SPECIFICATION_VERSION less than= 0x0001000A", File=3Dself.InfFileName) =20 =20 + if self.ModuleType =3D=3D 'SMM_CORE_STANDALONE' and int(self.PiSpe= cVersion, 16) < 0x0001000A: + EdkLogger.error("GenFds", FORMAT_NOT_SUPPORTED, "SMM_CORE_STAN= DALONE module type can't be used in the module with PI_SPECIFICATION_VERSIO= N less than 0x0001000A", File=3Dself.InfFileName) =20 + if Inf._Defs !=3D None and len(Inf._Defs) > 0: self.OptRomDefs.update(Inf._Defs) =20 --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Fri Dec 27 20:32:17 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1496699108296776.5596875715486; Mon, 5 Jun 2017 14:45:08 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D5C6021945DDC; Mon, 5 Jun 2017 14:44:00 -0700 (PDT) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 66FBF2095CC73 for ; Mon, 5 Jun 2017 14:44:00 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8E89D344; Mon, 5 Jun 2017 14:45:06 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 76AE63F25D; Mon, 5 Jun 2017 14:45:05 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Mon, 5 Jun 2017 22:43:52 +0100 Message-Id: <1496699034-4186-9-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> References: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 08/10] BaseTools: Tools change to support PI v1.5 Specification. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao , leif.lindholm@arm.com, ard.biesheuvel@linaro.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch registers SMM_STANDALONE and SMM_CORE_STANDALONE module type with python build tools. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao Signed-off-by: Supreeth Venkatesh --- BaseTools/Source/Python/build/BuildReport.py | 4 +++- BaseTools/Source/Python/build/build.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Sourc= e/Python/build/BuildReport.py index 91d1e93..2795da4 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -123,6 +123,8 @@ gDriverTypeMap =3D { 'UEFI_APPLICATION' : '0x9 (APPLICATION)', 'SMM_CORE' : '0xD (SMM_CORE)', 'SMM_DRIVER' : '0xA (SMM)', # Extension of module type to support= PI 1.1 SMM drivers + 'SMM_STANDALONE' : '0xE (SMM_STANDALONE)', + 'SMM_CORE_STANDALONE' : '0xD (SMM_CORE)', } =20 ## The look up table of the supported opcode in the dependency expression = binaries @@ -374,7 +376,7 @@ class DepexReport(object): if not ModuleType: ModuleType =3D gComponentType2ModuleType.get(M.ComponentType, = "") =20 - if ModuleType in ["SEC", "PEI_CORE", "DXE_CORE", "SMM_CORE", "UEFI= _APPLICATION"]: + if ModuleType in ["SEC", "PEI_CORE", "DXE_CORE", "SMM_CORE", "SMM_= CORE_STANDALONE", "UEFI_APPLICATION"]: return =20 for Source in M.SourceFileList: diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index fd94ae6..c67ccb7 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -1499,7 +1499,7 @@ class Build(): if IsIpfPlatform and ImageInfo.Image.Size % 0x2000= !=3D 0: ImageInfo.Image.Size =3D (ImageInfo.Image.Size= / 0x2000 + 1) * 0x2000 RtSize +=3D ImageInfo.Image.Size - elif Module.ModuleType in ['SMM_CORE', 'DXE_SMM_DRIVER= ']: + elif Module.ModuleType in ['SMM_CORE', 'DXE_SMM_DRIVER= ', 'SMM_STANDALONE', 'SMM_CORE_STANDALONE']: SmmModuleList[Module.MetaFile] =3D ImageInfo SmmSize +=3D ImageInfo.Image.Size if Module.ModuleType =3D=3D 'DXE_SMM_DRIVER': --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Fri Dec 27 20:32:17 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 149669911257512.412209410566447; Mon, 5 Jun 2017 14:45:12 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 19E342095CC73; Mon, 5 Jun 2017 14:44:05 -0700 (PDT) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 12FFE21945DEB for ; Mon, 5 Jun 2017 14:44:04 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3A948344; Mon, 5 Jun 2017 14:45:10 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 252043F25D; Mon, 5 Jun 2017 14:45:09 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Mon, 5 Jun 2017 22:43:53 +0100 Message-Id: <1496699034-4186-10-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> References: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 09/10] BaseTools: Tools change to support PI v1.5 Specification. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao , leif.lindholm@arm.com, ard.biesheuvel@linaro.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch checks SUP_MODULE_SMM_CORE_STANDALONE and SUP_MODULE_SMM_STANDALONE module compatibility with PI specification version. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao Signed-off-by: Supreeth Venkatesh --- BaseTools/Source/Python/Workspace/WorkspaceDatabase.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py b/BaseT= ools/Source/Python/Workspace/WorkspaceDatabase.py index c1af5c7..b2e2ecc 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceDatabase.py @@ -1977,6 +1977,10 @@ class InfBuildData(ModuleBuildClassObject): if (self._Specification =3D=3D None) or (not 'PI_SPECIFICATION= _VERSION' in self._Specification) or (int(self._Specification['PI_SPECIFICA= TION_VERSION'], 16) < 0x0001000A): if self._ModuleType =3D=3D SUP_MODULE_SMM_CORE: EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "SMM_CO= RE module type can't be used in the module with PI_SPECIFICATION_VERSION le= ss than 0x0001000A", File=3Dself.MetaFile) + if self._ModuleType =3D=3D SUP_MODULE_SMM_CORE_STANDALONE: + EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "SMM_CO= RE_STANDALONE module type can't be used in the module with PI_SPECIFICATION= _VERSION less than 0x0001000A", File=3Dself.MetaFile) + if self._ModuleType =3D=3D SUP_MODULE_SMM_STANDALONE: + EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "SMM_ST= ANDALONE module type can't be used in the module with PI_SPECIFICATION_VERS= ION less than 0x0001000A", File=3Dself.MetaFile) if self._Defs and 'PCI_DEVICE_ID' in self._Defs and 'PCI_VENDO= R_ID' in self._Defs \ and 'PCI_CLASS_CODE' in self._Defs and 'PCI_REVISION' in se= lf._Defs: self._BuildType =3D 'UEFI_OPTIONROM' --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Fri Dec 27 20:32:17 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1496699116635171.52713097093408; Mon, 5 Jun 2017 14:45:16 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 510E52095CC72; Mon, 5 Jun 2017 14:44:09 -0700 (PDT) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 6CE6321A09105 for ; Mon, 5 Jun 2017 14:44:08 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9452A344; Mon, 5 Jun 2017 14:45:14 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7E53C3F25D; Mon, 5 Jun 2017 14:45:13 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org From: Supreeth Venkatesh To: edk2-devel@lists.01.org Date: Mon, 5 Jun 2017 22:43:54 +0100 Message-Id: <1496699034-4186-11-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> References: <1496699034-4186-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [edk2] [PATCH 10/10] BaseTools: Tools change to support PI v1.5 Specification. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao , leif.lindholm@arm.com, ard.biesheuvel@linaro.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch registers SMM_STANDALONE with Ffs class. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao Signed-off-by: Supreeth Venkatesh --- BaseTools/Source/Python/Eot/FvImage.py | 1 + 1 file changed, 1 insertion(+) diff --git a/BaseTools/Source/Python/Eot/FvImage.py b/BaseTools/Source/Pyth= on/Eot/FvImage.py index f2a9bc6..1ba1dd6 100644 --- a/BaseTools/Source/Python/Eot/FvImage.py +++ b/BaseTools/Source/Python/Eot/FvImage.py @@ -999,6 +999,7 @@ class Ffs(Image): 0x0B : "FIRMWARE_VOLUME_IMAGE", 0x0C : "COMBINED_SMM_DXE", 0x0D : "SMM_CORE", + 0x0E : "SMM_STANDALONE", 0xc0 : "OEM_MIN", 0xdf : "OEM_MAX", 0xe0 : "DEBUG_MIN", --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel