MdeModulePkg SerialDxe: Handle Timeout change more robustly

[mirror_edk2.git] / MdeModulePkg / Universal / SerialDxe / SerialIo.c

diff --git a/MdeModulePkg/Universal/SerialDxe/SerialIo.c b/MdeModulePkg/Universal/SerialDxe/SerialIo.c
index de928d1719e9f7285c4c1decf1eb6db9b747216c..964d0329f4fbcc3f90992ef9f49fb167ec2d6d65 100644 (file)
--- a/MdeModulePkg/Universal/SerialDxe/SerialIo.c
+++ b/MdeModulePkg/Universal/SerialDxe/SerialIo.c
@@ -181,13 +181,16 @@ SERIAL_DEVICE_PATH mSerialDevicePath = {
 // Template used to initialize the Serial IO protocols.\r
 //\r
 EFI_SERIAL_IO_MODE mSerialIoMode = {\r
-  0, // ControlMask\r
-  0, // Timeout\r
-  0, // BaudRate\r
-  1, // ReceiveFifoDepth\r
-  0, // DataBits\r
-  0, // Parity\r
-  0  // StopBits\r
+  //\r
+  //    value  field                set in SerialDxeInitialize()?\r
+  //---------  -------------------  -----------------------------\r
+            0, // ControlMask\r
+  1000 * 1000, // Timeout\r
+            0, // BaudRate          yes\r
+            1, // ReceiveFifoDepth\r
+            0, // DataBits          yes\r
+            0, // Parity            yes\r
+            0  // StopBits          yes\r
 };\r
 \r
 EFI_SERIAL_IO_PROTOCOL mSerialIoTemplate = {\r
@@ -217,7 +220,6 @@ SerialReset (
   )\r
 {\r
   EFI_STATUS    Status;\r
-  EFI_TPL       Tpl;\r
 \r
   Status = SerialPortInitialize ();\r
   if (EFI_ERROR (Status)) {\r
@@ -225,49 +227,17 @@ SerialReset (
   }\r
 \r
   //\r
-  // Set the Serial I/O mode and update the device path\r
-  //\r
-\r
-  Tpl = gBS->RaiseTPL (TPL_NOTIFY);\r
-\r
-  //\r
-  // Set the Serial I/O mode\r
-  //\r
-  This->Mode->ReceiveFifoDepth  = 1;\r
-  This->Mode->Timeout           = 0;\r
-  This->Mode->BaudRate          = PcdGet64 (PcdUartDefaultBaudRate);\r
-  This->Mode->DataBits          = (UINT32) PcdGet8 (PcdUartDefaultDataBits);\r
-  This->Mode->Parity            = (UINT32) PcdGet8 (PcdUartDefaultParity);\r
-  This->Mode->StopBits          = (UINT32) PcdGet8 (PcdUartDefaultStopBits);\r
-\r
-  //\r
-  // Check if the device path has actually changed\r
-  //\r
-  if (mSerialDevicePath.Uart.BaudRate == This->Mode->BaudRate &&\r
-      mSerialDevicePath.Uart.DataBits == (UINT8) This->Mode->DataBits &&\r
-      mSerialDevicePath.Uart.Parity   == (UINT8) This->Mode->Parity &&\r
-      mSerialDevicePath.Uart.StopBits == (UINT8) This->Mode->StopBits\r
-     ) {\r
-    gBS->RestoreTPL (Tpl);\r
-    return EFI_SUCCESS;\r
-  }\r
-\r
-  //\r
-  // Update the device path\r
+  // Go set the current attributes\r
   //\r
-  mSerialDevicePath.Uart.BaudRate = This->Mode->BaudRate;\r
-  mSerialDevicePath.Uart.DataBits = (UINT8) This->Mode->DataBits;\r
-  mSerialDevicePath.Uart.Parity   = (UINT8) This->Mode->Parity;\r
-  mSerialDevicePath.Uart.StopBits = (UINT8) This->Mode->StopBits;\r
-\r
-  Status = gBS->ReinstallProtocolInterface (\r
-                  mSerialHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  &mSerialDevicePath,\r
-                  &mSerialDevicePath\r
-                  );\r
-\r
-  gBS->RestoreTPL (Tpl);\r
+  Status = This->SetAttributes (\r
+                   This,\r
+                   This->Mode->BaudRate,\r
+                   This->Mode->ReceiveFifoDepth,\r
+                   This->Mode->Timeout,\r
+                   (EFI_PARITY_TYPE) This->Mode->Parity,\r
+                   (UINT8) This->Mode->DataBits,\r
+                   (EFI_STOP_BITS_TYPE) This->Mode->StopBits\r
+                   );\r
 \r
   return Status;\r
 }\r
@@ -310,12 +280,52 @@ SerialSetAttributes (
   IN EFI_STOP_BITS_TYPE     StopBits\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
-  EFI_TPL       Tpl;\r
+  EFI_STATUS                Status;\r
+  EFI_TPL                   Tpl;\r
+  UINT64                    OriginalBaudRate;\r
+  UINT32                    OriginalReceiveFifoDepth;\r
+  UINT32                    OriginalTimeout;\r
+  EFI_PARITY_TYPE           OriginalParity;\r
+  UINT8                     OriginalDataBits;\r
+  EFI_STOP_BITS_TYPE        OriginalStopBits;\r
 \r
+  //\r
+  // Preserve the original input values in case\r
+  // SerialPortSetAttributes() updates the input/output\r
+  // parameters even on error.\r
+  //\r
+  OriginalBaudRate = BaudRate;\r
+  OriginalReceiveFifoDepth = ReceiveFifoDepth;\r
+  OriginalTimeout = Timeout;\r
+  OriginalParity = Parity;\r
+  OriginalDataBits = DataBits;\r
+  OriginalStopBits = StopBits;\r
   Status = SerialPortSetAttributes (&BaudRate, &ReceiveFifoDepth, &Timeout, &Parity, &DataBits, &StopBits);\r
   if (EFI_ERROR (Status)) {\r
-    return Status;\r
+    //\r
+    // If it is just to set Timeout value and unsupported is returned,\r
+    // do not return error.\r
+    //\r
+    if ((Status == EFI_UNSUPPORTED) &&\r
+        (This->Mode->Timeout          != OriginalTimeout) &&\r
+        (This->Mode->ReceiveFifoDepth == OriginalReceiveFifoDepth) &&\r
+        (This->Mode->BaudRate         == OriginalBaudRate) &&\r
+        (This->Mode->DataBits         == (UINT32) OriginalDataBits) &&\r
+        (This->Mode->Parity           == (UINT32) OriginalParity) &&\r
+        (This->Mode->StopBits         == (UINT32) OriginalStopBits)) {\r
+      //\r
+      // Restore to the original input values.\r
+      //\r
+      BaudRate = OriginalBaudRate;\r
+      ReceiveFifoDepth = OriginalReceiveFifoDepth;\r
+      Timeout = OriginalTimeout;\r
+      Parity = OriginalParity;\r
+      DataBits = OriginalDataBits;\r
+      StopBits = OriginalStopBits;\r
+      Status = EFI_SUCCESS;\r
+    } else {\r
+      return Status;\r
+    }\r
   }\r
 \r
   //\r
@@ -462,11 +472,25 @@ SerialRead (
   )\r
 {\r
   UINTN Count;\r
+  UINTN TimeOut;\r
 \r
   Count = 0;\r
 \r
-  if (SerialPortPoll ()) {\r
-    Count = SerialPortRead (Buffer, *BufferSize);\r
+  while (Count < *BufferSize) {\r
+    TimeOut = 0;\r
+    while (TimeOut < mSerialIoMode.Timeout) {\r
+      if (SerialPortPoll ()) {\r
+        break;\r
+      }\r
+      gBS->Stall (10);\r
+      TimeOut += 10;\r
+    }\r
+    if (TimeOut >= mSerialIoMode.Timeout) {\r
+      break;\r
+    }\r
+    SerialPortRead (Buffer, 1);\r
+    Count++;\r
+    Buffer = (VOID *) ((UINT8 *) Buffer + 1);\r
   }\r
 \r
   if (Count != *BufferSize) {\r
@@ -496,20 +520,24 @@ SerialDxeInitialize (
 {\r
   EFI_STATUS            Status;\r
 \r
-  Status = SerialPortInitialize ();\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
-\r
   mSerialIoMode.BaudRate = PcdGet64 (PcdUartDefaultBaudRate);\r
   mSerialIoMode.DataBits = (UINT32) PcdGet8 (PcdUartDefaultDataBits);\r
   mSerialIoMode.Parity   = (UINT32) PcdGet8 (PcdUartDefaultParity);\r
   mSerialIoMode.StopBits = (UINT32) PcdGet8 (PcdUartDefaultStopBits);\r
+  mSerialIoMode.ReceiveFifoDepth = PcdGet16 (PcdUartDefaultReceiveFifoDepth);\r
   mSerialDevicePath.Uart.BaudRate = PcdGet64 (PcdUartDefaultBaudRate);\r
   mSerialDevicePath.Uart.DataBits = PcdGet8 (PcdUartDefaultDataBits);\r
   mSerialDevicePath.Uart.Parity   = PcdGet8 (PcdUartDefaultParity);\r
   mSerialDevicePath.Uart.StopBits = PcdGet8 (PcdUartDefaultStopBits);\r
 \r
+  //\r
+  // Issue a reset to initialize the Serial Port\r
+  //\r
+  Status = mSerialIoTemplate.Reset (&mSerialIoTemplate);\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
   //\r
   // Make a new handle with Serial IO protocol and its device path on it.\r
   //\r