[edk2-devel] [edk2-test PATCHv2 0/5] Port SCT to RISCV64

Daniel Schaefer posted 5 patches 3 years, 2 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
uefi-sct/SctPkg/Application/InstallSct/InstallSctDef.h                                                                                  |  4 ++
uefi-sct/SctPkg/Library/SctLib/Aarch64/SctLibPlat.h                                                                                     |  4 +-
uefi-sct/SctPkg/Library/SctLib/Aarch64/initplat.c                                                                                       |  6 +-
uefi-sct/SctPkg/Library/SctLib/{Aarch64 => Riscv64}/SctLibPlat.h                                                                        |  4 +-
uefi-sct/SctPkg/Library/SctLib/{Aarch64 => Riscv64}/initplat.c                                                                          |  6 +-
uefi-sct/SctPkg/Library/SctLib/SctLib.inf                                                                                               |  6 ++
uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/GoVirtual.S                                                                                        | 15 ++---
uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/VirtualMemory.c                                                                                    | 22 +++----
uefi-sct/SctPkg/SCRT/SCRTApp/{Aarch64 => Riscv64}/GoVirtual.S                                                                           | 15 +++--
uefi-sct/SctPkg/SCRT/SCRTApp/{Aarch64 => Riscv64}/VirtualMemory.c                                                                       | 22 +++----
uefi-sct/SctPkg/SCRT/SCRTApp/SCRTApp.inf                                                                                                |  5 ++
uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Debug.c                                                                                         | 28 ++++-----
uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c                                                                                          |  8 +--
uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.c                                                                                            | 15 ++---
uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.h                                                                                            |  8 +--
uefi-sct/SctPkg/SCRT/SCRTDriver/{Aarch64 => Riscv64}/Debug.c                                                                            | 28 ++++-----
uefi-sct/SctPkg/SCRT/SCRTDriver/{Aarch64 => Riscv64}/Dump.c                                                                             |  8 +--
uefi-sct/SctPkg/SCRT/SCRTDriver/{Aarch64 => Riscv64}/Io.c                                                                               | 15 ++---
uefi-sct/SctPkg/SCRT/SCRTDriver/SCRTDriver.inf                                                                                          |  6 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestCacheFunction.c                          |  6 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestExceptionCallbackFunction.c              | 18 +++---
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/PlatformIsa.c                                              | 10 ++--
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTest.inf                                             |  6 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/{Aarch64 => Riscv64}/DebugSupportBBTestCacheFunction.c             |  6 +-
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/{Aarch64 => Riscv64}/DebugSupportBBTestExceptionCallbackFunction.c | 18 +++---
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/{Aarch64 => Riscv64}/PlatformIsa.c                                 | 10 ++--
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTest.inf                                                           |  4 ++
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTest.inf                                                             |  4 ++
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/EntsLibPlat.h                                                      |  8 +--
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/InitPlat.c                                                         |  6 +-
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsLib.inf                                                                |  5 ++
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/{Aarch64 => Riscv64}/EntsLibPlat.h                                         |  8 +--
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/{Aarch64 => Riscv64}/InitPlat.c                                            |  6 +-
uefi-sct/SctPkg/Tools/Source/GenBin/GNUmakefile                                                                                         |  4 ++
uefi-sct/SctPkg/UEFI/IHV_SCT.dsc                                                                                                        | 30 +++++++---
uefi-sct/SctPkg/UEFI/Protocol/DebugSupport.h                                                                                            | 61 +++++++++++++++++++-
uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc                                                                                                       | 31 +++++++---
uefi-sct/SctPkg/build.sh                                                                                                                | 11 +++-
38 files changed, 295 insertions(+), 182 deletions(-)
copy uefi-sct/SctPkg/Library/SctLib/{Aarch64 => Riscv64}/SctLibPlat.h (92%)
copy uefi-sct/SctPkg/Library/SctLib/{Aarch64 => Riscv64}/initplat.c (92%)
copy uefi-sct/SctPkg/SCRT/SCRTApp/{Aarch64 => Riscv64}/GoVirtual.S (83%)
copy uefi-sct/SctPkg/SCRT/SCRTApp/{Aarch64 => Riscv64}/VirtualMemory.c (85%)
copy uefi-sct/SctPkg/SCRT/SCRTDriver/{Aarch64 => Riscv64}/Debug.c (65%)
copy uefi-sct/SctPkg/SCRT/SCRTDriver/{Aarch64 => Riscv64}/Dump.c (93%)
copy uefi-sct/SctPkg/SCRT/SCRTDriver/{Aarch64 => Riscv64}/Io.c (84%)
copy uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/{Aarch64 => Riscv64}/DebugSupportBBTestCacheFunction.c (96%)
copy uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/{Aarch64 => Riscv64}/DebugSupportBBTestExceptionCallbackFunction.c (92%)
copy uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/{Aarch64 => Riscv64}/PlatformIsa.c (76%)
copy uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/{Aarch64 => Riscv64}/EntsLibPlat.h (89%)
copy uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/{Aarch64 => Riscv64}/InitPlat.c (92%)
[edk2-devel] [edk2-test PATCHv2 0/5] Port SCT to RISCV64
Posted by Daniel Schaefer 3 years, 2 months ago
Hi everyone,

