mirror of https://github.com/acidanthera/audk.git
OvmfPkg/PlatformPei: eliminate unchecked PcdSetXX() calls
These are deprecated / disabled under the DISABLE_NEW_DEPRECATED_INTERFACES feature test macro. Introduce a variable called PcdStatus, and use it to assert the success of these operations (there is no reason for them to fail here). Cc: Anthony PERARD <anthony.perard@citrix.com> Cc: Gary Lin <glin@suse.com> Cc: Jordan Justen <jordan.l.justen@intel.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=166 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Gary Lin <glin@suse.com> Tested-by: Gary Lin <glin@suse.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
parent
4d1362e1f9
commit
32e083c71d
|
@ -107,6 +107,7 @@ GetFirstNonAddress (
|
||||||
FIRMWARE_CONFIG_ITEM FwCfgItem;
|
FIRMWARE_CONFIG_ITEM FwCfgItem;
|
||||||
UINTN FwCfgSize;
|
UINTN FwCfgSize;
|
||||||
UINT64 HotPlugMemoryEnd;
|
UINT64 HotPlugMemoryEnd;
|
||||||
|
RETURN_STATUS PcdStatus;
|
||||||
|
|
||||||
FirstNonAddress = BASE_4GB + GetSystemMemorySizeAbove4gb ();
|
FirstNonAddress = BASE_4GB + GetSystemMemorySizeAbove4gb ();
|
||||||
|
|
||||||
|
@ -154,7 +155,8 @@ GetFirstNonAddress (
|
||||||
if (mBootMode != BOOT_ON_S3_RESUME) {
|
if (mBootMode != BOOT_ON_S3_RESUME) {
|
||||||
DEBUG ((EFI_D_INFO, "%a: disabling 64-bit PCI host aperture\n",
|
DEBUG ((EFI_D_INFO, "%a: disabling 64-bit PCI host aperture\n",
|
||||||
__FUNCTION__));
|
__FUNCTION__));
|
||||||
PcdSet64 (PcdPciMmio64Size, 0);
|
PcdStatus = PcdSet64S (PcdPciMmio64Size, 0);
|
||||||
|
ASSERT_RETURN_ERROR (PcdStatus);
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -202,8 +204,11 @@ GetFirstNonAddress (
|
||||||
// the GCD memory space map through our PciHostBridgeLib instance; here we
|
// the GCD memory space map through our PciHostBridgeLib instance; here we
|
||||||
// only need to set the PCDs.
|
// only need to set the PCDs.
|
||||||
//
|
//
|
||||||
PcdSet64 (PcdPciMmio64Base, Pci64Base);
|
PcdStatus = PcdSet64S (PcdPciMmio64Base, Pci64Base);
|
||||||
PcdSet64 (PcdPciMmio64Size, Pci64Size);
|
ASSERT_RETURN_ERROR (PcdStatus);
|
||||||
|
PcdStatus = PcdSet64S (PcdPciMmio64Size, Pci64Size);
|
||||||
|
ASSERT_RETURN_ERROR (PcdStatus);
|
||||||
|
|
||||||
DEBUG ((EFI_D_INFO, "%a: Pci64Base=0x%Lx Pci64Size=0x%Lx\n",
|
DEBUG ((EFI_D_INFO, "%a: Pci64Base=0x%Lx Pci64Size=0x%Lx\n",
|
||||||
__FUNCTION__, Pci64Base, Pci64Size));
|
__FUNCTION__, Pci64Base, Pci64Size));
|
||||||
}
|
}
|
||||||
|
|
|
@ -156,8 +156,9 @@ MemMapInitialization (
|
||||||
VOID
|
VOID
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
UINT64 PciIoBase;
|
UINT64 PciIoBase;
|
||||||
UINT64 PciIoSize;
|
UINT64 PciIoSize;
|
||||||
|
RETURN_STATUS PcdStatus;
|
||||||
|
|
||||||
PciIoBase = 0xC000;
|
PciIoBase = 0xC000;
|
||||||
PciIoSize = 0x4000;
|
PciIoSize = 0x4000;
|
||||||
|
@ -212,8 +213,11 @@ MemMapInitialization (
|
||||||
//
|
//
|
||||||
PciSize = 0xFC000000 - PciBase;
|
PciSize = 0xFC000000 - PciBase;
|
||||||
AddIoMemoryBaseSizeHob (PciBase, PciSize);
|
AddIoMemoryBaseSizeHob (PciBase, PciSize);
|
||||||
PcdSet64 (PcdPciMmio32Base, PciBase);
|
PcdStatus = PcdSet64S (PcdPciMmio32Base, PciBase);
|
||||||
PcdSet64 (PcdPciMmio32Size, PciSize);
|
ASSERT_RETURN_ERROR (PcdStatus);
|
||||||
|
PcdStatus = PcdSet64S (PcdPciMmio32Size, PciSize);
|
||||||
|
ASSERT_RETURN_ERROR (PcdStatus);
|
||||||
|
|
||||||
AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);
|
AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);
|
||||||
AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);
|
AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);
|
||||||
if (mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID) {
|
if (mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID) {
|
||||||
|
@ -266,8 +270,10 @@ MemMapInitialization (
|
||||||
PciIoBase,
|
PciIoBase,
|
||||||
PciIoSize
|
PciIoSize
|
||||||
);
|
);
|
||||||
PcdSet64 (PcdPciIoBase, PciIoBase);
|
PcdStatus = PcdSet64S (PcdPciIoBase, PciIoBase);
|
||||||
PcdSet64 (PcdPciIoSize, PciIoSize);
|
ASSERT_RETURN_ERROR (PcdStatus);
|
||||||
|
PcdStatus = PcdSet64S (PcdPciIoSize, PciIoSize);
|
||||||
|
ASSERT_RETURN_ERROR (PcdStatus);
|
||||||
}
|
}
|
||||||
|
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
|
@ -316,11 +322,13 @@ GetNamedFwCfgBoolean (
|
||||||
|
|
||||||
#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName) \
|
#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName) \
|
||||||
do { \
|
do { \
|
||||||
BOOLEAN Setting; \
|
BOOLEAN Setting; \
|
||||||
|
RETURN_STATUS PcdStatus; \
|
||||||
\
|
\
|
||||||
if (!EFI_ERROR (GetNamedFwCfgBoolean ( \
|
if (!EFI_ERROR (GetNamedFwCfgBoolean ( \
|
||||||
"opt/ovmf/" #TokenName, &Setting))) { \
|
"opt/ovmf/" #TokenName, &Setting))) { \
|
||||||
PcdSetBool (TokenName, Setting); \
|
PcdStatus = PcdSetBoolS (TokenName, Setting); \
|
||||||
|
ASSERT_RETURN_ERROR (PcdStatus); \
|
||||||
} \
|
} \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
@ -379,12 +387,13 @@ MiscInitialization (
|
||||||
VOID
|
VOID
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
UINTN PmCmd;
|
UINTN PmCmd;
|
||||||
UINTN Pmba;
|
UINTN Pmba;
|
||||||
UINT32 PmbaAndVal;
|
UINT32 PmbaAndVal;
|
||||||
UINT32 PmbaOrVal;
|
UINT32 PmbaOrVal;
|
||||||
UINTN AcpiCtlReg;
|
UINTN AcpiCtlReg;
|
||||||
UINT8 AcpiEnBit;
|
UINT8 AcpiEnBit;
|
||||||
|
RETURN_STATUS PcdStatus;
|
||||||
|
|
||||||
//
|
//
|
||||||
// Disable A20 Mask
|
// Disable A20 Mask
|
||||||
|
@ -424,7 +433,8 @@ MiscInitialization (
|
||||||
ASSERT (FALSE);
|
ASSERT (FALSE);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
PcdSet16 (PcdOvmfHostBridgePciDevId, mHostBridgeDevId);
|
PcdStatus = PcdSet16S (PcdOvmfHostBridgePciDevId, mHostBridgeDevId);
|
||||||
|
ASSERT_RETURN_ERROR (PcdStatus);
|
||||||
|
|
||||||
//
|
//
|
||||||
// If the appropriate IOspace enable bit is set, assume the ACPI PMBA
|
// If the appropriate IOspace enable bit is set, assume the ACPI PMBA
|
||||||
|
@ -491,6 +501,7 @@ ReserveEmuVariableNvStore (
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
EFI_PHYSICAL_ADDRESS VariableStore;
|
EFI_PHYSICAL_ADDRESS VariableStore;
|
||||||
|
RETURN_STATUS PcdStatus;
|
||||||
|
|
||||||
//
|
//
|
||||||
// Allocate storage for NV variables early on so it will be
|
// Allocate storage for NV variables early on so it will be
|
||||||
|
@ -509,7 +520,8 @@ ReserveEmuVariableNvStore (
|
||||||
VariableStore,
|
VariableStore,
|
||||||
(2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024
|
(2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024
|
||||||
));
|
));
|
||||||
PcdSet64 (PcdEmuVariableNvStoreReserved, VariableStore);
|
PcdStatus = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore);
|
||||||
|
ASSERT_RETURN_ERROR (PcdStatus);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -210,6 +210,8 @@ InitializeXen (
|
||||||
VOID
|
VOID
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
RETURN_STATUS PcdStatus;
|
||||||
|
|
||||||
if (mXenLeaf == 0) {
|
if (mXenLeaf == 0) {
|
||||||
return EFI_NOT_FOUND;
|
return EFI_NOT_FOUND;
|
||||||
}
|
}
|
||||||
|
@ -222,7 +224,8 @@ InitializeXen (
|
||||||
//
|
//
|
||||||
AddReservedMemoryBaseSizeHob (0xFC000000, 0x1000000, FALSE);
|
AddReservedMemoryBaseSizeHob (0xFC000000, 0x1000000, FALSE);
|
||||||
|
|
||||||
PcdSetBool (PcdPciDisableBusEnumeration, TRUE);
|
PcdStatus = PcdSetBoolS (PcdPciDisableBusEnumeration, TRUE);
|
||||||
|
ASSERT_RETURN_ERROR (PcdStatus);
|
||||||
|
|
||||||
return EFI_SUCCESS;
|
return EFI_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue