From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 16FBC1A1EE2 for ; Fri, 21 Oct 2016 14:28:00 -0700 (PDT) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A53F4B7CF3; Fri, 21 Oct 2016 21:27:59 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-45.phx2.redhat.com [10.3.116.45]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9LLReg9027240; Fri, 21 Oct 2016 17:27:58 -0400 From: Laszlo Ersek To: edk2-devel-01 Cc: Ard Biesheuvel Date: Fri, 21 Oct 2016 23:27:29 +0200 Message-Id: <20161021212737.15974-12-lersek@redhat.com> In-Reply-To: <20161021212737.15974-1-lersek@redhat.com> References: <20161021212737.15974-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 21 Oct 2016 21:27:59 +0000 (UTC) Subject: [PATCH 11/19] ArmVirtPkg/ArmVirtGicArchLib: eliminate unchecked PcdSetXX() calls X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2016 21:28:00 -0000 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: Ard Biesheuvel Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=165 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c index 648806126e78..dc1f5155f1fc 100644 --- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c +++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c @@ -41,6 +41,7 @@ ArmVirtGicArchLibConstructor ( UINTN GicRevision; EFI_STATUS Status; UINT64 DistBase, CpuBase, RedistBase; + RETURN_STATUS PcdStatus; Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL, (VOID **)&FdtClient); @@ -85,8 +86,10 @@ ArmVirtGicArchLibConstructor ( RedistBase = SwapBytes64 (Reg[2]); ASSERT (RedistBase < MAX_UINTN); - PcdSet64 (PcdGicDistributorBase, DistBase); - PcdSet64 (PcdGicRedistributorsBase, RedistBase); + PcdStatus = PcdSet64S (PcdGicDistributorBase, DistBase); + ASSERT_RETURN_ERROR (PcdStatus); + PcdStatus = PcdSet64S (PcdGicRedistributorsBase, RedistBase); + ASSERT_RETURN_ERROR (PcdStatus); DEBUG ((EFI_D_INFO, "Found GIC v3 (re)distributor @ 0x%Lx (0x%Lx)\n", DistBase, RedistBase)); @@ -120,8 +123,10 @@ ArmVirtGicArchLibConstructor ( ASSERT (DistBase < MAX_UINTN); ASSERT (CpuBase < MAX_UINTN); - PcdSet64 (PcdGicDistributorBase, DistBase); - PcdSet64 (PcdGicInterruptInterfaceBase, CpuBase); + PcdStatus = PcdSet64S (PcdGicDistributorBase, DistBase); + ASSERT_RETURN_ERROR (PcdStatus); + PcdStatus = PcdSet64S (PcdGicInterruptInterfaceBase, CpuBase); + ASSERT_RETURN_ERROR (PcdStatus); DEBUG ((EFI_D_INFO, "Found GIC @ 0x%Lx/0x%Lx\n", DistBase, CpuBase)); -- 2.9.2