OpenDuet: Use PcdTurnOffUsbLegacySupport PCD instead

USB emulation mode should only be disabled for regular OpenDuet build, and not BlockIoDxe one.
acidanthera · Aug 26, 2023 · 48b3beb · 48b3beb
1 parent ec656db
commit 48b3beb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 125 deletions.
diff --git a/Library/DuetBdsLib/BdsPlatform.c b/Library/DuetBdsLib/BdsPlatform.c
@@ -519,123 +519,6 @@ UpdateMemoryMap (
   }
 }
 
-STATIC
-EFI_STATUS
-DisableUsbLegacySupport (
-  VOID
-  )
-
-/*++
-
-Routine Description:
-  Disable the USB legacy Support in all Ehci and Uhci.
-  This function assume all PciIo handles have been created in system.
-
-Arguments:
-  None
-
-Returns:
-  EFI_SUCCESS
-  EFI_NOT_FOUND
---*/
-{
-  EFI_STATUS           Status;
-  EFI_HANDLE           *HandleArray;
-  UINTN                HandleArrayCount;
-  UINTN                Index;
-  EFI_PCI_IO_PROTOCOL  *PciIo;
-  UINT8                Class[3];
-  UINT16               Command;
-  UINT32               HcCapParams;
-  UINT32               ExtendCap;
-  UINT32               Value;
-  UINT32               TimeOut;
-
-  //
-  // Find the usb host controller
-  //
-  Status = gBS->LocateHandleBuffer (
-                  ByProtocol,
-                  &gEfiPciIoProtocolGuid,
-                  NULL,
-                  &HandleArrayCount,
-                  &HandleArray
-                  );
-  if (!EFI_ERROR (Status)) {
-    for (Index = 0; Index < HandleArrayCount; Index++) {
-      Status = gBS->HandleProtocol (
-                      HandleArray[Index],
-                      &gEfiPciIoProtocolGuid,
-                      (VOID **)&PciIo
-                      );
-      if (!EFI_ERROR (Status)) {
-        //
-        // Find the USB host controller controller
-        //
-        Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint8, 0x09, 3, &Class);
-        if (!EFI_ERROR (Status)) {
-          if ((PCI_CLASS_SERIAL == Class[2]) &&
-              (PCI_CLASS_SERIAL_USB == Class[1]))
-          {
-            if (PCI_IF_UHCI == Class[0]) {
-              //
-              // Found the UHCI, then disable the legacy support
-              //
-              Command = 0;
-              Status  = PciIo->Pci.Write (PciIo, EfiPciIoWidthUint16, 0xC0, 1, &Command);
-            } else if (PCI_IF_EHCI == Class[0]) {
-              //
-              // Found the EHCI, then disable the legacy support
-              //
-              Status = PciIo->Mem.Read (
-                                    PciIo,
-                                    EfiPciIoWidthUint32,
-                                    0,                       ///< EHC_BAR_INDEX
-                                    (UINT64)0x08,            ///< EHC_HCCPARAMS_OFFSET
-                                    1,
-                                    &HcCapParams
-                                    );
-
-              ExtendCap = (HcCapParams >> 8) & 0xFF;
-              //
-              // Disable the SMI in USBLEGCTLSTS firstly
-              // Not doing this may result in a hardlock soon after
-              //
-              PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, ExtendCap + 0x4, 1, &Value);
-              Value &= 0xFFFF0000;
-              PciIo->Pci.Write (PciIo, EfiPciIoWidthUint32, ExtendCap + 0x4, 1, &Value);
-
-              //
-              // Get EHCI Ownership from legacy bios
-              //
-              PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, ExtendCap, 1, &Value);
-              Value |= (0x1 << 24);
-              PciIo->Pci.Write (PciIo, EfiPciIoWidthUint32, ExtendCap, 1, &Value);
-
-              TimeOut = 40;
-              while (TimeOut--) {
-                gBS->Stall (500);
-
-                PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, ExtendCap, 1, &Value);
-
-                if ((Value & 0x01010000) == 0x01000000) {
-                  break;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    gBS->FreePool (HandleArray);
-  } else {
-    return Status;
-  }
-
-  return EFI_SUCCESS;
-}
-
 STATIC
 EFI_STATUS
 ConnectRootBridge (
@@ -1091,14 +974,6 @@ Routine Description:
     DetectAndPreparePlatformPciDevicePath (TRUE);
   }
 
-  //
-  // The ConIn devices connection will start the USB bus, should disable all
-  // Usb legacy support firstly.
-  // Caution: Must ensure the PCI bus driver has been started. Since the
-  // ConnectRootBridge() will create all the PciIo protocol, it's safe here now
-  //
-  DisableUsbLegacySupport ();
-
   //
   // Connect the all the default console with current console variable
   //

diff --git a/OpenDuetPkg.dsc b/OpenDuetPkg.dsc
@@ -245,6 +245,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|FALSE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE
   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport|FALSE
 
 [PcdsFixedAtBuild]