Skip to content

Commit

Permalink
ACPI: Expose EHCI unconditionally
Browse files Browse the repository at this point in the history 
But detect the OS booted and hide the PNP0D20 ID for Windows, so we
don't end up binding to the inbox driver package and crashing.

The fixed driver package[^1] will bind to the custom RKCP0D20 _HID
instead.

[^1]: https://github.com/worproject/Rockchip-Windows-Drivers/tree/master/drivers/usb/usbehci_noncoherent

Signed-off-by: Mario Bălănică <[email protected]>
  • Loading branch information
@mariobalanica
mariobalanica committed Feb 11, 2024
1 parent 4684b3a commit ccf967e
Show file tree
Hide file tree
Showing 41 changed files with 397 additions and 340 deletions.
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("I2s.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host2.asl")

Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/Firefly/ITX-3588J/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/Firefly/ITX-3588J/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)
include ("Uart.asl")
// include ("Spi.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host1.asl")
include ("Usb3Host2.asl")
Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("I2s.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host2.asl")

Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("I2s.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host1.asl")
// include ("Usb3Host2.asl")
Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588S", 2)
include ("Uart.asl")
//include ("Spi.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host1.asl")
}
Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)
include ("Uart.asl")
// include ("Spi.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host2.asl")
}
Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("I2s.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host1.asl")
include ("Usb3Host2.asl")
Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("I2s.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host2.asl")

Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)
include ("Uart.asl")
// include ("Spi.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host1.asl")
include ("Usb3Host2.asl")
Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("I2s.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host1.asl")
include ("Usb3Host2.asl")
Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)
include ("Uart.asl")
// include ("Spi.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host1.asl")
include ("Usb3Host2.asl")
Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("I2s.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host2.asl")

Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("I2s.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host1.asl")

Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("I2s.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host2.asl")

Expand Down
1 change: 0 additions & 1 deletion edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/AcpiTables.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
$(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
Expand Down
2 changes: 1 addition & 1 deletion edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("I2s.asl")

include ("Usb1Host.asl")
include ("Usb2Host.asl")
include ("Usb3Host0.asl")
include ("Usb3Host1.asl")
include ("Usb3Host2.asl")
Expand Down
108 changes: 0 additions & 108 deletions edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Usb1Host.asl
View file

This file was deleted.

Loading

0 comments on commit ccf967e

Please sign in to comment.