1. IsaSerialIo driver was changed to produce the flow control device path node when...

2. BMM driver was enhanced to take care of the optional flow control node.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10351 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
index 1c8e7629232e3734aa2777610ae153264e41ad0a..b47023d149ab260e87cd776f3b3432cfdad0088c 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
@@ -52,6 +52,9 @@
   UefiDriverEntryPoint\r
   DebugLib\r
 \r
   UefiDriverEntryPoint\r
   DebugLib\r
 \r

+[Guids]\r
+  gEfiUartDevicePathGuid\r
+\r

 [Protocols]\r
   gEfiIsaIoProtocolGuid                         ## TO_START\r
   gEfiDevicePathProtocolGuid                    ## TO_START\r
 [Protocols]\r
   gEfiIsaIoProtocolGuid                         ## TO_START\r
   gEfiDevicePathProtocolGuid                    ## TO_START\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
index 04d6373592d41393bb9555d195baa0cc4860bc66..b8421122307e31aef795a042a285ea893b2658fd 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
@@ -41,7 +41,7 @@ SERIAL_DEV  gSerialDevTempate = {
     NULL\r
   },\r
   { // SerialMode\r
     NULL\r
   },\r
   { // SerialMode\r

-    SERIAL_PORT_DEFAULT_CONTROL_MASK,\r
+    SERIAL_PORT_SUPPORT_CONTROL_MASK,\r

     SERIAL_PORT_DEFAULT_TIMEOUT,\r
     FixedPcdGet64 (PcdUartDefaultBaudRate),     // BaudRate\r
     SERIAL_PORT_DEFAULT_RECEIVE_FIFO_DEPTH,\r
     SERIAL_PORT_DEFAULT_TIMEOUT,\r
     FixedPcdGet64 (PcdUartDefaultBaudRate),     // BaudRate\r
     SERIAL_PORT_DEFAULT_RECEIVE_FIFO_DEPTH,\r


@@ -86,6 +86,51 @@ SERIAL_DEV  gSerialDevTempate = {
   NULL\r
 };\r
 \r
   NULL\r
 };\r
 \r

+/**\r
+  Check the device path node whether it's the Flow Control node or not.\r
+\r
+  @param[in] FlowControl    The device path node to be checked.\r
+  \r
+  @retval TRUE              It's the Flow Control node.\r
+  @retval FALSE             It's not.\r
+\r
+**/\r
+BOOLEAN\r
+IsUartFlowControlNode (\r
+  IN UART_FLOW_CONTROL_DEVICE_PATH *FlowControl\r
+  )\r
+{\r
+  return (BOOLEAN) (\r
+           (DevicePathType (FlowControl) == MESSAGING_DEVICE_PATH) &&\r
+           (DevicePathSubType (FlowControl) == MSG_VENDOR_DP) &&\r
+           (CompareGuid (&FlowControl->Guid, &gEfiUartDevicePathGuid))\r
+           );\r
+}\r
+\r
+/**\r
+  Check the device path node whether it contains Flow Control node or not.\r
+\r
+  @param[in] DevicePath     The device path to be checked.\r
+  \r
+  @retval TRUE              It contains the Flow Control node.\r
+  @retval FALSE             It doesn't.\r
+\r
+**/\r
+BOOLEAN\r
+ContainsFlowControl (\r
+  IN EFI_DEVICE_PATH_PROTOCOL      *DevicePath\r
+  )\r
+{\r
+  while (!IsDevicePathEnd (DevicePath)) {\r
+    if (IsUartFlowControlNode ((UART_FLOW_CONTROL_DEVICE_PATH *) DevicePath)) {\r
+      return TRUE;\r
+    }\r
+    DevicePath = NextDevicePathNode (DevicePath);\r
+  }\r
+\r
+  return FALSE;\r
+}\r
+\r

 /**\r
   The user Entry Point for module IsaSerial. The user code starts with this function.\r
 \r
 /**\r
   The user Entry Point for module IsaSerial. The user code starts with this function.\r
 \r


@@ -145,6 +190,11 @@ SerialControllerDriverSupported (
   EFI_DEVICE_PATH_PROTOCOL                  *ParentDevicePath;\r
   EFI_ISA_IO_PROTOCOL                       *IsaIo;\r
   UART_DEVICE_PATH                          *UartNode;\r
   EFI_DEVICE_PATH_PROTOCOL                  *ParentDevicePath;\r
   EFI_ISA_IO_PROTOCOL                       *IsaIo;\r
   UART_DEVICE_PATH                          *UartNode;\r

+  EFI_DEVICE_PATH_PROTOCOL                  *DevicePath;\r
+  UART_FLOW_CONTROL_DEVICE_PATH             *FlowControlNode;\r
+  EFI_OPEN_PROTOCOL_INFORMATION_ENTRY       *OpenInfoBuffer;\r
+  UINTN                                     EntryCount;\r
+  UINTN                                     Index;\r

 \r
   //\r
   // Check RemainingDevicePath validation\r
 \r
   //\r
   // Check RemainingDevicePath validation\r


@@ -192,8 +242,17 @@ SerialControllerDriverSupported (
       if ((UartNode->DataBits >= 6) && (UartNode->DataBits <= 8) && (UartNode->StopBits == OneFiveStopBits)) {\r
         goto Error;\r
       }\r
       if ((UartNode->DataBits >= 6) && (UartNode->DataBits <= 8) && (UartNode->StopBits == OneFiveStopBits)) {\r
         goto Error;\r
       }\r

-  \r
-      Status = EFI_SUCCESS;\r
+\r
+      FlowControlNode = (UART_FLOW_CONTROL_DEVICE_PATH *) NextDevicePathNode (UartNode);\r
+      if (IsUartFlowControlNode (FlowControlNode)) {\r
+        //\r
+        // If the second node is Flow Control Node,\r
+        //   return error when it request other than hardware flow control.\r
+        //\r
+        if ((ReadUnaligned32 (&FlowControlNode->FlowControlMap) & ~UART_FLOW_CONTROL_HARDWARE) != 0) {\r
+          goto Error;\r
+        }\r
+      }\r

     }\r
   }\r
 \r
     }\r
   }\r
 \r


@@ -209,7 +268,45 @@ SerialControllerDriverSupported (
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r
   if (Status == EFI_ALREADY_STARTED) {\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
                   );\r
   if (Status == EFI_ALREADY_STARTED) {\r

-    return EFI_SUCCESS;\r
+    if (RemainingDevicePath == NULL || IsDevicePathEnd (RemainingDevicePath)) {\r
+      //\r
+      // If RemainingDevicePath is NULL or is the End of Device Path Node\r
+      //\r
+      return EFI_SUCCESS;\r
+    }\r
+    //\r
+    // When the driver has produced device path with flow control node but RemainingDevicePath only contains UART node,\r
+    //   return unsupported, and vice versa.\r
+    //\r
+    Status = gBS->OpenProtocolInformation (\r
+                    Controller,\r
+                    &gEfiIsaIoProtocolGuid,\r
+                    &OpenInfoBuffer,\r
+                    &EntryCount\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+\r
+    for (Index = 0; Index < EntryCount; Index++) {\r
+      if ((OpenInfoBuffer[Index].Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0) {\r
+        Status = gBS->OpenProtocol (\r
+                        OpenInfoBuffer[Index].ControllerHandle,\r
+                        &gEfiDevicePathProtocolGuid,\r
+                        (VOID **) &DevicePath,\r
+                        This->DriverBindingHandle,\r
+                        Controller,\r
+                        EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                        );\r
+        if (!EFI_ERROR (Status) &&\r
+            (ContainsFlowControl (RemainingDevicePath) ^ ContainsFlowControl (DevicePath))) {\r
+          Status = EFI_UNSUPPORTED;\r
+        }\r
+        break;\r
+      }\r
+    }\r
+    FreePool (OpenInfoBuffer);\r
+    return Status;\r

   }\r
 \r
   if (EFI_ERROR (Status)) {\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r


@@ -295,7 +392,11 @@ SerialControllerDriverStart (
   EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfoBuffer;\r
   UINTN                               EntryCount;\r
   EFI_SERIAL_IO_PROTOCOL              *SerialIo;\r
   EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfoBuffer;\r
   UINTN                               EntryCount;\r
   EFI_SERIAL_IO_PROTOCOL              *SerialIo;\r

-  UART_DEVICE_PATH                    *UartNode;\r
+  UART_DEVICE_PATH                    *Uart;\r
+  UINT32                              FlowControlMap;\r
+  UART_FLOW_CONTROL_DEVICE_PATH       *FlowControl;\r
+  EFI_DEVICE_PATH_PROTOCOL            *TempDevicePath;\r
+  UINT32                              Control;\r

 \r
   SerialDevice = NULL;\r
   //\r
 \r
   SerialDevice = NULL;\r
   //\r


@@ -371,16 +472,35 @@ SerialControllerDriverStart (
                         EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                         );\r
         if (!EFI_ERROR (Status)) {\r
                         EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
                         );\r
         if (!EFI_ERROR (Status)) {\r

-          UartNode = (UART_DEVICE_PATH *) RemainingDevicePath;\r
+          Uart   = (UART_DEVICE_PATH *) RemainingDevicePath;\r

           Status = SerialIo->SetAttributes (\r
                                SerialIo,\r
           Status = SerialIo->SetAttributes (\r
                                SerialIo,\r

-                               UartNode->BaudRate,\r
+                               Uart->BaudRate,\r

                                SerialIo->Mode->ReceiveFifoDepth,\r
                                SerialIo->Mode->Timeout,\r
                                SerialIo->Mode->ReceiveFifoDepth,\r
                                SerialIo->Mode->Timeout,\r

-                               (EFI_PARITY_TYPE) UartNode->Parity,\r
-                               UartNode->DataBits,\r
-                               (EFI_STOP_BITS_TYPE) UartNode->StopBits\r
+                               (EFI_PARITY_TYPE) Uart->Parity,\r
+                               Uart->DataBits,\r
+                               (EFI_STOP_BITS_TYPE) Uart->StopBits\r

                                );\r
                                );\r

+\r
+          FlowControl = (UART_FLOW_CONTROL_DEVICE_PATH *) NextDevicePathNode (Uart);\r
+          if (!EFI_ERROR (Status) && IsUartFlowControlNode (FlowControl)) {\r
+            Status = SerialIo->GetControl (SerialIo, &Control);\r
+            if (!EFI_ERROR (Status)) {\r
+              if (ReadUnaligned32 (&FlowControl->FlowControlMap) == UART_FLOW_CONTROL_HARDWARE) {\r
+                Control |= EFI_SERIAL_HARDWARE_FLOW_CONTROL_ENABLE;\r
+              } else {\r
+                Control &= ~EFI_SERIAL_HARDWARE_FLOW_CONTROL_ENABLE;\r
+              }\r
+              //\r
+              // Clear the bits that are not allowed to pass to SetControl\r
+              //\r
+              Control &= (EFI_SERIAL_REQUEST_TO_SEND | EFI_SERIAL_DATA_TERMINAL_READY |\r
+                          EFI_SERIAL_HARDWARE_LOOPBACK_ENABLE | EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE | \r
+                          EFI_SERIAL_HARDWARE_FLOW_CONTROL_ENABLE);\r
+              Status = SerialIo->SetControl (SerialIo, Control);\r
+            }\r
+          }\r

         }\r
         break;\r
       }\r
         }\r
         break;\r
       }\r


@@ -412,6 +532,8 @@ SerialControllerDriverStart (
   SerialDevice->SerialIo.Mode       = &(SerialDevice->SerialMode);\r
   SerialDevice->IsaIo               = IsaIo;\r
   SerialDevice->ParentDevicePath    = ParentDevicePath;\r
   SerialDevice->SerialIo.Mode       = &(SerialDevice->SerialMode);\r
   SerialDevice->IsaIo               = IsaIo;\r
   SerialDevice->ParentDevicePath    = ParentDevicePath;\r

+  FlowControl                       = NULL;\r
+  FlowControlMap                    = 0;\r

 \r
   //\r
   // Check if RemainingDevicePath is NULL, \r
 \r
   //\r
   // Check if RemainingDevicePath is NULL, \r


@@ -426,6 +548,12 @@ SerialControllerDriverStart (
     // that we can support.\r
     //\r
     CopyMem (&SerialDevice->UartDevicePath, RemainingDevicePath, sizeof (UART_DEVICE_PATH));\r
     // that we can support.\r
     //\r
     CopyMem (&SerialDevice->UartDevicePath, RemainingDevicePath, sizeof (UART_DEVICE_PATH));\r

+    FlowControl = (UART_FLOW_CONTROL_DEVICE_PATH *) NextDevicePathNode (RemainingDevicePath);\r
+    if (IsUartFlowControlNode (FlowControl)) {\r
+      FlowControlMap = ReadUnaligned32 (&FlowControl->FlowControlMap);\r
+    } else {\r
+      FlowControl    = NULL;\r
+    }\r

   }\r
 \r
   AddName (SerialDevice, IsaIo);\r
   }\r
 \r
   AddName (SerialDevice, IsaIo);\r


@@ -435,6 +563,9 @@ SerialControllerDriverStart (
       SerialDevice->BaseAddress = (UINT16) SerialDevice->IsaIo->ResourceList->ResourceItem[Index].StartRange;\r
     }\r
   }\r
       SerialDevice->BaseAddress = (UINT16) SerialDevice->IsaIo->ResourceList->ResourceItem[Index].StartRange;\r
     }\r
   }\r

+  \r
+  SerialDevice->HardwareFlowControl = (BOOLEAN) (FlowControlMap == UART_FLOW_CONTROL_HARDWARE);\r
+\r

   //\r
   // Report status code the serial present\r
   //\r
   //\r
   // Report status code the serial present\r
   //\r


@@ -456,15 +587,28 @@ SerialControllerDriverStart (
 \r
   //\r
   // Build the device path by appending the UART node to the ParentDevicePath.\r
 \r
   //\r
   // Build the device path by appending the UART node to the ParentDevicePath.\r

-  //The Uart setings are zero here, since  SetAttribute() will update them to match \r
+  // The Uart setings are zero here, since  SetAttribute() will update them to match \r

   // the default setings.\r
   //\r
   SerialDevice->DevicePath = AppendDevicePathNode (\r
                                ParentDevicePath,\r
   // the default setings.\r
   //\r
   SerialDevice->DevicePath = AppendDevicePathNode (\r
                                ParentDevicePath,\r

-                               (EFI_DEVICE_PATH_PROTOCOL *)&SerialDevice->UartDevicePath\r
+                               (EFI_DEVICE_PATH_PROTOCOL *) &SerialDevice->UartDevicePath\r

                                );\r
                                );\r

+  //\r
+  // Only produce the Flow Control node when remaining device path has it\r
+  //\r
+  if (FlowControl != NULL) {\r
+    TempDevicePath = SerialDevice->DevicePath;\r
+    if (TempDevicePath != NULL) {\r
+      SerialDevice->DevicePath = AppendDevicePathNode (\r
+                                   TempDevicePath,\r
+                                   (EFI_DEVICE_PATH_PROTOCOL *) FlowControl\r
+                                   );\r
+      FreePool (TempDevicePath);\r
+    }\r
+  }\r

   if (SerialDevice->DevicePath == NULL) {\r
   if (SerialDevice->DevicePath == NULL) {\r

-    Status = EFI_DEVICE_ERROR;\r
+    Status = EFI_OUT_OF_RESOURCES;\r

     goto Error;\r
   }\r
 \r
     goto Error;\r
   }\r
 \r


@@ -968,6 +1112,7 @@ IsaSerialReset (
   SERIAL_PORT_MCR Mcr;\r
   SERIAL_PORT_FCR Fcr;\r
   EFI_TPL         Tpl;\r
   SERIAL_PORT_MCR Mcr;\r
   SERIAL_PORT_FCR Fcr;\r
   EFI_TPL         Tpl;\r

+  UINT32          Control;\r

 \r
   SerialDevice = SERIAL_DEV_FROM_THIS (This);\r
 \r
 \r
   SerialDevice = SERIAL_DEV_FROM_THIS (This);\r
 \r


@@ -1039,9 +1184,16 @@ IsaSerialReset (
   //\r
   // Go set the current control bits\r
   //\r
   //\r
   // Go set the current control bits\r
   //\r

+  Control = 0;\r
+  if (SerialDevice->HardwareFlowControl) {\r
+    Control |= EFI_SERIAL_HARDWARE_FLOW_CONTROL_ENABLE;\r
+  }\r
+  if (SerialDevice->SoftwareLoopbackEnable) {\r
+    Control |= EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE;\r
+  }\r

   Status = This->SetControl (\r
                    This,\r
   Status = This->SetControl (\r
                    This,\r

-                   This->Mode->ControlMask\r
+                   Control\r

                    );\r
 \r
   if (EFI_ERROR (Status)) {\r
                    );\r
 \r
   if (EFI_ERROR (Status)) {\r


@@ -1108,7 +1260,7 @@ IsaSerialSetAttributes (
   UINT32                    Divisor;\r
   UINT32                    Remained;\r
   SERIAL_PORT_LCR           Lcr;\r
   UINT32                    Divisor;\r
   UINT32                    Remained;\r
   SERIAL_PORT_LCR           Lcr;\r

-  EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;\r
+  UART_DEVICE_PATH          *Uart;\r

   EFI_TPL                   Tpl;\r
 \r
   SerialDevice = SERIAL_DEV_FROM_THIS (This);\r
   EFI_TPL                   Tpl;\r
 \r
   SerialDevice = SERIAL_DEV_FROM_THIS (This);\r


@@ -1347,37 +1499,25 @@ IsaSerialSetAttributes (
   SerialDevice->UartDevicePath.Parity   = (UINT8) Parity;\r
   SerialDevice->UartDevicePath.StopBits = (UINT8) StopBits;\r
 \r
   SerialDevice->UartDevicePath.Parity   = (UINT8) Parity;\r
   SerialDevice->UartDevicePath.StopBits = (UINT8) StopBits;\r
 \r

-  NewDevicePath = AppendDevicePathNode (\r
-                    SerialDevice->ParentDevicePath,\r
-                    (EFI_DEVICE_PATH_PROTOCOL *) &SerialDevice->UartDevicePath\r
-                    );\r
-  if (NewDevicePath == NULL) {\r
-    gBS->RestoreTPL (Tpl);\r
-    return EFI_DEVICE_ERROR;\r
-  }\r
-\r
+  Status = EFI_SUCCESS;\r

   if (SerialDevice->Handle != NULL) {\r
   if (SerialDevice->Handle != NULL) {\r

+    Uart = (UART_DEVICE_PATH *) (\r
+             (UINTN) SerialDevice->DevicePath\r
+             + GetDevicePathSize (SerialDevice->ParentDevicePath)\r
+             - END_DEVICE_PATH_LENGTH\r
+             );\r
+    CopyMem (Uart, &SerialDevice->UartDevicePath, sizeof (UART_DEVICE_PATH));\r

     Status = gBS->ReinstallProtocolInterface (\r
                     SerialDevice->Handle,\r
                     &gEfiDevicePathProtocolGuid,\r
                     SerialDevice->DevicePath,\r
     Status = gBS->ReinstallProtocolInterface (\r
                     SerialDevice->Handle,\r
                     &gEfiDevicePathProtocolGuid,\r
                     SerialDevice->DevicePath,\r

-                    NewDevicePath\r
+                    SerialDevice->DevicePath\r

                     );\r
                     );\r

-    if (EFI_ERROR (Status)) {\r
-      gBS->RestoreTPL (Tpl);\r
-      return Status;\r
-    }\r
-  }\r
-\r
-  if (SerialDevice->DevicePath != NULL) {\r
-    gBS->FreePool (SerialDevice->DevicePath);\r

   }\r
 \r
   }\r
 \r

-  SerialDevice->DevicePath = NewDevicePath;\r
-\r

   gBS->RestoreTPL (Tpl);\r
 \r
   gBS->RestoreTPL (Tpl);\r
 \r

-  return EFI_SUCCESS;\r
+  return Status;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -1397,9 +1537,11 @@ IsaSerialSetControl (
   IN UINT32                  Control\r
   )\r
 {\r
   IN UINT32                  Control\r
   )\r
 {\r

-  SERIAL_DEV      *SerialDevice;\r
-  SERIAL_PORT_MCR Mcr;\r
-  EFI_TPL         Tpl;\r
+  SERIAL_DEV                    *SerialDevice;\r
+  SERIAL_PORT_MCR               Mcr;\r
+  EFI_TPL                       Tpl;\r
+  UART_FLOW_CONTROL_DEVICE_PATH *FlowControl;\r
+  EFI_STATUS                    Status;\r

 \r
   //\r
   // The control bits that can be set are :\r
 \r
   //\r
   // The control bits that can be set are :\r


@@ -1407,13 +1549,16 @@ IsaSerialSetControl (
   //     EFI_SERIAL_REQUEST_TO_SEND: 0x0002  // WO\r
   //     EFI_SERIAL_HARDWARE_LOOPBACK_ENABLE: 0x1000  // RW\r
   //     EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE: 0x2000  // RW\r
   //     EFI_SERIAL_REQUEST_TO_SEND: 0x0002  // WO\r
   //     EFI_SERIAL_HARDWARE_LOOPBACK_ENABLE: 0x1000  // RW\r
   //     EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE: 0x2000  // RW\r

+  //     EFI_SERIAL_HARDWARE_FLOW_CONTROL_ENABLE: 0x4000 // RW\r

   //\r
   SerialDevice = SERIAL_DEV_FROM_THIS (This);\r
 \r
   //\r
   // first determine the parameter is invalid\r
   //\r
   //\r
   SerialDevice = SERIAL_DEV_FROM_THIS (This);\r
 \r
   //\r
   // first determine the parameter is invalid\r
   //\r

-  if ((Control & 0xffff8ffc) != 0) {\r
+  if (Control & (~(EFI_SERIAL_REQUEST_TO_SEND | EFI_SERIAL_DATA_TERMINAL_READY |\r
+                   EFI_SERIAL_HARDWARE_LOOPBACK_ENABLE | EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE | \r
+                   EFI_SERIAL_HARDWARE_FLOW_CONTROL_ENABLE))) {\r

     return EFI_UNSUPPORTED;\r
   }\r
 \r
     return EFI_UNSUPPORTED;\r
   }\r
 \r


@@ -1448,9 +1593,32 @@ IsaSerialSetControl (
     SerialDevice->SoftwareLoopbackEnable = TRUE;\r
   }\r
 \r
     SerialDevice->SoftwareLoopbackEnable = TRUE;\r
   }\r
 \r

+  Status = EFI_SUCCESS;\r
+  if (SerialDevice->Handle != NULL) {\r
+    FlowControl = (UART_FLOW_CONTROL_DEVICE_PATH *) (\r
+                    (UINTN) SerialDevice->DevicePath\r
+                    + GetDevicePathSize (SerialDevice->ParentDevicePath)\r
+                    - END_DEVICE_PATH_LENGTH\r
+                    + sizeof (UART_DEVICE_PATH)\r
+                    );\r
+    if (IsUartFlowControlNode (FlowControl) &&\r
+        ((ReadUnaligned32 (&FlowControl->FlowControlMap) == UART_FLOW_CONTROL_HARDWARE) ^ SerialDevice->HardwareFlowControl)) {\r
+      //\r
+      // Flow Control setting is changed, need to reinstall device path protocol\r
+      //\r
+      WriteUnaligned32 (&FlowControl->FlowControlMap, SerialDevice->HardwareFlowControl ? UART_FLOW_CONTROL_HARDWARE : 0);\r
+      Status = gBS->ReinstallProtocolInterface (\r
+                      SerialDevice->Handle,\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      SerialDevice->DevicePath,\r
+                      SerialDevice->DevicePath\r
+                      );\r
+    }\r
+  }\r
+\r

   gBS->RestoreTPL (Tpl);\r
 \r
   gBS->RestoreTPL (Tpl);\r
 \r

-  return EFI_SUCCESS;\r
+  return Status;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
index deb79265264c4ff5c186a32f335c3bef0775c1b4..db5bd21b92cdf363d430da4e8759a832cf62a16f 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
@@ -116,7 +116,17 @@ typedef struct {
 //\r
 #define SERIAL_PORT_DEFAULT_RECEIVE_FIFO_DEPTH  1\r
 #define SERIAL_PORT_DEFAULT_TIMEOUT             1000000\r
 //\r
 #define SERIAL_PORT_DEFAULT_RECEIVE_FIFO_DEPTH  1\r
 #define SERIAL_PORT_DEFAULT_TIMEOUT             1000000\r

-#define SERIAL_PORT_DEFAULT_CONTROL_MASK        0\r
+#define SERIAL_PORT_SUPPORT_CONTROL_MASK        (EFI_SERIAL_CLEAR_TO_SEND                | \\r
+                                                 EFI_SERIAL_DATA_SET_READY               | \\r
+                                                 EFI_SERIAL_RING_INDICATE                | \\r
+                                                 EFI_SERIAL_CARRIER_DETECT               | \\r
+                                                 EFI_SERIAL_REQUEST_TO_SEND              | \\r
+                                                 EFI_SERIAL_DATA_TERMINAL_READY          | \\r
+                                                 EFI_SERIAL_HARDWARE_LOOPBACK_ENABLE     | \\r
+                                                 EFI_SERIAL_SOFTWARE_LOOPBACK_ENABLE     | \\r
+                                                 EFI_SERIAL_HARDWARE_FLOW_CONTROL_ENABLE | \\r
+                                                 EFI_SERIAL_OUTPUT_BUFFER_EMPTY          | \\r
+                                                 EFI_SERIAL_INPUT_BUFFER_EMPTY)\r

 \r
 \r
 //\r
 \r
 \r
 //\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
index c6c9915f55f95f2cbb97d1b44d05babc0a892688..e79b3f6a3013cee3c68181d0d93782344fd1f708 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
@@ -1,7 +1,7 @@
 /** @file\r
   handles console redirection from boot manager\r
 \r
 /** @file\r
   handles console redirection from boot manager\r
 \r

-Copyright (c) 2004 - 2009, Intel Corporation. <BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. <BR>\r

 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -14,6 +14,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "BootMaint.h"\r
 \r
 \r
 #include "BootMaint.h"\r
 \r

+/**\r
+  Check whether the device path node is ISA Serial Node.\r
+\r
+  @param Acpi           Device path node to be checked\r
+\r
+  @retval TRUE          It's ISA Serial Node.\r
+  @retval FALSE         It's NOT ISA Serial Node.\r
+\r
+**/\r
+BOOLEAN\r
+IsIsaSerialNode (\r
+  IN ACPI_HID_DEVICE_PATH *Acpi\r
+  )\r
+{\r
+  return (BOOLEAN) (\r
+      (DevicePathType (Acpi) == ACPI_DEVICE_PATH) &&\r
+      (DevicePathSubType (Acpi) == ACPI_DP) &&\r
+      (ReadUnaligned32 (&Acpi->HID) == EISA_PNP_ID (0x0501))\r
+      );\r
+}\r
+\r

 /**\r
   Update Com Ports attributes from DevicePath\r
 \r
 /**\r
   Update Com Ports attributes from DevicePath\r
 \r


@@ -51,20 +72,16 @@ ChangeTerminalDevicePath (
   UART_DEVICE_PATH          *Uart;\r
   UART_DEVICE_PATH          *Uart1;\r
   UINTN                     Com;\r
   UART_DEVICE_PATH          *Uart;\r
   UART_DEVICE_PATH          *Uart1;\r
   UINTN                     Com;\r

-  UINT32                    Match;\r

   BM_TERMINAL_CONTEXT       *NewTerminalContext;\r
   BM_MENU_ENTRY             *NewMenuEntry;\r
 \r
   BM_TERMINAL_CONTEXT       *NewTerminalContext;\r
   BM_MENU_ENTRY             *NewMenuEntry;\r
 \r

-  Match = EISA_PNP_ID (0x0501);\r

   Node  = DevicePath;\r
   Node  = NextDevicePathNode (Node);\r
   Com   = 0;\r
   while (!IsDevicePathEnd (Node)) {\r
   Node  = DevicePath;\r
   Node  = NextDevicePathNode (Node);\r
   Com   = 0;\r
   while (!IsDevicePathEnd (Node)) {\r

-    if ((DevicePathType (Node) == ACPI_DEVICE_PATH) && (DevicePathSubType (Node) == ACPI_DP)) {\r
-      Acpi = (ACPI_HID_DEVICE_PATH *) Node;\r
-      if (CompareMem (&Acpi->HID, &Match, sizeof (UINT32)) == 0) {\r
-        CopyMem (&Com, &Acpi->UID, sizeof (UINT32));\r
-      }\r
+    Acpi = (ACPI_HID_DEVICE_PATH *) Node;\r
+    if (IsIsaSerialNode (Acpi)) {\r
+      CopyMem (&Com, &Acpi->UID, sizeof (UINT32));\r

     }\r
 \r
     NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Com);\r
     }\r
 \r
     NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Com);\r


@@ -165,20 +182,16 @@ ChangeVariableDevicePath (
   ACPI_HID_DEVICE_PATH      *Acpi;\r
   UART_DEVICE_PATH          *Uart;\r
   UINTN                     Com;\r
   ACPI_HID_DEVICE_PATH      *Acpi;\r
   UART_DEVICE_PATH          *Uart;\r
   UINTN                     Com;\r

-  UINT32                    Match;\r

   BM_TERMINAL_CONTEXT       *NewTerminalContext;\r
   BM_MENU_ENTRY             *NewMenuEntry;\r
 \r
   BM_TERMINAL_CONTEXT       *NewTerminalContext;\r
   BM_MENU_ENTRY             *NewMenuEntry;\r
 \r

-  Match = EISA_PNP_ID (0x0501);\r

   Node  = DevicePath;\r
   Node  = NextDevicePathNode (Node);\r
   Com   = 0;\r
   while (!IsDevicePathEnd (Node)) {\r
   Node  = DevicePath;\r
   Node  = NextDevicePathNode (Node);\r
   Com   = 0;\r
   while (!IsDevicePathEnd (Node)) {\r

-    if ((DevicePathType (Node) == ACPI_DEVICE_PATH) && (DevicePathSubType (Node) == ACPI_DP)) {\r
-      Acpi = (ACPI_HID_DEVICE_PATH *) Node;\r
-      if (CompareMem (&Acpi->HID, &Match, sizeof (UINT32)) == 0) {\r
-        CopyMem (&Com, &Acpi->UID, sizeof (UINT32));\r
-      }\r
+    Acpi = (ACPI_HID_DEVICE_PATH *) Node;\r
+    if (IsIsaSerialNode (Acpi)) {\r
+      CopyMem (&Com, &Acpi->UID, sizeof (UINT32));\r

     }\r
 \r
     if ((DevicePathType (Node) == MESSAGING_DEVICE_PATH) && (DevicePathSubType (Node) == MSG_UART_DP)) {\r
     }\r
 \r
     if ((DevicePathType (Node) == MESSAGING_DEVICE_PATH) && (DevicePathSubType (Node) == MSG_UART_DP)) {\r


@@ -234,29 +247,33 @@ RetrieveUartUid (
   IN OUT UINT32   *AcpiUid\r
   )\r
 {\r
   IN OUT UINT32   *AcpiUid\r
   )\r
 {\r

-  UINT32                    Match;\r
-  UINT8                     *Ptr;\r
+  EFI_STATUS                Status;\r

   ACPI_HID_DEVICE_PATH      *Acpi;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
 \r
   ACPI_HID_DEVICE_PATH      *Acpi;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
 \r

-  gBS->HandleProtocol (\r
-        Handle,\r
-        &gEfiDevicePathProtocolGuid,\r
-        (VOID **) &DevicePath\r
-        );\r
-  Ptr = (UINT8 *) DevicePath;\r
-\r
-  while (*Ptr != END_DEVICE_PATH_TYPE) {\r
-    Ptr++;\r
+  Status = gBS->HandleProtocol (\r
+                  Handle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  (VOID **) &DevicePath\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    return FALSE;\r

   }\r
 \r
   }\r
 \r

-  Ptr   = Ptr - sizeof (UART_DEVICE_PATH) - sizeof (ACPI_HID_DEVICE_PATH);\r
-  Acpi  = (ACPI_HID_DEVICE_PATH *) Ptr;\r
-  Match = EISA_PNP_ID (0x0501);\r
+  Acpi = NULL;\r
+  for (; !IsDevicePathEnd (DevicePath); DevicePath = NextDevicePathNode (DevicePath)) {\r
+    if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) && (DevicePathSubType (DevicePath) == MSG_UART_DP)) {\r
+      break;\r
+    }\r
+    //\r
+    // Acpi points to the node before the Uart node\r
+    //\r
+    Acpi = (ACPI_HID_DEVICE_PATH *) DevicePath;\r
+  }\r

 \r
 \r

-  if (CompareMem (&Acpi->HID, &Match, sizeof (UINT32)) == 0) {\r
+  if ((Acpi != NULL) && IsIsaSerialNode (Acpi)) {\r

     if (AcpiUid != NULL) {\r
     if (AcpiUid != NULL) {\r

-      *AcpiUid = Acpi->UID;\r
+      CopyMem (AcpiUid, &Acpi->UID, sizeof (UINT32));\r

     }\r
     return TRUE;\r
   } else {\r
     }\r
     return TRUE;\r
   } else {\r


@@ -339,7 +356,6 @@ LocateSerialIo (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  UINT8                     *Ptr;\r

   UINTN                     Index;\r
   UINTN                     Index2;\r
   UINTN                     NoHandles;\r
   UINTN                     Index;\r
   UINTN                     Index2;\r
   UINTN                     NoHandles;\r


@@ -347,8 +363,8 @@ LocateSerialIo (
   EFI_STATUS                Status;\r
   ACPI_HID_DEVICE_PATH      *Acpi;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
   EFI_STATUS                Status;\r
   ACPI_HID_DEVICE_PATH      *Acpi;\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r

-  UINT32                    Match;\r

   EFI_SERIAL_IO_PROTOCOL    *SerialIo;\r
   EFI_SERIAL_IO_PROTOCOL    *SerialIo;\r

+  EFI_DEVICE_PATH_PROTOCOL  *Node;\r

   EFI_DEVICE_PATH_PROTOCOL  *OutDevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL  *InpDevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL  *ErrDevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL  *OutDevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL  *InpDevicePath;\r
   EFI_DEVICE_PATH_PROTOCOL  *ErrDevicePath;\r


@@ -390,16 +406,19 @@ LocateSerialIo (
           &gEfiDevicePathProtocolGuid,\r
           (VOID **) &DevicePath\r
           );\r
           &gEfiDevicePathProtocolGuid,\r
           (VOID **) &DevicePath\r
           );\r

-    Ptr = (UINT8 *) DevicePath;\r
-    while (*Ptr != END_DEVICE_PATH_TYPE) {\r
-      Ptr++;\r
-    }\r

 \r
 \r

-    Ptr   = Ptr - sizeof (UART_DEVICE_PATH) - sizeof (ACPI_HID_DEVICE_PATH);\r
-    Acpi  = (ACPI_HID_DEVICE_PATH *) Ptr;\r
-    Match = EISA_PNP_ID (0x0501);\r
+    Acpi = NULL;\r
+    for (Node = DevicePath; !IsDevicePathEnd (Node); Node = NextDevicePathNode (Node)) {\r
+      if ((DevicePathType (Node) == MESSAGING_DEVICE_PATH) && (DevicePathSubType (Node) == MSG_UART_DP)) {\r
+        break;\r
+      }\r
+      //\r
+      // Acpi points to the node before Uart node\r
+      //\r
+      Acpi = (ACPI_HID_DEVICE_PATH *) Node;\r
+    }\r

 \r
 \r

-    if (CompareMem (&Acpi->HID, &Match, sizeof (UINT32)) == 0) {\r
+    if ((Acpi != NULL) && IsIsaSerialNode (Acpi)) {\r

       NewMenuEntry = BOpt_CreateMenuEntry (BM_TERMINAL_CONTEXT_SELECT);\r
       if (NewMenuEntry == NULL) {\r
         FreePool (Handles);\r
       NewMenuEntry = BOpt_CreateMenuEntry (BM_TERMINAL_CONTEXT_SELECT);\r
       if (NewMenuEntry == NULL) {\r
         FreePool (Handles);\r


@@ -547,23 +566,19 @@ UpdateComAttributeFromVariable (
   ACPI_HID_DEVICE_PATH      *Acpi;\r
   UART_DEVICE_PATH          *Uart;\r
   UART_DEVICE_PATH          *Uart1;\r
   ACPI_HID_DEVICE_PATH      *Acpi;\r
   UART_DEVICE_PATH          *Uart;\r
   UART_DEVICE_PATH          *Uart1;\r

-  UINT32                    Match;\r

   UINTN                     TerminalNumber;\r
   BM_MENU_ENTRY             *NewMenuEntry;\r
   BM_TERMINAL_CONTEXT       *NewTerminalContext;\r
   UINTN                     Index;\r
 \r
   UINTN                     TerminalNumber;\r
   BM_MENU_ENTRY             *NewMenuEntry;\r
   BM_TERMINAL_CONTEXT       *NewTerminalContext;\r
   UINTN                     Index;\r
 \r

-  Match           = EISA_PNP_ID (0x0501);\r

   Node            = DevicePath;\r
   Node            = NextDevicePathNode (Node);\r
   TerminalNumber  = 0;\r
   for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {\r
     while (!IsDevicePathEnd (Node)) {\r
   Node            = DevicePath;\r
   Node            = NextDevicePathNode (Node);\r
   TerminalNumber  = 0;\r
   for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {\r
     while (!IsDevicePathEnd (Node)) {\r

-      if ((DevicePathType (Node) == ACPI_DEVICE_PATH) && (DevicePathSubType (Node) == ACPI_DP)) {\r
-        Acpi = (ACPI_HID_DEVICE_PATH *) Node;\r
-        if (CompareMem (&Acpi->HID, &Match, sizeof (UINT32)) == 0) {\r
-          CopyMem (&TerminalNumber, &Acpi->UID, sizeof (UINT32));\r
-        }\r
+      Acpi = (ACPI_HID_DEVICE_PATH *) Node;\r
+      if (IsIsaSerialNode (Acpi)) {\r
+        CopyMem (&TerminalNumber, &Acpi->UID, sizeof (UINT32));\r

       }\r
 \r
       if ((DevicePathType (Node) == MESSAGING_DEVICE_PATH) && (DevicePathSubType (Node) == MSG_UART_DP)) {\r
       }\r
 \r
       if ((DevicePathType (Node) == MESSAGING_DEVICE_PATH) && (DevicePathSubType (Node) == MSG_UART_DP)) {\r


@@ -837,46 +852,60 @@ IsTerminalDevicePath (
   OUT UINTN                    *Com\r
   )\r
 {\r
   OUT UINTN                    *Com\r
   )\r
 {\r

-  UINT8                 *Ptr;\r
-  BOOLEAN               IsTerminal;\r
-  VENDOR_DEVICE_PATH    *Vendor;\r
-  ACPI_HID_DEVICE_PATH  *Acpi;\r
-  UINT32                Match;\r
-  EFI_GUID              TempGuid;\r
+  BOOLEAN                   IsTerminal;\r
+  EFI_DEVICE_PATH_PROTOCOL  *Node;\r
+  VENDOR_DEVICE_PATH        *Vendor;\r
+  UART_DEVICE_PATH          *Uart;\r
+  ACPI_HID_DEVICE_PATH      *Acpi;\r

 \r
   IsTerminal = FALSE;\r
 \r
 \r
   IsTerminal = FALSE;\r
 \r

-  //\r
-  // Parse the Device Path, should be change later!!!\r
-  //\r
-  Ptr = (UINT8 *) DevicePath;\r
-  while (*Ptr != END_DEVICE_PATH_TYPE) {\r
-    Ptr++;\r
+  Uart   = NULL;\r
+  Vendor = NULL;\r
+  Acpi   = NULL;\r
+  for (Node = DevicePath; !IsDevicePathEnd (Node); Node = NextDevicePathNode (Node)) {\r
+    //\r
+    // Vendor points to the node before the End node\r
+    //\r
+    Vendor = (VENDOR_DEVICE_PATH *) Node;\r
+\r
+    if ((DevicePathType (Node) == MESSAGING_DEVICE_PATH) && (DevicePathSubType (Node) == MSG_UART_DP)) {\r
+      Uart = (UART_DEVICE_PATH *) Node;\r
+    }\r
+\r
+    if (Uart == NULL) {\r
+      //\r
+      // Acpi points to the node before the UART node\r
+      //\r
+      Acpi = (ACPI_HID_DEVICE_PATH *) Node;\r
+    }\r

   }\r
 \r
   }\r
 \r

-  Ptr     = Ptr - sizeof (VENDOR_DEVICE_PATH);\r
-  Vendor  = (VENDOR_DEVICE_PATH *) Ptr;\r
+  if (Vendor == NULL ||\r
+      DevicePathType (Vendor) != MESSAGING_DEVICE_PATH ||\r
+      DevicePathSubType (Vendor) != MSG_VENDOR_DP ||\r
+      Uart == NULL) {\r
+    return FALSE;\r
+  }\r

 \r
   //\r
   // There are four kinds of Terminal types\r
   // check to see whether this devicepath\r
   // is one of that type\r
   //\r
 \r
   //\r
   // There are four kinds of Terminal types\r
   // check to see whether this devicepath\r
   // is one of that type\r
   //\r

-  CopyMem (&TempGuid, &Vendor->Guid, sizeof (EFI_GUID));\r
-\r
-  if (CompareGuid (&TempGuid, &TerminalTypeGuid[0])) {\r
+  if (CompareGuid (&Vendor->Guid, &TerminalTypeGuid[0])) {\r

     *Termi      = TerminalTypePcAnsi;\r
     IsTerminal  = TRUE;\r
   } else {\r
     *Termi      = TerminalTypePcAnsi;\r
     IsTerminal  = TRUE;\r
   } else {\r

-    if (CompareGuid (&TempGuid, &TerminalTypeGuid[1])) {\r
+    if (CompareGuid (&Vendor->Guid, &TerminalTypeGuid[1])) {\r

       *Termi      = TerminalTypeVt100;\r
       IsTerminal  = TRUE;\r
     } else {\r
       *Termi      = TerminalTypeVt100;\r
       IsTerminal  = TRUE;\r
     } else {\r

-      if (CompareGuid (&TempGuid, &TerminalTypeGuid[2])) {\r
+      if (CompareGuid (&Vendor->Guid, &TerminalTypeGuid[2])) {\r

         *Termi      = TerminalTypeVt100Plus;\r
         IsTerminal  = TRUE;\r
       } else {\r
         *Termi      = TerminalTypeVt100Plus;\r
         IsTerminal  = TRUE;\r
       } else {\r

-        if (CompareGuid (&TempGuid, &TerminalTypeGuid[3])) {\r
+        if (CompareGuid (&Vendor->Guid, &TerminalTypeGuid[3])) {\r

           *Termi      = TerminalTypeVtUtf8;\r
           IsTerminal  = TRUE;\r
         } else {\r
           *Termi      = TerminalTypeVtUtf8;\r
           IsTerminal  = TRUE;\r
         } else {\r


@@ -890,10 +919,7 @@ IsTerminalDevicePath (
     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  Ptr   = Ptr - sizeof (UART_DEVICE_PATH) - sizeof (ACPI_HID_DEVICE_PATH);\r
-  Acpi  = (ACPI_HID_DEVICE_PATH *) Ptr;\r
-  Match = EISA_PNP_ID (0x0501);\r
-  if (CompareMem (&Acpi->HID, &Match, sizeof (UINT32)) == 0) {\r
+  if ((Acpi != NULL) && IsIsaSerialNode (Acpi)) {\r

     CopyMem (Com, &Acpi->UID, sizeof (UINT32));\r
   } else {\r
     return FALSE;\r
     CopyMem (Com, &Acpi->UID, sizeof (UINT32));\r
   } else {\r
     return FALSE;\r