Date   

Re: [edk2-platforms][PATCH V1 15/27] NetworkFeaturePkg: Use MinPlatformPkg build include files

Isaac Oram
 

Pushed as e69e69bdf8..d0919cab63

-----Original Message-----
From: Chaganty, Rangasai V <rangasai.v.chaganty@...>
Sent: Thursday, January 13, 2022 9:58 PM
To: Oram, Isaac W <isaac.w.oram@...>; devel@edk2.groups.io
Cc: Gao, Liming <gaoliming@...>
Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 15/27] NetworkFeaturePkg: Use MinPlatformPkg build include files

Reviewed-by: Sai Chaganty <rangasai.v.chaganty@...>

-----Original Message-----
From: Oram, Isaac W <isaac.w.oram@...>
Sent: Tuesday, January 11, 2022 6:20 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W <isaac.w.oram@...>; Chaganty, Rangasai V <rangasai.v.chaganty@...>; Gao, Liming <gaoliming@...>
Subject: [edk2-devel][edk2-platforms][PATCH V1 15/27] NetworkFeaturePkg: Use MinPlatformPkg build include files

Standalong build was not working due to missing libraries.
Leverage MinPlatformPkg common includes for core libraries.

Cc: Sai Chaganty <rangasai.v.chaganty@...>
Cc: Liming Gao <gaoliming@...>

Signed-off-by: Isaac Oram <isaac.w.oram@...>
---
Features/Intel/Network/NetworkFeaturePkg/Include/NetworkFeature.dsc | 89 ++------------------
Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc | 18 ++++
2 files changed, 24 insertions(+), 83 deletions(-)

diff --git a/Features/Intel/Network/NetworkFeaturePkg/Include/NetworkFeature.dsc b/Features/Intel/Network/NetworkFeaturePkg/Include/NetworkFeature.dsc
index bbc91ecbb1..ca151b4e33 100644
--- a/Features/Intel/Network/NetworkFeaturePkg/Include/NetworkFeature.dsc
+++ b/Features/Intel/Network/NetworkFeaturePkg/Include/NetworkFeature.dsc
@@ -18,12 +18,12 @@
#
################################################################################
[Defines]
-!ifndef $(PEI_ARCH)
- !error "PEI_ARCH must be specified to build this feature!"
-!endif
-!ifndef $(DXE_ARCH)
- !error "DXE_ARCH must be specified to build this feature!"
-!endif
+ !ifndef $(PEI_ARCH)
+ !error "PEI_ARCH must be specified to build this feature!"
+ !endif
+ !ifndef $(DXE_ARCH)
+ !error "DXE_ARCH must be specified to build this feature!"
+ !endif

!include NetworkPkg/NetworkDefines.dsc.inc

@@ -41,56 +41,9 @@
#
################################################################################

-!include MdePkg/MdeLibs.dsc.inc
-
[LibraryClasses]
!include NetworkPkg/NetworkLibs.dsc.inc
-
- #######################################
- # Edk2 Packages
- #######################################
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
- BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
- BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
- DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
- DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
- FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
- HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
- PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
- PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
- PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
- PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
- ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
- SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
- SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
- TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
- UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
- UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
- UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
- UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
- UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
- UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
-
-[LibraryClasses.common.SEC,LibraryClasses.common.PEI_CORE,LibraryClasses.common.PEIM]
- #######################################
- # Edk2 Packages
- #######################################
- HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
- MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-
-[LibraryClasses.common.DXE_CORE,LibraryClasses.common.DXE_SMM_DRIVER,LibraryClasses.common.SMM_CORE,LibraryClasses.common.DXE_DRIVER,LibraryClasses.common.DXE_RUNTIME_DRIVER,LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION]
- #######################################
- # Edk2 Packages
- #######################################
- DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
- DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
- HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
- MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
- PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

################################################################################
#
@@ -106,21 +59,6 @@
# generated for it, but the binary will not be put into any firmware volume.
#
################################################################################
-#
-# Feature PEI Components
-#
-
-# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-# is completed.
-[Components.IA32]
- #####################################
- # Network Feature Package
- #####################################
-
- # Add library instances here that are not included in package components and should be tested
- # in the package build.
-
- # Add components here that should be included in the package build.

#
# Feature DXE Components
@@ -138,18 +76,3 @@

# Add components here that should be included in the package build.
!include NetworkPkg/NetworkComponents.dsc.inc
-
-###################################################################################################
-#
-# BuildOptions Section - Define the module specific tool chain flags that should be used as
-# the default flags for a module. These flags are appended to any
-# standard flags that are defined by the build process. They can be
-# applied for any modules or only those modules with the specific
-# module style (EDK or EDKII) specified in [Components] section.
-#
-# For advanced features, it is recommended to enable [BuildOptions] in
-# the applicable INF file so it does not affect the whole board package
-# build when this DSC file is active.
-#
-###################################################################################################
-[BuildOptions]
diff --git a/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc b/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc
index 199686fa09..cdc5dc851d 100644
--- a/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc
+++ b/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc
@@ -24,6 +24,24 @@
PEI_ARCH = IA32
DXE_ARCH = X64

+[Packages]
+ MinPlatformPkg/MinPlatformPkg.dec
+
+[PcdsFeatureFlag]
+ #
+ # PCD needed for MinPlatform build includes
+ #
+ gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
+ gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
+ gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+
+#
+# Include common libraries
+#
+!include MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
+!include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
+!include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
+
#
# This package always builds the feature.
#
--
2.27.0.windows.1


Re: [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable

Ni, Ray
 

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Long1 Huang
Sent: Thursday, January 13, 2022 1:06 AM
To: devel@edk2.groups.io
Cc: Huang, Long1 <long1.huang@...>; Feng, Bob C <bob.c.feng@...>; Gao, Liming <gaoliming@...>; Bi, Dandan <dandan.bi@...>; Chen, Lin Z <lin.z.chen@...>; Li, Zhuangzhi <zhuangzhi.li@...>
Subject: [edk2-devel] [PATCH] MdeModulePkg/HiiDatabaseDxe: Add Support for authenticated variable

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3796

Database.c:
1. Replace PcdGetExPtr with PcdGetExPtr.
What does above mean? Replace <a> with <a>?


Re: [edk2-platforms][PATCH V1 08/27] SmbiosFeaturePkg: Fix all relative package paths

Isaac Oram
 

Pushed as d1864efa5b..e69e69bdf8

-----Original Message-----
From: Chaganty, Rangasai V <rangasai.v.chaganty@...>
Sent: Thursday, January 13, 2022 9:31 PM
To: Oram, Isaac W <isaac.w.oram@...>; devel@edk2.groups.io
Cc: Gao, Liming <gaoliming@...>
Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 08/27] SmbiosFeaturePkg: Fix all relative package paths

Reviewed-by: Sai Chaganty <rangasai.v.chaganty@...>

-----Original Message-----
From: Oram, Isaac W <isaac.w.oram@...>
Sent: Tuesday, January 11, 2022 6:20 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W <isaac.w.oram@...>; Chaganty, Rangasai V <rangasai.v.chaganty@...>; Gao, Liming <gaoliming@...>
Subject: [edk2-devel][edk2-platforms][PATCH V1 08/27] SmbiosFeaturePkg: Fix all relative package paths

Packages should be at the root of a PACKAGES_PATH entry.
At some point, paths were relative to edk2-platforms/Features/Intel which was functional, but interferes with the proper functioning of packaging tools.

Cc: Sai Chaganty <rangasai.v.chaganty@...>
Cc: Liming Gao <gaoliming@...>

Signed-off-by: Isaac Oram <isaac.w.oram@...>
---
Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/PostMemory.fdf | 2 +-
Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeature.dsc | 2 +-
Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf | 2 +-
Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec | 10 +++++-----
4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/PostMemory.fdf b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/PostMemory.fdf
index 3ed23bd937..c3a3e81503 100644
--- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/PostMemory.fdf
+++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/PostMemo
+++ ry.fdf
@@ -7,4 +7,4 @@
#
##

- INF SystemInformation/SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf
+ INF SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf
diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeature.dsc b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeature.dsc
index 31d44b68b3..094dd957b8 100644
--- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeature.dsc
+++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFe
+++ ature.dsc
@@ -100,7 +100,7 @@
# in the package build.

# Add components here that should be included in the package build.
- SystemInformation/SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf
+ SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf

###################################################################################################
#
diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf
index bd8736b621..8e530c4945 100644
--- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf
+++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosBasicDxe/S
+++ mbiosBasicDxe.inf
@@ -33,7 +33,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec
+ SmbiosFeaturePkg/SmbiosFeaturePkg.dec

[LibraryClasses]
BaseLib
diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec
index 6170f37969..db3cdbb0d0 100644
--- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec
+++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg
+++ .dec
@@ -38,7 +38,7 @@
IndustryStandard/SmBios.h
<Packages>
MdePkg/MdePkg.dec
- SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec
+ SmbiosFeaturePkg/SmbiosFeaturePkg.dec
}
gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType0BiosInformation.Vendor|0x1
gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType0BiosInformation.BiosVersion|0x2
@@ -71,7 +71,7 @@
IndustryStandard/SmBios.h
<Packages>
MdePkg/MdePkg.dec
- SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec
+ SmbiosFeaturePkg/SmbiosFeaturePkg.dec
}
gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType1SystemInformation.Manufacturer|0x1
gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType1SystemInformation.ProductName|0x2
@@ -87,7 +87,7 @@
IndustryStandard/SmBios.h
<Packages>
MdePkg/MdePkg.dec
- SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec
+ SmbiosFeaturePkg/SmbiosFeaturePkg.dec
}

#
@@ -111,7 +111,7 @@
IndustryStandard/SmBios.h
<Packages>
MdePkg/MdePkg.dec
- SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec
+ SmbiosFeaturePkg/SmbiosFeaturePkg.dec
}
gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType3SystemEnclosureChassis.Manufacturer|0x1
gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType3SystemEnclosureChassis.Type|MiscChassisTypeRackMountChassis
@@ -131,7 +131,7 @@
IndustryStandard/SmBios.h
<Packages>
MdePkg/MdePkg.dec
- SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec
+ SmbiosFeaturePkg/SmbiosFeaturePkg.dec
}
gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType32SystemBootInformation.BootStatus|BootInformationStatusNoError

--
2.27.0.windows.1


Re: [edk2-platforms][PATCH V1 07/27] S3FeaturePkg: Use MinPlatformPkg build include files

Isaac Oram
 

Pushed as a16d6344dc..d1864efa5b

-----Original Message-----
From: Chaganty, Rangasai V <rangasai.v.chaganty@...>
Sent: Thursday, January 13, 2022 9:30 PM
To: Oram, Isaac W <isaac.w.oram@...>; devel@edk2.groups.io
Cc: Gao, Liming <gaoliming@...>
Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 07/27] S3FeaturePkg: Use MinPlatformPkg build include files

Reviewed-by: Sai Chaganty <rangasai.v.chaganty@...>

-----Original Message-----
From: Oram, Isaac W <isaac.w.oram@...>
Sent: Tuesday, January 11, 2022 6:20 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W <isaac.w.oram@...>; Chaganty, Rangasai V <rangasai.v.chaganty@...>; Gao, Liming <gaoliming@...>
Subject: [edk2-devel][edk2-platforms][PATCH V1 07/27] S3FeaturePkg: Use MinPlatformPkg build include files

Use the MinPlatformPkg common core build files to build libraries needed by this feature.

Cc: Sai Chaganty <rangasai.v.chaganty@...>
Cc: Liming Gao <gaoliming@...>

Signed-off-by: Isaac Oram <isaac.w.oram@...>
---
Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf | 2 +- Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc | 72 ++------------------
Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc | 18 +++++
3 files changed, 26 insertions(+), 66 deletions(-)

diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf
index 34caf3dacc..fdd16a4e03 100644
--- a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf
+++ b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf
@@ -7,4 +7,4 @@
#
##

- INF S3FeaturePkg/S3Pei/S3Pei.inf
+INF S3FeaturePkg/S3Pei/S3Pei.inf
diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc
index f94bd2b431..cc34e78507 100644
--- a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc
+++ b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc
@@ -18,12 +18,12 @@
#
################################################################################
[Defines]
-!ifndef $(PEI_ARCH)
- !error "PEI_ARCH must be specified to build this feature!"
-!endif
-!ifndef $(DXE_ARCH)
- !error "DXE_ARCH must be specified to build this feature!"
-!endif
+ !ifndef $(PEI_ARCH)
+ !error "PEI_ARCH must be specified to build this feature!"
+ !endif
+ !ifndef $(DXE_ARCH)
+ !error "DXE_ARCH must be specified to build this feature!"
+ !endif

################################################################################
#
@@ -31,34 +31,7 @@
#
################################################################################

-!include MdePkg/MdeLibs.dsc.inc
-
-[LibraryClasses]
- #######################################
- # Edk2 Packages
- #######################################
- BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
- BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
- DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
- IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
- PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
- PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
- PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
-
-[LibraryClasses.common.PEI_CORE,LibraryClasses.common.PEIM]
- #######################################
- # Edk2 Packages
- #######################################
- HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
- MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
- PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
- PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
- PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
-
- #######################################
- # Silicon Initialization Package
- #######################################
+[LibraryClasses.common.PEIM]
SmmAccessLib|IntelSiliconPkg/Feature/SmmAccess/Library/PeiSmmAccessLib/PeiSmmAccessLib.inf

################################################################################
@@ -92,34 +65,3 @@

# Add components here that should be included in the package build.
S3FeaturePkg/S3Pei/S3Pei.inf
-
-#
-# Feature DXE Components
-#
-
-# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308
-# is completed.
-[Components.X64]
- #####################################
- # S3 Feature Package
- #####################################
-
- # Add library instances here that are not included in package components and should be tested
- # in the package build.
-
- # Add components here that should be included in the package build.
-
-###################################################################################################
-#
-# BuildOptions Section - Define the module specific tool chain flags that should be used as
-# the default flags for a module. These flags are appended to any
-# standard flags that are defined by the build process. They can be
-# applied for any modules or only those modules with the specific
-# module style (EDK or EDKII) specified in [Components] section.
-#
-# For advanced features, it is recommended to enable [BuildOptions] in
-# the applicable INF file so it does not affect the whole board package
-# build when this DSC file is active.
-#
-###################################################################################################
-[BuildOptions]
diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc b/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc
index 28ee49d429..e16a1f8d00 100644
--- a/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc
+++ b/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc
@@ -24,6 +24,24 @@
PEI_ARCH = IA32
DXE_ARCH = X64

+[Packages]
+ MinPlatformPkg/MinPlatformPkg.dec
+
+[PcdsFeatureFlag]
+ #
+ # PCD needed for MinPlatform build includes
+ #
+ gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable |FALSE
+ gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable |FALSE
+ gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable |FALSE
+
+#
+# Include common libraries
+#
+!include MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
+!include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
+!include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
+
#
# This package always builds the feature.
#
--
2.27.0.windows.1


Re: [edk2-platforms][PATCH V1 06/27] S3FeaturePkg: Fix all relative package paths

Isaac Oram
 

Pushed as af5a7863ff..a16d6344dc

-----Original Message-----
From: Chaganty, Rangasai V <rangasai.v.chaganty@...>
Sent: Thursday, January 13, 2022 9:20 PM
To: Oram, Isaac W <isaac.w.oram@...>; devel@edk2.groups.io
Cc: Gao, Liming <gaoliming@...>
Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 06/27] S3FeaturePkg: Fix all relative package paths

Reviewed-by: Sai Chaganty <rangasai.v.chaganty@...>

-----Original Message-----
From: Oram, Isaac W <isaac.w.oram@...>
Sent: Tuesday, January 11, 2022 6:20 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W <isaac.w.oram@...>; Chaganty, Rangasai V <rangasai.v.chaganty@...>; Gao, Liming <gaoliming@...>
Subject: [edk2-devel][edk2-platforms][PATCH V1 06/27] S3FeaturePkg: Fix all relative package paths

Packages should be at the root of a PACKAGES_PATH entry.
At some point, paths were relative to edk2-platforms/Features/Intel which was functional, but interferes with the proper functioning of packaging tools.

Cc: Sai Chaganty <rangasai.v.chaganty@...>
Cc: Liming Gao <gaoliming@...>

Signed-off-by: Isaac Oram <isaac.w.oram@...>
---
Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf | 2 +- Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc | 2 +-
Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf
index 3cd5cd9628..34caf3dacc 100644
--- a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf
+++ b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf
@@ -7,4 +7,4 @@
#
##

- INF PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf
+ INF S3FeaturePkg/S3Pei/S3Pei.inf
diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc
index 312870981e..f94bd2b431 100644
--- a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc
+++ b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc
@@ -91,7 +91,7 @@
# in the package build.

# Add components here that should be included in the package build.
- PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf
+ S3FeaturePkg/S3Pei/S3Pei.inf

#
# Feature DXE Components
diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf b/Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf
index 46fbb62a46..e485eac952 100644
--- a/Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf
+++ b/Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf
@@ -23,7 +23,7 @@
[Packages]
MdePkg/MdePkg.dec
IntelSiliconPkg/IntelSiliconPkg.dec
- PowerManagement/S3FeaturePkg/S3FeaturePkg.dec
+ S3FeaturePkg/S3FeaturePkg.dec

[Sources]
S3Pei.c
--
2.27.0.windows.1


Re: [PATCH v2] MdeModulePkg: Enabling OS boot from SD card through UEFI payload

Wu, Hao A
 

Hello Aiman Rosli,

I have provided my feedbacks by replying your patch mail.
Please help to check if you received the mail.
Or you can check the feedbacks at: https://edk2.groups.io/g/devel/message/85764

Best Regards,
Hao Wu

-----Original Message-----
From: Rosli, Muhammad Aiman <muhammad.aiman.rosli@...>
Sent: Wednesday, January 19, 2022 12:26 AM
To: devel@edk2.groups.io; Wu, Hao A <hao.a.wu@...>; Gao, Zhichao
<zhichao.gao@...>; Ni, Ray <ray.ni@...>; Wang, Jian J
<jian.j.wang@...>
Subject: RE: [edk2-devel] [PATCH v2] MdeModulePkg: Enabling OS boot from
SD card through UEFI payload

Hi all,

Please review my patch, if there is no issue, can help to add push label.

Thank you.

Regards,
Aiman Rosli

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Aiman
Rosli
Sent: Monday, 17 January, 2022 8:56 PM
To: devel@edk2.groups.io
Cc: Rosli, Muhammad Aiman <muhammad.aiman.rosli@...>
Subject: [edk2-devel] [PATCH v2] MdeModulePkg: Enabling OS boot from SD
card through UEFI payload

This changes is by adding 50ms delay during voltage switching from 3.3V to
1.8V, plus adding a goto Voltage33Retry for 3.3V checking and retrying.

Signed-off-by: Aiman Rosli <muhammad.aiman.rosli@...>
---
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 23
++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
index 662f9f483c..527fe7dc20 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
+++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
@@ -1213,9 +1213,14 @@ SdCardIdentification (
UINT32 PresentState;
UINT8 HostCtrl2;
UINTN Retry;
+ BOOLEAN ForceVoltage33;
+
+ ForceVoltage33 = FALSE;

PciIo = Private->PciIo;
PassThru = &Private->PassThru;
+
+Voltage33Retry:
//
// 1. Send Cmd0 to the device
//
@@ -1294,6 +1299,14 @@ SdCardIdentification (
return EFI_UNSUPPORTED;
}

+ //
+ // 1.8V had failed in the previous run, forcing a retry with 3.3V
+ instead // if (ForceVoltage33 == TRUE) {
+ S18r = FALSE;
+ ForceVoltage33 = FALSE;
+ }
+
//
// 5. Repeatly send Acmd41 with supply voltage window to the device.
// Note here we only support the cards complied with SD physical
@@ -1362,13 +1375,17 @@ SdCardIdentification (
goto Error;
}

- gBS->Stall (1000);
+ // Workaround to add a delay of 50 ms in order for clock to stabilize
before turning on the SD card again.
+ gBS->Stall (50000);

SdMmcHcRwMmio (PciIo, Slot, SD_MMC_HC_PRESENT_STATE, TRUE,
sizeof (PresentState), &PresentState);
if (((PresentState >> 20) & 0xF) != 0xF) {
DEBUG ((DEBUG_ERROR, "SdCardIdentification: SwitchVoltage fails with
PresentState = 0x%x, It should be 0xF\n", PresentState));
- Status = EFI_DEVICE_ERROR;
- goto Error;
+ Status = SdMmcHcReset (Private, Slot);
+ Status = SdMmcHcInitHost (Private, Slot);
+ ForceVoltage33 = TRUE;
+ DEBUG ((DEBUG_ERROR, "SdCardIdentification: Switching to 1.8V had
failed in the previous run, forcing a retry with 3.3V instead\n"));
+ goto Voltage33Retry;
}
}

--
2.34.1.windows.1





Re: 回复: [PATCH v2 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy

Rebecca Cran
 

It looks like the BZ associated with this change is https://bugzilla.tianocore.org/show_bug.cgi?id=3421 .

It would be nice to get this fix committed, to stop the loud deprecated interface messages.


--
Rebecca Cran

On 6/16/21 18:58, gaoliming wrote:
Ken:
Thanks for your update. Please also update
MdeModulePkg\Universal\BdsDxe\Bds.h to remove #include
<Protocol/VariableLock.h>, because EDKII_VARIABLE_LOCK_PROTOCOL is not used
any more.

Thanks
Liming
-----邮件原件-----
发件人: kenlautner3@... <kenlautner3@...>
发送时间: 2021年6月17日 6:45
收件人: devel@edk2.groups.io
抄送: Jian J Wang <jian.j.wang@...>; Hao A Wu
<hao.a.wu@...>; Zhichao Gao <zhichao.gao@...>; Ray Ni
<ray.ni@...>; Liming Gao <gaoliming@...>
主题: [PATCH v2 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use
Variable Policy

From: Ken Lautner <klautner@...>

Changed BdsEntry.c to use Variable Policy instead of Variable Lock
as Variable Lock will be Deprecated eventually

Cc: Jian J Wang <jian.j.wang@...>
Cc: Hao A Wu <hao.a.wu@...>
Cc: Zhichao Gao <zhichao.gao@...>
Cc: Ray Ni <ray.ni@...>
Cc: Liming Gao <gaoliming@...>
Signed-off-by: Kenneth Lautner <kenlautner3@...>

Reviewed-by Liming Gao <gaoliming@...>
---
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf | 4 +++-
MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 20 +++++++++++++++-----
2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
index 9310b4dccb18..76ff6a0f5fc3 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -50,6 +50,8 @@
BaseMemoryLib

DebugLib

UefiBootManagerLib

+ VariablePolicyLib

+ VariablePolicyHelperLib

PlatformBootManagerLib

PcdLib

PrintLib

@@ -77,7 +79,7 @@
[Protocols]

gEfiBdsArchProtocolGuid ## PRODUCES

gEfiSimpleTextInputExProtocolGuid ## CONSUMES

- gEdkiiVariableLockProtocolGuid ##
SOMETIMES_CONSUMES

+ gEdkiiVariablePolicyProtocolGuid ##
SOMETIMES_CONSUMES

gEfiDeferredImageLoadProtocolGuid ## CONSUMES



[FeaturePcd]

diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
index 83b773a2fa5f..13c10bdc5bf8 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -15,6 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include "Bds.h"

#include "Language.h"

#include "HwErrRecSupport.h"

+#include <Library/VariablePolicyHelperLib.h>



#define SET_BOOT_OPTION_SUPPORT_KEY_COUNT(a, c) { \

(a) = ((a) & ~EFI_BOOT_OPTION_SUPPORT_COUNT) | (((c) <<
LowBitSet32 (EFI_BOOT_OPTION_SUPPORT_COUNT)) &
EFI_BOOT_OPTION_SUPPORT_COUNT); \

@@ -670,7 +671,7 @@ BdsEntry (
EFI_STATUS Status;

UINT32 BootOptionSupport;

UINT16 BootTimeOut;

- EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock;

+ EDKII_VARIABLE_POLICY_PROTOCOL *VariablePolicy;

UINTN Index;

EFI_BOOT_MANAGER_LOAD_OPTION LoadOption;

UINT16 *BootNext;

@@ -716,12 +717,21 @@ BdsEntry (
//

// Mark the read-only variables if the Variable Lock protocol exists

//

- Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL,
(VOID **) &VariableLock);

- DEBUG ((EFI_D_INFO, "[BdsDxe] Locate Variable Lock protocol - %r\n",
Status));

+ Status = gBS->LocateProtocol(&gEdkiiVariablePolicyProtocolGuid, NULL,
(VOID**)&VariablePolicy);

+ DEBUG((DEBUG_INFO, "[BdsDxe] Locate Variable Policy protocol - %r\n",
Status));

if (!EFI_ERROR (Status)) {

for (Index = 0; Index < ARRAY_SIZE (mReadOnlyVariables); Index++) {

- Status = VariableLock->RequestToLock (VariableLock,
mReadOnlyVariables[Index], &gEfiGlobalVariableGuid);

- ASSERT_EFI_ERROR (Status);

+ Status = RegisterBasicVariablePolicy(

+ VariablePolicy,

+ &gEfiGlobalVariableGuid,

+ mReadOnlyVariables[Index],

+ VARIABLE_POLICY_NO_MIN_SIZE,

+ VARIABLE_POLICY_NO_MAX_SIZE,

+ VARIABLE_POLICY_NO_MUST_ATTR,

+ VARIABLE_POLICY_NO_CANT_ATTR,

+ VARIABLE_POLICY_TYPE_LOCK_NOW

+ );

+ ASSERT_EFI_ERROR(Status);

}

}



--
2.31.1.windows.1





Re: [edk2-platforms][PATCH V1 04/27] IpmiFeaturePkg: Fix all relative package paths

Isaac Oram
 

Pushed as 025d67dccc..af5a7863ff

-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desimone@...>
Sent: Wednesday, January 12, 2022 6:49 PM
To: Oram, Isaac W <isaac.w.oram@...>; devel@edk2.groups.io
Cc: Gao, Liming <gaoliming@...>
Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 04/27] IpmiFeaturePkg: Fix all relative package paths

Reviewed-by: Nate DeSimone <nathaniel.l.desimone@...>

-----Original Message-----
From: Oram, Isaac W <isaac.w.oram@...>
Sent: Tuesday, January 11, 2022 6:20 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W <isaac.w.oram@...>; Gao, Liming
<gaoliming@...>; Desimone, Nathaniel L
<nathaniel.l.desimone@...>
Subject: [edk2-devel][edk2-platforms][PATCH V1 04/27] IpmiFeaturePkg:
Fix all relative package paths

Packages should be at the root of a PACKAGES_PATH entry.
At some point, paths were relative to edk2-platforms/Features/Intel
which was functional, but interferes with the proper functioning of packaging tools.

Cc: Liming Gao <gaoliming@...>
Cc: Nate DeSimone <nathaniel.l.desimone@...>

Signed-off-by: Isaac Oram <isaac.w.oram@...>
---

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.
inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElog.i
nf | 2 +-
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
| 2 +-
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
| 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/
GenericIpmi.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/P
eiGenericIpmi.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Smm
/SmmGenericIpmi.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeatu
re.dsc | 36 ++++++++++----------

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMem
ory.fdf | 16 ++++-----

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMemo
ry.fdf | 6 ++--

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru.in
f | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpmiI
nit.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmiIni
t.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLi
b/IpmiBaseLib.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLi
bNull/IpmiBaseLibNull.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiComm
andLib/IpmiCommandLib.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatfor
mHookLibNull/IpmiPlatformHookLibNull.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiBas
eLib/PeiIpmiBaseLib.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiB
aseLib/SmmIpmiBaseLib.inf | 2 +-
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.inf
| 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolStatu
s.inf | 2 +-
21 files changed, 47 insertions(+), 47 deletions(-)

diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAc
pi.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAc
pi.inf
index a84813f55c..7cd60e417b 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAc
pi.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAc
pi.
+++ inf
@@ -22,7 +22,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiBootServicesTableLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElo
g.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElo
g.inf
index 665b3d9bda..388dd2740c 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElo
g.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElo
g.
+++ inf
@@ -21,7 +21,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiDriverEntryPoint
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
index 85836cd8ee..61222e0c00 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
@@ -21,7 +21,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiBootServicesTableLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
index 7ad00ae574..797dbe6a07 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
@@ -20,7 +20,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
PeimEntryPoint
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dx
e/GenericIpmi.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dx
e/GenericIpmi.inf
index 9881f9e3d0..8d80aeb6b5 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dx
e/GenericIpmi.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dx
e/
+++ GenericIpmi.inf
@@ -36,7 +36,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
MemoryAllocationLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei
/PeiGenericIpmi.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei
/PeiGenericIpmi.inf
index 883a9168e5..a646161ce1 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei
/PeiGenericIpmi.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei
/
+++ PeiGenericIpmi.inf
@@ -33,7 +33,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
PeimEntryPoint
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Sm
m/SmmGenericIpmi.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Sm
m/SmmGenericIpmi.inf
index a534f7dac8..f430195d1e 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Sm
m/SmmGenericIpmi.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Sm
m/
+++ SmmGenericIpmi.inf
@@ -27,7 +27,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
MemoryAllocationLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea
ture.dsc
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea
ture.dsc
index a6eccb428b..c1ce340da2 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea
ture.dsc
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea
t
+++ ure.dsc
@@ -47,8 +47,8 @@
#####################################
# IPMI Feature Package
#####################################
-
IpmiCommandLib|OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCo
mmandLib/IpmiCommandLib.inf
-
IpmiPlatformHookLib|OutOfBandManagement/IpmiFeaturePkg/Library/Ipm
iPlatformHookLibNull/IpmiPlatformHookLibNull.inf
+
+
IpmiCommandLib|IpmiFeaturePkg/Library/IpmiCommandLib/IpmiCommand
Lib.in
+ f
+
IpmiPlatformHookLib|IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/Ipm
+ iPlatformHookLibNull.inf

[LibraryClasses.common.PEI_CORE,LibraryClasses.common.PEIM]
#######################################
@@ -65,7 +65,7 @@
#####################################
# IPMI Feature Package
#####################################
-
IpmiBaseLib|OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiBaseL
ib/PeiIpmiBaseLib.inf
+
+ IpmiBaseLib|IpmiFeaturePkg/Library/PeiIpmiBaseLib/PeiIpmiBaseLib.inf

[LibraryClasses.common.DXE_DRIVER,LibraryClasses.common.UEFI_DRIVER]
#######################################
@@ -82,7 +82,7 @@
#####################################
# IPMI Feature Package
#####################################
-
IpmiBaseLib|OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib/
IpmiBaseLib.inf
+ IpmiBaseLib|IpmiFeaturePkg/Library/IpmiBaseLib/IpmiBaseLib.inf


##########################################################
######################
#
@@ -112,14 +112,14 @@
# Add library instances here that are not included in package
components and should be tested
# in the package build.

-
OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/
IpmiPlatformHookLibNull.inf
+
+
IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull
+ .inf

#
# Add components here that should be included in the package build.
#
-
OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.i
nf
- OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
- OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf
+ IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.inf
+ IpmiFeaturePkg/Frb/FrbPei.inf
+ IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf

#
# Feature DXE Components
@@ -135,20 +135,20 @@
# Add library instances here that are not included in package
components and should be tested
# in the package build.

-
OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/
IpmiPlatformHookLibNull.inf
+
+
IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull
+ .inf

#
# Add components here that should be included in the package build.
#
-
OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf
-
OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIp
miBaseLib.inf
- OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf
- OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElog.inf
- OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
- OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru.inf
- OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf
- OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.inf
- OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolStatus.inf
+ IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf
+ IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf
+ IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf
+ IpmiFeaturePkg/BmcElog/BmcElog.inf
+ IpmiFeaturePkg/Frb/FrbDxe.inf
+ IpmiFeaturePkg/IpmiFru/IpmiFru.inf
+ IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf
+ IpmiFeaturePkg/OsWdt/OsWdt.inf
+ IpmiFeaturePkg/SolStatus/SolStatus.inf


##########################################################
#########################################
#
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe
mory.fdf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe
mory.fdf
index cbd9453cf0..158b5455d8 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe
mory.fdf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe
mo
+++ ry.fdf
@@ -7,11 +7,11 @@
#
##

- INF
OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf
- INF OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf
- INF RuleOverride = DRIVER_ACPITABLE
OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf
- INF OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElog.inf
- INF OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
- INF OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru.inf
- INF OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.inf
- INF OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolStatus.inf
+ INF IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf
+ INF IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf
+ INF RuleOverride = DRIVER_ACPITABLE
+ IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf
+ INF IpmiFeaturePkg/BmcElog/BmcElog.inf
+ INF IpmiFeaturePkg/Frb/FrbDxe.inf
+ INF IpmiFeaturePkg/IpmiFru/IpmiFru.inf
+ INF IpmiFeaturePkg/OsWdt/OsWdt.inf
+ INF IpmiFeaturePkg/SolStatus/SolStatus.inf
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMe
mory.fdf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMe
mory.fdf
index 826490952b..d214988bd1 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMe
mory.fdf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMe
mor
+++ y.fdf
@@ -7,6 +7,6 @@
#
##

-INF
OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.i
nf
-INF OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf
-INF OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
+INF IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.inf
+INF IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf
+INF IpmiFeaturePkg/Frb/FrbPei.inf
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru
.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru
.inf
index 0778b221c1..322f061a0f 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru
.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru
.
+++ inf
@@ -21,7 +21,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiDriverEntryPoint
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpm
iInit.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpm
iInit.inf
index 831bfb0b5e..8236fe4842 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpm
iInit.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpm
i
+++ Init.inf
@@ -21,7 +21,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiBootServicesTableLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmi
Init.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmi
Init.inf
index 607a185eb6..3fb31c729a 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmi
Init.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmi
+++ Init.inf
@@ -21,7 +21,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
PeimEntryPoint
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
eLib/IpmiBaseLib.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
eLib/IpmiBaseLib.inf
index 86df943560..72ca3495fb 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
eLib/IpmiBaseLib.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
e
+++ Lib/IpmiBaseLib.inf
@@ -18,7 +18,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiBootServicesTableLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
eLibNull/IpmiBaseLibNull.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
eLibNull/IpmiBaseLibNull.inf
index 5478f9842b..52f8863032 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
eLibNull/IpmiBaseLibNull.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
e
+++ LibNull/IpmiBaseLibNull.inf
@@ -24,7 +24,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
BaseLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCom
mandLib/IpmiCommandLib.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCo
mmandLib/IpmiCommandLib.inf
index f8e7ba5a8f..d5c14ff2a4 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCom
mandLib/IpmiCommandLib.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCo
mm
+++ andLib/IpmiCommandLib.inf
@@ -24,7 +24,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
BaseMemoryLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatf
ormHookLibNull/IpmiPlatformHookLibNull.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlat
formHookLibNull/IpmiPlatformHookLibNull.inf
index ab270079aa..8e472ebdad 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatf
ormHookLibNull/IpmiPlatformHookLibNull.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlat
+++ formHookLibNull/IpmiPlatformHookLibNull.inf
@@ -20,7 +20,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
DebugLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiB
aseLib/PeiIpmiBaseLib.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiB
aseLib/PeiIpmiBaseLib.inf
index 9a2c87873f..234492db65 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiB
aseLib/PeiIpmiBaseLib.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiB
+++ aseLib/PeiIpmiBaseLib.inf
@@ -18,7 +18,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
DebugLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpm
iBaseLib/SmmIpmiBaseLib.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIp
miBaseLib/SmmIpmiBaseLib.inf
index bb1ccf1ca2..7ea688fc16 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpm
iBaseLib/SmmIpmiBaseLib.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIp
miB
+++ aseLib/SmmIpmiBaseLib.inf
@@ -18,7 +18,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiBootServicesTableLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.i
nf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.i
nf
index 7e7d2826cb..3fd1078271 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.i
nf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.i
nf
@@ -20,7 +20,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiDriverEntryPoint
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolSta
tus.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolSta
tus.inf
index 826144e537..9019b849ac 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolSta
tus.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolSta
+++ tus.inf
@@ -21,7 +21,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[Pcd]
gIpmiFeaturePkgTokenSpaceGuid.PcdMaxSOLChannels
--
2.27.0.windows.1


Re: [edk2-platforms][PATCH V1 05/27] IpmiFeaturePkg: Fix build errors

Isaac Oram
 

Pushed as d8232e8816..025d67dccc

-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desimone@...>
Sent: Wednesday, January 12, 2022 6:49 PM
To: Oram, Isaac W <isaac.w.oram@...>; devel@edk2.groups.io
Cc: Gao, Liming <gaoliming@...>
Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 05/27] IpmiFeaturePkg: Fix build errors

Reviewed-by: Nate DeSimone <nathaniel.l.desimone@...>

-----Original Message-----
From: Oram, Isaac W <isaac.w.oram@...>
Sent: Tuesday, January 11, 2022 6:20 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W <isaac.w.oram@...>; Desimone, Nathaniel L
<nathaniel.l.desimone@...>; Gao, Liming
<gaoliming@...>
Subject: [edk2-devel][edk2-platforms][PATCH V1 05/27] IpmiFeaturePkg:
Fix build errors

Fix build issues with standalone build.
Switch to using MinPlatformPkg common core include for common modules.

Cc: Nate DeSimone <nathaniel.l.desimone@...>
Cc: Liming Gao <gaoliming@...>

Signed-off-by: Isaac Oram <isaac.w.oram@...>
---

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeatu
re.dsc | 54 --------------------
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMem
ory.fdf | 16 +++---

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.ds
c | 18 +++++++
3 files changed, 26 insertions(+), 62 deletions(-)

diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea
ture.dsc
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea
ture.dsc
index c1ce340da2..237a4fc006 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea
ture.dsc
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea
t
+++ ure.dsc
@@ -34,54 +34,15 @@
!include MdePkg/MdeLibs.dsc.inc

[LibraryClasses]
- #######################################
- # Edk2 Packages
- #######################################
- BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
-
BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibR
epStr.inf
- DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
IpmiLib|MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf
- PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTem
plate.inf

- #####################################
- # IPMI Feature Package
- #####################################

IpmiCommandLib|IpmiFeaturePkg/Library/IpmiCommandLib/IpmiCommand
Lib.inf

IpmiPlatformHookLib|IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/Ipm
iPlatformHookLibNull.inf

[LibraryClasses.common.PEI_CORE,LibraryClasses.common.PEIM]
- #######################################
- # Edk2 Packages
- #######################################
- HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
-
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemory
AllocationLib.inf
- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
- PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
- PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
-
PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibId
PeiServicesTablePointerLib|t/P
eiServicesTablePointerLibIdt.inf
-
ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiR
eportStatusCodeLib.inf
-
- #####################################
- # IPMI Feature Package
- #####################################

IpmiBaseLib|IpmiFeaturePkg/Library/PeiIpmiBaseLib/PeiIpmiBaseLib.inf

[LibraryClasses.common.DXE_DRIVER,LibraryClasses.common.UEFI_DRIVER]
- #######################################
- # Edk2 Packages
- #######################################
-
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
-
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo
ryAllocationLib.inf
- PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-
UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiB
UefiBootServicesTableLib|o
otServicesTableLib.inf
-
UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEnt
UefiDriverEntryPoint|ry
Point.inf
- UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
-
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib
/UefiRuntimeServicesTableLib.inf
-
- #####################################
- # IPMI Feature Package
- #####################################
IpmiBaseLib|IpmiFeaturePkg/Library/IpmiBaseLib/IpmiBaseLib.inf


##########################################################
######################
@@ -149,18 +110,3 @@
IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf
IpmiFeaturePkg/OsWdt/OsWdt.inf
IpmiFeaturePkg/SolStatus/SolStatus.inf
-
-
##########################################################
#########################################
-#
-# BuildOptions Section - Define the module specific tool chain flags
that should be used as
-# the default flags for a module. These flags are appended to any
-# standard flags that are defined by the build process. They can
be
-# applied for any modules or only those modules with the
specific
-# module style (EDK or EDKII) specified in [Components] section.
-#
-# For advanced features, it is recommended to enable
[BuildOptions] in
-# the applicable INF file so it does not affect the whole board
package
-# build when this DSC file is active.
-#
-
##########################################################
#########################################
-[BuildOptions]
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe
mory.fdf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe
mory.fdf
index 158b5455d8..e0f3bbe158 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe
mory.fdf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe
mo
+++ ry.fdf
@@ -7,11 +7,11 @@
#
##

- INF IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf
- INF IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf
- INF RuleOverride = DRIVER_ACPITABLE
IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf
- INF IpmiFeaturePkg/BmcElog/BmcElog.inf
- INF IpmiFeaturePkg/Frb/FrbDxe.inf
- INF IpmiFeaturePkg/IpmiFru/IpmiFru.inf
- INF IpmiFeaturePkg/OsWdt/OsWdt.inf
- INF IpmiFeaturePkg/SolStatus/SolStatus.inf
+INF IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf
+INF IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf
+INF RuleOverride = DRIVER_ACPITABLE
IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf
+INF IpmiFeaturePkg/BmcElog/BmcElog.inf
+INF IpmiFeaturePkg/Frb/FrbDxe.inf
+INF IpmiFeaturePkg/IpmiFru/IpmiFru.inf
+INF IpmiFeaturePkg/OsWdt/OsWdt.inf
+INF IpmiFeaturePkg/SolStatus/SolStatus.inf
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.
dsc
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.
dsc
index 6a3eed0882..c35e1e174e 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.
dsc
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.
d
+++ sc
@@ -25,6 +25,24 @@
PEI_ARCH = IA32
DXE_ARCH = X64

+[Packages]
+ MinPlatformPkg/MinPlatformPkg.dec
+
+[PcdsFeatureFlag]
+ #
+ # PCD needed for MinPlatform build includes
+ #
+ gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable
|FALSE
+ gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable
|FALSE
+ gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable
|FALSE
+
+#
+# Include common libraries
+#
+!include MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
+!include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
+!include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
+
#
# This package always builds the feature.
#
--
2.27.0.windows.1


Re: [edk2-platforms][PATCH V1 03/27] AcpiDebugFeaturePkg: Fix all relative package paths

Isaac Oram
 

Pushed as 73d1067db3..d8232e8816

-----Original Message-----
From: Chaganty, Rangasai V <rangasai.v.chaganty@...>
Sent: Thursday, January 13, 2022 9:18 PM
To: Oram, Isaac W <isaac.w.oram@...>; devel@edk2.groups.io
Cc: Gao, Liming <gaoliming@...>; Dong, Eric <eric.dong@...>
Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 03/27] AcpiDebugFeaturePkg: Fix all relative package paths

Reviewed-by: Sai Chaganty <rangasai.v.chaganty@...>

-----Original Message-----
From: Oram, Isaac W <isaac.w.oram@...>
Sent: Tuesday, January 11, 2022 6:20 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W <isaac.w.oram@...>; Chaganty, Rangasai V <rangasai.v.chaganty@...>; Gao, Liming <gaoliming@...>; Dong, Eric <eric.dong@...>
Subject: [edk2-devel][edk2-platforms][PATCH V1 03/27] AcpiDebugFeaturePkg: Fix all relative package paths

Packages should be at the root of a PACKAGES_PATH entry.
At some point, paths were relative to edk2-platforms/Features/Intel which was functional, but interferes with the proper functioning of packaging tools.

Cc: Sai Chaganty <rangasai.v.chaganty@...>
Cc: Liming Gao <gaoliming@...>
Cc: Eric Dong <eric.dong@...>

Signed-off-by: Isaac Oram <isaac.w.oram@...>
---
Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.inf | 2 +- Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.inf | 2 +-
Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec | 2 +-
Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc | 4 ++--
Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.inf b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.inf
index b293d83cd9..04b5953bf6 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.inf
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiD
+++ ebugDxe.inf
@@ -32,7 +32,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec
+ AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec

[Pcd]
gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureActive ## CONSUMES diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.inf b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.inf
index dbb33e4ae2..a0058b51ab 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.inf
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiD
+++ ebugSmm.inf
@@ -33,7 +33,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec
+ AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec

[Pcd]
gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureActive ## CONSUMES diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec
index c3bd89fe2b..9159231007 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.d
+++ ec
@@ -29,7 +29,7 @@
[PcdsFeatureFlag]
gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable|FALSE|BOOLEAN|0xA0000001

-[PcdsFixedAtBuild,PcdsPatchableInModule,PcdsDynamic,PcdsDynamicEx]
+[PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
## This PCD specifies the ACPI debug message buffer size.
gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugBufferSize|0x10000|UINT32|0xF0000001

diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc
index 856222a53d..b142978be1 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeat
+++ ure.dsc
@@ -109,8 +109,8 @@
# in the package build.

# Add components here that should be included in the package build.
- Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.inf
- Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.inf
+ AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.inf
+ AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.inf

###################################################################################################
#
diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf
index bbd6eca87b..84560dae50 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fd
+++ f
@@ -7,5 +7,5 @@
#
##

- INF RuleOverride = DRIVER_ACPITABLE Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.inf
- INF RuleOverride = DRIVER_ACPITABLE Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.inf
+ INF RuleOverride = DRIVER_ACPITABLE
+ AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.inf
+ INF RuleOverride = DRIVER_ACPITABLE
+ AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.inf
--
2.27.0.windows.1


Re: [PATCH v2 1/2] EDK2 Code First: PI Specification: New error codes of Host Software class

Michael D Kinney
 

The spec and code changes need to be put together in the edk2-staging repository
following the process here:

https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Code-First-Process

Once we have Reviewed-by from community for the spec and code changes and everything
is checked into the edk2-staging repository, platforms can test the changes and provide
feedback. The amount of testing required depends on the complexity of the change.
Once testing requirements have been met, it is ready for UEFI Forum review of the
content in edk2-staging.


Mike

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Kun Qin
Sent: Tuesday, January 18, 2022 11:00 AM
To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@...>
Cc: Andrew Fish <afish@...>; Leif Lindholm <leif@...>; Gao, Liming <gaoliming@...>; Liu, Zhiguang
<zhiguang.liu@...>
Subject: Re: [edk2-devel] [PATCH v2 1/2] EDK2 Code First: PI Specification: New error codes of Host Software class

Hi Mike,

Do you have further feedback regarding this updated change? If not,
could you please shed some light on how to proceed on this code first PI
spec change request?

Any help is appreciated.

Regards,
Kun

On 01/07/2022 17:32, Kun Qin via groups.io wrote:
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3794

This change includes specification update markdown file that describes
the proposed PI Specification v1.7 Errata A in detail and potential
impact to the existing codebase.

Cc: Andrew Fish <afish@...>
Cc: Leif Lindholm <leif@...>
Cc: Michael D Kinney <michael.d.kinney@...>
Cc: Liming Gao <gaoliming@...>
Cc: Zhiguang Liu <zhiguang.liu@...>

Signed-off-by: Kun Qin <kuqin12@...>
---

Notes:
v2:
- Removed "RELEASE_ASSERT" definition
- Removed reference to EDK2 based memory type info [Mike]

CodeFirst/BZ3794-SpecChange.md | 55 ++++++++++++++++++++
1 file changed, 55 insertions(+)

diff --git a/CodeFirst/BZ3794-SpecChange.md b/CodeFirst/BZ3794-SpecChange.md
new file mode 100644
index 000000000000..61a0be798d7f
--- /dev/null
+++ b/CodeFirst/BZ3794-SpecChange.md
@@ -0,0 +1,55 @@
+# Title: Introduction of `EFI_SW_EC_FRAGMENTED_MEMORY_MAP` Status Code
+
+## Status: Draft
+
+## Document: UEFI Platform Initialization Specification Version 1.7 Errata A
+
+## License
+
+SPDX-License-Identifier: CC-BY-4.0
+
+## Submitter: [TianoCore Community](https://www.tianocore.org)
+
+## Summary of the change
+
+Add `EFI_SW_EC_FRAGMENTED_MEMORY_MAP` into Status Codes definition.
+
+## Benefits of the change
+
+Current Status Codes covered various [software class error code
definitions](https://github.com/tianocore/edk2/blob/master/MdePkg/Include/Pi/PiStatusCode.h).
+
+However, fragmented memory map from boot to boot would fail to meet certain OS ACPI requirements (i.e. S4 resume boot requires
consistent memory maps) and trigger system reboots. Yet the corresponding case was not covered by the already defined status
codes.
+
+The unexpected system reboots above could indicate decay of system health and reporting of such generic events would provide
helpful information to OEMs to investigate/prevent system failures in general.
+
+The request of this change intends to expand definitions of `EFI_SW_EC_**` under Status Codes to cover more unexpected system
reboot events, which could improve Status Code futility and readability.
+
+## Impact of the change
+
+Occupy a new macro definitions of Error Codes under Software class Status Codes.
+
+## Detailed description of the change [normative updates]
+
+### Specification Changes
+
+1. In PI Specification v1.7 Errata A: Vol. 3, Table 3-61: Error Code Operations: Host Software Class, add one new rows below
`EFI_SW_EC_FV_CORRUPTED` definition:
+
+ | Operation | Description | Extended Data |
+ | --- | --- | --- |
+ | EFI_SW_EC_FRAGMENTED_MEMORY_MAP | System will reboot due to fragmented memory maps | None |
+
+1. In PI Specification v1.7 Errata A: Vol. 3, Table 3-61: Error Code Operations: Host Software Class, replace the row of
`0x0014-0x00FF` to:
+
+ | Operation | Description | Extended Data |
+ | --- | --- | --- |
+ | 0x0015-0x00FF | Reserved for future use by this specification for Host Software class error codes. | None |
+
+1. In PI Specification v1.7 Errata A: Vol. 3, Section 6.7.4.3 Error Code Definitions: Prototype, add one new definitions below
`EFI_SW_EC_FV_CORRUPTED` definition:
+
+ ```c
+ #define EFI_SW_EC_FRAGMENTED_MEMORY_MAP 0x00000014
+ ```
+
+### Code Changes
+
+1. Add macro definitions in `MdePkg/Include/Pi/PiStatusCode.h` to match new specification.



Re: [PATCH v2 0/6] MM communicate functionality in variable policy

Kun Qin
 

I thought the reply on website will retain the original CC list. But I was wrong about that.

Thanks for the reminder, Rebecca.

Regards,
Kun

On 01/18/2022 14:04, Rebecca Cran wrote:
[+Leif, Ard]
Kun,
There's often so much mailing list traffic that you need to CC the maintainers for them to see your emails.
--
Rebecca Cran
On 1/18/22 11:40, Kun Qin wrote:
Hi ArmPkg maintainers,

It has been almost a month since this v2 patch series has been sent out for review. Could you please take a look and provide feedback? Thanks in advance.

Regards,
Kun


Re: [PATCH v2 0/6] MM communicate functionality in variable policy

Rebecca Cran
 

[+Leif, Ard]


Kun,


There's often so much mailing list traffic that you need to CC the maintainers for them to see your emails.


--

Rebecca Cran


On 1/18/22 11:40, Kun Qin wrote:
Hi ArmPkg maintainers,

It has been almost a month since this v2 patch series has been sent out for review. Could you please take a look and provide feedback? Thanks in advance.

Regards,
Kun


Re: [PATCH v2 1/2] EDK2 Code First: PI Specification: New error codes of Host Software class

Kun Qin
 

Hi Mike,

Do you have further feedback regarding this updated change? If not, could you please shed some light on how to proceed on this code first PI spec change request?

Any help is appreciated.

Regards,
Kun

On 01/07/2022 17:32, Kun Qin via groups.io wrote:
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3794
This change includes specification update markdown file that describes
the proposed PI Specification v1.7 Errata A in detail and potential
impact to the existing codebase.
Cc: Andrew Fish <afish@...>
Cc: Leif Lindholm <leif@...>
Cc: Michael D Kinney <michael.d.kinney@...>
Cc: Liming Gao <gaoliming@...>
Cc: Zhiguang Liu <zhiguang.liu@...>
Signed-off-by: Kun Qin <kuqin12@...>
---
Notes:
v2:
- Removed "RELEASE_ASSERT" definition
- Removed reference to EDK2 based memory type info [Mike]
CodeFirst/BZ3794-SpecChange.md | 55 ++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/CodeFirst/BZ3794-SpecChange.md b/CodeFirst/BZ3794-SpecChange.md
new file mode 100644
index 000000000000..61a0be798d7f
--- /dev/null
+++ b/CodeFirst/BZ3794-SpecChange.md
@@ -0,0 +1,55 @@
+# Title: Introduction of `EFI_SW_EC_FRAGMENTED_MEMORY_MAP` Status Code
+
+## Status: Draft
+
+## Document: UEFI Platform Initialization Specification Version 1.7 Errata A
+
+## License
+
+SPDX-License-Identifier: CC-BY-4.0
+
+## Submitter: [TianoCore Community](https://www.tianocore.org)
+
+## Summary of the change
+
+Add `EFI_SW_EC_FRAGMENTED_MEMORY_MAP` into Status Codes definition.
+
+## Benefits of the change
+
+Current Status Codes covered various [software class error code definitions](https://github.com/tianocore/edk2/blob/master/MdePkg/Include/Pi/PiStatusCode.h).
+
+However, fragmented memory map from boot to boot would fail to meet certain OS ACPI requirements (i.e. S4 resume boot requires consistent memory maps) and trigger system reboots. Yet the corresponding case was not covered by the already defined status codes.
+
+The unexpected system reboots above could indicate decay of system health and reporting of such generic events would provide helpful information to OEMs to investigate/prevent system failures in general.
+
+The request of this change intends to expand definitions of `EFI_SW_EC_**` under Status Codes to cover more unexpected system reboot events, which could improve Status Code futility and readability.
+
+## Impact of the change
+
+Occupy a new macro definitions of Error Codes under Software class Status Codes.
+
+## Detailed description of the change [normative updates]
+
+### Specification Changes
+
+1. In PI Specification v1.7 Errata A: Vol. 3, Table 3-61: Error Code Operations: Host Software Class, add one new rows below `EFI_SW_EC_FV_CORRUPTED` definition:
+
+ | Operation | Description | Extended Data |
+ | --- | --- | --- |
+ | EFI_SW_EC_FRAGMENTED_MEMORY_MAP | System will reboot due to fragmented memory maps | None |
+
+1. In PI Specification v1.7 Errata A: Vol. 3, Table 3-61: Error Code Operations: Host Software Class, replace the row of `0x0014-0x00FF` to:
+
+ | Operation | Description | Extended Data |
+ | --- | --- | --- |
+ | 0x0015-0x00FF | Reserved for future use by this specification for Host Software class error codes. | None |
+
+1. In PI Specification v1.7 Errata A: Vol. 3, Section 6.7.4.3 Error Code Definitions: Prototype, add one new definitions below `EFI_SW_EC_FV_CORRUPTED` definition:
+
+ ```c
+ #define EFI_SW_EC_FRAGMENTED_MEMORY_MAP 0x00000014
+ ```
+
+### Code Changes
+
+1. Add macro definitions in `MdePkg/Include/Pi/PiStatusCode.h` to match new specification.


Re: [PATCH v2 0/6] MM communicate functionality in variable policy

Kun Qin
 

Hi ArmPkg maintainers,

It has been almost a month since this v2 patch series has been sent out for review. Could you please take a look and provide feedback? Thanks in advance.

Regards,
Kun


Re: [PATCH v2] MdeModulePkg: Enabling OS boot from SD card through UEFI payload

Aiman Rosli
 

Hi all,

Please review my patch, if there is no issue, can help to add push label.

Thank you.

Regards,
Aiman Rosli

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Aiman Rosli
Sent: Monday, 17 January, 2022 8:56 PM
To: devel@edk2.groups.io
Cc: Rosli, Muhammad Aiman <muhammad.aiman.rosli@...>
Subject: [edk2-devel] [PATCH v2] MdeModulePkg: Enabling OS boot from SD card through UEFI payload

This changes is by adding 50ms delay during voltage switching from 3.3V to 1.8V, plus adding a goto Voltage33Retry for 3.3V checking and retrying.

Signed-off-by: Aiman Rosli <muhammad.aiman.rosli@...>
---
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 23 ++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
index 662f9f483c..527fe7dc20 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
+++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
@@ -1213,9 +1213,14 @@ SdCardIdentification (
UINT32 PresentState;
UINT8 HostCtrl2;
UINTN Retry;
+ BOOLEAN ForceVoltage33;
+
+ ForceVoltage33 = FALSE;

PciIo = Private->PciIo;
PassThru = &Private->PassThru;
+
+Voltage33Retry:
//
// 1. Send Cmd0 to the device
//
@@ -1294,6 +1299,14 @@ SdCardIdentification (
return EFI_UNSUPPORTED;
}

+ //
+ // 1.8V had failed in the previous run, forcing a retry with 3.3V
+ instead // if (ForceVoltage33 == TRUE) {
+ S18r = FALSE;
+ ForceVoltage33 = FALSE;
+ }
+
//
// 5. Repeatly send Acmd41 with supply voltage window to the device.
// Note here we only support the cards complied with SD physical
@@ -1362,13 +1375,17 @@ SdCardIdentification (
goto Error;
}

- gBS->Stall (1000);
+ // Workaround to add a delay of 50 ms in order for clock to stabilize before turning on the SD card again.
+ gBS->Stall (50000);

SdMmcHcRwMmio (PciIo, Slot, SD_MMC_HC_PRESENT_STATE, TRUE, sizeof (PresentState), &PresentState);
if (((PresentState >> 20) & 0xF) != 0xF) {
DEBUG ((DEBUG_ERROR, "SdCardIdentification: SwitchVoltage fails with PresentState = 0x%x, It should be 0xF\n", PresentState));
- Status = EFI_DEVICE_ERROR;
- goto Error;
+ Status = SdMmcHcReset (Private, Slot);
+ Status = SdMmcHcInitHost (Private, Slot);
+ ForceVoltage33 = TRUE;
+ DEBUG ((DEBUG_ERROR, "SdCardIdentification: Switching to 1.8V had failed in the previous run, forcing a retry with 3.3V instead\n"));
+ goto Voltage33Retry;
}
}

--
2.34.1.windows.1


Re: [PATCH 00/24] CryptoPkg/openssl: update openssl submodule to v3.0

Michael D Kinney
 

Gerd,

Thank you for the continued work on v3.0 support. Comments below.

Mike

-----Original Message-----
From: Yao, Jiewen <jiewen.yao@...>
Sent: Tuesday, January 18, 2022 3:12 AM
To: kraxel@...; devel@edk2.groups.io
Cc: Kinney, Michael D <michael.d.kinney@...>; Wang, Jian J <jian.j.wang@...>; Jiang, Guomin <guomin.jiang@...>;
Pawel Polawski <ppolawsk@...>; Lu, XiaoyuX <xiaoyux.lu@...>
Subject: RE: [edk2-devel] [PATCH 00/24] CryptoPkg/openssl: update openssl submodule to v3.0

Thank you!
Good result. Comment below:

-----Original Message-----
From: kraxel@... <kraxel@...>
Sent: Monday, January 17, 2022 7:46 PM
To: devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@...>
Cc: Kinney, Michael D <michael.d.kinney@...>; Wang, Jian J
<jian.j.wang@...>; Jiang, Guomin <guomin.jiang@...>; Pawel
Polawski <ppolawsk@...>; Lu, XiaoyuX <xiaoyux.lu@...>
Subject: Re: [edk2-devel] [PATCH 00/24] CryptoPkg/openssl: update openssl
submodule to v3.0

Hi,

I've continued working on this over the last weeks. Time for a status
update. All applies to the latest tree, sneak preview is here:
https://github.com/kraxel/edk2/commits/openssl3

Also, assuming you have done enough test, would you please provide:
1) size difference, Including PEI, SMM, DXE.
No changes in SEC and PEI.
[Jiewen] Do you mean the Crypto consumer in PEI has no size difference? Such as
https://github.com/tianocore/edk2/tree/master/SecurityPkg/Tcg/Tcg2Pei ,
https://github.com/tianocore/edk2/tree/master/SecurityPkg/FvReportPei ,
https://github.com/tianocore/edk2/tree/master/SignedCapsulePkg/Universal/RecoveryModuleLoadPei linking
https://github.com/tianocore/edk2/tree/master/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256.

DXE:

openssl 1.1
- 399582 SecureBootConfigDxe
- 472182 SecurityStubDxe
- 532626 VariableSmm
- 656382 TlsDxe

openssl 3.0
+ 809886 SecureBootConfigDxe
+ 912310 SecurityStubDxe
+ 970898 VariableSmm
+ 1125758 TlsDxe

Most of that seems to come from some openssl core changes (the new
'provider' concept) and I don't see an easy way to cut that down.

That is with the same feature set we have right now (i.e. no elliptic
curves and thus no TLS 1.3 support).
[Jiewen] It almost doubles the size, which will becomes a big challenge for openssl3.0 adoption.



2) performance difference, Including PEI, SMM, DXE.
Suggestions how to measure that?
[Jiewen] Please just write an app to call the crypto API, multiple times.
https://github.com/tianocore/edk2/tree/master/CryptoPkg/Test/UnitTest/Library/BaseCryptLib
I think we can focus on SHA256/RSA2048 + AES, which is used in secure boot, and HTTPS boot.


3) what unit test you have done (such as each crypto API)
CryptoPkg/UnitTest passes.
[Jiewen] Good enough.


4) what system test you have done (such as secure boot, trusted boot)
Secure boot works.
TlsDxe (boot from https server) works.
TPM not tested yet.
[Jiewen] Good enough. TPM only includes HASH. I am not too worry about that.




I still have a bunch of failures in CI, for some of them I'm not sure
how to handle them best:

(1) 32-bit builds on windows fail:

INFO - OpensslLibCrypto.lib(rsa_lib.obj) : error LNK2001: unresolved external
symbol __allmul
INFO - OpensslLibCrypto.lib(rsa_lib.obj) : error LNK2001: unresolved external
symbol __aulldiv
INFO - OpensslLibCrypto.lib(bio_print.obj) : error LNK2001: unresolved external
symbol __aulldvrm
INFO - OpensslLibCrypto.lib(bio_print.obj) : error LNK2001: unresolved external
symbol __ftol2_sse
We need to see if there are any OpenSSL config settings to completely remove use of
float/double types. UEFI envs do not support float/double. It is possible to
use them in a UEFI App or other UEFI FW components, but the use of those need
to do extra work to disable interrupts and save/restore state.


Those symbols look like they reference helper functions to do 64bit math
on 32bit architecture. Any hints how to fix that?
[Jiewen] Please add them to https://github.com/tianocore/edk2/tree/master/CryptoPkg/Library/IntrinsicLib



(2) va_arg is not working with floats due to SEE being disabled:

INFO -
/home/vsts/work/1/s/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bio_pri
nt.c:265:28: error: SSE register argument with SSE disabled
INFO - fvalue = va_arg(args, LDOUBLE);

I can't see a way to fix that given that va_arg typically refers to a
compiler builtin so I don't think there is a way to declare that a
EFIAPI function to change the calling convention. Not all builds fail
though, possibly because the compiler inlines with optimization turned
on.

Suggestions anyone?
[Jiewen] This seems infrastructure issue.
Any suggestion, Mike ?
As mentioned above, it would be better if OpenSSL had a config setting to
not use any float/double types.





(3) Some NOOPT builds are failing due to the size growing ...
[Jiewen] Size becomes big challenge...
Have you tried to use https://github.com/tianocore/edk2/tree/master/CryptoPkg/Driver solution?




take care,
Gerd


Re: [PATCH 00/24] CryptoPkg/openssl: update openssl submodule to v3.0

Yao, Jiewen
 

Thank you!
Good result. Comment below:

-----Original Message-----
From: kraxel@... <kraxel@...>
Sent: Monday, January 17, 2022 7:46 PM
To: devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@...>
Cc: Kinney, Michael D <michael.d.kinney@...>; Wang, Jian J
<jian.j.wang@...>; Jiang, Guomin <guomin.jiang@...>; Pawel
Polawski <ppolawsk@...>; Lu, XiaoyuX <xiaoyux.lu@...>
Subject: Re: [edk2-devel] [PATCH 00/24] CryptoPkg/openssl: update openssl
submodule to v3.0

Hi,

I've continued working on this over the last weeks. Time for a status
update. All applies to the latest tree, sneak preview is here:
https://github.com/kraxel/edk2/commits/openssl3

Also, assuming you have done enough test, would you please provide:
1) size difference, Including PEI, SMM, DXE.
No changes in SEC and PEI.
[Jiewen] Do you mean the Crypto consumer in PEI has no size difference? Such as
https://github.com/tianocore/edk2/tree/master/SecurityPkg/Tcg/Tcg2Pei ,
https://github.com/tianocore/edk2/tree/master/SecurityPkg/FvReportPei ,
https://github.com/tianocore/edk2/tree/master/SignedCapsulePkg/Universal/RecoveryModuleLoadPei linking https://github.com/tianocore/edk2/tree/master/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256.

DXE:

openssl 1.1
- 399582 SecureBootConfigDxe
- 472182 SecurityStubDxe
- 532626 VariableSmm
- 656382 TlsDxe

openssl 3.0
+ 809886 SecureBootConfigDxe
+ 912310 SecurityStubDxe
+ 970898 VariableSmm
+ 1125758 TlsDxe

Most of that seems to come from some openssl core changes (the new
'provider' concept) and I don't see an easy way to cut that down.

That is with the same feature set we have right now (i.e. no elliptic
curves and thus no TLS 1.3 support).
[Jiewen] It almost doubles the size, which will becomes a big challenge for openssl3.0 adoption.



2) performance difference, Including PEI, SMM, DXE.
Suggestions how to measure that?
[Jiewen] Please just write an app to call the crypto API, multiple times.
https://github.com/tianocore/edk2/tree/master/CryptoPkg/Test/UnitTest/Library/BaseCryptLib
I think we can focus on SHA256/RSA2048 + AES, which is used in secure boot, and HTTPS boot.


3) what unit test you have done (such as each crypto API)
CryptoPkg/UnitTest passes.
[Jiewen] Good enough.


4) what system test you have done (such as secure boot, trusted boot)
Secure boot works.
TlsDxe (boot from https server) works.
TPM not tested yet.
[Jiewen] Good enough. TPM only includes HASH. I am not too worry about that.




