Changeset 89983 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/StandaloneMmPkg/Include

Timestamp:

Jul 1, 2021 8:17:41 AM (4 years ago)

Author:

vboxsync

Message:

Devices/EFI: Merge edk-stable202105 and openssl 1.1.1j and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• StandaloneMmPkg/Include/Guid/MmCoreData.h (modified) (3 diffs)
• StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h (modified) (8 diffs)
• StandaloneMmPkg/Include/Library/FvLib.h (modified) (1 diff)
• StandaloneMmPkg/Include/Library/StandaloneMmDriverEntryPoint.h (deleted)
• StandaloneMmPkg/Include/Library/StandaloneMmMemLib.h (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/StandaloneMmPkg/Include/Guid/MmCoreData.h

@@ -3 +3 @@
 
 Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
-Copyright (c) 2018, ARM Limited. All rights reserved.<BR>
+Copyright (c) 2018 - 2021, Arm Limited. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -99 +99 @@
 
   ///
-  /// This field is used by the MM Communicatioon Protocol to pass a buffer into
+  /// This field is used by the MM Communication Protocol to pass a buffer into
   /// a software MMI handler and for the software MMI handler to pass a buffer back to
   /// the caller of the MM Communication Protocol.
@@ -106 +106 @@
 
   ///
-  /// This field is used by the MM Communicatioon Protocol to pass the size of a buffer,
+  /// This field is used by the MM Communication Protocol to pass the size of a buffer,
   /// in bytes, into a software MMI handler and for the software MMI handler to pass the
   /// size, in bytes, of a buffer back to the caller of the MM Communication Protocol.

trunk/src/VBox/Devices/EFI/FirmwareNew/StandaloneMmPkg/Include/Library/AArch64/StandaloneMmCoreEntryPoint.h

@@ -3 +3 @@
   phase on ARM platforms
 
-Copyright (c) 2017 - 2018, ARM Ltd. All rights reserved.<BR>
+Copyright (c) 2017 - 2021, Arm Ltd. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -71 +71 @@
   and make further progress in the boot process.
 
-  @param  ImageContext           Pointer to PE/COFF image context
-  @param  SectionHeaderOffset    Offset of PE/COFF image section header
-  @param  NumberOfSections       Number of Sections
-  @param  TextUpdater            Function to change code permissions
-  @param  ReadOnlyUpdater        Function to change RO permissions
-  @param  ReadWriteUpdater       Function to change RW permissions
+  @param  [in] ImageContext           Pointer to PE/COFF image context
+  @param  [in] ImageBase              Base of image in memory
+  @param  [in] SectionHeaderOffset    Offset of PE/COFF image section header
+  @param  [in] NumberOfSections       Number of Sections
+  @param  [in] TextUpdater            Function to change code permissions
+  @param  [in] ReadOnlyUpdater        Function to change RO permissions
+  @param  [in] ReadWriteUpdater       Function to change RW permissions
 
 **/
@@ -83 +84 @@
 UpdateMmFoundationPeCoffPermissions (
   IN  CONST PE_COFF_LOADER_IMAGE_CONTEXT      *ImageContext,
+  IN  EFI_PHYSICAL_ADDRESS                    ImageBase,
   IN  UINT32                                  SectionHeaderOffset,
   IN  CONST  UINT16                           NumberOfSections,
@@ -97 +99 @@
   individual sections later in the boot process.
 
-  @param  TeData                 Pointer to PE/COFF image data
-  @param  ImageContext           Pointer to PE/COFF image context
-  @param  SectionHeaderOffset    Offset of PE/COFF image section header
-  @param  NumberOfSections       Number of Sections
+  @param  [in]      TeData                Pointer to PE/COFF image data
+  @param  [in, out] ImageContext          Pointer to PE/COFF image context
+  @param  [out]     ImageBase             Pointer to ImageBase variable
+  @param  [in, out] SectionHeaderOffset   Offset of PE/COFF image section header
+  @param  [in, out] NumberOfSections      Number of Sections
 
 **/
@@ -108 +111 @@
   IN        VOID                            *TeData,
   IN  OUT   PE_COFF_LOADER_IMAGE_CONTEXT    *ImageContext,
+      OUT   EFI_PHYSICAL_ADDRESS            *ImageBase,
   IN  OUT   UINT32                          *SectionHeaderOffset,
   IN  OUT   UINT16                          *NumberOfSections
@@ -118 +122 @@
   module PE/COFF image in the BFV and returns this information.
 
-  @param  BfvAddress             Base Address of Boot Firmware Volume
-  @param  TeData                 Pointer to address for allocating memory for
-                                 PE/COFF image data
-  @param  TeDataSize             Pointer to size of PE/COFF image data
+  @param  [in]      BfvAddress         Base Address of Boot Firmware Volume
+  @param  [in, out] TeData             Pointer to address for allocating memory
+                                       for PE/COFF image data
+  @param  [in, out] TeDataSize         Pointer to size of PE/COFF image data
 
 **/
@@ -137 +141 @@
   suitable for consumption by the MM Core and drivers.
 
-  @param  CpuDriverEntryPoint    Address of MM CPU driver entrypoint
-  @param  PayloadBootInfo        Boot information passed by privileged firmware
+  @param  [in, out] CpuDriverEntryPoint   Address of MM CPU driver entrypoint
+  @param  [in]      PayloadBootInfo       Boot information passed by privileged
+                                          firmware
 
 **/
@@ -152 +157 @@
   The entry point of Standalone MM Foundation.
 
-  @param  SharedBufAddress  Pointer to the Buffer between SPM and SP.
-  @param  cookie1.
-  @param  cookie2.
+  @param  [in]  SharedBufAddress  Pointer to the Buffer between SPM and SP.
+  @param  [in]  SharedBufSize     Size of the shared buffer.
+  @param  [in]  cookie1           Cookie 1
+  @param  [in]  cookie2           Cookie 2
+
 **/
 VOID

trunk/src/VBox/Devices/EFI/FirmwareNew/StandaloneMmPkg/Include/Library/FvLib.h

@@ -51 +51 @@
 **/
 EFI_STATUS
+EFIAPI
 FfsFindSection (
   IN EFI_SECTION_TYPE              SectionType,

trunk/src/VBox/Devices/EFI/FirmwareNew/StandaloneMmPkg/Include/Library/StandaloneMmMemLib.h

@@ -7 +7 @@
 
   Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
-  Copyright (c) 2016 - 2018, ARM Limited. All rights reserved.<BR>
+  Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -70 +70 @@
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.
 
-  @retval EFI_SECURITY_VIOLATION The DesinationBuffer is invalid per processor architecture or overlap with MMRAM.
+  @retval EFI_SECURITY_VIOLATION The DestinationBuffer is invalid per processor architecture or overlap with MMRAM.
   @retval EFI_SUCCESS            Memory is copied.
 
@@ -95 +95 @@
   @param  Length              The number of bytes to copy from SourceBuffer to DestinationBuffer.
 
-  @retval EFI_SECURITY_VIOLATION The DesinationBuffer is invalid per processor architecture or overlap with MMRAM.
+  @retval EFI_SECURITY_VIOLATION The DestinationBuffer is invalid per processor architecture or overlap with MMRAM.
   @retval EFI_SECURITY_VIOLATION The SourceBuffer is invalid per processor architecture or overlap with MMRAM.
   @retval EFI_SUCCESS            Memory is copied.