3 files changed, 13 insertions, 57 deletions
diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLib.h
index a5823af..52ff1b8 100644
--- a/MdePkg/Include/Library/ArmLib.h
+++ b/MdePkg/Include/Library/ArmLib.h
@@ -699,6 +699,18 @@ ArmHasGicSystemRegisters (
   VOID
   );
 
+/**
+  Check whether the CPU supports the GICv5 system register interface
+
+  @return   Whether GICv5 System Register Interface is supported
+
+**/
+BOOLEAN
+EFIAPI
+ArmHasGicV5SystemRegisters (
+  VOID
+  );
+
 /** Checks if CCIDX is implemented.
 
    @retval TRUE  CCIDX is implemented.
diff --git a/MdePkg/Include/Library/BaseRiscVSbiLib.h b/MdePkg/Include/Library/BaseRiscVSbiLib.h
index 2244165..d166671 100644
--- a/MdePkg/Include/Library/BaseRiscVSbiLib.h
+++ b/MdePkg/Include/Library/BaseRiscVSbiLib.h
@@ -66,13 +66,6 @@
 
 #define SBI_LAST_ERR  SBI_ERR_ALREADY_STOPPED
 
-typedef struct {
-  UINT64    BootHartId;
-  VOID      *PeiServiceTable;    // PEI Service table
-  VOID      *PrePiHobList;       // Pre PI Hob List
-  UINT64    FlattenedDeviceTree; // Pointer to Flattened Device tree
-} EFI_RISCV_FIRMWARE_CONTEXT;
-
 //
 // EDK2 OpenSBI firmware extension return status.
 //
@@ -110,55 +103,6 @@ SbiSystemReset (
   );
 
 /**
-  Get firmware context of the calling hart.
-
-  @param[out] FirmwareContext      The firmware context pointer.
-**/
-VOID
-EFIAPI
-GetFirmwareContext (
-  OUT EFI_RISCV_FIRMWARE_CONTEXT  **FirmwareContext
-  );
-
-/**
-  Set firmware context of the calling hart.
-
-  @param[in] FirmwareContext       The firmware context pointer.
-**/
-VOID
-EFIAPI
-SetFirmwareContext (
-  IN EFI_RISCV_FIRMWARE_CONTEXT  *FirmwareContext
-  );
-
-/**
-  Get pointer to OpenSBI Firmware Context
-
-  Get the pointer of firmware context.
-
-  @param    FirmwareContextPtr   Pointer to retrieve pointer to the
-                                 Firmware Context.
-**/
-VOID
-EFIAPI
-GetFirmwareContextPointer (
-  IN OUT EFI_RISCV_FIRMWARE_CONTEXT  **FirmwareContextPtr
-  );
-
-/**
-  Set pointer to OpenSBI Firmware Context
-
-  Set the pointer of firmware context.
-
-  @param    FirmwareContextPtr   Pointer to Firmware Context.
-**/
-VOID
-EFIAPI
-SetFirmwareContextPointer (
-  IN EFI_RISCV_FIRMWARE_CONTEXT  *FirmwareContextPtr
-  );
-
-/**
   Make ECALL in assembly
 
   Switch to M-mode
diff --git a/MdePkg/Include/Library/CpuLib.h b/MdePkg/Include/Library/CpuLib.h
index 27f3f82..0ecdaec 100644
--- a/MdePkg/Include/Library/CpuLib.h
+++ b/MdePkg/Include/Library/CpuLib.h
@@ -42,7 +42,7 @@ CpuFlushTlb (
   VOID
   );
 
-#if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64) || defined (MDE_CPU_LOONGARCH64)
+#if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64) || defined (MDE_CPU_LOONGARCH64) || defined (MDE_CPU_RISCV64)
 
 /**
   Initialize the CPU floating point units.