I still have a bunch of failures in CI, for some of them I'm not sure
how to handle them best:

(1) 32-bit builds on windows fail:

INFO - OpensslLibCrypto.lib(rsa_lib.obj) : error LNK2001: unresolved external
symbol __allmul
INFO - OpensslLibCrypto.lib(rsa_lib.obj) : error LNK2001: unresolved external
symbol __aulldiv
INFO - OpensslLibCrypto.lib(bio_print.obj) : error LNK2001: unresolved external
symbol __aulldvrm
INFO - OpensslLibCrypto.lib(bio_print.obj) : error LNK2001: unresolved external
symbol __ftol2_sse

Those symbols look like they reference helper functions to do 64bit math
on 32bit architecture. Any hints how to fix that?
[Jiewen] Please add them to https://github.com/tianocore/edk2/tree/master/CryptoPkg/Library/IntrinsicLib



(2) va_arg is not working with floats due to SEE being disabled:

INFO -
/home/vsts/work/1/s/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bio_pri
nt.c:265:28: error: SSE register argument with SSE disabled
INFO - fvalue = va_arg(args, LDOUBLE);

I can't see a way to fix that given that va_arg typically refers to a
compiler builtin so I don't think there is a way to declare that a
EFIAPI function to change the calling convention. Not all builds fail
though, possibly because the compiler inlines with optimization turned
on.