here's my second patch series for porting the SCT to RISCV64.
Nothing substantial has changed. The first one was really just an RFC
like Leif mentioned. Now I have cleaned it up and it could be merged.

I've got 5 patches:

1. Copy the architectures specific sources from Aarch64
2. Adapt those sources to Riscv64
3. Adapt the generic files, like the make system and general headers to Riscv64
4. Unify the CC_FLAGS for the different GCC architectures
5. Remove trailing whitespace from Riscv64 and Aarch64 specific sources

1, 2 and 3 are split to make the review easier and to provide clean
separated commits. If you think it would be better to squash before
applying them to the repo, feel free to do so.
Please don't waste your time reviewing 1 because you'll just be
reviewing the old Aarch64 code.

4 and 5 are new in this series because of Leif's comments on the last
series. I don't really think 5 belongs here, as almost all files in this
repo have the same issue. We could have a separate patch series for
that.
4 could also be squashed into 3, if you like.

Heinrich already tested the first patch series on Uboot and confirmed
that the test results of SCT look similar as on Aarch64.

It can't currently be easily tested on the EDK2 port that we've done
because a few things are missing.
We're working on an OVMF-style platform for the RISC-V virt machine of
QEMU.

Cheers,
Daniel

Cc: G Edhaya Chandran <Edhaya.Chandran@arm.com>
Cc: Barton Gao <gaojie@byosoft.com.cn>
Cc: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>
Cc: Eric Jin <eric.jin@intel.com>
Cc: Arvin Chen <arvinx.chen@intel.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Abner Chang <abner.chang@hpe.com>

