From nobody Tue May 14 12:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+106729+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+106729+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1688725289; cv=none; d=zohomail.com; s=zohoarc; b=AbD0k0GilcYmFC2qPbxnE8Kx570RiGAJKwmwCx9eUTpctvAAVtis+zCMjoPvY2TyjGn9q9gCU2a6Z/0zy+S5q562EPLBvF7wi/Q/wBnwbSB8d45bGS6L8ZdWrOrWMLIHU+kC92hDPjbhr0xF4WsjeiGzTlCO7Wke/JNbVA8e6W8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688725289; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=75uGiGLPEtgG3dj+fpfdnKmNFN8nPHRkcCcLkxOGV7s=; b=Z0/OPRmqzfSn6zEmVny5pPzeLkRfD4POlD1LaoRbk4Xo/MK26HQZXfp98dcbMF6oB5L0w4To7KUru7Ot2AmVqOo1yFYVfD+TCXRsSH2/muHwzYGUkim584AI6QaZz/pkacVPbpQtEFKh1qK1LdRo074EH6SlMJRc3hoh6UfgGhk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+106729+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1688725289429839.9817684891451; Fri, 7 Jul 2023 03:21:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jtqrYY1788612xviiGI0S55t; Fri, 07 Jul 2023 03:21:29 -0700 X-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.9425.1688725287144694332 for ; Fri, 07 Jul 2023 03:21:28 -0700 X-Received: from prodtpl.icoremail.net (unknown [10.12.1.20]) by hzbj-icmmx-7 (Coremail) with SMTP id AQAAfwAnsGGs5qdkb37wAg--.23620S2; Fri, 07 Jul 2023 18:19:24 +0800 (CST) X-Received: from phytium.com.cn (unknown [123.150.8.50]) by mail (Coremail) with SMTP id AQAAfwAHJ5wf56dkS4IAAA--.1411S4; Fri, 07 Jul 2023 18:21:22 +0800 (CST) From: "Yuquan Wang" To: devel@edk2.groups.io Cc: chenbaozi@phytium.com.cn, Yuquan Wang Subject: [edk2-devel] [PATCH edk2-platforms v2 1/3] Platform/Qemu/SbsaQemu/SbsaQemu.dsc: define XHCI Pcd settings Date: Fri, 7 Jul 2023 18:20:40 +0800 Message-Id: <20230707102042.409842-2-wangyuquan1236@phytium.com.cn> In-Reply-To: <20230707102042.409842-1-wangyuquan1236@phytium.com.cn> References: <20230707102042.409842-1-wangyuquan1236@phytium.com.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAfwAHJ5wf56dkS4IAAA--.1411S4 X-CM-SenderInfo: 5zdqw5pxtxt0arstlqxsk13x1xpou0fpof0/1tbiAQANAWSnEikEjQAAs8 X-Coremail-Antispam: 1Uk129KBjvJXoWxXFW5tw1UCFyxCFyxCw4Durg_yoW5Gr13pr 1xZFZ3CrWkJryaqw4UG3WrXa1YkFyaya1kGrsIqr18ursxJF1UXr4UK3W0yry7ZFnxW34q yF1Iv34jyF4ru3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj DUYxn0WfASr-VFAU7a7-sFnT9fnUUIcSsGvfJ3UbIYCTnIWIevJa73UjIFyTuYvj4RJUUU UUUUU Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,wangyuquan1236@phytium.com.cn X-Gm-Message-State: m0gE8hJNJnibGXA3XA3ad2B6x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1688725289; bh=gHlpFDNg7Tw7EwtakGTsAnaILMQMBc65yCtjiRgZ7Mk=; h=Cc:Date:From:Reply-To:Subject:To; b=tx0HsMNf2aCHp6ifV3C4UivnlZ8dHj1gsDTkWxfcDeubQHgtSdNrfYXvrcfDiHEo2Ok 7EV6nVyfoNnTkjsH7qa/BNyzKKmsZPHRIH9NU82Xtujw4lktHPZFD+D4IUJE6dEUBB5W5 1WxGhbYljIAppD2BdQ1VCjNtSRmpB9gmlZw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1688725291110100009 Content-Type: text/plain; charset="utf-8" Define the pcd settings for identifying the base address of XHCI and XHCI's mmio size, and remove relevant EHCI settings. Signed-off-by: Yuquan Wang Tested-by: Marcin Juszkiewicz --- Silicon/Qemu/SbsaQemu/SbsaQemu.dec | 4 ++-- Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Silicon/Qemu/SbsaQemu/SbsaQemu.dec b/Silicon/Qemu/SbsaQemu/Sbs= aQemu.dec index 5182978cf56d..90776f1007dc 100644 --- a/Silicon/Qemu/SbsaQemu/SbsaQemu.dec +++ b/Silicon/Qemu/SbsaQemu/SbsaQemu.dec @@ -32,8 +32,8 @@ [PcdsFixedAtBuild.common] # Non discoverable devices Pcds gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciBase|0|UINT64|0x00= 000001 gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciSize|0x10000|UINT3= 2|0x00000002 - gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciBase|0|UINT64|0x00= 000003 - gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciSize|0x10000|UINT3= 2|0x00000004 + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciBase|0|UINT64|0x00= 000003 + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciSize|0x10000|UINT3= 2|0x00000004 gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdDeviceTreeBaseAddress|0x100000= 00000|UINT64|0x00000005 =20 # PCDs complementing PCIe layout pulled into ACPI tables diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/S= bsaQemu.dsc index b88729ad8ad6..dbb08756d10f 100644 --- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc @@ -429,11 +429,11 @@ [PcdsFixedAtBuild.common] # Initial Device Tree Location gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdDeviceTreeBaseAddress|0x100000= 00000 =20 - # Non discoverable devices (AHCI,EHCI) + # Non discoverable devices (AHCI,XHCI) gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciBase|0x60100000 gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciSize|0x00010000 - gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciBase|0x60110000 - gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciSize|0x00010000 + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciBase|0x60110000 + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciSize|0x00010000 =20 # PL011 - Serial Terminal gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x60000000 --=20 2.34.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#106729): https://edk2.groups.io/g/devel/message/106729 Mute This Topic: https://groups.io/mt/100003412/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 12:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+106728+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+106728+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1688725288; cv=none; d=zohomail.com; s=zohoarc; b=hpZ3iHrOJYd0uGY3vDMGPjgAGTIdx8NQMVZ9hpY1bDCHl6cM5pcQ+Dv1rLiTG5m8/QOzF0BOZiLclapOncTuRdz37+EweYpH+04SFLOqQri5C1J2/UxAlX6AuQcVPPlttbXdTtPC6Hger36FaGv+ibHz1pBHz4cIaWzSNW4MaTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688725288; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Nu624Khe6HDk/WBIj9LFCSeF56phc5nAj5rH7oanSH4=; b=bnY5oKR2FF31VQoQjyjbPs/zEiDgBL8DwBDDhYKgY+kMcQnAaime+EJQvuBiRYHTEtaRzB74x5jLLpZJ09hPzDl9664cFdp7lru6qcqWC4C/N5OJSQ29fuA9PdLOQaQ/lms/4UUS1OdUrTP7GkG/2YcAVCvPl/D9eIsaZ67MuMQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+106728+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1688725288481724.3260080332554; Fri, 7 Jul 2023 03:21:28 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id avAgYY1788612xvvqhEhwVdT; Fri, 07 Jul 2023 03:21:28 -0700 X-Received: from zg8tmja5ljk3lje4ms43mwaa.icoremail.net (zg8tmja5ljk3lje4ms43mwaa.icoremail.net [209.97.181.73]) by mx.groups.io with SMTP id smtpd.web10.9228.1688725287118926383 for ; Fri, 07 Jul 2023 03:21:27 -0700 X-Received: from prodtpl.icoremail.net (unknown [10.12.1.20]) by hzbj-icmmx-6 (Coremail) with SMTP id AQAAfwBXkUdP6KdkQJxOAg--.63148S2; Fri, 07 Jul 2023 18:26:23 +0800 (CST) X-Received: from phytium.com.cn (unknown [123.150.8.50]) by mail (Coremail) with SMTP id AQAAfwAHJ5wf56dkS4IAAA--.1411S5; Fri, 07 Jul 2023 18:21:23 +0800 (CST) From: "Yuquan Wang" To: devel@edk2.groups.io Cc: chenbaozi@phytium.com.cn, Yuquan Wang Subject: [edk2-devel] [PATCH edk2-platforms v2 2/3] SbsaQemu: Drivers: Add initial support for XHCI Date: Fri, 7 Jul 2023 18:20:41 +0800 Message-Id: <20230707102042.409842-3-wangyuquan1236@phytium.com.cn> In-Reply-To: <20230707102042.409842-1-wangyuquan1236@phytium.com.cn> References: <20230707102042.409842-1-wangyuquan1236@phytium.com.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAfwAHJ5wf56dkS4IAAA--.1411S5 X-CM-SenderInfo: 5zdqw5pxtxt0arstlqxsk13x1xpou0fpof0/1tbiAQANAWSnEikEjgAAs- X-Coremail-Antispam: 1Uk129KBjvJXoWxXFWrCF4kZryrGFWDuF18uFg_yoW5tFyxpF 10vFZ7ur17G3yayw43G3WrXr4YkFyfKrWUGrsxXF40kwsxXF1UXw4aqF18Z3srJFn8Xw4D Ar10ya4UZan3ur7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj DUYxn0WfASr-VFAU7a7-sFnT9fnUUIcSsGvfJ3UbIYCTnIWIevJa73UjIFyTuYvj4RJUUU UUUUU Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,wangyuquan1236@phytium.com.cn X-Gm-Message-State: F3muEi7gtdRkKG9Oze5Ksoy5x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1688725288; bh=fs+HDIAD4UPivDaSU9EUYaSbwqxuarmfTGWIiKnuDjQ=; h=Cc:Date:From:Reply-To:Subject:To; b=VrMtF4FD7AAZH1QZrX4QDwi+HsKY3VaFk8mmFtJB67xWIhwHP+sG1TeYsrEqOPnt2RK 1jNaYVNf9hoVKMit+FGvi+SP6Vf9TDWtyJTnKtTAgPCNxKn+E1sBNnCaGnGxWnWPJ2SLQ Tkn85E4aqdgOgbYJHPOC1PyKZPQIFi90S+8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1688725288910100005 Content-Type: text/plain; charset="utf-8" This registers the non-discoverable XHCI for sbsa-ref. Signed-off-by: Yuquan Wang Tested-by: Marcin Juszkiewicz --- .../SbsaQemuPlatformDxe.inf | 2 + .../SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c | 41 +++++++++++++++---- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlat= formDxe.inf b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPla= tformDxe.inf index 545794a8c7ff..06700331efea 100644 --- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe= .inf +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe= .inf @@ -37,6 +37,8 @@ [LibraryClasses] [Pcd] gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciBase gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciSize + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciBase + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciSize =20 gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformVersionMajor gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformVersionMinor diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlat= formDxe.c b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatf= ormDxe.c index f6a3e84483fe..969c25ae0e17 100644 --- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe= .c +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe= .c @@ -26,22 +26,23 @@ InitializeSbsaQemuPlatformDxe ( ) { EFI_STATUS Status; - UINTN Size; - VOID* Base; UINTN Arg0; UINTN Arg1; UINTN SmcResult; RETURN_STATUS Result; + UINTN AhciSize, XhciSize; + VOID* AhciBase; + VOID* XhciBase; =20 DEBUG ((DEBUG_INFO, "%a: InitializeSbsaQemuPlatformDxe called\n", __FUNC= TION__)); =20 - Base =3D (VOID*)(UINTN)PcdGet64 (PcdPlatformAhciBase); - ASSERT (Base !=3D NULL); - Size =3D (UINTN)PcdGet32 (PcdPlatformAhciSize); - ASSERT (Size !=3D 0); + AhciBase =3D (VOID*)(UINTN)PcdGet64 (PcdPlatformAhciBase); + ASSERT (AhciBase !=3D NULL); + AhciSize =3D (UINTN)PcdGet32 (PcdPlatformAhciSize); + ASSERT (AhciSize !=3D 0); =20 DEBUG ((DEBUG_INFO, "%a: Got platform AHCI %llx %u\n", - __FUNCTION__, Base, Size)); + __FUNCTION__, AhciBase, AhciSize)); =20 Status =3D RegisterNonDiscoverableMmioDevice ( NonDiscoverableDeviceTypeAhci, @@ -49,11 +50,33 @@ InitializeSbsaQemuPlatformDxe ( NULL, NULL, 1, - Base, Size); + AhciBase, AhciSize); =20 if (EFI_ERROR(Status)) { DEBUG ((DEBUG_ERROR, "%a: NonDiscoverable: Cannot install AHCI device = @%p (Staus =3D=3D %r)\n", - __FUNCTION__, Base, Status)); + __FUNCTION__, AhciBase, Status)); + return Status; + } + + XhciBase =3D (VOID*)(UINTN)PcdGet64 (PcdPlatformXhciBase); + ASSERT (XhciBase !=3D NULL); + XhciSize =3D (UINTN)PcdGet32 (PcdPlatformXhciSize); + ASSERT (XhciSize !=3D 0); + + DEBUG ((DEBUG_INFO, "%a: Got platform XHCI %llx %u\n", + __FUNCTION__, XhciBase, XhciSize)); + + Status =3D RegisterNonDiscoverableMmioDevice ( + NonDiscoverableDeviceTypeXhci, + NonDiscoverableDeviceDmaTypeCoherent, + NULL, + NULL, + 1, + XhciBase, XhciSize); + + if (EFI_ERROR(Status)) { + DEBUG ((DEBUG_ERROR, "%a: NonDiscoverable: Cannot install XHCI device = @%p (Staus =3D=3D %r)\n", + __FUNCTION__, XhciBase, Status)); return Status; } =20 --=20 2.34.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#106728): https://edk2.groups.io/g/devel/message/106728 Mute This Topic: https://groups.io/mt/100003411/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 12:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+106730+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+106730+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1688725290; cv=none; d=zohomail.com; s=zohoarc; b=HGcVEmyADWCybaUYYmSKb2UYRbr6yXMV7iz5pQBrK/OKPh2cLkUhm+LJZn/2whjD+WkMS/W5AtCeijjFhDjnw6mL5WVar3wRfRkpXPITPaNzVvRWLvo+H/YRrA+Kx69Nt4OlX19xv53fzvOC2dRFt48eBT2I+5MZctOYBlvMJgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688725290; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Zn43cDce+SHZiYC4oxIw3bZTsS2UpzeRUZg/YufBXJM=; b=Q0NQQ9uKNkdDAqIvRGV9zfuvR5qsplm5Gsd4lrpQ7bO44i5vOIMP+FixREiZqFuAFYg3oLDsgKM9NLe/1LzYEp0xLxMPsLZ8i7iBhmOcNd9niO9rOIJkJs4sfAR4fZQS+8pFxMHP9d7V1HkV7WWBFICVsWm/Tdlawn9K6b1fyps= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+106730+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1688725290565739.4459295350905; Fri, 7 Jul 2023 03:21:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Pt1WYY1788612xLPbw3JZaWd; Fri, 07 Jul 2023 03:21:30 -0700 X-Received: from zg8tmtyylji0my4xnjqumte4.icoremail.net (zg8tmtyylji0my4xnjqumte4.icoremail.net [162.243.164.118]) by mx.groups.io with SMTP id smtpd.web10.9229.1688725288690734347 for ; Fri, 07 Jul 2023 03:21:28 -0700 X-Received: from prodtpl.icoremail.net (unknown [10.12.1.20]) by hzbj-icmmx-7 (Coremail) with SMTP id AQAAfwDHTV+u5qdkkH7wAg--.8134S2; Fri, 07 Jul 2023 18:19:26 +0800 (CST) X-Received: from phytium.com.cn (unknown [123.150.8.50]) by mail (Coremail) with SMTP id AQAAfwAHJ5wf56dkS4IAAA--.1411S6; Fri, 07 Jul 2023 18:21:25 +0800 (CST) From: "Yuquan Wang" To: devel@edk2.groups.io Cc: chenbaozi@phytium.com.cn, Yuquan Wang Subject: [edk2-devel] [PATCH edk2-platforms v2 3/3] SbsaQemu: AcpiTables: Add XHCI info into DSDT Date: Fri, 7 Jul 2023 18:20:42 +0800 Message-Id: <20230707102042.409842-4-wangyuquan1236@phytium.com.cn> In-Reply-To: <20230707102042.409842-1-wangyuquan1236@phytium.com.cn> References: <20230707102042.409842-1-wangyuquan1236@phytium.com.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAfwAHJ5wf56dkS4IAAA--.1411S6 X-CM-SenderInfo: 5zdqw5pxtxt0arstlqxsk13x1xpou0fpof0/1tbiAQANAWSnEikEkQAAsg X-Coremail-Antispam: 1Uk129KBjvJXoWxXFW7uw1ktrykurWrCr47XFb_yoWrZr1xpr 17ZFWfCrs7Crn8tr1Ygw10vrn3AFy0yF4qkwnFqr1UJws7KF4UXr45Ga48KFyUJwsxAF1j 9Fn2vFWqvF1kW3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj DUYxn0WfASr-VFAU7a7-sFnT9fnUUIcSsGvfJ3UbIYCTnIWIevJa73UjIFyTuYvj4RJUUU UUUUU Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,wangyuquan1236@phytium.com.cn X-Gm-Message-State: 4SdHLuSbr9eTct9bKllZnK4cx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1688725290; bh=8/t0pbB+pNyuKaZSQ4vqaodo5xTljwjH2aby9qJUR4U=; h=Cc:Date:From:Reply-To:Subject:To; b=K/b4r+DC2Rt3+rj310xcYTchVAspACKuP0phWfG203DoYY1cb7a9sypfBlry6mLGajb gwt8/vfJCg7t+8qVBqEgW4Bn/g8veU8QSZGtkbOV/YfTWSgC/IJVT0zPP46yXPa+k9XJe yuAlg29Dq3oLu974TnLH0U8qAlqXr9OSTSY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1688725291126100010 Content-Type: text/plain; charset="utf-8" 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 Tested-by: Marcin Juszkiewicz --- .../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 0501c670d565..89afbd9315ae 100644 --- a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf +++ b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf @@ -69,8 +69,8 @@ [FixedPcd] =20 gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciBase gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciSize - gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciBase - gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciSize + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciBase + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciSize =20 [Pcd] gArmTokenSpaceGuid.PcdGicDistributorBase diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl b/Silicon/Qemu/SbsaQ= emu/AcpiTables/Dsdt.asl index e50772fcf76d..cc8b99a8fb31 100644 --- a/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl +++ b/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl @@ -68,120 +68,21 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", } } =20 - // 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) { 4= 3 } + }) Method (_STA) { - Return (0xF) + Return (0xF) } - Method (_CRS, 0x0, Serialized) { - Name (RBUF, ResourceTemplate() { - Memory32Fixed (ReadWrite, - FixedPcdGet32 (PcdPlatformEhciBase), - FixedPcdGet32 (PcdPlatformEhciSize)) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive)= { 43 } - }) - Return (RBUF) - } - - // 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 + } =20 Device (PCI0) { --=20 2.34.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#106730): https://edk2.groups.io/g/devel/message/106730 Mute This Topic: https://groups.io/mt/100003413/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-