From nobody Tue Apr 30 19:36:04 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+80753+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+80753+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1631773351; cv=none; d=zohomail.com; s=zohoarc; b=J+A8gYfAoT9mV5DZbAwixc0uI7lqmjSG5AQ1SnxuCBX9ZxPlbGmx7W7AOyW851NX8aoQ1SA8ObFcZG/pD3gVaiSscEEOOkD2DMhxtc00lw2Re69neyCZLvOkpbr+GW8LrEwFl0geG0blJcnBOhqsvb+T6s9c94hi+UIFQjCjasA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631773351; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=af9jrcHP9Qtv1T75f0HJKuYKE/xsMNLcLnh92FU8ex0=; b=aYxiZ12WszQ73fB7CMfvrG6c74XLSJsywTZKuwcfz+gpMdNEwlzU2Q03e1cjo9gMotOiA3Q6pG5VlID5Y1ZQShTbnsTh5K7M1TeA/c9lAQWsNeQWuJ/Ch0S/9b1d4uT9DgF8p2wr3IbLZMJAmdT/3sQER5PhfJDQlJlba6mRI3I= 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+80753+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1631773351664710.1199317485247; Wed, 15 Sep 2021 23:22:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id KfXLYY1788612x2yExZAvytV; Wed, 15 Sep 2021 23:22:31 -0700 X-Received: from netsrv01.beckhoff.com (netsrv01.beckhoff.com [62.159.14.10]) by mx.groups.io with SMTP id smtpd.web12.7582.1631773350207043312 for ; Wed, 15 Sep 2021 23:22:30 -0700 X-Received: from 172.17.5.170 by netsrv01.beckhoff.com (Tls12, Aes256, Sha384, DiffieHellmanEllipticKey256); Thu, 16 Sep 2021 06:22:26 GMT X-Received: from CorvinK-NB03.beckhoff.com (172.17.62.165) by ex04.beckhoff.com (172.17.5.170) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.14; Thu, 16 Sep 2021 08:22:17 +0200 From: =?UTF-8?B?Q29ydmluIEvDtmhuZQ==?= To: CC: , , , , , , =?UTF-8?q?Corvin=20K=C3=B6hne?= Subject: [edk2-devel] [PATCH v2] OvmfPkg: set a default value for the WorkAreaHeader PCD Date: Thu, 16 Sep 2021 08:21:39 +0200 Message-ID: <20210916062139.1897-1-c.koehne@beckhoff.com> MIME-Version: 1.0 X-Originating-IP: [172.17.62.165] X-ClientProxiedBy: ex03.beckhoff.com (172.17.2.169) To ex04.beckhoff.com (172.17.5.170) Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,c.koehne@beckhoff.com X-Gm-Message-State: 1sNyhEqWSJ8WFQKvCqgochhsx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1631773351; bh=/eu+2m9nFteZDgruEAvAG9jrkAhqc0CJ+E7aScoyKPs=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=RwoQHZi+A6i/s1N0ho1Rr2Zp4kgYy2TiPAN2EI+Q/7lRIue4jpBYgyvdTM95JqIYjUN S2uNBA7IIFrw5ESUPtLkyRHs6L9X/31wPWwzpiafZlQGqVOdeYgok8uU90QA5lGKLL7/6 cnJyMyGKkSoK1gHg/7Sb5/NiAkPK40Il8Nc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1631773352823100002 Content-Type: text/plain; charset="utf-8" SEC checks in IsSevGuest if the PCD defined WorkAreaHeader size matches the= size of the WorkAreaHeader struct definition. Set a default value for the = PCD to avoid unnecessary DSC/FDF file changes in all OVMF DSC/FDF files. Signed-off-by: Corvin K=C3=B6hne Reviewed-by: Jiewen Yao --- OvmfPkg/Include/WorkArea.h | 4 ++++ OvmfPkg/OvmfPkg.dec | 7 ++++++- OvmfPkg/OvmfPkgDefines.fdf.inc | 6 ------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/OvmfPkg/Include/WorkArea.h b/OvmfPkg/Include/WorkArea.h index c16030e3ac..0f9b442e43 100644 --- a/OvmfPkg/Include/WorkArea.h +++ b/OvmfPkg/Include/WorkArea.h @@ -25,6 +25,10 @@ typedef enum { // to the structure need to be kept in sync with the // PcdOvmfConfidentialComputingWorkAreaHeader. // +// PcdOvmfConfidentialComputingWorkAreaHeader =3D=3D +// sizeof (CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER) +// +// PcdOvmfConfidentialComputingWorkAreaHeader defined in OvmfPkg/OvmfPkg.d= ec typedef struct _CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER { UINT8 GuestType; UINT8 Reserved1[3]; diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index 75d47e0e00..3ed3811320 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -339,7 +339,12 @@ # The size of this header is used early boot, and is provided through # a fixed PCD. It need to be kept in sync with any changes to the # header definition. - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfConfidentialComputingWorkAreaHeader|0|= UINT32|0x51 + # + # PcdOvmfConfidentialComputingWorkAreaHeader =3D=3D + # sizeof (CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER) + # + # CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER defined in OvmfPkg/Include/Wor= kArea.h + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfConfidentialComputingWorkAreaHeader|4|= UINT32|0x51 [PcdsDynamic, PcdsDynamicEx] diff --git a/OvmfPkg/OvmfPkgDefines.fdf.inc b/OvmfPkg/OvmfPkgDefines.fdf.inc index 3b5e452539..35fd454b97 100644 --- a/OvmfPkg/OvmfPkgDefines.fdf.inc +++ b/OvmfPkg/OvmfPkgDefines.fdf.inc @@ -82,12 +82,6 @@ SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwW= orkingSize =3D $(BLOCK_SIZ SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwSpareBase =3D gUefi= OvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwWorkingBase + gEfiMdeModulePk= gTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize =3D $(VAR= S_SPARE_SIZE) -# The OVMF WorkArea contains a fixed size header followed by the actual da= ta. -# The size of header is accessed through a fixed PCD in the reset vector c= ode. -# The value need to be kept in sync with the any changes to the Confidenti= al -# Computing Work Area header defined in the Include/WorkArea.h -SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfConfidentialComputingWorkAreaHeader = =3D 4 - !if $(SMM_REQUIRE) =3D=3D TRUE SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64 =3D gUe= fiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageVariableBase SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase =3D gUe= fiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwWorkingBase -- 2.11.0 Beckhoff Automation GmbH & Co. KG | Managing Director: Dipl. Phys. Hans Bec= khoff Registered office: Verl, Germany | Register court: Guetersloh HRA 7075 -=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 (#80753): https://edk2.groups.io/g/devel/message/80753 Mute This Topic: https://groups.io/mt/85646096/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-