From nobody Mon Feb 9 20:30:30 2026 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+94910+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+94910+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1665396765; cv=none; d=zohomail.com; s=zohoarc; b=J8mKEjQIlh77IRUpWNm6aLr4zsc7sOWI4kOiuISQ5Lu1Nn15BOKGdCI1U101w26/onAHEoDOXT4zJPZ/QVMxId+YTsvyxZEqyH60ivBaiGH+P/y/r0tQ4Hc6Wml0VugEBrZ7dYHEQcPIn20pKCkLgvk4uO/sQ+3E3DDXBthKqhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665396765; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=aB05APwz3sQLJj+WNs8+s3G9bpg6A4x+rRS68uc5kkY=; b=cxK+ZjIXP12ZjBEreK+Ki5Wm7iBH2Gs4dBhCgIhT3TEBPt62sP0eU3tI2ArOPphUq43WH2po9XcpCGN/uXF+rrhQPnCcXFwq2paOJ0jKd7PIgMJqPNhPhQzq+zqxLct5zr3wwJw59Y5vkC68oVwrCYxBYu6LLbmfsxd30YNYWeQ= 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+94910+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1665396765053170.86043469422611; Mon, 10 Oct 2022 03:12:45 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id cUTXYY1788612xowDDPQpkig; Mon, 10 Oct 2022 03:12:43 -0700 X-Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web12.4577.1665396763122194924 for ; Mon, 10 Oct 2022 03:12:43 -0700 X-Received: by mail-pg1-f175.google.com with SMTP id b5so9927645pgb.6 for ; Mon, 10 Oct 2022 03:12:43 -0700 (PDT) X-Gm-Message-State: iIuDueNzVm8fmGL4AA10ifYIx1787277AA= X-Google-Smtp-Source: AMsMyM660/78hd53nbgFuZYljBGQKuOwqwRNUFalIe4uzSITEUqhQWBSyDsus3SpQWD/PETnBl32/g== X-Received: by 2002:a05:6a00:b85:b0:563:4623:ec40 with SMTP id g5-20020a056a000b8500b005634623ec40mr6072309pfj.56.1665396762309; Mon, 10 Oct 2022 03:12:42 -0700 (PDT) X-Received: from localhost.localdomain ([49.206.13.138]) by smtp.gmail.com with ESMTPSA id h17-20020a170902f55100b001788ccecbf5sm6302138plf.31.2022.10.10.03.12.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Oct 2022 03:12:41 -0700 (PDT) From: "Sunil V L" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Gerd Hoffmann Subject: [edk2-devel] [edk2-staging/RiscV64QemuVirt PATCH 11/29] OvmfPkg/PlatformPei: Refactor to allow other architectures Date: Mon, 10 Oct 2022 15:41:44 +0530 Message-Id: <20221010101202.1146624-12-sunilvl@ventanamicro.com> In-Reply-To: <20221010101202.1146624-1-sunilvl@ventanamicro.com> References: <20221010101202.1146624-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 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,sunilvl@ventanamicro.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1665396763; bh=3I6unxwXUMQuX/znZ3wISpuVP+7W8yM4F29LEz9Jg1A=; h=Cc:Date:From:Reply-To:Subject:To; b=iN70HwbpsjNKVbA46Lyl+M+tONRmv20OFVaFOcHD17u76kkG4N5+sLYuyNsNqzrA07N EIXKa06BZjStbgPihP9lqroDetorehAuf+Ubdy235QEAlPFIOAmocvHbEFG5CnWk04rgF TbUeG8USX9vNXlcruz83H3t30a8sntJ0U4M= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1665396767163100009 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4076 Currently, PlatformPei supports only X86 architecture. So, refactor it to allow other CPU architectures. Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Signed-off-by: Sunil V L --- OvmfPkg/PlatformPei/PlatformPei.inf | 34 +++++++++++-------- OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/Platform.h | 0 OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/AmdSev.c | 0 .../PlatformPei/{ =3D> Ia32_X64}/ClearCache.c | 0 .../{ =3D> Ia32_X64}/FeatureControl.c | 0 OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/Fv.c | 0 OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/IntelTdx.c | 0 .../PlatformPei/{ =3D> Ia32_X64}/MemDetect.c | 0 .../PlatformPei/{ =3D> Ia32_X64}/MemTypeInfo.c | 0 OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/Platform.c | 0 10 files changed, 19 insertions(+), 15 deletions(-) rename OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/Platform.h (100%) rename OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/AmdSev.c (100%) rename OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/ClearCache.c (100%) rename OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/FeatureControl.c (100%) rename OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/Fv.c (100%) rename OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/IntelTdx.c (100%) rename OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/MemDetect.c (100%) rename OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/MemTypeInfo.c (100%) rename OvmfPkg/PlatformPei/{ =3D> Ia32_X64}/Platform.c (100%) diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/Plat= formPei.inf index 3cd83e6ec3e5..683ebf1a440a 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -22,16 +22,16 @@ [Defines] # VALID_ARCHITECTURES =3D IA32 X64 EBC # =20 -[Sources] - AmdSev.c - ClearCache.c - FeatureControl.c - Fv.c - MemDetect.c - MemTypeInfo.c - Platform.c - Platform.h - IntelTdx.c +[Sources.IA32, Sources.X64] + Ia32_X64/AmdSev.c + Ia32_X64/ClearCache.c + Ia32_X64/FeatureControl.c + Ia32_X64/Fv.c + Ia32_X64/MemDetect.c + Ia32_X64/MemTypeInfo.c + Ia32_X64/Platform.c + Ia32_X64/Platform.h + Ia32_X64/IntelTdx.c =20 [Packages] EmbeddedPkg/EmbeddedPkg.dec @@ -57,14 +57,16 @@ [LibraryClasses] PeiServicesLib PeiServicesTablePointerLib PeimEntryPoint + PcdLib + PlatformInitLib + +[LibraryClasses.IA32, LibraryClasses.X64] + MtrrLib + VmgExitLib QemuFwCfgLib QemuFwCfgS3Lib QemuFwCfgSimpleParserLib - MtrrLib MemEncryptSevLib - PcdLib - VmgExitLib - PlatformInitLib =20 [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase @@ -99,7 +101,6 @@ [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved - gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable @@ -116,6 +117,9 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdGhcbHypervisorFeatures gEfiMdeModulePkgTokenSpaceGuid.PcdTdxSharedBitMask =20 +[Pcd.IA32, Pcd.X64] + gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode + [FixedPcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfCpuidBase gUefiOvmfPkgTokenSpaceGuid.PcdOvmfCpuidSize diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Ia32_X64/= Platform.h similarity index 100% rename from OvmfPkg/PlatformPei/Platform.h rename to OvmfPkg/PlatformPei/Ia32_X64/Platform.h diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/Ia32_X64/Am= dSev.c similarity index 100% rename from OvmfPkg/PlatformPei/AmdSev.c rename to OvmfPkg/PlatformPei/Ia32_X64/AmdSev.c diff --git a/OvmfPkg/PlatformPei/ClearCache.c b/OvmfPkg/PlatformPei/Ia32_X6= 4/ClearCache.c similarity index 100% rename from OvmfPkg/PlatformPei/ClearCache.c rename to OvmfPkg/PlatformPei/Ia32_X64/ClearCache.c diff --git a/OvmfPkg/PlatformPei/FeatureControl.c b/OvmfPkg/PlatformPei/Ia3= 2_X64/FeatureControl.c similarity index 100% rename from OvmfPkg/PlatformPei/FeatureControl.c rename to OvmfPkg/PlatformPei/Ia32_X64/FeatureControl.c diff --git a/OvmfPkg/PlatformPei/Fv.c b/OvmfPkg/PlatformPei/Ia32_X64/Fv.c similarity index 100% rename from OvmfPkg/PlatformPei/Fv.c rename to OvmfPkg/PlatformPei/Ia32_X64/Fv.c diff --git a/OvmfPkg/PlatformPei/IntelTdx.c b/OvmfPkg/PlatformPei/Ia32_X64/= IntelTdx.c similarity index 100% rename from OvmfPkg/PlatformPei/IntelTdx.c rename to OvmfPkg/PlatformPei/Ia32_X64/IntelTdx.c diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/Ia32_X64= /MemDetect.c similarity index 100% rename from OvmfPkg/PlatformPei/MemDetect.c rename to OvmfPkg/PlatformPei/Ia32_X64/MemDetect.c diff --git a/OvmfPkg/PlatformPei/MemTypeInfo.c b/OvmfPkg/PlatformPei/Ia32_X= 64/MemTypeInfo.c similarity index 100% rename from OvmfPkg/PlatformPei/MemTypeInfo.c rename to OvmfPkg/PlatformPei/Ia32_X64/MemTypeInfo.c diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Ia32_X64/= Platform.c similarity index 100% rename from OvmfPkg/PlatformPei/Platform.c rename to OvmfPkg/PlatformPei/Ia32_X64/Platform.c --=20 2.25.1 -=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 (#94910): https://edk2.groups.io/g/devel/message/94910 Mute This Topic: https://groups.io/mt/94233010/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-