Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.c (modified) (6 diffs)
• SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.c

@@ -2 +2 @@
   Debug Port Library implementation based on serial port.
 
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -19 +19 @@
 #include <Library/TimerLib.h>
 #include <Library/DebugLib.h>
+#include <Library/BaseLib.h>
+#include <Library/BaseMemoryLib.h>
+
+#pragma pack(1)
+//
+// The internal data structure of DEBUG_PORT_HANDLE, which stores some
+// important datum which are used across various phases.
+//
+typedef struct _SERIAL_DEBUG_PORT_HANDLE{
+  //
+  // Timter settings
+  //
+  UINT64       TimerFrequency;
+  UINT64       TimerCycle;
+  BOOLEAN      TimerCountDown;
+} SERIAL_DEBUG_PORT_HANDLE;
+#pragma pack()
+
+//
+// The global variable which can be used after memory is ready.
+//
+SERIAL_DEBUG_PORT_HANDLE     mSerialDebugPortHandle;
+
+/**
+  Check if the timer is timeout.
+  
+  @param[in] SerialDebugPortHandle  Pointer to Serial Debug port handle
+  @param[in] Timer                  The start timer from the begin.
+  @param[in] TimeoutTicker          Ticker number need time out.
+
+  @return TRUE  Timer time out occurs.
+  @retval FALSE Timer does not time out.
+
+**/
+BOOLEAN
+IsTimerTimeout (
+  IN SERIAL_DEBUG_PORT_HANDLE   *SerialDebugPortHandle,
+  IN UINT64                     Timer,
+  IN UINT64                     TimeoutTicker
+  )
+{
+  UINT64  CurrentTimer;
+  UINT64  Delta;
+
+  CurrentTimer = GetPerformanceCounter ();
+
+  if (SerialDebugPortHandle->TimerCountDown) {
+    //
+    // The timer counter counts down.  Check for roll over condition.
+    //
+    if (CurrentTimer < Timer) {
+      Delta = Timer - CurrentTimer;
+    } else {
+      //
+      // Handle one roll-over. 
+      //
+      Delta = SerialDebugPortHandle->TimerCycle - (CurrentTimer - Timer);
+    }
+  } else {
+    //
+    // The timer counter counts up.  Check for roll over condition.
+    //
+    if (CurrentTimer > Timer) {
+      Delta = CurrentTimer - Timer;
+    } else {
+      //
+      // Handle one roll-over. 
+      //
+      Delta = SerialDebugPortHandle->TimerCycle - (Timer - CurrentTimer);
+    }
+  }
+ 
+  return (BOOLEAN) (Delta >= TimeoutTicker);
+}
 
 /**
@@ -43 +117 @@
   b) If the instance does not understand, or does not want to continue use the
      private data of the previous instance, it could ignore the input Context parameter
-     and create the new hanlde to be returned.
+     and create the new handle to be returned.
 
   If Function() is NULL and Context is NULL, Debug Communication Library could create a
@@ -63 +137 @@
   )
 {
-  RETURN_STATUS      Status;
+  RETURN_STATUS              Status;
+  SERIAL_DEBUG_PORT_HANDLE   Handle;
+  SERIAL_DEBUG_PORT_HANDLE   *SerialDebugPortHandle;
+  UINT64                     TimerStartValue;
+  UINT64                     TimerEndValue;
+
+  //
+  // Validate the PCD PcdDebugPortHandleBufferSize value 
+  //
+  ASSERT (PcdGet16 (PcdDebugPortHandleBufferSize) == sizeof (SERIAL_DEBUG_PORT_HANDLE));
+
+  if (Context != NULL && Function == NULL) {
+    SerialDebugPortHandle = (SERIAL_DEBUG_PORT_HANDLE *)Context;
+  } else {
+    ZeroMem (&Handle, sizeof (SERIAL_DEBUG_PORT_HANDLE));
+    SerialDebugPortHandle = &Handle;
+  }
+  SerialDebugPortHandle->TimerFrequency = GetPerformanceCounterProperties (
+                                            &TimerStartValue,
+                                            &TimerEndValue
+                                            );
+  DEBUG ((EFI_D_INFO, "Serial Debug Port: TimerFrequency  = 0x%lx\n", SerialDebugPortHandle->TimerFrequency)); 
+  DEBUG ((EFI_D_INFO, "Serial Debug Port: TimerStartValue = 0x%lx\n", TimerStartValue)); 
+  DEBUG ((EFI_D_INFO, "Serial Debug Port: TimerEndValue   = 0x%lx\n", TimerEndValue)); 
+
+  if (TimerEndValue < TimerStartValue) {
+    SerialDebugPortHandle->TimerCountDown = TRUE;
+    SerialDebugPortHandle->TimerCycle     = TimerStartValue - TimerEndValue;
+  } else {
+    SerialDebugPortHandle->TimerCountDown = FALSE;
+    SerialDebugPortHandle->TimerCycle     = TimerEndValue - TimerStartValue;
+  }  
+
+  if (Function == NULL && Context != NULL) {
+    return (DEBUG_PORT_HANDLE *) Context;
+  }
 
   Status = SerialPortInitialize ();
@@ -71 +180 @@
 
   if (Function != NULL) {
-    Function (Context, NULL);
-  }
-
-  return NULL;
+    Function (Context, SerialDebugPortHandle);
+  } else {
+    CopyMem(&mSerialDebugPortHandle, SerialDebugPortHandle, sizeof (SERIAL_DEBUG_PORT_HANDLE));
+  }
+
+  return (DEBUG_PORT_HANDLE)(UINTN)&mSerialDebugPortHandle;
 }
 
@@ -103 +214 @@
   )
 {
-  UINTN                Index;
-  INTN                 Elapsed;
-
-  for (Index = 0; Index < NumberOfBytes; Index ++) {
-    Elapsed = (INTN) Timeout;
-    while (TRUE) {
-      if (SerialPortPoll () || Timeout == 0) {
-        SerialPortRead (Buffer + Index, 1);
-        break;
-      }
-      MicroSecondDelay (1000);
-      Elapsed -= 1000;
-      if (Elapsed < 0) {
+  SERIAL_DEBUG_PORT_HANDLE *SerialDebugPortHandle;
+  UINTN                    Index;
+  UINT64                   Begin;
+  UINT64                   TimeoutTicker;
+  UINT64                   TimerRound;
+  
+  //
+  // If Handle is NULL, it means memory is ready for use.
+  // Use global variable to store handle value.
+  //
+  if (Handle == NULL) {
+    SerialDebugPortHandle = &mSerialDebugPortHandle;
+  } else {
+    SerialDebugPortHandle = (SERIAL_DEBUG_PORT_HANDLE *)Handle;
+  }
+
+  Begin         = 0;
+  TimeoutTicker = 0;  
+  TimerRound    = 0;
+  if (Timeout != 0) {
+    Begin = GetPerformanceCounter ();
+    TimeoutTicker = DivU64x32 (
+                      MultU64x64 (
+                        SerialDebugPortHandle->TimerFrequency,
+                        Timeout
+                        ),
+                      1000000u
+                      );
+    TimerRound = DivU64x64Remainder (
+                   TimeoutTicker,
+                   DivU64x32 (SerialDebugPortHandle->TimerCycle, 2),
+                   &TimeoutTicker
+                   );
+  }
+  Index = 0;
+  while (Index < NumberOfBytes) {
+    if (SerialPortPoll () || Timeout == 0) {
+      SerialPortRead (Buffer + Index, 1);
+      Index ++; 
+      continue;
+    }
+    if (TimerRound == 0) {
+      if (IsTimerTimeout (SerialDebugPortHandle, Begin, TimeoutTicker)) {
+        //
+        // If time out occurs.
+        //
         return 0;
       }
+    } else {
+      if (IsTimerTimeout (SerialDebugPortHandle, Begin, DivU64x32 (SerialDebugPortHandle->TimerCycle, 2))) {
+        TimerRound --;
+      }
     }
   }
 
-  return NumberOfBytes;
+  return Index;
 }
 

trunk/src/VBox/Devices/EFI/Firmware/SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf

@@ -2 +2 @@
 #  Debug Communication Library instance based on serila port.
 #
-#  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
@@ -17 +17 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DebugCommunicationLibSerialPort
+  MODULE_UNI_FILE                = DebugCommunicationLibSerialPort.uni
   FILE_GUID                      = 8CC435C5-6330-4269-B0C3-E3BD05C86FB8
   MODULE_TYPE                    = BASE
@@ -37 +38 @@
   TimerLib
   DebugLib
-  
+  BaseMemoryLib
+  BaseLib
+
+[PCD]
+  # The value of data buffer size used for Serial debug port handle.
+  # It should be equal to sizeof (SERIAL_DEBUG_PORT_HANDLE).
+  gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugPortHandleBufferSize|17   ## SOMETIMES_CONSUMES
+