From patchwork Fri Oct 21 21:27:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 78742 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1505145qge; Fri, 21 Oct 2016 14:28:24 -0700 (PDT) X-Received: by 10.98.18.23 with SMTP id a23mr5050710pfj.151.1477085304342; Fri, 21 Oct 2016 14:28:24 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id c204si4190662pfb.131.2016.10.21.14.28.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Oct 2016 14:28:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8FE4F1A1EF4; Fri, 21 Oct 2016 14:28:06 -0700 (PDT) X-Original-To: edk2-devel@ml01.01.org Delivered-To: edk2-devel@ml01.01.org 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 DD1271A1EF0 for ; Fri, 21 Oct 2016 14:28:04 -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 7693D800B0; Fri, 21 Oct 2016 21:28:04 +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 u9LLRegD027240; Fri, 21 Oct 2016 17:28:03 -0400 From: Laszlo Ersek To: edk2-devel-01 Date: Fri, 21 Oct 2016 23:27:33 +0200 Message-Id: <20161021212737.15974-16-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.28]); Fri, 21 Oct 2016 21:28:04 +0000 (UTC) Subject: [edk2] [PATCH 15/19] ArmVirtPkg/FdtPciPcdProducerLib: 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: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.9.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ard Biesheuvel diff --git a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c index ea27cda7b77c..072f54ef7d9e 100644 --- a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c +++ b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c @@ -98,6 +98,7 @@ FdtPciPcdProducerLibConstructor ( INT32 Node; RETURN_STATUS RetStatus; UINT64 IoTranslation; + RETURN_STATUS PcdStatus; PciExpressBaseAddress = PcdGet64 (PcdPciExpressBaseAddress); if (PciExpressBaseAddress != MAX_UINT64) { @@ -126,12 +127,14 @@ FdtPciPcdProducerLibConstructor ( if (!EFI_ERROR (Status) && RegSize == 2 * sizeof (UINT64)) { PciExpressBaseAddress = SwapBytes64 (*Reg); - PcdSetBool (PcdPciDisableBusEnumeration, FALSE); + PcdStatus = PcdSetBoolS (PcdPciDisableBusEnumeration, FALSE); + ASSERT_RETURN_ERROR (PcdStatus); IoTranslation = 0; RetStatus = GetPciIoTranslation (FdtClient, Node, &IoTranslation); if (!RETURN_ERROR (RetStatus)) { - PcdSet64 (PcdPciIoTranslation, IoTranslation); + PcdStatus = PcdSet64S (PcdPciIoTranslation, IoTranslation); + ASSERT_RETURN_ERROR (PcdStatus); } else { // // Support for I/O BARs is not mandatory, and so it does not make sense @@ -145,7 +148,8 @@ FdtPciPcdProducerLibConstructor ( } } - PcdSet64 (PcdPciExpressBaseAddress, PciExpressBaseAddress); + PcdStatus = PcdSet64S (PcdPciExpressBaseAddress, PciExpressBaseAddress); + ASSERT_RETURN_ERROR (PcdStatus); return RETURN_SUCCESS; }