From: Gary Lin <glin@suse.com>
To: Laszlo Ersek <lersek@redhat.com>
Cc: edk2-devel-01 <edk2-devel@ml01.01.org>,
Anthony PERARD <anthony.perard@citrix.com>,
Jordan Justen <jordan.l.justen@intel.com>
Subject: Re: [PATCH 08/19] OvmfPkg/PlatformPei: eliminate unchecked PcdSetXX() calls
Date: Mon, 24 Oct 2016 12:45:51 +0800 [thread overview]
Message-ID: <20161024044551.dg7sceb7olp3axsz@GaryWorkstation> (raw)
In-Reply-To: <20161021212737.15974-9-lersek@redhat.com>
On Fri, Oct 21, 2016 at 11:27:26PM +0200, Laszlo Ersek wrote:
> 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).
>
Reviewed-by: Gary Lin <glin@suse.com> and Tested-by: Gary Lin <glin@suse.com>
> 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>
> ---
>
> Notes:
> The ReserveEmuVariableNvStore() and InitializeXen() hunks make no
> difference in my setup, so testing for those would be appreciated.
>
> OvmfPkg/PlatformPei/MemDetect.c | 11 +++--
> OvmfPkg/PlatformPei/Platform.c | 44 +++++++++++++-------
> OvmfPkg/PlatformPei/Xen.c | 5 ++-
> 3 files changed, 40 insertions(+), 20 deletions(-)
>
> diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
> index 4863eb101067..d00a570d4381 100644
> --- a/OvmfPkg/PlatformPei/MemDetect.c
> +++ b/OvmfPkg/PlatformPei/MemDetect.c
> @@ -107,6 +107,7 @@ GetFirstNonAddress (
> FIRMWARE_CONFIG_ITEM FwCfgItem;
> UINTN FwCfgSize;
> UINT64 HotPlugMemoryEnd;
> + RETURN_STATUS PcdStatus;
>
> FirstNonAddress = BASE_4GB + GetSystemMemorySizeAbove4gb ();
>
> @@ -154,7 +155,8 @@ GetFirstNonAddress (
> if (mBootMode != BOOT_ON_S3_RESUME) {
> DEBUG ((EFI_D_INFO, "%a: disabling 64-bit PCI host aperture\n",
> __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
> // only need to set the PCDs.
> //
> - PcdSet64 (PcdPciMmio64Base, Pci64Base);
> - PcdSet64 (PcdPciMmio64Size, Pci64Size);
> + PcdStatus = PcdSet64S (PcdPciMmio64Base, Pci64Base);
> + ASSERT_RETURN_ERROR (PcdStatus);
> + PcdStatus = PcdSet64S (PcdPciMmio64Size, Pci64Size);
> + ASSERT_RETURN_ERROR (PcdStatus);
> +
> DEBUG ((EFI_D_INFO, "%a: Pci64Base=0x%Lx Pci64Size=0x%Lx\n",
> __FUNCTION__, Pci64Base, Pci64Size));
> }
> diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
> index ca1e6dc7e320..c6e1106c9ed0 100644
> --- a/OvmfPkg/PlatformPei/Platform.c
> +++ b/OvmfPkg/PlatformPei/Platform.c
> @@ -156,8 +156,9 @@ MemMapInitialization (
> VOID
> )
> {
> - UINT64 PciIoBase;
> - UINT64 PciIoSize;
> + UINT64 PciIoBase;
> + UINT64 PciIoSize;
> + RETURN_STATUS PcdStatus;
>
> PciIoBase = 0xC000;
> PciIoSize = 0x4000;
> @@ -212,8 +213,11 @@ MemMapInitialization (
> //
> PciSize = 0xFC000000 - PciBase;
> AddIoMemoryBaseSizeHob (PciBase, PciSize);
> - PcdSet64 (PcdPciMmio32Base, PciBase);
> - PcdSet64 (PcdPciMmio32Size, PciSize);
> + PcdStatus = PcdSet64S (PcdPciMmio32Base, PciBase);
> + ASSERT_RETURN_ERROR (PcdStatus);
> + PcdStatus = PcdSet64S (PcdPciMmio32Size, PciSize);
> + ASSERT_RETURN_ERROR (PcdStatus);
> +
> AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);
> AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);
> if (mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID) {
> @@ -266,8 +270,10 @@ MemMapInitialization (
> PciIoBase,
> PciIoSize
> );
> - PcdSet64 (PcdPciIoBase, PciIoBase);
> - PcdSet64 (PcdPciIoSize, PciIoSize);
> + PcdStatus = PcdSet64S (PcdPciIoBase, PciIoBase);
> + ASSERT_RETURN_ERROR (PcdStatus);
> + PcdStatus = PcdSet64S (PcdPciIoSize, PciIoSize);
> + ASSERT_RETURN_ERROR (PcdStatus);
> }
>
> EFI_STATUS
> @@ -316,11 +322,13 @@ GetNamedFwCfgBoolean (
>
> #define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName) \
> do { \
> - BOOLEAN Setting; \
> + BOOLEAN Setting; \
> + RETURN_STATUS PcdStatus; \
> \
> if (!EFI_ERROR (GetNamedFwCfgBoolean ( \
> "opt/ovmf/" #TokenName, &Setting))) { \
> - PcdSetBool (TokenName, Setting); \
> + PcdStatus = PcdSetBoolS (TokenName, Setting); \
> + ASSERT_RETURN_ERROR (PcdStatus); \
> } \
> } while (0)
>
> @@ -379,12 +387,13 @@ MiscInitialization (
> VOID
> )
> {
> - UINTN PmCmd;
> - UINTN Pmba;
> - UINT32 PmbaAndVal;
> - UINT32 PmbaOrVal;
> - UINTN AcpiCtlReg;
> - UINT8 AcpiEnBit;
> + UINTN PmCmd;
> + UINTN Pmba;
> + UINT32 PmbaAndVal;
> + UINT32 PmbaOrVal;
> + UINTN AcpiCtlReg;
> + UINT8 AcpiEnBit;
> + RETURN_STATUS PcdStatus;
>
> //
> // Disable A20 Mask
> @@ -424,7 +433,8 @@ MiscInitialization (
> ASSERT (FALSE);
> return;
> }
> - PcdSet16 (PcdOvmfHostBridgePciDevId, mHostBridgeDevId);
> + PcdStatus = PcdSet16S (PcdOvmfHostBridgePciDevId, mHostBridgeDevId);
> + ASSERT_RETURN_ERROR (PcdStatus);
>
> //
> // If the appropriate IOspace enable bit is set, assume the ACPI PMBA
> @@ -491,6 +501,7 @@ ReserveEmuVariableNvStore (
> )
> {
> EFI_PHYSICAL_ADDRESS VariableStore;
> + RETURN_STATUS PcdStatus;
>
> //
> // Allocate storage for NV variables early on so it will be
> @@ -509,7 +520,8 @@ ReserveEmuVariableNvStore (
> VariableStore,
> (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024
> ));
> - PcdSet64 (PcdEmuVariableNvStoreReserved, VariableStore);
> + PcdStatus = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore);
> + ASSERT_RETURN_ERROR (PcdStatus);
> }
>
>
> diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c
> index 223908a4f529..ab38f97a67aa 100644
> --- a/OvmfPkg/PlatformPei/Xen.c
> +++ b/OvmfPkg/PlatformPei/Xen.c
> @@ -210,6 +210,8 @@ InitializeXen (
> VOID
> )
> {
> + RETURN_STATUS PcdStatus;
> +
> if (mXenLeaf == 0) {
> return EFI_NOT_FOUND;
> }
> @@ -222,7 +224,8 @@ InitializeXen (
> //
> AddReservedMemoryBaseSizeHob (0xFC000000, 0x1000000, FALSE);
>
> - PcdSetBool (PcdPciDisableBusEnumeration, TRUE);
> + PcdStatus = PcdSetBoolS (PcdPciDisableBusEnumeration, TRUE);
> + ASSERT_RETURN_ERROR (PcdStatus);
>
> return EFI_SUCCESS;
> }
> --
> 2.9.2
>
>
>
next prev parent reply other threads:[~2016-10-24 4:46 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-21 21:27 [PATCH 00/19] OvmfPkg, ArmVirtPkg: leave deprecated interfaces behind Laszlo Ersek
2016-10-21 21:27 ` [PATCH 01/19] MdePkg/DebugLib.h: add ASSERT_RETURN_ERROR() Laszlo Ersek
2016-10-24 20:59 ` Laszlo Ersek
2016-10-24 23:05 ` Kinney, Michael D
2016-10-25 7:54 ` Laszlo Ersek
2016-10-25 10:32 ` Gao, Liming
2016-10-27 2:53 ` Kinney, Michael D
2016-10-25 8:22 ` Zeng, Star
2016-10-25 8:33 ` Laszlo Ersek
2016-10-21 21:27 ` [PATCH 02/19] OvmfPkg/XenBusDxe: eliminate AsciiStrCpy() calls Laszlo Ersek
2016-10-24 4:44 ` Gary Lin
2016-10-21 21:27 ` [PATCH 03/19] OvmfPkg/XenBusDxe: eliminate AsciiStrCat() calls Laszlo Ersek
2016-10-24 4:44 ` Gary Lin
2016-10-21 21:27 ` [PATCH 04/19] OvmfPkg/EmuVariableFvbRuntimeDxe: eliminate unchecked PcdSetXX() calls Laszlo Ersek
2016-10-24 4:45 ` Gary Lin
2016-10-21 21:27 ` [PATCH 05/19] OvmfPkg/PlatformBootManagerLib: " Laszlo Ersek
2016-10-24 4:45 ` Gary Lin
2016-10-21 21:27 ` [PATCH 06/19] OvmfPkg/SmbiosVersionLib: " Laszlo Ersek
2016-10-24 8:00 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 07/19] OvmfPkg/PlatformDxe: " Laszlo Ersek
2016-10-21 21:27 ` [PATCH 08/19] OvmfPkg/PlatformPei: " Laszlo Ersek
2016-10-24 4:45 ` Gary Lin [this message]
2016-10-24 11:51 ` Laszlo Ersek
2016-10-21 21:27 ` [PATCH 09/19] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: " Laszlo Ersek
2016-10-21 21:27 ` [PATCH 10/19] OvmfPkg: disable deprecated interfaces Laszlo Ersek
2016-10-21 21:27 ` [PATCH 11/19] ArmVirtPkg/ArmVirtGicArchLib: eliminate unchecked PcdSetXX() calls Laszlo Ersek
2016-10-24 8:00 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 12/19] ArmVirtPkg/ArmVirtPL031FdtClientLib: " Laszlo Ersek
2016-10-24 8:00 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 13/19] ArmVirtPkg/ArmVirtPlatformLib: " Laszlo Ersek
2016-10-24 7:59 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 14/19] ArmVirtPkg/ArmVirtTimerFdtClientLib: " Laszlo Ersek
2016-10-24 7:59 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 15/19] ArmVirtPkg/FdtPciPcdProducerLib: " Laszlo Ersek
2016-10-24 7:59 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 16/19] ArmVirtPkg/PlatformBootManagerLib: " Laszlo Ersek
2016-10-24 7:58 ` Ard Biesheuvel
2016-10-21 21:27 ` [PATCH 17/19] ArmPkg/ArmDisassemblerLib: replace AsciiStrCat() with AsciiStrCatS() Laszlo Ersek
2016-10-24 7:58 ` Ard Biesheuvel
2016-10-24 18:47 ` Jordan Justen
2016-10-24 19:54 ` Laszlo Ersek
2016-10-21 21:27 ` [PATCH 18/19] ArmPkg/DefaultExceptionHandlerLib: " Laszlo Ersek
2016-10-24 7:57 ` Ard Biesheuvel
2016-10-24 11:52 ` Laszlo Ersek
2016-10-21 21:27 ` [PATCH 19/19] ArmVirtPkg: disable deprecated interfaces Laszlo Ersek
2016-10-25 8:25 ` Laszlo Ersek
2016-10-25 8:28 ` Ard Biesheuvel
2016-10-24 8:04 ` [PATCH 00/19] OvmfPkg, ArmVirtPkg: leave deprecated interfaces behind Ard Biesheuvel
2016-10-24 11:50 ` Laszlo Ersek
2016-10-25 8:26 ` Laszlo Ersek
2016-10-25 8:45 ` Laszlo Ersek
2016-10-25 8:49 ` Ard Biesheuvel
2016-10-24 18:48 ` Jordan Justen
2016-10-25 9:07 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161024044551.dg7sceb7olp3axsz@GaryWorkstation \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox