tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg PCD: Add DynamicEx PcdVpdBaseAddress64 for non SPI platform 

https://bugzilla.tianocore.org/show_bug.cgi?id=1356
Current PcdVpdBaseAddress is 32bit static Pcd. NON SPI platform needs to
configure it as Dynamic PCD. Emulator platform (such as NT32) may set its
value to 64bit address.
To meet with this usage, 64bit DynamicEx PcdVpdBaseAddress64 is introduced.
If its value is not zero, it will be used.
If its value is zero, static PcdVpdBaseAddress will be used.
When NON SPI platform enables VPD PCD, they need to set PcdVpdBaseAddress64.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
This commit is contained in:
Liming Gao 2018-11-22 22:10:29 +08:00
parent 277a3958d9
commit 534efca06f
8 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MdeModulePkg/MdeModulePkg.dec
View File

@ -2022,5 +2022,13 @@
# @Prompt NV Storage Default Value Buffer
gEfiMdeModulePkgTokenSpaceGuid.PcdNvStoreDefaultValueBuffer|{0x0}|VOID*|0x00030005
## VPD type PCD allows a developer to point to an absolute physical address PcdVpdBaseAddress64
# to store PCD value. It will be DynamicExDefault only.
# It is used to set VPD region base address. So, it can't be DynamicExVpd PCD. Its value is
# required to be accessed in PcdDxe driver entry point. So, its value must be set in PEI phase.
# It can't depend on EFI variable service, and can't be DynamicExHii PCD.
# @Prompt 64bit VPD base address.
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress64|0x0|UINT64|0x00030006
[UserExtensions.TianoCore."ExtraFiles"]
MdeModulePkgExtra.uni

8
MdeModulePkg/MdeModulePkg.uni
View File

@ -1260,3 +1260,11 @@
#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdEdkiiFpdtStringRecordEnableOnly_HELP #language en-US "Control which FPDT record format will be used to store the performance entry.\n"
"On TRUE, the string FPDT record will be used to store every performance entry.\n"
"On FALSE, the different FPDT record will be used to store the different performance entries."
#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdVpdBaseAddress_PROMPT #language en-US "64bit VPD base address"
#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdVpdBaseAddress_HELP #language en-US "VPD type PCD allows a developer to point to an absolute physical address PcdVpdBaseAddress64"
"to store PCD value. It will be DynamicExDefault only."
"It is used to set VPD region base address. So, it can't be DynamicExVpd PCD. Its value is"
"required to be accessed in PcdDxe driver entry point. So, its value must be set in PEI phase."
"It can't depend on EFI variable service, and can't be DynamicExHii PCD."

16
MdeModulePkg/Universal/PCD/Dxe/Pcd.c
View File

@ -109,6 +109,7 @@ EFI_GET_PCD_INFO_PROTOCOL mEfiGetPcdInfoInstance = {
};
EFI_HANDLE mPcdHandle = NULL;
UINTN mVpdBaseAddress = 0;
/**
Main entry for PCD DXE driver.
@ -175,6 +176,21 @@ PcdDxeInit (
&Registration
);
//
// Cache VpdBaseAddress in entry point for the following usage.
//
//
// PcdVpdBaseAddress64 is DynamicEx PCD only. So, DxePcdGet64Ex() is used to get its value.
//
mVpdBaseAddress = (UINTN) DxePcdGet64Ex (&gEfiMdeModulePkgTokenSpaceGuid, PcdToken (PcdVpdBaseAddress64));
if (mVpdBaseAddress == 0) {
//
// PcdVpdBaseAddress64 is not set, get value from PcdVpdBaseAddress.
//
mVpdBaseAddress = (UINTN) PcdGet32 (PcdVpdBaseAddress);
}
return Status;
}

3
MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
View File

@ -73,7 +73,7 @@
#
# c) OEM specificed storage area:
# - The PCD value is stored in OEM specified area which base address is
# specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.
# specified by PCD setting - PcdVpdBaseAddress64 or PcdVpdBaseAddress.
# - The area is read only for PEI and DXE phase.
# - [PcdsDynamicVpd] is used as section name for this type PCD in platform
# DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.
@ -344,6 +344,7 @@
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress64 ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNvStoreDefaultId ## SOMETIMES_CONSUMES
[Depex]

3
MdeModulePkg/Universal/PCD/Dxe/Service.c
View File

@ -435,7 +435,8 @@ GetWorker (
switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {
case PCD_TYPE_VPD:
VpdHead = (VPD_HEAD *) ((UINT8 *) PcdDb + Offset);
RetPtr = (VOID *) ((UINTN) PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);
ASSERT (mVpdBaseAddress != 0);
RetPtr = (VOID *) (mVpdBaseAddress + VpdHead->Offset);
break;

2
MdeModulePkg/Universal/PCD/Dxe/Service.h
View File

@ -48,6 +48,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#error "Please make sure the version of PCD DXE Service and the generated PCD DXE Database match."
#endif
extern UINTN mVpdBaseAddress;
/**
Retrieve additional information associated with a PCD token in the default token space.

3
MdeModulePkg/Universal/PCD/Pei/Pcd.inf
View File

@ -72,7 +72,7 @@
#
# c) OEM specificed storage area:
# - The PCD value is stored in OEM specified area which base address is
# specified by a FixedAtBuild PCD setting - PcdVpdBaseAddress.
# specified by PCD setting - PcdVpdBaseAddress64 or PcdVpdBaseAddress.
# - The area is read only for PEI and DXE phase.
# - [PcdsDynamicVpd] is used as section name for this type PCD in platform
# DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.
@ -344,6 +344,7 @@
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress64 ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdNvStoreDefaultValueBuffer ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNvStoreDefaultId ## CONSUMES

15
MdeModulePkg/Universal/PCD/Pei/Service.c
View File

@ -861,6 +861,7 @@ GetWorker (
UINT32 LocalTokenNumber;
UINT32 LocalTokenCount;
UINT8 *VaraiableDefaultBuffer;
UINTN VpdBaseAddress;
//
// TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.
@ -889,7 +890,19 @@ GetWorker (
{
VPD_HEAD *VpdHead;
VpdHead = (VPD_HEAD *) ((UINT8 *)PeiPcdDb + Offset);
return (VOID *) ((UINTN) PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);
//
// PcdVpdBaseAddress64 is DynamicEx PCD only. So, PeiPcdGet64Ex() is used to get its value.
//
VpdBaseAddress = (UINTN) PeiPcdGet64Ex (&gEfiMdeModulePkgTokenSpaceGuid, PcdToken (PcdVpdBaseAddress64));
if (VpdBaseAddress == 0) {
//
// PcdVpdBaseAddress64 is not set, get value from PcdVpdBaseAddress.
//
VpdBaseAddress = (UINTN) PcdGet32 (PcdVpdBaseAddress);
}
ASSERT (VpdBaseAddress != 0);
return (VOID *)(VpdBaseAddress + VpdHead->Offset);
}
case PCD_TYPE_HII|PCD_TYPE_STRING: