Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add LoongArchVirt instance to OvmfPkg and enable it #5746

Merged
merged 13 commits into from
Jun 18, 2024
Merged

Add LoongArchVirt instance to OvmfPkg and enable it #5746

merged 13 commits into from
Jun 18, 2024

Conversation

kilaterlee
Copy link
Contributor

Description

Add LoongArch QEMU virt-machine instance to OvmfPkg and enbale it.
Patch1-patch7: Some LoongArch specific libraries, such as stable timer, Cpu MMU Initialization, RTC, reset, etc.
Patch8, 9: LoongArch Qemu SEC and PEI phase code.
Patch10: LoongArch building file.
Patch11: LoongArch QEMU README.
Patch12: Add CI coverage for LoongArch QEMU.
Patch13: Add LoongArch QEMU virt-machine maintainers.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

How This Was Tested

Prepare (X86 Linux Environment)

Fedora39 and higher

Install LoongArch64 cross compiler, LoongArch system QEMU.

yum install gcc-loongarch64-linux-gnu
yum install qemu-system-loongarch64

Others X86 OS ENV

Configure cross-tools

Download:

wget https://github.com/loongson/build-tools/releases/download/2023.08.08/x86_64-cross-tools-loongarch64-binutils_2.41-gcc_13.2.0.tar.xz

Configure the cross-tools environment:

mkdir /opt/loongarch64_cross-toolchain/
tar -vxf x86_64-cross-tools-loongarch64-binutils_2.41-gcc_13.2.0.tar.xz -C /opt/loongarch64_cross-toolchain/
export PATH=/opt/loongarch64_cross-toolchain/cross-tools/bin:$PATH

Note: Please obtain the latest cross-compilation toolchains.

Build QEMU

git clone https://gitlab.com/qemu-project/qemu.git

Note: Please refer to QEMU compilation rules, located in qemu/doc/system/loongarch/virt.rst.

Build LoongArch QEMU virtual machine firmware

Get edk2 resouces

git clone --recurse-submodule https://github.com/tianocore/edk2.git

Building LoongArch QEMU virt FW with GCC

export WORKSPACE=`pwd`
export GCC5_LOONGARCH64_PREFIX=loongarch64-unknown-linux-gnu-
export PACKAGES_PATH=$WORKSPACE/edk2
export EDK_TOOLS_PATH=$WORKSPACE/edk2/BaseTools
source edk2/edksetup.sh --reconfig
make -C edk2/BaseTools
source edk2/edksetup.sh BaseTools
build -b RELEASE -t GCC5 -a LOONGARCH64 -p OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc

Test LoongArch QEMU virtual machine firmware

qemu-system-loongarch64 \
-m 4G \
-M virt \
-smp 2 \
-cpu la464 \
-bios Build/LoongArchVirtQemu/RELEASE_GCC5/FV/QEMU_EFI.fd \
-serial stdio

Test LoongArch QEMU virtual machine OS

Integration Instructions

N/A

@kilaterlee kilaterlee marked this pull request as draft June 6, 2024 09:01
@kilaterlee kilaterlee force-pushed the SubmitOvmfPkg branch 3 times, most recently from fca56a7 to 368aec3 Compare June 7, 2024 01:19
@kilaterlee kilaterlee marked this pull request as ready for review June 7, 2024 01:30
ardbiesheuvel
ardbiesheuvel requested changes Jun 13, 2024
View reviewed changes
OvmfPkg/LoongArchVirt/Drivers/StableTimerDxe/Timer.c Outdated Show resolved Hide resolved
OvmfPkg/LoongArchVirt/Drivers/StableTimerDxe/Timer.c Show resolved Hide resolved
OvmfPkg/LoongArchVirt/Library/LsRealTimeClockLib/LsRealTimeClockLib.c Outdated Show resolved Hide resolved
OvmfPkg/LoongArchVirt/Library/LsRealTimeClockLib/LsRealTimeClockLib.c Show resolved Hide resolved
OvmfPkg/LoongArchVirt/Library/LsRealTimeClockLib/LsRealTimeClockLib.c Outdated Show resolved Hide resolved
OvmfPkg/LoongArchVirt/Library/ResetSystemAcpiLib/DxeResetSystemAcpiGed.c Show resolved Hide resolved
OvmfPkg/LoongArchVirt/Library/ResetSystemAcpiLib/DxeResetSystemAcpiGed.c Show resolved Hide resolved
OvmfPkg/LoongArchVirt/Library/ResetSystemAcpiLib/BaseResetSystemAcpiGed.c Outdated Show resolved Hide resolved
OvmfPkg/LoongArchVirt/Library/ResetSystemAcpiLib/BaseResetSystemAcpiGed.c Show resolved Hide resolved
OvmfPkg/LoongArchVirt/Sec/SecMain.c Outdated Show resolved Hide resolved
@kilaterlee kilaterlee force-pushed the SubmitOvmfPkg branch 2 times, most recently from 9c228cf to ba37b63 Compare June 17, 2024 09:36
@kilaterlee
Copy link
Contributor Author

@ardbiesheuvel Hi Ard, I have rebased this PR to the newest, could you give me a push label after the CI passes?

@ardbiesheuvel ardbiesheuvel added the push Auto push patch series in PR if all checks pass label Jun 18, 2024
kilaterlee and others added 13 commits June 18, 2024 13:43
@kilaterlee @zhangbaoqi-ls @ardbiesheuvel
OvmfPkg/LoongArchVirt: Add stable timer driver
f2b2fe3 
Add a CPU timer driver named StableTimerDxe, which proviedes
EFI_TIMER_ARCH_PROTOCOL for LoongArch.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

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>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Dongyan Qian <qiandongyan@loongson.cn>
Signed-off-by: Chao Li <lichao@loongson.cn>
Co-authored-by: Baoqi Zhang <zhangbaoqi@loongson.cn>
@kilaterlee @zhangbaoqi-ls
@MarsDoge @lixianglai @bibo-mao @ardbiesheuvel
OvmfPkg/LoongArchVirt: Add CpuMmuInit library
3fdf783 
Added a new library for LoongArch, it use for initialization the CPU
MMU, it consumed the CpuMmuLib.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Chao Li <lichao@loongson.cn>
Co-authored-by: Baoqi Zhang <zhangbaoqi@loongson.cn>
Co-authored-by: Dongyan Qian <qiandongyan@loongson.cn>
Co-authored-by: Xianglai Li <lixianglai@loongson.cn>
Co-authored-by: Bibo Mao <maobibo@loongson.cn>
@kilaterlee @ardbiesheuvel
OvmfPkg/LoongArchVirt: Add serial port hook library
0841fd8 
Add a serial port hook library in LoongArchVirt named
Fdt16550SerialProtHookLib, this library is referenced from ArmVirtPkg.

LoongArch QEMU virtual machine uses register of LOONGARCH_CSR_KS1 to
transfer serial port base addres from the PEI phase to the DXE phase.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

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>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Dongyan Qian <qiandongyan@loongson.cn>
Signed-off-by: Chao Li <lichao@loongson.cn>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
@kilaterlee @lixianglai @ardbiesheuvel
OvmfPkg/LoongArchVirt: Add the early serial port output library
d3ab568 
Add a early serial port output library into LoongArchVirt that named
EarlyFdtSerialPortLib16550, this library is referenced from
MdeModulePkg.

This library is used in the PEI phase. Since the serial port address can
not be saved in memory of the LoongArch QEMU virtual machine in the PEI
phase, the serial prot base address will be obtained from the FDT before
each output.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

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>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Dongyan Qian <qiandongyan@loongson.cn>
Signed-off-by: Chao Li <lichao@loongson.cn>
Co-authored-by: Xianglai Li <lixianglai@loongson.cn>
@kilaterlee @ardbiesheuvel
OvmfPkg: Add a new GUID called gRtcRegisterBaseAddressHobGuid
c7072b8 
Added a new GUID use for store the RTC register base address if the
platform can not uses the dynamic PCD in PEI stage.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Chao Li <lichao@loongson.cn>
@kilaterlee @zhangbaoqi-ls
@lixianglai @ardbiesheuvel
OvmfPkg/LoongArchVirt: Add real time clock library
81fdcb9 
This library is provides real time clock for LoongArch virtual machine.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

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>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Dongyan Qian <qiandongyan@loongson.cn>
Signed-off-by: Chao Li <lichao@loongson.cn>
Co-authored-by: Baoqi Zhang <zhangbaoqi@loongson.cn>
Co-authored-by: Xianglai Li <lixianglai@loongson.cn>
@kilaterlee @lixianglai
@bibo-mao @ardbiesheuvel
OvmfPkg/LoongArchVirt: Add reset system library
ced344b 
This library provides interface related to restart and shudown the
LoongArch64 virtual machine.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

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>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Dongyan Qian <qiandongyan@loongson.cn>
Signed-off-by: Chao Li <lichao@loongson.cn>
Co-authored-by: Xianglai Li <lixianglai@loongson.cn>
Co-authored-by: Bibo Mao <maobibo@loongson.cn>
@kilaterlee @lixianglai
@bibo-mao @ardbiesheuvel
OvmfPkg/LoongArchVirt: Support SEC phase
b9c5373 
Add SEC code for LoongArch virtual machine.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

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>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Dongyan Qian <qiandongyan@loongson.cn>
Signed-off-by: Chao Li <lichao@loongson.cn>
Co-authored-by: Xianglai Li <lixianglai@loongson.cn>
Co-authored-by: Bibo Mao <maobibo@loongson.cn>
@kilaterlee @lixianglai
@bibo-mao @ardbiesheuvel
OvmfPkg/LoongArchVirt: Support PEI phase
72a62e3 
Platfrom PEI module for LoongArch platfrom initialization.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

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>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Dongyan Qian <qiandongyan@loongson.cn>
Signed-off-by: Chao Li <lichao@loongson.cn>
Co-authored-by: Xianglai Li <lixianglai@loongson.cn>
Co-authored-by: Bibo Mao <maobibo@loongson.cn>
@kilaterlee @lixianglai
@bibo-mao @ardbiesheuvel
OvmfPkg/LoongArchVirt: Add build file
2a35fb3 
Add infrastructure files to build edk2 for LoongArch QEMU virtual
machine.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

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>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Dongyan Qian <qiandongyan@loongson.cn>
Signed-off-by: Chao Li <lichao@loongson.cn>
Co-authored-by: Xianglai Li <lixianglai@loongson.cn>
Co-authored-by: Bibo Mao <maobibo@loongson.cn>
@kilaterlee @ardbiesheuvel
OvmfPkg/LoongArchVirt: Add self introduction file
8a0010d 
Add self introduction file for LoongArch virtual machine.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

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>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Dongyan Qian <qiandongyan@loongson.cn>
Signed-off-by: Chao Li <lichao@loongson.cn>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
@kilaterlee @ardbiesheuvel
OvmfPkg/PlatformCI: Add CI coverage for LoongArchVirtQemu
e2b2932 
Add support for building LoongArchVirtQemu platform in CI

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Chao Li <lichao@loongson.cn>
@kilaterlee @ardbiesheuvel
Maintainers.txt: Update maintainers and reviewers for OvmfPkg/LoongAr…
57f4745 
…chVirt

Update Maintainers.txt to add Chao Li and Bibo Mao as LoongArchVirt Qemu
virt-machine platform maintainers, add Xianglai Li as the reviewer.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Xianglai Li <lixianglai@loongson.cn>
Signed-off-by: Chao Li <lichao@loongson.cn>
@mergify mergify bot merged commit bfda27d into tianocore:master Jun 18, 2024
127 checks passed
@kilaterlee kilaterlee deleted the SubmitOvmfPkg branch June 18, 2024 15:04
@MarsDoge MarsDoge mentioned this pull request Jun 19, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ardbiesheuvel ardbiesheuvel ardbiesheuvel approved these changes

@kraxel kraxel Awaiting requested review from kraxel

@jyao1 jyao1 Awaiting requested review from jyao1

Assignees
No one assigned
Labels
push Auto push patch series in PR if all checks pass
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kilaterlee @ardbiesheuvel