From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sgoci-sdnproxy-4.icoremail.net (sgoci-sdnproxy-4.icoremail.net [129.150.39.64]) by mx.groups.io with SMTP id smtpd.web11.4532.1685962224103554179 for ; Mon, 05 Jun 2023 03:50:24 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: phytium.com.cn, ip: 129.150.39.64, mailfrom: wangyuquan1236@phytium.com.cn) Received: from prodtpl.icoremail.net (unknown [10.12.1.20]) by hzbj-icmmx-7 (Coremail) with SMTP id AQAAfwCXop2KvX1kzS1NAg--.1986S2; Mon, 05 Jun 2023 18:48:42 +0800 (CST) Received: from phytium.com.cn (unknown [123.150.8.50]) by mail (Coremail) with SMTP id AQAAfwC34iLRvX1koZQAAA--.793S6; Mon, 05 Jun 2023 18:49:58 +0800 (CST) From: "wangyuquan1236" To: ardb+tianocore@kernel.org, quic_llindhol@quicinc.com Cc: quic_ggregory@quicinc.com, rad@semihalf.com, chenbaozi@phytium.com.cn, devel@edk2.groups.io, Yuquan Wang Subject: [PATCH 3/3] SbsaQemu: AcpiTables: Add XHCI info into DSDT Date: Mon, 5 Jun 2023 18:49:13 +0800 Message-Id: <20230605104913.117643-4-wangyuquan1236@phytium.com.cn> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230605104913.117643-1-wangyuquan1236@phytium.com.cn> References: <20230605104913.117643-1-wangyuquan1236@phytium.com.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAfwC34iLRvX1koZQAAA--.793S6 X-CM-SenderInfo: 5zdqw5pxtxt0arstlqxsk13x1xpou0fpof0/1tbiAQABAWR84icE5QAAs9 Authentication-Results: hzbj-icmmx-7; spf=neutral smtp.mail=wangyuquan 1236@phytium.com.cn; X-Coremail-Antispam: 1Uk129KBjvJXoWxXFWrtrWUtr4DCrWfuFyrtFb_yoWrCw1xpr 17ZFWfCr4kCrn8tw1Yg3W0vrn3AFy0yF4qkwnFqr1UJws7KF4UXr45Ka48GFyUJanxZF1j 9Fn2vFWqvF1kWw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj DUYxn0WfASr-VFAU7a7-sFnT9fnUUIcSsGvfJ3UbIYCTnIWIevJa73UjIFyTuYvj4RJUUU UUUUU Content-Transfer-Encoding: quoted-printable 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 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 @@ =0D gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciBase=0D gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciSize=0D - gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciBase=0D - gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciSize=0D + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciBase=0D + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciSize=0D diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl b/Silicon/Qemu/SbsaQ= emu/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", }=0D }=0D =0D - // USB EHCI Host Controller=0D - Device (USB0) {=0D - Name (_HID, "LNRO0D20")=0D - Name (_CID, "PNP0D20")=0D + // USB XHCI Host Controller=0D + Device (XHCI) {=0D + Name (_HID, "PNP0D10") // _HID: Hardware ID=0D + Name (_UID, 0x00) // _UID: Unique ID=0D + Name (_CCA, 0x01) // _CCA: Cache Coherency Attribute=0D + Name (_CRS, ResourceTemplate() {=0D + Memory32Fixed (ReadWrite,=0D + FixedPcdGet32 (PcdPlatformXhciBase),=0D + FixedPcdGet32 (PcdPlatformXhciSize))=0D + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 4= 3 }=0D + })=0D Method (_STA) {=0D - Return (0xF)=0D - }=0D - Method (_CRS, 0x0, Serialized) {=0D - Name (RBUF, ResourceTemplate() {=0D - Memory32Fixed (ReadWrite,=0D - FixedPcdGet32 (PcdPlatformEhciBase),=0D - FixedPcdGet32 (PcdPlatformEhciSize))=0D - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive)= { 43 }=0D - })=0D - Return (RBUF)=0D + Return (0xF)=0D }=0D -=0D - // Root Hub=0D - Device (RHUB) {=0D - Name (_ADR, 0x00000000) // Address of Root Hub should be 0 as= per ACPI 5.0 spec=0D - Method (_STA) {=0D - Return (0xF)=0D - }=0D -=0D - // Ports connected to Root Hub=0D - Device (HUB1) {=0D - Name (_ADR, 0x00000001)=0D - Name (_UPC, Package() {=0D - 0x00, // Port is NOT connectable=0D - 0xFF, // Don't care=0D - 0x00000000, // Reserved 0 must be zero=0D - 0x00000000 // Reserved 1 must be zero=0D - })=0D - Method (_STA) {=0D - Return (0xF)=0D - }=0D -=0D - Device (PRT1) {=0D - Name (_ADR, 0x00000001)=0D - Name (_UPC, Package() {=0D - 0xFF, // Port is connectable=0D - 0x00, // Port connector is A=0D - 0x00000000,=0D - 0x00000000=0D - })=0D - Name (_PLD, Package() {=0D - Buffer(0x10) {=0D - 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00= ,=0D - 0x31, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00= =0D - }=0D - })=0D - Method (_STA) {=0D - Return (0xF)=0D - }=0D - } // USB0_RHUB_HUB1_PRT1=0D - Device (PRT2) {=0D - Name (_ADR, 0x00000002)=0D - Name (_UPC, Package() {=0D - 0xFF, // Port is connectable=0D - 0x00, // Port connector is A=0D - 0x00000000,=0D - 0x00000000=0D - })=0D - Name (_PLD, Package() {=0D - Buffer(0x10) {=0D - 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00= ,=0D - 0x31, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00= =0D - }=0D - })=0D - Method (_STA) {=0D - Return (0xF)=0D - }=0D - } // USB0_RHUB_HUB1_PRT2=0D -=0D - Device (PRT3) {=0D - Name (_ADR, 0x00000003)=0D - Name (_UPC, Package() {=0D - 0xFF, // Port is connectable=0D - 0x00, // Port connector is A=0D - 0x00000000,=0D - 0x00000000=0D - })=0D - Name (_PLD, Package() {=0D - Buffer (0x10) {=0D - 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00= ,=0D - 0x31, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00= =0D - }=0D - })=0D - Method (_STA) {=0D - Return (0xF)=0D - }=0D - } // USB0_RHUB_HUB1_PRT3=0D -=0D - Device (PRT4) {=0D - Name (_ADR, 0x00000004)=0D - Name (_UPC, Package() {=0D - 0xFF, // Port is connectable=0D - 0x00, // Port connector is A=0D - 0x00000000,=0D - 0x00000000=0D - })=0D - Name (_PLD, Package() {=0D - Buffer (0x10){=0D - 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00= ,=0D - 0x31, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00= =0D - }=0D - })=0D - Method (_STA) {=0D - Return (0xF)=0D - }=0D - } // USB0_RHUB_HUB1_PRT4=0D - } // USB0_RHUB_HUB1=0D - } // USB0_RHUB=0D - } // USB0=0D + }=0D =0D Device (PCI0)=0D {=0D --=20 2.34.1