Daniel Schaefer (5):
  SctPkg: Add RISCV64 support by using Aarch64 sources
  SctPkg: Adapt Aarch64 sources for Riscv64
  SctPkg: Add RISCV64 build support
  SctPkg: Unify CC_FLAGS for all GCC platforms
  SctPkg: Remove trailing whitespace

 uefi-sct/SctPkg/Application/InstallSct/InstallSctDef.h                                                                                  |  4 ++
 uefi-sct/SctPkg/Library/SctLib/Aarch64/SctLibPlat.h                                                                                     |  4 +-
 uefi-sct/SctPkg/Library/SctLib/Aarch64/initplat.c                                                                                       |  6 +-
 uefi-sct/SctPkg/Library/SctLib/{Aarch64 => Riscv64}/SctLibPlat.h                                                                        |  4 +-
 uefi-sct/SctPkg/Library/SctLib/{Aarch64 => Riscv64}/initplat.c                                                                          |  6 +-
 uefi-sct/SctPkg/Library/SctLib/SctLib.inf                                                                                               |  6 ++
 uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/GoVirtual.S                                                                                        | 15 ++---
 uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/VirtualMemory.c                                                                                    | 22 +++----
 uefi-sct/SctPkg/SCRT/SCRTApp/{Aarch64 => Riscv64}/GoVirtual.S                                                                           | 15 +++--
 uefi-sct/SctPkg/SCRT/SCRTApp/{Aarch64 => Riscv64}/VirtualMemory.c                                                                       | 22 +++----
 uefi-sct/SctPkg/SCRT/SCRTApp/SCRTApp.inf                                                                                                |  5 ++
 uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Debug.c                                                                                         | 28 ++++-----
 uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c                                                                                          |  8 +--
 uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.c                                                                                            | 15 ++---
 uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.h                                                                                            |  8 +--
 uefi-sct/SctPkg/SCRT/SCRTDriver/{Aarch64 => Riscv64}/Debug.c                                                                            | 28 ++++-----
 uefi-sct/SctPkg/SCRT/SCRTDriver/{Aarch64 => Riscv64}/Dump.c                                                                             |  8 +--
 uefi-sct/SctPkg/SCRT/SCRTDriver/{Aarch64 => Riscv64}/Io.c                                                                               | 15 ++---
 uefi-sct/SctPkg/SCRT/SCRTDriver/SCRTDriver.inf                                                                                          |  6 ++
 uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestCacheFunction.c                          |  6 +-
 uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestExceptionCallbackFunction.c              | 18 +++---
 uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/PlatformIsa.c                                              | 10 ++--
 uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/DebugSupportBBTest.inf                                             |  6 ++
 uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/{Aarch64 => Riscv64}/DebugSupportBBTestCacheFunction.c             |  6 +-
 uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/{Aarch64 => Riscv64}/DebugSupportBBTestExceptionCallbackFunction.c | 18 +++---
 uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/{Aarch64 => Riscv64}/PlatformIsa.c                                 | 10 ++--
 uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTest.inf                                                           |  4 ++
 uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTest.inf                                                             |  4 ++
 uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/EntsLibPlat.h                                                      |  8 +--
 uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/InitPlat.c                                                         |  6 +-
 uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsLib.inf                                                                |  5 ++
 uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/{Aarch64 => Riscv64}/EntsLibPlat.h                                         |  8 +--
 uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/{Aarch64 => Riscv64}/InitPlat.c                                            |  6 +-
 uefi-sct/SctPkg/Tools/Source/GenBin/GNUmakefile                                                                                         |  4 ++
 uefi-sct/SctPkg/UEFI/IHV_SCT.dsc                                                                                                        | 30 +++++++---
 uefi-sct/SctPkg/UEFI/Protocol/DebugSupport.h                                                                                            | 61 +++++++++++++++++++-
 uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc                                                                                                       | 31 +++++++---
 uefi-sct/SctPkg/build.sh                                                                                                                | 11 +++-
 38 files changed, 295 insertions(+), 182 deletions(-)
 copy uefi-sct/SctPkg/Library/SctLib/{Aarch64 => Riscv64}/SctLibPlat.h (92%)
 copy uefi-sct/SctPkg/Library/SctLib/{Aarch64 => Riscv64}/initplat.c (92%)
 copy uefi-sct/SctPkg/SCRT/SCRTApp/{Aarch64 => Riscv64}/GoVirtual.S (83%)
 copy uefi-sct/SctPkg/SCRT/SCRTApp/{Aarch64 => Riscv64}/VirtualMemory.c (85%)
 copy uefi-sct/SctPkg/SCRT/SCRTDriver/{Aarch64 => Riscv64}/Debug.c (65%)
 copy uefi-sct/SctPkg/SCRT/SCRTDriver/{Aarch64 => Riscv64}/Dump.c (93%)
 copy uefi-sct/SctPkg/SCRT/SCRTDriver/{Aarch64 => Riscv64}/Io.c (84%)
 copy uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/{Aarch64 => Riscv64}/DebugSupportBBTestCacheFunction.c (96%)
 copy uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/{Aarch64 => Riscv64}/DebugSupportBBTestExceptionCallbackFunction.c (92%)
 copy uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/{Aarch64 => Riscv64}/PlatformIsa.c (76%)
 copy uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/{Aarch64 => Riscv64}/EntsLibPlat.h (89%)
 copy uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/{Aarch64 => Riscv64}/InitPlat.c (92%)

-- 
2.30.0



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#71528): https://edk2.groups.io/g/devel/message/71528
Mute This Topic: https://groups.io/mt/80507439/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-