Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/XenPvBlkDxe/BlockIo.c

Timestamp:

Apr 14, 2023 3:17:44 PM (23 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156854

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• OvmfPkg/XenPvBlkDxe/BlockIo.c (modified) (8 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/XenPvBlkDxe/BlockIo.c

@@ -47 +47 @@
 };
 
-
-
-
 /**
   Read/Write BufferSize bytes from Lba into Buffer.
@@ -77 +74 @@
   )
 {
-  XEN_BLOCK_FRONT_IO IoData;
-  EFI_BLOCK_IO_MEDIA *Media = This->Media;
-  UINTN Sector;
-  EFI_STATUS Status;
+  XEN_BLOCK_FRONT_IO  IoData;
+  EFI_BLOCK_IO_MEDIA  *Media = This->Media;
+  UINTN               Sector;
+  EFI_STATUS          Status;
 
   if (Buffer == NULL) {
     return EFI_INVALID_PARAMETER;
   }
+
   if (BufferSize == 0) {
     return EFI_SUCCESS;
@@ -90 +88 @@
 
   if (BufferSize % Media->BlockSize != 0) {
-    DEBUG ((DEBUG_ERROR, "XenPvBlkDxe: Bad buffer size: 0x%Lx\n",
-      (UINT64)BufferSize));
+    DEBUG ((
+      DEBUG_ERROR,
+      "XenPvBlkDxe: Bad buffer size: 0x%Lx\n",
+      (UINT64)BufferSize
+      ));
     return EFI_BAD_BUFFER_SIZE;
   }
 
-  if (Lba > Media->LastBlock ||
-      (BufferSize / Media->BlockSize) - 1 > Media->LastBlock - Lba) {
-    DEBUG ((DEBUG_ERROR,
+  if ((Lba > Media->LastBlock) ||
+      ((BufferSize / Media->BlockSize) - 1 > Media->LastBlock - Lba))
+  {
+    DEBUG ((
+      DEBUG_ERROR,
       "XenPvBlkDxe: %a with invalid LBA: 0x%Lx, size: 0x%Lx\n",
-      IsWrite ? "Write" : "Read", Lba, (UINT64)BufferSize));
+      IsWrite ? "Write" : "Read",
+      Lba,
+      (UINT64)BufferSize
+      ));
     return EFI_INVALID_PARAMETER;
   }
@@ -112 +118 @@
     // buffer here.
     //
-    VOID *NewBuffer;
+    VOID  *NewBuffer;
 
     //
     // Try again with a properly aligned buffer.
     //
-    NewBuffer = AllocateAlignedPages((BufferSize + EFI_PAGE_SIZE) / EFI_PAGE_SIZE,
-                                     Media->IoAlign);
+    NewBuffer = AllocateAlignedPages (
+                  (BufferSize + EFI_PAGE_SIZE) / EFI_PAGE_SIZE,
+                  Media->IoAlign
+                  );
     if (!IsWrite) {
-      Status = XenPvBlkDxeBlockIoReadBlocks (This, MediaId,
-                                             Lba, BufferSize, NewBuffer);
+      Status = XenPvBlkDxeBlockIoReadBlocks (
+                 This,
+                 MediaId,
+                 Lba,
+                 BufferSize,
+                 NewBuffer
+                 );
       CopyMem (Buffer, NewBuffer, BufferSize);
     } else {
       CopyMem (NewBuffer, Buffer, BufferSize);
-      Status = XenPvBlkDxeBlockIoWriteBlocks (This, MediaId,
-                                              Lba, BufferSize, NewBuffer);
+      Status = XenPvBlkDxeBlockIoWriteBlocks (
+                 This,
+                 MediaId,
+                 Lba,
+                 BufferSize,
+                 NewBuffer
+                 );
     }
+
     FreeAlignedPages (NewBuffer, (BufferSize + EFI_PAGE_SIZE) / EFI_PAGE_SIZE);
     return Status;
@@ -133 +152 @@
 
   IoData.Dev = XEN_BLOCK_FRONT_FROM_BLOCK_IO (This);
-  Sector = (UINTN)MultU64x32 (Lba, Media->BlockSize / 512);
+  Sector     = (UINTN)MultU64x32 (Lba, Media->BlockSize / 512);
 
   while (BufferSize > 0) {
     if (((UINTN)Buffer & EFI_PAGE_MASK) == 0) {
-      IoData.Size = MIN (BLKIF_MAX_SEGMENTS_PER_REQUEST * EFI_PAGE_SIZE,
-                         BufferSize);
+      IoData.Size = MIN (
+                      BLKIF_MAX_SEGMENTS_PER_REQUEST * EFI_PAGE_SIZE,
+                      BufferSize
+                      );
     } else {
-      IoData.Size = MIN ((BLKIF_MAX_SEGMENTS_PER_REQUEST - 1) * EFI_PAGE_SIZE,
-                         BufferSize);
+      IoData.Size = MIN (
+                      (BLKIF_MAX_SEGMENTS_PER_REQUEST - 1) * EFI_PAGE_SIZE,
+                      BufferSize
+                      );
     }
 
     IoData.Buffer = Buffer;
     IoData.Sector = Sector;
-    BufferSize -= IoData.Size;
-    Buffer = (VOID*) ((UINTN) Buffer + IoData.Size);
-    Sector += IoData.Size / 512;
-    Status = XenPvBlockIo (&IoData, IsWrite);
+    BufferSize   -= IoData.Size;
+    Buffer        = (VOID *)((UINTN)Buffer + IoData.Size);
+    Sector       += IoData.Size / 512;
+    Status        = XenPvBlockIo (&IoData, IsWrite);
     if (EFI_ERROR (Status)) {
-      DEBUG ((DEBUG_ERROR, "XenPvBlkDxe: Error during %a operation.\n",
-              IsWrite ? "write" : "read"));
+      DEBUG ((
+        DEBUG_ERROR,
+        "XenPvBlkDxe: Error during %a operation.\n",
+        IsWrite ? "write" : "read"
+        ));
       return Status;
     }
   }
+
   return EFI_SUCCESS;
 }
-
 
 /**
@@ -182 +208 @@
 EFIAPI
 XenPvBlkDxeBlockIoReadBlocks (
-  IN  EFI_BLOCK_IO_PROTOCOL         *This,
-  IN  UINT32                        MediaId,
-  IN  EFI_LBA                       Lba,
-  IN  UINTN                         BufferSize,
-  OUT VOID                          *Buffer
-  )
-{
-  return XenPvBlkDxeBlockIoReadWriteBlocks (This,
-      MediaId, Lba, BufferSize, Buffer, FALSE);
+  IN  EFI_BLOCK_IO_PROTOCOL  *This,
+  IN  UINT32                 MediaId,
+  IN  EFI_LBA                Lba,
+  IN  UINTN                  BufferSize,
+  OUT VOID                   *Buffer
+  )
+{
+  return XenPvBlkDxeBlockIoReadWriteBlocks (
+           This,
+           MediaId,
+           Lba,
+           BufferSize,
+           Buffer,
+           FALSE
+           );
 }
 
@@ -216 +248 @@
 EFIAPI
 XenPvBlkDxeBlockIoWriteBlocks (
-  IN EFI_BLOCK_IO_PROTOCOL          *This,
-  IN UINT32                         MediaId,
-  IN EFI_LBA                        Lba,
-  IN UINTN                          BufferSize,
-  IN VOID                           *Buffer
-  )
-{
-  return XenPvBlkDxeBlockIoReadWriteBlocks (This,
-      MediaId, Lba, BufferSize, Buffer, TRUE);
+  IN EFI_BLOCK_IO_PROTOCOL  *This,
+  IN UINT32                 MediaId,
+  IN EFI_LBA                Lba,
+  IN UINTN                  BufferSize,
+  IN VOID                   *Buffer
+  )
+{
+  return XenPvBlkDxeBlockIoReadWriteBlocks (
+           This,
+           MediaId,
+           Lba,
+           BufferSize,
+           Buffer,
+           TRUE
+           );
 }
 
@@ -259 +297 @@
 EFIAPI
 XenPvBlkDxeBlockIoReset (
-  IN EFI_BLOCK_IO_PROTOCOL   *This,
-  IN BOOLEAN                 ExtendedVerification
+  IN EFI_BLOCK_IO_PROTOCOL  *This,
+  IN BOOLEAN                ExtendedVerification
   )
 {