From nobody Thu Mar 28 20:33:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51248+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51248+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1574705243; cv=none; d=zohomail.com; s=zohoarc; b=eAASgrOCR13aQhKQaet6ANvr4kRFU1gT7qRi3timUjX6jRQjJ0U3u+J7IRO3lPUJnFbOivFufJxL9oXM9ANadxJDVPH/N85SJFAesas1dS9s5yvVhbQgKcta78U9T3AJVTESgr2BHTIj/Vsy3opnhVEap11LejYVK8nMIfcpjaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574705243; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=vm2Uz+Jp4eXOrUFUmpvxl4WKTOlHLL3UW7K5IoEL5I4=; b=DFCRNzpeIs93mv+mXXd2EB4kv89P2aOrtFDZxdnFc4AyNvjKYMayiHQZpn5NA5rtEs+ZdYG8Q0Y+IWlhPxFQ6qWxKJbbYxn/R3jA7mSFlVx8QWqlTC5uEhk7V1+mNUyZoqpXi9kru3wQMmoGIlw6/NoW/4rdhQPfiuAisjScHbs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51248+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574705243616724.8845330127783; Mon, 25 Nov 2019 10:07:23 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id TBJpYY1788612x5qYNtDxlNB; Mon, 25 Nov 2019 10:07:23 -0800 X-Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.web11.380.1574705242173144163 for ; Mon, 25 Nov 2019 10:07:22 -0800 X-Received: by mail-wm1-f44.google.com with SMTP id b11so274066wmb.5 for ; Mon, 25 Nov 2019 10:07:21 -0800 (PST) X-Gm-Message-State: VkhtHSPb8wco0hudmB1IoQ9jx1787277AA= X-Google-Smtp-Source: APXvYqyfjqhswyeb+z0Bn19pEH6MxzlYi532n4VX+CqWFOjBElPcHJRTNUPZZfBKIRhO/G58LB769w== X-Received: by 2002:a7b:ce11:: with SMTP id m17mr122951wmc.113.1574705240523; Mon, 25 Nov 2019 10:07:20 -0800 (PST) X-Received: from localhost.localdomain (91-167-84-221.subs.proxad.net. [91.167.84.221]) by smtp.gmail.com with ESMTPSA id b3sm50478wmj.44.2019.11.25.10.07.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2019 10:07:19 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms 1/3] Platform/Overdrive: add missing resolution for FileHandleLib Date: Mon, 25 Nov 2019 19:07:08 +0100 Message-Id: <20191125180710.62600-2-ard.biesheuvel@linaro.org> In-Reply-To: <20191125180710.62600-1-ard.biesheuvel@linaro.org> References: <20191125180710.62600-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,ard.biesheuvel@linaro.org Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574705243; bh=B6+16Y2OpaYVEPIe91hu5j/JrUEBtioJFHdA2Q4Kj/s=; h=Cc:Date:From:Reply-To:Subject:To; b=G/hFS2bj3jzh2atYTy7F2IO7JxFCsTDiNlCg9mFzFb30echHM4bUXt5phf+om0foIi/ ZdV2tgy1kV2eyHzu8WSxCr4N39czel2IgFoxIy0wMauYVb95nJnDOf39J/prcNOlL/T7Q shiGEsGhg1W/18YtpUus/nkDrXoqRpl6Rjs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Changes to the core EDK2 repository have caused the build for Overdrive to break. Move the existing FileHandleLib resolution to global scope to get things working again. Signed-off-by: Ard Biesheuvel Acked-by: Leif Lindholm --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/= OverdriveBoard/OverdriveBoard.dsc index 7369173cc125..5a38b9dd96ae 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -142,6 +142,7 @@ [LibraryClasses.common] DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf =20 DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf @@ -697,7 +698,6 @@ [Components.common] PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcf= gCommandLib.inf =20 - FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf =20 --=20 2.20.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 (#51248): https://edk2.groups.io/g/devel/message/51248 Mute This Topic: https://groups.io/mt/61945301/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 Thu Mar 28 20:33:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51249+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51249+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1574705245; cv=none; d=zohomail.com; s=zohoarc; b=byZ4FYedrrTQ2vDzb4LBkOg/ekjNpAhQPbLjffsNJXTlBjrdKesEXBrNciNzTt8uTebhNBW2KQ0y7LXYmebSzWr9gbtbI/aCYeRv3ZV9tFeLtDVCGqom7ZjRpHWYLCy09LvEtJF2OSQgsTJob097Kg1tFzJvwypNkGmiPfIAsbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574705245; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=JZF/T2CLZwEj9K0AW2JviQiFTx1kPZOZF15Cvmk2+jE=; b=NRkupJeO9kVOVKAOsk2SGDs44JAQ89utXqy4h9Wgl+FAVNtmbiHwwGViETrwvmY6zqxYajNtvG+H0VtCsKhJZ3FxNUxd6yJzc43luhJ+45zy+0eor+BlQyRV4KiswZhZMZ3VbMeiqIvHyEkUk/a0gvuswPFQLnIy2gLSuPaTanI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51249+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574705245648852.1320719760411; Mon, 25 Nov 2019 10:07:25 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id O2oOYY1788612xXR8S3WcLId; Mon, 25 Nov 2019 10:07:24 -0800 X-Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.groups.io with SMTP id smtpd.web12.393.1574705243879734901 for ; Mon, 25 Nov 2019 10:07:24 -0800 X-Received: by mail-wm1-f65.google.com with SMTP id z19so296638wmk.3 for ; Mon, 25 Nov 2019 10:07:23 -0800 (PST) X-Gm-Message-State: NjIPX8SbhQ13HE2GLUwPbzuyx1787277AA= X-Google-Smtp-Source: APXvYqwTjAbt/G16FDGLS6k+Ff74YdKz7ALgPOHDuQQdnMsRpvAtyW8dD8FrW+LQrhRKdOT9L2q6uw== X-Received: by 2002:a1c:96d5:: with SMTP id y204mr123187wmd.63.1574705241919; Mon, 25 Nov 2019 10:07:21 -0800 (PST) X-Received: from localhost.localdomain (91-167-84-221.subs.proxad.net. [91.167.84.221]) by smtp.gmail.com with ESMTPSA id b3sm50478wmj.44.2019.11.25.10.07.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2019 10:07:20 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms 2/3] Silicon/AMD/Styx: clean up stream ID mappings for SMMU Date: Mon, 25 Nov 2019 19:07:09 +0100 Message-Id: <20191125180710.62600-3-ard.biesheuvel@linaro.org> In-Reply-To: <20191125180710.62600-1-ard.biesheuvel@linaro.org> References: <20191125180710.62600-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,ard.biesheuvel@linaro.org Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574705244; bh=5ZC5diLdU0XWiYjRiLhx+xqTFHOL2vodSWGK+42ZLDg=; h=Cc:Date:From:Reply-To:Subject:To; b=AbtJXGwrCtYR8Fq2WwCioUmMnoqZKuJuCazEt5oI6v9OwAMFbNcF4KkLCsdltwHM4kS EpASWgk3S9rPacP+SPIoASiywATG7KpNd7jDaDfrvLUFMnt7Pb3ULm+JLLTCHjKa8EBBO Gr4/VSwI5lExcZ6gP9+7EuZKAg4jbdt+u/8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Tighten the stream ID mappings for the SMMU to only cover the stream IDs that are actually being issued by the respective masters. This is mostly just a cleanup exercise, since specifying unused stream IDs does not typically create any problems. However, the CCP crypto accelerator on B1 silicon actually uses stream IDs that we assigned to the second SATA controller, so there this actually fixes a problem. Since the crypto accelerator is not behind a SMMU on B0 silicon, we need to either parameterize the IORT using C code, or drop the CCP entirely from the B0 description. Given that most distros don't even carry the CCP driver, let's make our lives easier and just move the CCP device node to the B1-only SSDT. Signed-off-by: Ard Biesheuvel Acked-by: Leif Lindholm --- Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl | 23 ---- Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc | 137 +++++-----------= ---- Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtB1.asl | 23 ++++ 3 files changed, 56 insertions(+), 127 deletions(-) diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl b/Silicon/AM= D/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl index 3a3bdcad627e..6dc29758649e 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dsdt.asl @@ -266,29 +266,6 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "AMDINC", "SEA= TTLE ", 3) } } =20 - Device (CCP0) - { - Name (_HID, "AMDI0C00") // _HID: Hardware ID - Name (_CCA, 0x01) // _CCA: Cache Coherency Attribute - Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings - { - Memory32Fixed (ReadWrite, - 0xE0100000, // Address Base - 0x00010000, // Address Length - ) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,= ,, ) {0x00000023, } - }) - - Name (_DSD, Package (0x02) // _DSD: Device-Specific Data - { - ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - Package () - { - Package (0x02) {"amd,zlib-support", 1} - } - }) - } - // // PCIe Root Bus // diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc b/Silicon/A= MD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc index d46be49f0318..8d8a2c693aa6 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc @@ -46,8 +46,14 @@ typedef struct { typedef struct { EFI_ACPI_6_0_IO_REMAPPING_NAMED_COMP_NODE Node; CONST CHAR8 Name[11]; - EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE RcIdMapping[32]; -} STYX_NC_NODE; + EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE RcIdMapping[16]; +} STYX_ETH_NODE; + +typedef struct { + EFI_ACPI_6_0_IO_REMAPPING_NAMED_COMP_NODE Node; + CONST CHAR8 Name[11]; + EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE RcIdMapping[3]; +} STYX_SATA_NODE; =20 typedef struct { EFI_ACPI_6_0_IO_REMAPPING_TABLE Iort; @@ -55,14 +61,15 @@ typedef struct { STYX_RC_NODE PciRcNode; =20 STYX_SMMU_NODE Eth0SmmuNode; - STYX_NC_NODE Eth0NamedNode; + STYX_ETH_NODE Eth0NamedNode; STYX_SMMU_NODE Eth1SmmuNode; - STYX_NC_NODE Eth1NamedNode; + STYX_ETH_NODE Eth1NamedNode; =20 STYX_SMMU_NODE Sata0SmmuNode; - STYX_NC_NODE Sata0NamedNode; + STYX_SATA_NODE Sata0NamedNode; STYX_SMMU_NODE Sata1SmmuNode; - STYX_NC_NODE Sata1NamedNode; + STYX_SATA_NODE Sata1NamedNode; + STYX_SATA_NODE CcpNamedNode; } STYX_IO_REMAPPING_STRUCTURE; =20 #define __STYX_SMMU_NODE(Base, Size, Irq) \ @@ -114,15 +121,19 @@ typedef struct { EFI_ACPI_IORT_ID_MAPPING_FLAGS_SINGLE \ } =20 -#define __STYX_NAMED_COMPONENT_NODE(Name) \ +#define __STYX_NUM_NODES(Type) \ + ((sizeof(Type) - FIELD_OFFSET(Type, RcIdMapping)) / \ + sizeof(EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE)) + +#define __STYX_NAMED_COMPONENT_NODE(Name, Type) \ { \ { \ EFI_ACPI_IORT_TYPE_NAMED_COMP, \ - sizeof(STYX_NC_NODE), \ + sizeof(Type), \ 0x0, \ 0x0, \ - 0x20, \ - FIELD_OFFSET(STYX_NC_NODE, RcIdMapping), \ + __STYX_NUM_NODES(Type), \ + FIELD_OFFSET(Type, RcIdMapping), \ }, \ 0x0, \ EFI_ACPI_IORT_MEM_ACCESS_PROP_CCA, \ @@ -175,7 +186,7 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { STYX_ETH0_SMMU_INTERRUPT) }, { // Eth0NamedNode - __STYX_NAMED_COMPONENT_NODE("\\_SB_.ETH0"), + __STYX_NAMED_COMPONENT_NODE("\\_SB_.ETH0", STYX_ETH_NODE), { __STYX_ID_MAPPING_SINGLE(0x00, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x01, Eth0SmmuNode), @@ -185,14 +196,6 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { __STYX_ID_MAPPING_SINGLE(0x05, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x06, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x07, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x08, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x09, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0A, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0B, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0C, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0D, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0E, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0F, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x10, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x11, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x12, Eth0SmmuNode), @@ -201,14 +204,6 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { __STYX_ID_MAPPING_SINGLE(0x15, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x16, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x17, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x18, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x19, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1A, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1B, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1C, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1D, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1E, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1F, Eth0SmmuNode), } }, { // Eth1SmmuNode @@ -217,7 +212,7 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { STYX_ETH1_SMMU_INTERRUPT) }, { // Eth1NamedNode - __STYX_NAMED_COMPONENT_NODE("\\_SB_.ETH1"), + __STYX_NAMED_COMPONENT_NODE("\\_SB_.ETH1", STYX_ETH_NODE), { __STYX_ID_MAPPING_SINGLE(0x00, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x01, Eth1SmmuNode), @@ -227,14 +222,6 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { __STYX_ID_MAPPING_SINGLE(0x05, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x06, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x07, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x08, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x09, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0A, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0B, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0C, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0D, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0E, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0F, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x10, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x11, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x12, Eth1SmmuNode), @@ -243,14 +230,6 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { __STYX_ID_MAPPING_SINGLE(0x15, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x16, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x17, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x18, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x19, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1A, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1B, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1C, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1D, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1E, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1F, Eth1SmmuNode), } }, { // Sata0SmmuNode @@ -259,40 +238,11 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { STYX_SATA0_SMMU_INTERRUPT) }, { // Sata0NamedNode - __STYX_NAMED_COMPONENT_NODE("\\_SB_.AHC0"), + __STYX_NAMED_COMPONENT_NODE("\\_SB_.AHC0", STYX_SATA_NODE), { - __STYX_ID_MAPPING_SINGLE(0x00, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x01, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x02, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x03, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x04, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x05, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x06, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x07, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x08, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x09, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0A, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0B, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0C, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0D, Sata0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x0E, Sata0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x0F, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x10, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x11, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x12, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x13, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x14, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x15, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x16, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x17, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x18, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x19, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1A, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1B, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1C, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1D, Sata0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x1E, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1F, Sata0SmmuNode), } }, { // Sata1SmmuNode @@ -301,40 +251,19 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { STYX_SATA1_SMMU_INTERRUPT) }, { // Sata1NamedNode - __STYX_NAMED_COMPONENT_NODE("\\_SB_.AHC1"), + __STYX_NAMED_COMPONENT_NODE("\\_SB_.AHC1", STYX_SATA_NODE), { - __STYX_ID_MAPPING_SINGLE(0x00, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x01, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x02, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x03, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x04, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x05, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x06, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x07, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x08, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x09, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0A, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0B, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0C, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0D, Sata1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x0E, Sata1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x0F, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x10, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x11, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x12, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x13, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x14, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x15, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x16, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x17, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x18, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x19, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1A, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1B, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1C, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1D, Sata1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x1E, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1F, Sata1SmmuNode), + } + }, { + // CcpNamedNode + __STYX_NAMED_COMPONENT_NODE("\\_SB_.CCP0", STYX_SATA_NODE), + { + __STYX_ID_MAPPING_SINGLE(0x00, Sata1SmmuNode), + __STYX_ID_MAPPING_SINGLE(0x02, Sata1SmmuNode), + __STYX_ID_MAPPING_SINGLE(0x40, Sata1SmmuNode), } } }; diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtB1.asl b/Silicon/= AMD/Styx/Drivers/AcpiPlatformDxe/SsdtB1.asl index 5c7e87181d10..d44bb9181d87 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtB1.asl +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/SsdtB1.asl @@ -76,5 +76,28 @@ DefinitionBlock ("SsdtB1.aml", "SSDT", 2, "AMDINC", "Sty= xB1 ", 3) Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,= ,, ) {0x0000018D, } }) } + + Device (CCP0) + { + Name (_HID, "AMDI0C00") // _HID: Hardware ID + Name (_CCA, 0x01) // _CCA: Cache Coherency Attribute + Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings + { + Memory32Fixed (ReadWrite, + 0xE0100000, // Address Base + 0x00010000, // Address Length + ) + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,= ,, ) {0x00000023, } + }) + + Name (_DSD, Package (0x02) // _DSD: Device-Specific Data + { + ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () + { + Package (0x02) {"amd,zlib-support", 1} + } + }) + } } } --=20 2.20.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 (#51249): https://edk2.groups.io/g/devel/message/51249 Mute This Topic: https://groups.io/mt/61945302/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 Thu Mar 28 20:33:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51250+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51250+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1574705245; cv=none; d=zohomail.com; s=zohoarc; b=Pb2u5XmxAB1toztoP2bTUlGBHz0vsKv+glw1xVn7++F8Uzg+Penv6y57jD4h+sIHGF+3V5IJ2oqTPKKfjUSKPCjX36EKDALTGOpkyWmfJBdfCb31IZY/171mHqLXdlHl2jKrVMzde9r929dKYX5vOzwIXA7UsTKuCWhd1mmoi7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574705245; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Bd086EvHmkFbq4BI/cEkhGlk+KnqMn4NbbyCy9O5nUg=; b=e/IILCq0pzV4wKZfx20JjGwmT2PPYnyisluPUoQKfk0WJ6dXV6SajdjdZFOV7/3vPsThxrm/bcylsopu29TfvWKj9R1S5D6uxMRYTmN/niQoc94ouFF0ogpAPT3eNP9Jhgm0dRedSpdpSuwkU2MzaoXK/KWKN1Qim+YctfBYq2Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51250+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574705245658982.2773445688133; Mon, 25 Nov 2019 10:07:25 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id J95QYY1788612xt41SyXBG3M; Mon, 25 Nov 2019 10:07:25 -0800 X-Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.groups.io with SMTP id smtpd.web12.395.1574705244490236309 for ; Mon, 25 Nov 2019 10:07:24 -0800 X-Received: by mail-wm1-f67.google.com with SMTP id u18so294658wmc.3 for ; Mon, 25 Nov 2019 10:07:24 -0800 (PST) X-Gm-Message-State: YUdHLy7bqgqgQSJzm60wC0iDx1787277AA= X-Google-Smtp-Source: APXvYqwagZ2k8v2NtnqfcHTOGHd5MmDTDc690GcSECBhhVzJGYh8lVNVFGzGN+y/qmyyffgAIomLZw== X-Received: by 2002:a1c:2846:: with SMTP id o67mr140830wmo.7.1574705242802; Mon, 25 Nov 2019 10:07:22 -0800 (PST) X-Received: from localhost.localdomain (91-167-84-221.subs.proxad.net. [91.167.84.221]) by smtp.gmail.com with ESMTPSA id b3sm50478wmj.44.2019.11.25.10.07.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2019 10:07:22 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms 3/3] Platform/Overdrive: clean up stream ID descriptions in DT Date: Mon, 25 Nov 2019 19:07:10 +0100 Message-Id: <20191125180710.62600-4-ard.biesheuvel@linaro.org> In-Reply-To: <20191125180710.62600-1-ard.biesheuvel@linaro.org> References: <20191125180710.62600-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,ard.biesheuvel@linaro.org Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574705245; bh=pGVZQ1/MYc2oZ+rKq1Yk76mtUbEuBH+Xqw2LGVJzDkQ=; h=Cc:Date:From:Reply-To:Subject:To; b=uGF1megCH4pP63P9WvdV279hy9FH2nJqSZ4tLkr4SGgk90Iuk1+63qR57DvLO0NmCbb IWdeOo2Hz7pbWCTGZGRRcaGI6KY6p8vyLdsXPJ+8W8qWq84D7RmD/coGd/dtO+67B2Wbq RPrI9GM3dX3gBoze2GgSAkpAgHlHReRbriU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Align the DT description of the SMMU topology and stream IDs with the actual routing of the SoC. As with the preceding IORT change, this is mostly a cleanup exercise, but it does actually fix an issue with the CCP crypto accelerator on B1 silicon. This time, let's retain the CCP description for B0 silicon, and just remove the 'iommus' DT property in this case. Since the SMMU is shared, it is no longer an error if the SMMU node is missing when attempting to delete it, so remove the warning that we issue in that case. Signed-off-by: Ard Biesheuvel Acked-by: Leif Lindholm --- Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts | 19 ++++++++= +++++------ Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c | 5 ++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts b/Pl= atform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts index 1ba0d403eaf0..ba31240f2e91 100644 --- a/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts +++ b/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts @@ -86,7 +86,7 @@ */ <0 332 4>, <0 332 4>; - #iommu-cells =3D <2>; + #iommu-cells =3D <1>; dma-coherent; }; =20 @@ -99,7 +99,7 @@ */ <0 331 4>, <0 331 4>; - #iommu-cells =3D <2>; + #iommu-cells =3D <1>; dma-coherent; }; =20 @@ -109,7 +109,9 @@ interrupts =3D <0x0 0x163 0x4>; clocks =3D <&sata_clk>; dma-coherent; - iommus =3D <&sata0_smmu 0x00 0x1f>; /* 0-31 */ + iommus =3D <&sata0_smmu 0x0e>, + <&sata0_smmu 0x0f>, + <&sata0_smmu 0x1e>; }; =20 sata@e0d00000 { @@ -119,7 +121,9 @@ interrupts =3D <0x0 0x162 0x4>; clocks =3D <&sata_clk>; dma-coherent; - iommus =3D <&sata1_smmu 0x00 0x1f>; /* 0-31 */ + iommus =3D <&sata1_smmu 0x0e>, + <&sata1_smmu 0x0f>, + <&sata1_smmu 0x1e>; }; =20 i2c@e1000000 { @@ -233,6 +237,9 @@ interrupts =3D <0x0 0x3 0x4>; dma-coherent; amd,zlib-support =3D <0x1>; + iommus =3D <&sata1_smmu 0x00>, + <&sata1_smmu 0x02>, + <&sata1_smmu 0x40>; }; =20 pcie: pcie@f0000000 { @@ -409,7 +416,7 @@ phy-handle =3D <&xgmac0_phy>; phy-mode =3D "xgmii"; dma-coherent; - iommus =3D <&xgmac0_smmu 0x00 0x1f>; /* 0-31 */ + iommus =3D <&xgmac0_smmu 0x00 0x17>; /* 0-7, 16-23 */ }; =20 xgmac@e0900000 { @@ -428,7 +435,7 @@ phy-handle =3D <&xgmac1_phy>; phy-mode =3D "xgmii"; dma-coherent; - iommus =3D <&xgmac1_smmu 0x00 0x1f>; /* 0-31 */ + iommus =3D <&xgmac1_smmu 0x00 0x17>; /* 0-7, 16-23 */ }; }; =20 diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c b= /Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c index c84c1a81c3ec..5608946a5396 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c @@ -212,8 +212,6 @@ DisableSmmu ( =20 Node =3D fdt_path_offset (Fdt, SmmuNodeName); if (Node <=3D 0) { - DEBUG ((DEBUG_WARN, "%a: Failed to find path %s: %a\n", - __FUNCTION__, SmmuNodeName, fdt_strerror (Node))); return; } =20 @@ -253,8 +251,9 @@ SetSocIdStatus ( DisableSmmu (Fdt, "iommus", "/smb/smmu@e0200000", "/smb/sata@e0300000"= ); } =20 - if (!PcdGetBool (PcdEnableSmmus) || !IsRevB1 || FixedPcdGet8 (PcdSata1Po= rtCount) =3D=3D 0) { + if (!PcdGetBool (PcdEnableSmmus) || !IsRevB1) { DisableSmmu (Fdt, "iommus", "/smb/smmu@e0c00000", "/smb/sata@e0d00000"= ); + DisableSmmu (Fdt, "iommus", "/smb/smmu@e0c00000", "/smb/ccp@e0100000"); } =20 if (!FixedPcdGetBool (PcdXgbeEnable) || !PcdGetBool (PcdEnableSmmus)) { --=20 2.20.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 (#51250): https://edk2.groups.io/g/devel/message/51250 Mute This Topic: https://groups.io/mt/61945305/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-