Suggestions anyone?
[Jiewen] This seems infrastructure issue.
Any suggestion, Mike ?




(3) Some NOOPT builds are failing due to the size growing ...
[Jiewen] Size becomes big challenge...
Have you tried to use https://github.com/tianocore/edk2/tree/master/CryptoPkg/Driver solution?




take care,
Gerd


Re: [PATCH v3 0/2] MdePkg,SecurityPkg: Add support to RngDxe and BaseRngLib for AARCH64 RNDR

PierreGondois
 

Hello all,
I have a question about the this patch, and more generically the organization
of the MdePkg. The current organization, for the BaseRngLib, is as:
 - the BaseRngLib implements the library functions of
   MdePkg/Include/Library/RngLib.h
 - the BaseRngLib contains Ia32, X64 and AARCH64 implementations

This means the BaseRngLib contains arch specific functions. It comes that I
would like to re-use one of these arch specific functions. My question is
then, shouldn't the BaseRngLib contains an arch agnostic implementation,
and the arch specific implementation be placed in arch specific folders
(ArmPkg for arm, I am not sure for other architectures) ?

Another possibility for me is to me is to move the function that I want
to use to the ArmPkg, but this means the MdePkg would be dependent
on the ArmPkg. Would this be a viable option ?

Regards,
Pierre

