From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web12.1926.1608583152592928007 for ; Mon, 21 Dec 2020 12:39:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XhNBEdoX; spf=pass (domain: redhat.com, ip: 216.205.24.124, mailfrom: msalter@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608583151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TAHkIytxIGs3vebrpXa/ds9mC8OF+Y1In03BlPS4GwI=; b=XhNBEdoXLiNx932e1ZmvHXn0rLjKZcukh/3QaOjv+K8ucHXggBt2mzGFWw18SwEs0hTOTf rw3THOy/6Kq9evyc3ZRBARdAnK/O3tnaSlHjHa5H7Wni2m+NWo/7XdRgI98IU5IH5VgSSM IHW/lunvcHRKwQa+V3PbPS5bNR+s9Bs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-373-V0EFYhgUNRaExwDfgr_Fsg-1; Mon, 21 Dec 2020 15:39:04 -0500 X-MC-Unique: V0EFYhgUNRaExwDfgr_Fsg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1BF9559; Mon, 21 Dec 2020 20:39:03 +0000 (UTC) Received: from trippy.localdomain (ovpn-118-51.rdu2.redhat.com [10.10.118.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D4DC5D9DB; Mon, 21 Dec 2020 20:39:02 +0000 (UTC) From: "Mark Salter" To: devel@edk2.groups.io Cc: Leif Lindholm , Abner Chang , Daniel Schaefer , Gilbert Chen Subject: [PATCH edk2-platforms 2/2] Platform/SiFive/U5SeriesPkg: Remove use of deprecated interfaces Date: Mon, 21 Dec 2020 15:38:55 -0500 Message-Id: <20201221203855.635031-3-msalter@redhat.com> In-Reply-To: <20201221203855.635031-1-msalter@redhat.com> References: <20201221203855.635031-1-msalter@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=msalter@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="US-ASCII" The non-status reporting PcdSet functions were deprecated and have now been removed. Update SiFive code to assert on error status. Deprecated PcdSet* code under DISABLE_NEW_DEPRECATED_INTERFACES has been removed. This includes PcdSetXX interfaces used by RISC-V code which is now causing a compilation error. Switch to the PcdSetXXS interfaces. CC: Leif Lindholm CC: Abner Chang CC: Daniel Schaefer CC: Gilbert Chen Signed-off-by: Mark Salter --- .../Dxe/RamFvbServicesRuntimeDxe/FwBlockService.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Platform/SiFive/U5SeriesPkg/Universal/Dxe/RamFvbServicesRuntim= eDxe/FwBlockService.c b/Platform/SiFive/U5SeriesPkg/Universal/Dxe/RamFvbSer= vicesRuntimeDxe/FwBlockService.c index b69569339d25..55501fa6b85f 100644 --- a/Platform/SiFive/U5SeriesPkg/Universal/Dxe/RamFvbServicesRuntimeDxe/Fw= BlockService.c +++ b/Platform/SiFive/U5SeriesPkg/Universal/Dxe/RamFvbServicesRuntimeDxe/Fw= BlockService.c @@ -1087,18 +1087,21 @@ FvbInitialize ( //=0D // Set several PCD values to point to flash=0D //=0D - PcdSet64 (=0D + Status =3D PcdSet64S (=0D PcdFlashNvStorageVariableBase64,=0D (UINTN) PcdGet32 (PcdPlatformFlashNvStorageVariableBase)=0D );=0D - PcdSet32 (=0D + ASSERT_EFI_ERROR (Status);=0D + Status =3D PcdSet32S (=0D PcdFlashNvStorageFtwWorkingBase,=0D PcdGet32 (PcdPlatformFlashNvStorageFtwWorkingBase)=0D );=0D - PcdSet32 (=0D + ASSERT_EFI_ERROR (Status);=0D + Status =3D PcdSet32S (=0D PcdFlashNvStorageFtwSpareBase,=0D PcdGet32 (PcdPlatformFlashNvStorageFtwSpareBase)=0D );=0D + ASSERT_EFI_ERROR (Status);=0D =20=0D FwhInstance =3D (EFI_FW_VOL_INSTANCE *)=0D (=0D --=20 2.29.2