From nobody Thu May 2 15:24:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+69344+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+69344+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608583149; cv=none; d=zohomail.com; s=zohoarc; b=iG/OF8rtjtiMik95tRQpE6ICiULN220cKsbqse1jn6bY8WL53av4g6fXV7D5lGTrCWxRRR/+M5ZoSz1C5dYLk4aRawmp4fomB2IzZY8ODGVsI/Tzj9ceuAeXtqs0pJo7sp1dfQRK6Tdn26AheeVxADN/af5nOvVg/wIA8EM00MQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608583149; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=UzRi/m4f9PP0UWcFb+zsDvRl3CquCKsZwX3ZDnZj/7E=; b=UuwmXmBys4dc2mDDwEMHf0KCc30TfFSPbZLPQT99V4xnQk3xy3g8tXNopN9EpbeVEKohF2WhFaR4d70Bb60r10l0l63dAphjkVH1tjVSlGgs9oWBP8V3uyGW2fysodkKOuFlIiM0g+W3xMP6ZQQRiV1PWpuIubSGFxWeT/AwVQQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+69344+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1608583149265868.8365437160995; Mon, 21 Dec 2020 12:39:09 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id n1AiYY1788612xxlVCODyR6I; Mon, 21 Dec 2020 12:39:08 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.groups.io with SMTP id smtpd.web10.1947.1608583148205064555 for ; Mon, 21 Dec 2020 12:39:08 -0800 X-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-570-ZDPSChHoN4ep6-iMF8LE-g-1; Mon, 21 Dec 2020 15:39:03 -0500 X-MC-Unique: ZDPSChHoN4ep6-iMF8LE-g-1 X-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 6D3278049C1; Mon, 21 Dec 2020 20:39:02 +0000 (UTC) X-Received: from trippy.localdomain (ovpn-118-51.rdu2.redhat.com [10.10.118.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBE6B5D9D7; Mon, 21 Dec 2020 20:39:01 +0000 (UTC) From: "Mark Salter" To: devel@edk2.groups.io Cc: Leif Lindholm , Abner Chang , Daniel Schaefer , Gilbert Chen Subject: [edk2-devel] [PATCH edk2-platforms 1/2] Silicon/RISC-V: Update old SMBIOS struct filed name Date: Mon, 21 Dec 2020 15:38:54 -0500 Message-Id: <20201221203855.635031-2-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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,msalter@redhat.com X-Gm-Message-State: fqCgnYU73YUsmRjsBwQabQodx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608583148; bh=ylJZBXvY1OgiS7HsKvomkfw6t5dLP8Cx5zv6iqNP9Ao=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=d0l0CvFzQQismphC/gOv3eyNNB0eCVzM2mk6bAdc9feOJmbhoO1TnMJCROtTAEqCNPa N/asrzhpfT4qL7pe0MjbunDo0cNeAp9UizDopu4VQMCfyNqLbIge6XAcMwzL7ZlDD3g+y XTSqfOcMa82MmJ0dmYWQJxAdzhmzdbtzwRI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The "ProcessorManufacture" field of SMBIOS_TABLE_TYPE4 was recently renamed to "ProcessorManufacturer". This is causing a compilation error for RISC-V/SiFive builds. Switch to the new name. CC: Leif Lindholm CC: Abner Chang CC: Daniel Schaefer CC: Gilbert Chen Signed-off-by: Mark Salter Reviewed-by: Abner Chang --- .../RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c | 2 +- Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe= .c b/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c index 6079513a559f..b30f9d7f6a18 100644 --- a/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c +++ b/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c @@ -142,7 +142,7 @@ BuildSmbiosType4 ( DEBUG ((DEBUG_VERBOSE, " Socket StringID: %d\n", Type4HobData->Smbio= sType4Processor.Socket)); DEBUG ((DEBUG_VERBOSE, " Processor Type: 0x%x\n", Type4HobData->Smbi= osType4Processor.ProcessorType)); DEBUG ((DEBUG_VERBOSE, " Processor Family: 0x%x\n", Type4HobData->Sm= biosType4Processor.ProcessorFamily)); - DEBUG ((DEBUG_VERBOSE, " Processor Manufacture StringID: %d\n", Type= 4HobData->SmbiosType4Processor.ProcessorManufacture)); + DEBUG ((DEBUG_VERBOSE, " Processor Manufacture StringID: %d\n", Type= 4HobData->SmbiosType4Processor.ProcessorManufacturer)); DEBUG ((DEBUG_VERBOSE, " Processor Id: 0x%x:0x%x\n", \ Type4HobData->SmbiosType4Processor.ProcessorId.Signature, Type4H= obData->SmbiosType4Processor.ProcessorId.FeatureFlags)); DEBUG ((DEBUG_VERBOSE, " Processor Version StringID: %d\n", Type4Hob= Data->SmbiosType4Processor.ProcessorVersion)); diff --git a/Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c b/S= ilicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c index 88f36cbbe299..326c4525bb0e 100644 --- a/Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c +++ b/Silicon/SiFive/U54/Library/PeiCoreInfoHobLib/CoreInfoHob.c @@ -198,7 +198,7 @@ CreateU54SmbiosType4DataHob ( ProcessorDataHob.SmbiosType4Processor.Socket =3D TO_BE_FILLED_BY_VENDOR; ProcessorDataHob.SmbiosType4Processor.ProcessorType =3D CentralProcessor; ProcessorDataHob.SmbiosType4Processor.ProcessorFamily =3D ProcessorFamil= yIndicatorFamily2; - ProcessorDataHob.SmbiosType4Processor.ProcessorManufacture =3D TO_BE_FIL= LED_BY_VENDOR; + ProcessorDataHob.SmbiosType4Processor.ProcessorManufacturer =3D TO_BE_FI= LLED_BY_VENDOR; SetMem ((VOID *)&ProcessorDataHob.SmbiosType4Processor.ProcessorId, size= of (PROCESSOR_ID_DATA), TO_BE_FILLED_BY_CODE); ProcessorDataHob.SmbiosType4Processor.ProcessorVersion =3D TO_BE_FILLED_= BY_VENDOR; ProcessorDataHob.SmbiosType4Processor.Voltage.ProcessorVoltageCapability= 3_3V =3D 1; --=20 2.29.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#69344): https://edk2.groups.io/g/devel/message/69344 Mute This Topic: https://groups.io/mt/79134942/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu May 2 15:24:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+69345+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+69345+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608583158; cv=none; d=zohomail.com; s=zohoarc; b=MnGKfdNQGjxfZ9h7dStXjbiesreHIfNsfJgfVFbNuzg2m+/VQueK+lCiQNhb//x0Qde+pYFc1JAucTaNTxdN6R8bHBdzoOQoxDDriOOu54Ky7d00+4K9lMs/MvPrNshcV+YOUi5JLpQnpwCGJxOtabMY7AHIHL4wtm4FSxVKq0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608583158; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=VVTWQJKSkcxpJW6Wt/BDmm2uvIsf7A7dSwl8kSmnL/s=; b=IWo0l33Q+XY/ZbuAf7i5GASWWUYsFPbzrK8Z7ePT0olJZt6M2S6Q4MWAHyuOaFIDfFrTiWVqGFteZtvl05oAvxlZedtwwXmHpYbH1iAgWEIsVUhbkifCC1Tb+nghTU0+zmim3D2GfHeqTHRzxR5CbWjc52u75WSnFrQkBFFPSmE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+69345+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1608583158600774.9814198171576; Mon, 21 Dec 2020 12:39:18 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id jEYTYY1788612xLVFayOfYPv; Mon, 21 Dec 2020 12:39:18 -0800 X-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 X-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 X-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) X-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: [edk2-devel] [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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,msalter@redhat.com X-Gm-Message-State: fGnx8nuUTPvV6hYFjggXlPSux1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1608583158; bh=AJSrqS6ER+Vqbbx/YAIpZCZPUTm4Kuu8lvyFBc6XFf0=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=nwa7Fe9KZPLf+z8iWYTC5gQeZ08UQqw8pkP3rTNcgIRNnMrAq8Dpk/Juhn2DYUsKRun WIaP5TRT5/8UyfjtCfb7pFNOCIH0GCEu7pRgGUA2P8c+bvs7zJ0pcJ/q3Etj0QY8T6uji uhPFSm8ktuk/3y/TmX0KU4pPDGPA/BnvTNc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Abner Chang --- .../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 ( // // Set several PCD values to point to flash // - PcdSet64 ( + Status =3D PcdSet64S ( PcdFlashNvStorageVariableBase64, (UINTN) PcdGet32 (PcdPlatformFlashNvStorageVariableBase) ); - PcdSet32 ( + ASSERT_EFI_ERROR (Status); + Status =3D PcdSet32S ( PcdFlashNvStorageFtwWorkingBase, PcdGet32 (PcdPlatformFlashNvStorageFtwWorkingBase) ); - PcdSet32 ( + ASSERT_EFI_ERROR (Status); + Status =3D PcdSet32S ( PcdFlashNvStorageFtwSpareBase, PcdGet32 (PcdPlatformFlashNvStorageFtwSpareBase) ); + ASSERT_EFI_ERROR (Status); =20 FwhInstance =3D (EFI_FW_VOL_INSTANCE *) ( --=20 2.29.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#69345): https://edk2.groups.io/g/devel/message/69345 Mute This Topic: https://groups.io/mt/79134944/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-