On 5/10/21 11:53 PM, Rebecca Cran via groups.io wrote:
Update MdePkg BaseRngLib and SecurityPkg RngDxe to add support for
the AARCH64 RNDR instruction.

Changes from v2 to v3:

o Fixed the default value of gEfiSecurityPkgTokenSpaceGuid.PcdCpuRngSupportedAlgorithm
to be an empty GUID.
o Removed RNDRRS since it wasn't being used.
o Fixed the commit message to remove mention of BaseLib.

Rebecca Cran (2):
MdePkg/BaseRngLib: Add support for ARMv8.5 RNG instructions
SecurityPkg: Add support for RngDxe on AARCH64

MdePkg/MdePkg.dec | 9 +-
SecurityPkg/SecurityPkg.dec | 2 +
MdePkg/MdePkg.dsc | 4 +-
SecurityPkg/SecurityPkg.dsc | 11 +-
MdePkg/Library/BaseRngLib/BaseRngLib.inf | 23 ++-
SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf | 24 ++-
MdePkg/Library/BaseRngLib/AArch64/ArmRng.h | 43 +++++
MdePkg/Library/BaseRngLib/BaseRngLibInternals.h | 78 +++++++++
SecurityPkg/RandomNumberGenerator/RngDxe/{ => Rand}/AesCore.h | 0
SecurityPkg/RandomNumberGenerator/RngDxe/{ => Rand}/RdRand.h | 17 --
SecurityPkg/RandomNumberGenerator/RngDxe/RngDxeInternals.h | 117 ++++++++++++++
MdePkg/Library/BaseRngLib/AArch64/Rndr.c | 139 ++++++++++++++++
MdePkg/Library/BaseRngLib/BaseRng.c | 87 +++++-----
MdePkg/Library/BaseRngLib/Rand/RdRand.c | 131 +++++++++++++++
SecurityPkg/RandomNumberGenerator/RngDxe/AArch64/RngDxe.c | 127 +++++++++++++++
SecurityPkg/RandomNumberGenerator/RngDxe/{ => Rand}/AesCore.c | 0
SecurityPkg/RandomNumberGenerator/RngDxe/{ => Rand}/RdRand.c | 45 +-----
SecurityPkg/RandomNumberGenerator/RngDxe/Rand/RngDxe.c | 146 +++++++++++++++++
SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.c | 170 ++++++++------------
MdePkg/Library/BaseRngLib/AArch64/ArmReadIdIsar0.S | 31 ++++
MdePkg/Library/BaseRngLib/AArch64/ArmReadIdIsar0.asm | 30 ++++
MdePkg/Library/BaseRngLib/AArch64/ArmRng.S | 37 +++++
MdePkg/Library/BaseRngLib/AArch64/ArmRng.asm | 39 +++++
MdePkg/Library/BaseRngLib/BaseRngLib.uni | 6 +-
24 files changed, 1086 insertions(+), 230 deletions(-)
create mode 100644 MdePkg/Library/BaseRngLib/AArch64/ArmRng.h
create mode 100644 MdePkg/Library/BaseRngLib/BaseRngLibInternals.h
rename SecurityPkg/RandomNumberGenerator/RngDxe/{ => Rand}/AesCore.h (100%)
rename SecurityPkg/RandomNumberGenerator/RngDxe/{ => Rand}/RdRand.h (72%)
create mode 100644 SecurityPkg/RandomNumberGenerator/RngDxe/RngDxeInternals.h
create mode 100644 MdePkg/Library/BaseRngLib/AArch64/Rndr.c
create mode 100644 MdePkg/Library/BaseRngLib/Rand/RdRand.c
create mode 100644 SecurityPkg/RandomNumberGenerator/RngDxe/AArch64/RngDxe.c
rename SecurityPkg/RandomNumberGenerator/RngDxe/{ => Rand}/AesCore.c (100%)
rename SecurityPkg/RandomNumberGenerator/RngDxe/{ => Rand}/RdRand.c (71%)
create mode 100644 SecurityPkg/RandomNumberGenerator/RngDxe/Rand/RngDxe.c
create mode 100644 MdePkg/Library/BaseRngLib/AArch64/ArmReadIdIsar0.S
create mode 100644 MdePkg/Library/BaseRngLib/AArch64/ArmReadIdIsar0.asm
create mode 100644 MdePkg/Library/BaseRngLib/AArch64/ArmRng.S
create mode 100644 MdePkg/Library/BaseRngLib/AArch64/ArmRng.asm


