Expose USB EHCI + OHCI controllers in ACPI

- EHCI is exposed conditionally (via a user setting) and disabled by default due to Windows compatibility issues. - OHCI is exposed at all times. Windows on Arm does not have a driver for it.
edk2-porting · Aug 5, 2023 · d999a44 · d999a44
1 parent e762111
commit d999a44
Show file tree

Hide file tree

Showing 39 changed files with 512 additions and 368 deletions.
diff --git a/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host2.asl")
   }

diff --git a/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host2.asl")
   }

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host1.asl")
     // include ("Usb3Host2.asl")

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588S", 2)
     include ("Uart.asl")
     //include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    //include ("Usb2Host.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host1.asl")
   }

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host2.asl")
   }

diff --git a/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host1.asl")
     include ("Usb3Host2.asl")

diff --git a/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host2.asl")
   }

diff --git a/edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host1.asl")
     include ("Usb3Host2.asl")

diff --git a/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host1.asl")
     include ("Usb3Host2.asl")

diff --git a/edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host1.asl")
     include ("Usb3Host2.asl")

diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host2.asl")
   }

diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host2.asl")
   }

diff --git a/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host2.asl")
   }

diff --git a/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/AcpiTables.inf
@@ -39,6 +39,7 @@
   $(RK_COMMON_ACPI_DIR)/Sata0.asl
   $(RK_COMMON_ACPI_DIR)/Sata1.asl
   $(RK_COMMON_ACPI_DIR)/Sata2.asl
+  $(RK_COMMON_ACPI_DIR)/Usb2Host.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl
@@ -27,9 +27,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
     include ("Uart.asl")
     // include ("Spi.asl")
 
-    // won't work on Windows, will trigger bugcheck by usbehci
-    // include ("Usb2.asl")
-
+    include ("Usb1Host.asl")
     include ("Usb3Host0.asl")
     include ("Usb3Host1.asl")
     include ("Usb3Host2.asl")

diff --git a/edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Usb1Host.asl b/edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Usb1Host.asl
@@ -0,0 +1,108 @@
+/** @file
+ *
+ *  USB 1.1 (OHCI) controllers.
+ *
+ *  Copyright (c) 2022, Rockchip Electronics Co., Ltd
+ *  Copyright (c) 2023, Mario Bălănică <[email protected]>
+ *
+ *  SPDX-License-Identifier: BSD-2-Clause-Patent
+ *
+ **/
+
+#include "AcpiTables.h"
+
+Device (OHC0) {
+  Name (_HID, "PRP0001")
+  Name (_CLS, Package() { 0x0c, 0x03, 0x10 })
+  Name (_UID, Zero)
+  Name (_CCA, Zero)
+
+  Name (_DSD, Package () {
+    ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+    Package () {
+      Package () { "compatible", "generic-ohci" },
+    }
+  })
+
+  Method (_CRS, 0x0, Serialized) {
+    Name (RBUF, ResourceTemplate() {
+      Memory32Fixed (ReadWrite, 0xFC840000, 0x40000)
+      Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 248 }
+    })
+    Return (RBUF)
+  }
+
+  Device (RHUB) {
+    Name (_ADR, 0)
+    Device (PRT1) {
+      Name (_ADR, 1)
+      Name (_UPC, Package() {
+        0xFF,         // Port is connectable
+        0x00,         // Connector type - Type 'A'
+        0x00000000,   // Reserved, must be zero
+        0x00000000    // Reserved, must be zero
+      })
+      Name (_PLD, Package (0x01) {
+        ToPLD (
+          PLD_Revision            = 0x2,
+          PLD_IgnoreColor         = 0x1,
+          PLD_UserVisible         = 0x1,
+          PLD_Panel               = "UNKNOWN",
+          PLD_VerticalPosition    = "UPPER",
+          PLD_HorizontalPosition  = "LEFT",
+          PLD_Shape               = "HORIZONTALRECTANGLE",
+          PLD_Ejectable           = 0x1,
+          PLD_EjectRequired       = 0x1,
+        )
+      })
+    }
+  }
+}
+
+Device (OHC1) {
+  Name (_HID, "PRP0001")
+  Name (_CLS, Package() { 0x0c, 0x03, 0x10 })
+  Name (_UID, One)
+  Name (_CCA, Zero)
+
+  Name (_DSD, Package () {
+    ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+    Package () {
+      Package () { "compatible", "generic-ohci" },
+    }
+  })
+
+  Method (_CRS, 0x0, Serialized) {
+    Name (RBUF, ResourceTemplate() {
+      Memory32Fixed (ReadWrite, 0xFC8C0000, 0x40000)
+      Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 251 }
+    })
+    Return (RBUF)
+  }
+
+  Device (RHUB) {
+    Name (_ADR, 0)
+    Device (PRT1) {
+      Name (_ADR, 1)
+      Name (_UPC, Package() {
+        0xFF,         // Port is connectable
+        0x00,         // Connector type - Type 'A'
+        0x00000000,   // Reserved, must be zero
+        0x00000000    // Reserved, must be zero
+      })
+      Name (_PLD, Package (0x01) {
+        ToPLD (
+          PLD_Revision            = 0x2,
+          PLD_IgnoreColor         = 0x1,
+          PLD_UserVisible         = 0x1,
+          PLD_Panel               = "UNKNOWN",
+          PLD_VerticalPosition    = "LOWER",
+          PLD_HorizontalPosition  = "LEFT",
+          PLD_Shape               = "HORIZONTALRECTANGLE",
+          PLD_Ejectable           = 0x1,
+          PLD_EjectRequired       = 0x1,
+        )
+      })
+    }
+  }
+}