As sbsa-ref board uses xhci to replace ehci, the DSDT is updated to match
the platform xhci controller. This also removes previous ehci structure.

Signed-off-by: Yuquan Wang <wangyuquan1...@phytium.com.cn>
Change-Id: I7f7d6f69e3091f036ff086722ea5847ba2a1e27c
---
 .../Qemu/SbsaQemu/AcpiTables/AcpiTables.inf   |   4 +-
 Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl     | 125 ++----------------
 2 files changed, 15 insertions(+), 114 deletions(-)

diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf 
b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
index 176d8fab..f9caca96 100644
--- a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
+++ b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
@@ -72,5 +72,5 @@
 
   gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciBase
   gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciSize
-  gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciBase
-  gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciSize
+  gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciBase
+  gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciSize
diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl 
b/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl
index 33579165..b4ef2c1f 100644
--- a/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl
+++ b/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl
@@ -68,120 +68,21 @@ DefinitionBlock ("DsdtTable.aml", "DSDT",
       }
     }
 
-    // USB EHCI Host Controller
-    Device (USB0) {
-        Name (_HID, "LNRO0D20")
-        Name (_CID, "PNP0D20")
+    // USB XHCI Host Controller
+    Device (XHCI) {
+        Name (_HID, "PNP0D10")      // _HID: Hardware ID
+        Name (_UID, 0x00)            // _UID: Unique ID
+        Name (_CCA, 0x01)            // _CCA: Cache Coherency Attribute
+        Name (_CRS, ResourceTemplate() {
+            Memory32Fixed (ReadWrite,
+                           FixedPcdGet32 (PcdPlatformXhciBase),
+                           FixedPcdGet32 (PcdPlatformXhciSize))
+            Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 43 }
+        })
         Method (_STA) {
-          Return (0xF)
-        }
-        Method (_CRS, 0x0, Serialized) {
-            Name (RBUF, ResourceTemplate() {
-                Memory32Fixed (ReadWrite,
-                               FixedPcdGet32 (PcdPlatformEhciBase),
-                               FixedPcdGet32 (PcdPlatformEhciSize))
-                Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 
43 }
-            })
-            Return (RBUF)
+            Return (0xF)
         }
-
-        // Root Hub
-        Device (RHUB) {
-            Name (_ADR, 0x00000000)  // Address of Root Hub should be 0 as per 
ACPI 5.0 spec
-            Method (_STA) {
-              Return (0xF)
-            }
-
-            // Ports connected to Root Hub
-            Device (HUB1) {
-                Name (_ADR, 0x00000001)
-                Name (_UPC, Package() {
-                    0x00,       // Port is NOT connectable
-                    0xFF,       // Don't care
-                    0x00000000, // Reserved 0 must be zero
-                    0x00000000  // Reserved 1 must be zero
-                })
-                Method (_STA) {
-                  Return (0xF)
-                }
-
-                Device (PRT1) {
-                    Name (_ADR, 0x00000001)
-                    Name (_UPC, Package() {
-                        0xFF,        // Port is connectable
-                        0x00,        // Port connector is A
-                        0x00000000,
-                        0x00000000
-                    })
-                    Name (_PLD, Package() {
-                        Buffer(0x10) {
-                            0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                            0x31, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                        }
-                    })
-                    Method (_STA) {
-                      Return (0xF)
-                    }
-                } // USB0_RHUB_HUB1_PRT1
-                Device (PRT2) {
-                    Name (_ADR, 0x00000002)
-                    Name (_UPC, Package() {
-                        0xFF,        // Port is connectable
-                        0x00,        // Port connector is A
-                        0x00000000,
-                        0x00000000
-                    })
-                    Name (_PLD, Package() {
-                        Buffer(0x10) {
-                            0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                            0x31, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                        }
-                    })
-                    Method (_STA) {
-                      Return (0xF)
-                    }
-                } // USB0_RHUB_HUB1_PRT2
-
-                Device (PRT3) {
-                    Name (_ADR, 0x00000003)
-                    Name (_UPC, Package() {
-                        0xFF,        // Port is connectable
-                        0x00,        // Port connector is A
-                        0x00000000,
-                        0x00000000
-                    })
-                    Name (_PLD, Package() {
-                        Buffer (0x10) {
-                            0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                            0x31, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                        }
-                    })
-                    Method (_STA) {
-                      Return (0xF)
-                    }
-                } // USB0_RHUB_HUB1_PRT3
-
-                Device (PRT4) {
-                    Name (_ADR, 0x00000004)
-                    Name (_UPC, Package() {
-                        0xFF,        // Port is connectable
-                        0x00,        // Port connector is A
-                        0x00000000,
-                        0x00000000
-                    })
-                    Name (_PLD, Package() {
-                        Buffer (0x10){
-                            0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                            0x31, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                        }
-                    })
-                    Method (_STA) {
-                      Return (0xF)
-                    }
-                } // USB0_RHUB_HUB1_PRT4
-            } // USB0_RHUB_HUB1
-        } // USB0_RHUB
-    } // USB0
+    }
 
     Device (PCI0)
     {
-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#105715): https://edk2.groups.io/g/devel/message/105715
Mute This Topic: https://groups.io/mt/99337903/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-


Reply via email to