ACPI: Support PCIe root port and switches in Windows and Linux

To deal with the broken ECAM on this platform, reuse some existing OS workarounds: - for Windows: "NXPMX6" OEM ID in FADT and split MCFG entries for root port and main config space. - for Linux: "AMAZON" OEM ID + "GRAVITON" OEM Table ID in MCFG. An "AMZN0001" device with _UID matching the RC segment number returns the root port's DBI address in _CRS. Both workarounds filter device > 0 on primary and secondary buses of RP to hide ghost and duplicate devices. The compatibility mode used can be configured in the setup menu. Default is "Auto (NXPMX6 + Single Device)", which selects the NXPMX6 mode when Windows is booted and the classic single device/bus mode for other OSes, since it's the most compatible one. Also move the PCIe and SATA SSDT definitions in DSDT and patch _STA instead to disable the unnecessary controllers. Signed-off-by: Mario Bălănică <[email protected]>
edk2-porting · Feb 11, 2024 · 4b915e6 · 4b915e6
1 parent ccf967e
commit 4b915e6
Show file tree

Hide file tree

Showing 56 changed files with 595 additions and 971 deletions.
diff --git a/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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,6 +27,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/Firefly/ITX-3588J/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Firefly/ITX-3588J/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.asl
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/edk2-rockchip/Platform/Firefly/ITX-3588J/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Firefly/ITX-3588J/AcpiTables/Dsdt.asl
@@ -19,6 +19,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.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
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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,6 +27,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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
@@ -21,6 +21,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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
@@ -19,6 +19,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588S", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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
@@ -19,6 +19,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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,6 +27,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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,6 +27,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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
@@ -19,6 +19,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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,6 +27,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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
@@ -19,6 +19,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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,6 +27,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     // include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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,6 +27,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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,6 +27,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")

diff --git a/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/AcpiTables.inf
@@ -32,14 +32,6 @@
   $(RK_COMMON_ACPI_DIR)/Mcfg.aslc
   $(RK_COMMON_ACPI_DIR)/Dbg2.aslc
   $(RK_COMMON_ACPI_DIR)/Pptt.aslc
-  $(RK_COMMON_ACPI_DIR)/Pcie3x4.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie3x2.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l0.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l1.asl
-  $(RK_COMMON_ACPI_DIR)/Pcie2x1l2.asl
-  $(RK_COMMON_ACPI_DIR)/Sata0.asl
-  $(RK_COMMON_ACPI_DIR)/Sata1.asl
-  $(RK_COMMON_ACPI_DIR)/Sata2.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,6 +27,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
   {
     include ("Cpu.asl")
 
+    include ("Pcie.asl")
+    include ("Sata.asl")
     include ("Emmc.asl")
     include ("Sdhc.asl")
     include ("Dma.asl")