From: "Sunil V L" <sunilvl@ventanamicro.com>
To: devel@edk2.groups.io
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>,
Jiewen Yao <jiewen.yao@intel.com>,
Jordan Justen <jordan.l.justen@intel.com>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [edk2-staging/RiscV64QemuVirt PATCH V2 11/33] OvmfPkg/PlatformPei: Refactor to allow other architectures
Date: Wed, 12 Oct 2022 16:14:34 +0530 [thread overview]
Message-ID: <20221012104456.1393376-12-sunilvl@ventanamicro.com> (raw)
In-Reply-To: <20221012104456.1393376-1-sunilvl@ventanamicro.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4076
Currently, PlatformPei supports only X86 architecture. So,
refactor it to allow other CPU architectures.
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
---
OvmfPkg/PlatformPei/PlatformPei.inf | 34 +++++++++++--------
OvmfPkg/PlatformPei/{ => Ia32_X64}/Platform.h | 0
OvmfPkg/PlatformPei/{ => Ia32_X64}/AmdSev.c | 0
.../PlatformPei/{ => Ia32_X64}/ClearCache.c | 0
.../{ => Ia32_X64}/FeatureControl.c | 0
OvmfPkg/PlatformPei/{ => Ia32_X64}/Fv.c | 0
OvmfPkg/PlatformPei/{ => Ia32_X64}/IntelTdx.c | 0
.../PlatformPei/{ => Ia32_X64}/MemDetect.c | 0
.../PlatformPei/{ => Ia32_X64}/MemTypeInfo.c | 0
OvmfPkg/PlatformPei/{ => Ia32_X64}/Platform.c | 0
10 files changed, 19 insertions(+), 15 deletions(-)
rename OvmfPkg/PlatformPei/{ => Ia32_X64}/Platform.h (100%)
rename OvmfPkg/PlatformPei/{ => Ia32_X64}/AmdSev.c (100%)
rename OvmfPkg/PlatformPei/{ => Ia32_X64}/ClearCache.c (100%)
rename OvmfPkg/PlatformPei/{ => Ia32_X64}/FeatureControl.c (100%)
rename OvmfPkg/PlatformPei/{ => Ia32_X64}/Fv.c (100%)
rename OvmfPkg/PlatformPei/{ => Ia32_X64}/IntelTdx.c (100%)
rename OvmfPkg/PlatformPei/{ => Ia32_X64}/MemDetect.c (100%)
rename OvmfPkg/PlatformPei/{ => Ia32_X64}/MemTypeInfo.c (100%)
rename OvmfPkg/PlatformPei/{ => Ia32_X64}/Platform.c (100%)
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
index 3cd83e6ec3e5..683ebf1a440a 100644
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
@@ -22,16 +22,16 @@ [Defines]
# VALID_ARCHITECTURES = IA32 X64 EBC
#
-[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
[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
[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
+[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/AmdSev.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_X64/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/Ia32_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_X64/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
--
2.25.1
next prev parent reply other threads:[~2022-10-12 10:45 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-12 10:44 [edk2-staging/RiscV64QemuVirt PATCH V2 00/33] Add support for RISC-V virt machine Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 01/33] MdePkg/Register: Add register definition header files for RISC-V Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 02/33] MdePkg: Add RISCV_EFI_BOOT_PROTOCOL related definitions Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 03/33] MdePkg/BaseLib: RISC-V: Add few more helper functions Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 04/33] MdePkg: Add BaseRiscVSbiLib Library for RISC-V Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 05/33] OvmfPkg/PlatformInitLib: Refactor to allow other architectures Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 06/33] OvmfPkg/PlatformInitLib: Add support for RISC-V Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 07/33] OvmfPkg/ResetSystemLib: Refactor to allow other architectures Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 08/33] OvmfPkg/ResetSystemLib: Add support for RISC-V Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 09/33] OvmfPkg/Sec: Refactor to allow other architectures Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 10/33] OvmfPkg/Sec: Add RISC-V support Sunil V L
2022-10-12 10:44 ` Sunil V L [this message]
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 12/33] OvmfPkg/PlatformPei: Add support for RISC-V Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 13/33] UefiCpuPkg/CpuTimerLib: Refactor to allow other architectures Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 14/33] UefiCpuPkg/CpuTimerLib: Add support for RISC-V Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 15/33] UefiCpuPkg/CpuExceptionHandlerLib: Refactor to allow other architectures Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 16/33] UefiCpuPkg/CpuExceptionHandlerLib: Add support for RISC-V Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 17/33] UefiCpuPkg/CpuDxe: Refactor to allow other architectures Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 18/33] UefiCpuPkg/CpuDxe: Add support for RISC-V Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 19/33] UefiCpuPkg/CpuDxe: Add RISC-V Boot protocol support Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 20/33] UefiCpuPkg: Add CpuTimerDxe module Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 21/33] ArmVirtPkg/PlatformHasAcpiDtDxe: Move to OvmfPkg Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 22/33] ArmVirtPkg: Fix up the location of PlatformHasAcpiDtDxe Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 23/33] ArmVirtPkg/PlatformBootManagerLib: Move to OvmfPkg Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 24/33] ArmVirtPkg: Fix up the paths to PlatformBootManagerLib Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 25/33] ArmPlatformPkg/NorFlashPlatformLib.h:Move to MdePkg Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 26/33] EmbeddedPkg/NvVarStoreFormattedLib: Migrate to MdeModulePkg Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 27/33] OvmfPkg: Add NorFlashQemuLib library Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 28/33] OvmfPkg: Add Qemu NOR flash DXE driver Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 29/33] OvmfPkg/NorFlashDxe: Avoid switching to array mode during writes Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 30/33] OvmfPkg/NorFlashDxe: Avoid switching between modes in a tight loop Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 31/33] OvmfPkg: RiscVVirt: Add Qemu Virt platform support Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 32/33] Maintainers.txt: Add entry for OvmfPkg/RiscVVirt Sunil V L
2022-10-12 10:44 ` [edk2-staging/RiscV64QemuVirt PATCH V2 33/33] UefiCpuPkg/UefiCpuPkg.ci.yaml: Ignore RISC-V file Sunil V L
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221012104456.1393376-12-sunilvl@ventanamicro.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox