Changeset 58498 in vbox for trunk/src/VBox/Devices/EFI/Firmware

Timestamp:

Oct 29, 2015 7:27:43 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware/PciHostBridgeDxe: Corrected wrongly merged part in first update attempt, removed the now obsolote VBox modification because upstream implemented optimized port I/O in their own way

File:

• trunk/src/VBox/Devices/EFI/Firmware/PcAtChipsetPkg/PciHostBridgeDxe/PciRootBridgeIo.c (modified) (4 diffs)

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

@@ -15 +15 @@
 #include "PciHostBridge.h"
 #include "IoFifo.h"
-#ifdef VBOX
-# define IN_RING3
-# include <iprt/asm-amd64-x86.h>
-#endif
 
 typedef struct {
@@ -1000 +996 @@
   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)
-          ASMOutStrU8((RTIOPORT)Address, (const uint8_t*)Buffer, (size_t)Count);
-        else
-          ASMInStrU8((RTIOPORT)Address, (uint8_t*)Buffer, (size_t)Count);
-        break;
-      case EfiPciWidthFifoUint16:
-        if (Write)
-          ASMOutStrU16((RTIOPORT)Address, (const uint16_t*)Buffer, (size_t)Count);
-        else
-          ASMInStrU16((RTIOPORT)Address, (uint16_t*)Buffer, (size_t)Count);
-        break;
-      case EfiPciWidthFifoUint32:
-        if (Write)
-          ASMOutStrU32((RTIOPORT)Address, (const uint32_t*)Buffer, (size_t)Count);
-        else
-          ASMInStrU32((RTIOPORT)Address, (uint32_t*)Buffer, (size_t)Count);
-        break;
-      default:
-          ASSERT (FALSE);
-    }
-  } else {
-#endif
-  for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {
+
+#if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64)
+  if (InStride == 0) {
     if (Write) {
       switch (OperationWidth) {
         case EfiPciWidthUint8:
-          IoWrite8 ((UINTN)Address, *Uint8Buffer);
-          break;
+          IoWriteFifo8 ((UINTN) Address, Count, Buffer);
+          return EFI_SUCCESS;
         case EfiPciWidthUint16:
-          IoWrite16 ((UINTN)Address, *((UINT16 *)Uint8Buffer));
-          break;
+          IoWriteFifo16 ((UINTN) Address, Count, Buffer);
+          return EFI_SUCCESS;
         case EfiPciWidthUint32:
-          IoWrite32 ((UINTN)Address, *((UINT32 *)Uint8Buffer));
-          break;
+          IoWriteFifo32 ((UINTN) Address, Count, Buffer);
+          return EFI_SUCCESS;
         default:
           //
@@ -1052 +1021 @@
       switch (OperationWidth) {
         case EfiPciWidthUint8:
-          *Uint8Buffer = IoRead8 ((UINTN)Address);
-          break;
+          IoReadFifo8 ((UINTN) Address, Count, Buffer);
+          return EFI_SUCCESS;
         case EfiPciWidthUint16:
-          *((UINT16 *)Uint8Buffer) = IoRead16 ((UINTN)Address);
-          break;
+          IoReadFifo16 ((UINTN) Address, Count, Buffer);
+          return EFI_SUCCESS;
         case EfiPciWidthUint32:
-          *((UINT32 *)Uint8Buffer) = IoRead32 ((UINTN)Address);
-          break;
+          IoReadFifo32 ((UINTN) Address, Count, Buffer);
+          return EFI_SUCCESS;
         default:
           //
@@ -1070 +1039 @@
     }
   }
-#ifdef VBOX
-  }
 #endif
+
+  for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {
+    if (Write) {
+      switch (OperationWidth) {
+        case EfiPciWidthUint8:
+          IoWrite8 ((UINTN)Address, *Uint8Buffer);
+          break;
+        case EfiPciWidthUint16:
+          IoWrite16 ((UINTN)Address, *((UINT16 *)Uint8Buffer));
+          break;
+        case EfiPciWidthUint32:
+          IoWrite32 ((UINTN)Address, *((UINT32 *)Uint8Buffer));
+          break;
+        default:
+          //
+          // The RootBridgeIoCheckParameter call above will ensure that this
+          // path is not taken.
+          //
+          ASSERT (FALSE);
+          break;
+      }
+    } else {
+      switch (OperationWidth) {
+        case EfiPciWidthUint8:
+          *Uint8Buffer = IoRead8 ((UINTN)Address);
+          break;
+        case EfiPciWidthUint16:
+          *((UINT16 *)Uint8Buffer) = IoRead16 ((UINTN)Address);
+          break;
+        case EfiPciWidthUint32:
+          *((UINT32 *)Uint8Buffer) = IoRead32 ((UINTN)Address);
+          break;
+        default:
+          //
+          // The RootBridgeIoCheckParameter call above will ensure that this
+          // path is not taken.
+          //
+          ASSERT (FALSE);
+          break;
+      }
+    }
+  }
+
   return EFI_SUCCESS;
 }