REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3042
Cc: G Edhaya Chandran <edhaya.chand...@arm.com>
Cc: Barton Gao <gao...@byosoft.com.cn>
Cc: Samer El-Haj-Mahmoud <samer.el-haj-mahm...@arm.com>
Cc: Eric Jin <eric....@intel.com>
Cc: Arvin Chen <arvinx.c...@intel.com>
Cc: Leif Lindholm <l...@nuviainc.com>
Cc: Heinrich Schuchardt <xypron.g...@gmx.de>
Cc: Abner Chang <abner.ch...@hpe.com>
Signed-off-by: Daniel Schaefer <daniel.schae...@hpe.com>
---
uefi-sct/SctPkg/Library/SctLib/Aarch64/SctLibPlat.h
| 4 +--
uefi-sct/SctPkg/Library/SctLib/Aarch64/initplat.c
| 6 ++---
uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h
| 7 +++--
uefi-sct/SctPkg/Library/SctLib/Riscv64/initplat.c
| 6 ++---
uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/GoVirtual.S
| 15 ++++++-----
uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/VirtualMemory.c
| 22 +++++++--------
uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S
| 6 ++---
uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c
| 6 ++---
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/Riscv64/Debug.c
| 6 ++---
uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c
| 8 +++---
uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c
| 8 +++---
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/Riscv64/DebugSupportBBTestCacheFunction.c
| 6 ++---
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c
| 6 ++---
uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/PlatformIsa.c
| 6 ++---
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/Riscv64/EntsLibPlat.h
| 6 ++---
uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/InitPlat.c
| 6 ++---
25 files changed, 109 insertions(+), 122 deletions(-)
diff --git a/uefi-sct/SctPkg/Library/SctLib/Aarch64/SctLibPlat.h
b/uefi-sct/SctPkg/Library/SctLib/Aarch64/SctLibPlat.h
index ee7c656b..b7832e18 100644
--- a/uefi-sct/SctPkg/Library/SctLib/Aarch64/SctLibPlat.h
+++ b/uefi-sct/SctPkg/Library/SctLib/Aarch64/SctLibPlat.h
@@ -5,12 +5,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git a/uefi-sct/SctPkg/Library/SctLib/Aarch64/initplat.c
b/uefi-sct/SctPkg/Library/SctLib/Aarch64/initplat.c
index a48bb2f3..1c247c91 100644
--- a/uefi-sct/SctPkg/Library/SctLib/Aarch64/initplat.c
+++ b/uefi-sct/SctPkg/Library/SctLib/Aarch64/initplat.c
@@ -5,12 +5,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git a/uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h
b/uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h
index 69e7f904..b7832e18 100644
--- a/uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h
+++ b/uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h
@@ -2,16 +2,15 @@
Copyright 2006 - 2012 Unified EFI, Inc.<BR>
Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.<BR>
- Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All rights
reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -21,7 +20,7 @@ Module Name:
Abstract:
- RISCV64 specific defines
+ AArch64 specific defines
--*/
diff --git a/uefi-sct/SctPkg/Library/SctLib/Riscv64/initplat.c
b/uefi-sct/SctPkg/Library/SctLib/Riscv64/initplat.c
index a48bb2f3..1c247c91 100644
--- a/uefi-sct/SctPkg/Library/SctLib/Riscv64/initplat.c
+++ b/uefi-sct/SctPkg/Library/SctLib/Riscv64/initplat.c
@@ -5,12 +5,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/GoVirtual.S
b/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/GoVirtual.S
index d223b36b..66b5ab6a 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/GoVirtual.S
+++ b/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/GoVirtual.S
@@ -2,15 +2,16 @@
#
# Copyright 2010 - 2012 Unified EFI, Inc.<BR>
# Copyright (c) 2012, ARM Ltd. All rights reserved.<BR>
+# Copyright (c) 2021, Hewlett Packard Enterprise Development LP.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD
License
-# which accompanies this distribution. The full text of the license may be
found at
+# which accompanies this distribution. The full text of the license may be
found at
# http://opensource.org/licenses/bsd-license.php
-#
+#
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED.
-#
+#
##
#
#
@@ -23,7 +24,7 @@
#--*/
#start of the code section
.text
-/* FIXME: Should alignment be different on Aarch64? */
+/* FIXME: Should alignment be different on Riscv64? */
.align 3
.global JumpToTestFunc
@@ -37,8 +38,8 @@
# )
#
JumpToTestFunc:
- mov x2, x0
- mov x0, x1
+ mv x2, x0
+ mv x0, x1
// Jump to Virtual function
- blr x2
+ jalr x2
diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/VirtualMemory.c
b/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/VirtualMemory.c
index 397b3514..c85ea27b 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/VirtualMemory.c
+++ b/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/VirtualMemory.c
@@ -2,15 +2,16 @@
Copyright 2006 - 2012 Unified EFI, Inc.<BR>
Copyright (c) 2012, ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All rights
reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -22,9 +23,6 @@ Module Name:
#include "SCRTApp.h"
-#define VIRT_TO_PHYS_OFFSET (0x80000000) //2G
-
-BOOLEAN HighAddress = FALSE;
UINTN PageTable = 0;
@@ -49,11 +47,10 @@ Returns:
--*/
{
- /*Note: It is presumed that on ARM v5, V6 and V7 architectures
- * the MMU is configured and enabled in PEI phase. As VirtualFunc
- * is already mapped to virtual memory, don't have to do anything here.
+ /* Note: It is presumed that on RISCV architectures the MMU is configured and
+ * enabled in PEI phase. As VirtualFunc is already mapped to virtual memory,
+ * don't have to do anything here.
*/
- /* FIXME: Is it the same on ARM v8? */
}
@@ -174,9 +171,8 @@ Returns:
--*/
{
//
- // Note: It is assumed that the MMU and page tables are configured on ARM
platforms
- // based on ARM v5 v6 and v7 architecture.
+ // Note: It is assumed that the MMU and page tables are configured on RISC-V
+ // platforms.
//
- /* FIXME: Is it the same on ARM v8? */
JumpToTestFunc(VirtualFunc, HandOffAddr);
}
diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S
b/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S
index ae33da18..6b727d6e 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S
+++ b/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S
@@ -6,12 +6,12 @@
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD
License
-# which accompanies this distribution. The full text of the license may be
found at
+# which accompanies this distribution. The full text of the license may be
found at
# http://opensource.org/licenses/bsd-license.php
-#
+#
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED.
-#
+#
##
#
#
diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c
b/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c
index 00b59594..c85ea27b 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c
+++ b/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c
@@ -6,12 +6,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Debug.c
b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Debug.c
index 6161d596..b3e13f63 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Debug.c
+++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Debug.c
@@ -1,16 +1,17 @@
/** @file
Copyright 2006 - 2012 Unified EFI, Inc.<BR>
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2021 Hewlett Packard Enterprise Development LP. All rights
reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -24,7 +25,6 @@ Module Name:
#include "SCRTDriver.h"
UINTN mHandOffPtr = 0;
-EFI_PHYSICAL_ADDRESS mIoPortSpaceAddress = 0;
EFI_STATUS
@@ -42,18 +42,10 @@ ConsumeHandOff (
HandOffPtr = (RUNTIME_HANDOFF*)mHandOffPtr;
*ConfigData = HandOffPtr->ConfigureInfo;
- if (!HandOffPtr->DebuggerInfo.MmioFlag){
- //
- // If debug port is I/O mapped, fix IoBase Address.
- //
- FixAddress(&HandOffPtr->DebuggerInfo.IoBase);
- mIoPortSpaceAddress = HandOffPtr->DebuggerInfo.IoBase;
- } else {
- //
- // If debug port is MMIO, fix MmioBase Address.
- //
- FixAddress(&HandOffPtr->DebuggerInfo.MmioBase);
- }
+ //
+ // Fix MmioBase Address.
+ //
+ FixAddress(&HandOffPtr->DebuggerInfo.MmioBase);
return EFI_SUCCESS;
}
@@ -65,7 +57,7 @@ Send2UART (
)
{
//
- // TODO: On ARM platforms use platform specific functions to
+ // TODO: On RISC-V platforms use platform specific functions to
// write the data to UART.
//
return EFI_SUCCESS;
diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c
b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c
index cc8d9869..cb9771b1 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c
+++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c
@@ -1,16 +1,16 @@
/** @file
Copyright 2006 - 2012 Unified EFI, Inc.<BR>
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.c
b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.c
index b925e151..a728d3ca 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.c
+++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.c
@@ -1,16 +1,17 @@
/** @file
Copyright 2006 - 2012 Unified EFI, Inc.<BR>
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.<BR>
+ (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found a
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -21,7 +22,7 @@ Module Name:
--*/
-#include "Io.h"
+#include "SCRTDriver.h"
EFI_STATUS
EFIAPI
@@ -119,11 +120,11 @@ FixAddress (
)
{
//
- //Note: On ARM platforms don't have to do this as all the
functions are virtually mapped.
+ //Note: On RISC-V platforms don't have to do this as all the
functions are virtually mapped.
//
}
-// Quick port to ARM
+// Quick port to RISC-V. It doesn't have traditional I/O-Port 80h POST Codes
VOID
Port80 (
diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.h
b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.h
index 1e78b3e4..10ab372a 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.h
+++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.h
@@ -1,16 +1,16 @@
/** @file
Copyright 2006 - 2012 Unified EFI, Inc.<BR>
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c
b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c
index 2991935a..b3e13f63 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c
+++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c
@@ -6,12 +6,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c
b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c
index cc8d9869..cb9771b1 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c
+++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c
@@ -1,16 +1,16 @@
/** @file
Copyright 2006 - 2012 Unified EFI, Inc.<BR>
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c
b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c
index 255cb9a6..a728d3ca 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c
+++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c
@@ -1,17 +1,17 @@
/** @file
Copyright 2006 - 2012 Unified EFI, Inc.<BR>
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.<BR>
(C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found a
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestCacheFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestCacheFunction.c
index 96ee7b57..6b54a25f 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestCacheFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestCacheFunction.c
@@ -5,12 +5,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestExceptionCallbackFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestExceptionCallbackFunction.c
index c27c0c0c..1cf2dd74 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestExceptionCallbackFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestExceptionCallbackFunction.c
@@ -2,15 +2,16 @@
Copyright 2006 - 2016 Unified EFI, Inc.<BR>
Copyright (c) 2011 - 2016, ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All rights
reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found a
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -37,7 +38,7 @@ SoftwareBreak (
void
)
{
- // Not ported to ARM yet
+ // Not ported to RISC-V yet
ASSERT (FALSE);
}
@@ -99,9 +100,7 @@ BBTestRegisterExceptionCallbackFunctionManualTest (
// Invoke RegisterExceptionCallback() to install an interrupt handler
function.
//
InvokedExceptionCallback = FALSE;
- // FIXME: Is it normal that we use EXCEPT_IA32_BREAKPOINT here?
- // Shouldn't we define proper constants for ARM exceptions in
DebugSupportProtocol.h file?
- Status = DebugSupport->RegisterExceptionCallback (DebugSupport, 0,
ExceptionCallback, EXCEPT_IA32_BREAKPOINT);
+ Status = DebugSupport->RegisterExceptionCallback (DebugSupport, 0,
ExceptionCallback, EXCEPT_RISCV_BREAKPOINT);
if ((Status == EFI_SUCCESS) || (Status == EFI_ALREADY_STARTED)) {
AssertionType = EFI_TEST_ASSERTION_PASSED;
@@ -205,7 +204,7 @@ BBTestRegisterExceptionCallbackFunctionManualTest (
// Assertion Point 3.4.2.3
// Invoke RegisterExceptionCallback() to install another interrupt handler
function.
//
- Status = DebugSupport->RegisterExceptionCallback (DebugSupport, 0,
ExceptionCallback1, EXCEPT_IA32_BREAKPOINT);
+ Status = DebugSupport->RegisterExceptionCallback (DebugSupport, 0,
ExceptionCallback1, EXCEPT_RISCV_BREAKPOINT);
if (Status != EFI_ALREADY_STARTED) {
AssertionType = EFI_TEST_ASSERTION_FAILED;
@@ -228,7 +227,7 @@ BBTestRegisterExceptionCallbackFunctionManualTest (
// Assertion Point 3.4.2.4
// Invoke RegisterExceptionCallback() to unstall the interrupt handler
function.
//
- Status = DebugSupport->RegisterExceptionCallback (DebugSupport, 0, NULL,
EXCEPT_IA32_BREAKPOINT);
+ Status = DebugSupport->RegisterExceptionCallback (DebugSupport, 0, NULL,
EXCEPT_RISCV_BREAKPOINT);
if (EFI_ERROR(Status)) {
AssertionType = EFI_TEST_ASSERTION_FAILED;
@@ -273,4 +272,3 @@ BBTestRegisterExceptionCallbackFunctionManualTest (
return EFI_SUCCESS;
}
-
diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/PlatformIsa.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/PlatformIsa.c
index 8334f601..d91f520e 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/PlatformIsa.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/PlatformIsa.c
@@ -2,15 +2,16 @@
Copyright 2006 - 2012 Unified EFI, Inc.<BR>
Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All rights
reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -26,5 +27,4 @@ Abstract:
#include "DebugSupportBBTestMain.h"
-EFI_INSTRUCTION_SET_ARCHITECTURE PlatformIsa = IsaAArch64;
-
+EFI_INSTRUCTION_SET_ARCHITECTURE PlatformIsa = IsaRiscv64;
diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestCacheFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestCacheFunction.c
index 96ee7b57..6b54a25f 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestCacheFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestCacheFunction.c
@@ -5,12 +5,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c
index c6e72806..1cf2dd74 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c
@@ -6,12 +6,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found a
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/PlatformIsa.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/PlatformIsa.c
index 8b23d91b..d91f520e 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/PlatformIsa.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/PlatformIsa.c
@@ -6,12 +6,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git
a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/EntsLibPlat.h
b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/EntsLibPlat.h
index ff781aee..41a6c8bf 100644
---
a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/EntsLibPlat.h
+++
b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/EntsLibPlat.h
@@ -5,12 +5,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found a
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
@@ -20,7 +20,7 @@ Module Name:
Abstract:
- AArch64 specific defines
+ RISCV64 specific defines
--*/
diff --git
a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/InitPlat.c
b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/InitPlat.c
index 70a509a4..7a66c099 100644
---
a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/InitPlat.c
+++
b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/InitPlat.c
@@ -5,12 +5,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found a
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git
a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/EntsLibPlat.h
b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/EntsLibPlat.h
index 7f7835e4..41a6c8bf 100644
---
a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/EntsLibPlat.h
+++
b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/EntsLibPlat.h
@@ -5,12 +5,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found a
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
diff --git
a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/InitPlat.c
b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/InitPlat.c
index 70a509a4..7a66c099 100644
---
a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/InitPlat.c
+++
b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/InitPlat.c
@@ -5,12 +5,12 @@
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
+ which accompanies this distribution. The full text of the license may be
found a
http://opensource.org/licenses/bsd-license.php
-
+
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
+
**/
/*++
--
2.30.0
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#71532): https://edk2.groups.io/g/devel/message/71532
Mute This Topic: https://groups.io/mt/80507448/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
