Changeset 53251 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 6, 2014 11:10:15 AM (10 years ago)

Author:

vboxsync

Message:

EFI: use rep ins/outs where appropriate

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• MdePkg/Include/Library/IoLib.h (modified) (1 diff)
• MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c (modified) (1 diff)
• PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Include/Library/IoLib.h

@@ -2620 +2620 @@
 
 
+#ifdef VBOX
+
+/**
+  Reads an 8-bit I/O FIFO port.
+
+  @param  Port   The I/O port to read.
+  @param  Buffer The buffer to write the data to.
+  @param  Count  The number of bytes to read.
+
+**/
+VOID
+EFIAPI
+IoReadBuffer8 (
+  IN      UINTN                     Port,
+  OUT     VOID                      *Buffer,
+  IN      UINTN                     Count
+  );
+
+/**
+  Reads a 16-bit I/O FIFO port.
+
+  @param  Port   The I/O port to read.
+  @param  Buffer The buffer to write the data to.
+  @param  Count  The number of words to read.
+
+**/
+VOID
+EFIAPI
+IoReadBuffer16 (
+  IN      UINTN                     Port,
+  OUT     VOID                      *Buffer,
+  IN      UINTN                     Count
+  );
+
+/**
+  Reads a 32-bit I/O FIFO port.
+
+  @param  Port   The I/O port to read.
+  @param  Buffer The buffer to write the data to.
+  @param  Count  The number of dwords to read.
+
+**/
+VOID
+EFIAPI
+IoReadBuffer32 (
+  IN      UINTN                     Port,
+  OUT     VOID                      *Buffer,
+  IN      UINTN                     Count
+  );
+
+/**
+  Writes to an 8-bit I/O FIFO port.
+
+  @param  Port   The I/O port to read.
+  @param  Buffer The buffer to write the data to.
+  @param  Count  The number of bytes to write.
+
+**/
+VOID
+EFIAPI
+IoWriteBuffer8 (
+  IN      UINTN                     Port,
+  IN CONST VOID                     *Buffer,
+  IN      UINTN                     Count
+  );
+
+/**
+  Writes to a 16-bit I/O FIFO port.
+
+  @param  Port   The I/O port to read.
+  @param  Buffer The buffer to write the data to.
+  @param  Count  The number of words to write.
+
+**/
+VOID
+EFIAPI
+IoWriteBuffer16 (
+  IN      UINTN                     Port,
+  IN CONST VOID                     *Buffer,
+  IN      UINTN                     Count
+  );
+
+/**
+  Writes to a 32-bit I/O FIFO port.
+
+  @param  Port   The I/O port to read.
+  @param  Buffer The buffer to write the data to.
+  @param  Count  The number of dwords to write.
+
+**/
+VOID
+EFIAPI
+IoWriteBuffer32 (
+  IN      UINTN                     Port,
+  IN CONST VOID                     *Buffer,
+  IN      UINTN                     Count
+  );
+
+#endif /* VBOX */
+
 #endif
 

trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c

@@ -197 +197 @@
 }
 
+
+#ifdef VBOX
+
+/**
+  Reads an 8-bit I/O FIFO port.
+
+  @param  Port   The I/O port to read.
+  @param  Buffer The buffer to write the data to.
+  @param  Count  The number of bytes to read.
+
+**/
+__inline__
+VOID
+EFIAPI
+IoReadBuffer8 (
+  IN      UINTN                     Port,
+  OUT     VOID                      *Buffer,
+  IN      UINTN                     Count
+  )
+{
+  __asm__ __volatile__ ("rep; insb" : "+D" (Buffer), "+c" (Count) : "d" ((UINT16)Port));
+}
+
+
+/**
+  Reads a 16-bit I/O FIFO port.
+
+  @param  Port   The I/O port to read.
+  @param  Buffer The buffer to write the data to.
+  @param  Count  The number of words to read.
+
+**/
+__inline__
+VOID
+EFIAPI
+IoReadBuffer16 (
+  IN      UINTN                     Port,
+  OUT     VOID                      *Buffer,
+  IN      UINTN                     Count
+  )
+{
+  __asm__ __volatile__ ("rep; insw" : "+D" (Buffer), "+c" (Count) : "d" ((UINT16)Port));
+}
+
+/**
+  Reads a 32-bit I/O FIFO port.
+
+  @param  Port   The I/O port to read.
+  @param  Buffer The buffer to write the data to.
+  @param  Count  The number of dwords to read.
+
+**/
+__inline__
+VOID
+EFIAPI
+IoReadBuffer32 (
+  IN      UINTN                     Port,
+  OUT     VOID                      *Buffer,
+  IN      UINTN                     Count
+  )
+{
+  __asm__ __volatile__ ("rep; insl" : "+D" (Buffer), "+c" (Count) : "d" ((UINT16)Port));
+}
+
+
+/**
+  Writes to an 8-bit I/O FIFO port.
+
+  @param  Port   The I/O port to read.
+  @param  Buffer The buffer to write the data to.
+  @param  Count  The number of bytes to write.
+
+**/
+__inline__
+VOID
+EFIAPI
+IoWriteBuffer8 (
+  IN      UINTN                     Port,
+  IN CONST VOID                     *Buffer,
+  IN      UINTN                     Count
+  )
+{
+  __asm__ __volatile__ ("rep; outsb" : "+S" (Buffer), "+c" (Count) : "d" ((UINT16)Port));
+}
+
+
+/**
+  Writes to a 16-bit I/O FIFO port.
+
+  @param  Port   The I/O port to read.
+  @param  Buffer The buffer to write the data to.
+  @param  Count  The number of words to write.
+
+**/
+__inline__
+VOID
+EFIAPI
+IoWriteBuffer16 (
+  IN      UINTN                     Port,
+  IN CONST VOID                     *Buffer,
+  IN      UINTN                     Count
+  )
+{
+  __asm__ __volatile__ ("rep; outsw" : "+S" (Buffer), "+c" (Count) : "d" ((UINT16)Port));
+}
+
+/**
+  Writes to a 32-bit I/O FIFO port.
+
+  @param  Port   The I/O port to read.
+  @param  Buffer The buffer to write the data to.
+  @param  Count  The number of dwords to write.
+
+**/
+__inline__
+VOID
+EFIAPI
+IoWriteBuffer32 (
+  IN      UINTN                     Port,
+  IN CONST VOID                     *Buffer,
+  IN      UINTN                     Count
+  )
+{
+  __asm__ __volatile__ ("rep; outsl" : "+S" (Buffer), "+c" (Count) : "d" ((UINT16)Port));
+}
+
+#endif /* VBOX */

trunk/src/VBox/Devices/EFI/Firmware/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c

@@ -995 +995 @@
   OutStride = mOutStride[Width];
   OperationWidth = (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) (Width & 0x03);
+#ifdef VBOX
+  /* rep ins/outs is much faster than single port I/O */
+  if (Count > 1 && Width >= EfiPciWidthFifoUint8 && Width <= EfiPciWidthFifoUint32)
+  {
+    switch (Width)
+    {
+      case EfiPciWidthFifoUint8:
+        if (Write)
+          IoWriteBuffer8((UINTN)Address, Buffer, Count);
+        else
+          IoReadBuffer8((UINTN)Address, Buffer, Count);
+        break;
+      case EfiPciWidthFifoUint16:
+        if (Write)
+          IoWriteBuffer16((UINTN)Address, Buffer, Count);
+        else
+          IoReadBuffer16((UINTN)Address, Buffer, Count);
+        break;
+      case EfiPciWidthFifoUint32:
+        if (Write)
+          IoWriteBuffer32((UINTN)Address, Buffer, Count);
+        else
+          IoReadBuffer32((UINTN)Address, Buffer, Count);
+        break;
+      default:
+        ASSERT (FALSE);
+    }
+  } else {
+#endif
   for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {
     if (Write) {
@@ -1036 +1065 @@
     }
   }
+#ifdef VBOX
+  }
+#endif
   return EFI_SUCCESS;
 }