Re: [PATCH v5 1/4] IntelSiliconPkg/VTd: Fix typos

Huang, Jenny
 

Reviewed-by: Jenny Huang <jenny.huang@...>

-----Original Message-----
From: Sheng, W <w.sheng@...>
Sent: Tuesday, January 18, 2022 4:15 PM
To: devel@edk2.groups.io
Cc: Ni, Ray <ray.ni@...>; Chaganty, Rangasai V <rangasai.v.chaganty@...>; Huang, Jenny <jenny.huang@...>; Kowalewski, Robert <robert.kowalewski@...>
Subject: [PATCH v5 1/4] IntelSiliconPkg/VTd: Fix typos

It is DRHD(DMA Remapping Hardware Unit Definition).

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3622

Cc: Ray Ni <ray.ni@...>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@...>
Cc: Jenny Huang <jenny.huang@...>
Cc: Robert Kowalewski <robert.kowalewski@...>
Reviewed-by: Jenny Huang <jenny.huang@...>
Signed-off-by: Sheng Wei <w.sheng@...>
---
.../IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/DmarTable.c | 12 ++++++------ .../IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c | 12 ++++++------
.../IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/DmarTable.c | 6 +++---
3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/DmarTable.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/DmarTable.c
index 2154690d..e9c99d0a 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/DmarTable.c
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/DmarTabl
+++ e.c
@@ -539,14 +539,14 @@ RegisterPciDevice ( }

/**
- Process DMAR DHRD table.
+ Process DMAR DRHD table.

@param[in] VTdUnitInfo The VTd engine unit information.
@param[in] DmarDrhd The DRHD table.

**/
VOID
-ProcessDhrd (
+ProcessDrhd (
IN VTD_UNIT_INFO *VTdUnitInfo,
IN EFI_ACPI_DMAR_DRHD_HEADER *DmarDrhd
)
@@ -581,10 +581,10 @@ ProcessDhrd (

if ((DmarDrhd->Flags & EFI_ACPI_DMAR_DRHD_FLAGS_INCLUDE_PCI_ALL) != 0) {
VTdUnitInfo->PciDeviceInfo.IncludeAllFlag = TRUE;
- DEBUG ((DEBUG_INFO," ProcessDhrd: with INCLUDE ALL\n"));
+ DEBUG ((DEBUG_INFO," ProcessDrhd: with INCLUDE ALL\n"));
} else {
VTdUnitInfo->PciDeviceInfo.IncludeAllFlag = FALSE;
- DEBUG ((DEBUG_INFO," ProcessDhrd: without INCLUDE ALL\n"));
+ DEBUG ((DEBUG_INFO," ProcessDrhd: without INCLUDE ALL\n"));
}

VTdUnitInfo->PciDeviceInfo.PciDeviceDataNumber = 0; @@ -600,7 +600,7 @@ ProcessDhrd (
return;
}

- DEBUG ((DEBUG_INFO," ProcessDhrd: "));
+ DEBUG ((DEBUG_INFO," ProcessDrhd: "));
switch (DmarDevScopeEntry->Type) {
case EFI_ACPI_DEVICE_SCOPE_ENTRY_TYPE_PCI_ENDPOINT:
DEBUG ((DEBUG_INFO,"PCI Endpoint")); @@ -708,7 +708,7 @@ ParseDmarAcpiTableDrhd (
switch (DmarHeader->Type) {
case EFI_ACPI_DMAR_TYPE_DRHD:
ASSERT (VtdIndex < VtdUnitNumber);
- ProcessDhrd (&VTdInfo->VtdUnitInfo[VtdIndex], (EFI_ACPI_DMAR_DRHD_HEADER *) DmarHeader);
+ ProcessDrhd (&VTdInfo->VtdUnitInfo[VtdIndex],
+ (EFI_ACPI_DMAR_DRHD_HEADER *) DmarHeader);
VtdIndex++;

break;
diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
index 1ee290b7..75fbd53e 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTabl
+++ e.c
@@ -662,7 +662,7 @@ GetPciBusDeviceFunction ( }

/**
- Process DMAR DHRD table.
+ Process DMAR DRHD table.

@param[in] VtdIndex The index of VTd engine.
@param[in] DmarDrhd The DRHD table.
@@ -670,7 +670,7 @@ GetPciBusDeviceFunction (
@retval EFI_SUCCESS The DRHD table is processed.
**/
EFI_STATUS
-ProcessDhrd (
+ProcessDrhd (
IN UINTN VtdIndex,
IN EFI_ACPI_DMAR_DRHD_HEADER *DmarDrhd
)
@@ -690,7 +690,7 @@ ProcessDhrd (

if ((DmarDrhd->Flags & EFI_ACPI_DMAR_DRHD_FLAGS_INCLUDE_PCI_ALL) != 0) {
mVtdUnitInformation[VtdIndex].PciDeviceInfo.IncludeAllFlag = TRUE;
- DEBUG ((DEBUG_INFO," ProcessDhrd: with INCLUDE ALL\n"));
+ DEBUG ((DEBUG_INFO," ProcessDrhd: with INCLUDE ALL\n"));

Status = ScanAllPciBus((VOID *)VtdIndex, DmarDrhd->SegmentNumber, ScanBusCallbackRegisterPciDevice);
if (EFI_ERROR (Status)) {
@@ -698,7 +698,7 @@ ProcessDhrd (
}
} else {
mVtdUnitInformation[VtdIndex].PciDeviceInfo.IncludeAllFlag = FALSE;
- DEBUG ((DEBUG_INFO," ProcessDhrd: without INCLUDE ALL\n"));
+ DEBUG ((DEBUG_INFO," ProcessDrhd: without INCLUDE ALL\n"));
}

DmarDevScopeEntry = (EFI_ACPI_DMAR_DEVICE_SCOPE_STRUCTURE_HEADER *)((UINTN)(DmarDrhd + 1)); @@ -709,7 +709,7 @@ ProcessDhrd (
return Status;
}

- DEBUG ((DEBUG_INFO," ProcessDhrd: "));
+ DEBUG ((DEBUG_INFO," ProcessDrhd: "));
switch (DmarDevScopeEntry->Type) {
case EFI_ACPI_DEVICE_SCOPE_ENTRY_TYPE_PCI_ENDPOINT:
DEBUG ((DEBUG_INFO,"PCI Endpoint")); @@ -877,7 +877,7 @@ ParseDmarAcpiTableDrhd (
switch (DmarHeader->Type) {
case EFI_ACPI_DMAR_TYPE_DRHD:
ASSERT (VtdIndex < mVtdUnitNumber);
- Status = ProcessDhrd (VtdIndex, (EFI_ACPI_DMAR_DRHD_HEADER *)DmarHeader);
+ Status = ProcessDrhd (VtdIndex, (EFI_ACPI_DMAR_DRHD_HEADER
+ *)DmarHeader);
if (EFI_ERROR (Status)) {
return Status;
}
diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/DmarTable.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/DmarTable.c
index d920d136..1bb74f40 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/DmarTable.c
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/DmarTable
+++ .c
@@ -356,14 +356,14 @@ GetVtdEngineNumber ( }

/**
- Process DMAR DHRD table.
+ Process DMAR DRHD table.

@param[in] VTdInfo The VTd engine context information.
@param[in] VtdIndex The index of VTd engine.
@param[in] DmarDrhd The DRHD table.
**/
VOID
-ProcessDhrd (
+ProcessDrhd (
IN VTD_INFO *VTdInfo,
IN UINTN VtdIndex,
IN EFI_ACPI_DMAR_DRHD_HEADER *DmarDrhd @@ -415,7 +415,7 @@ ParseDmarAcpiTableDrhd (
switch (DmarHeader->Type) {
case EFI_ACPI_DMAR_TYPE_DRHD:
ASSERT (VtdIndex < VtdUnitNumber);
- ProcessDhrd (VTdInfo, VtdIndex, (EFI_ACPI_DMAR_DRHD_HEADER *)DmarHeader);
+ ProcessDrhd (VTdInfo, VtdIndex, (EFI_ACPI_DMAR_DRHD_HEADER
+ *)DmarHeader);
VtdIndex++;

break;
--
2.16.2.windows.1

8861 - 8880 of 94572