From nobody Wed May 1 05:34:27 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+73978+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+73978+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1618252420; cv=none; d=zohomail.com; s=zohoarc; b=i2UYFqTrlhPGYovlYlaotwl5jGRwNlPnbck7rCso2QJMxA3y4H1aWsRKUA7z5or3tgPBFMQ4aBLHHgAHg+VRNOis2h+Z+Djo4P8PaFYeJI3/tu4p1aOJE3kdQHBMv+DubgvBfaABFMbOlw6V6gCwToUlsy2VXhIKM1zhTZ7qAO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618252420; 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=i9LC2QiH5cKifiH56Uk9hRVPcwYO65om62p/XKlgJEc=; b=V73pjuFwWKETWlEsT5WAjZJPXgqUtQlmOqobGyyWjqRmWSJjhtCbpqY7jtZU2f8p6gZVx3XAPonFb7X6hvBZBqjgKx0fgwMRQujHwligXkZP2IpuN1/ZjLecgYK0UHxxAqS57Qc2aL2AHpuxOLpkVxqwwENN5cBLzvqX2xLjCi4= 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+73978+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1618252420882506.7029800291373; Mon, 12 Apr 2021 11:33:40 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hBKAYY1788612xVkEZxhcqPw; Mon, 12 Apr 2021 11:33:40 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.1384.1618252419944953249 for ; Mon, 12 Apr 2021 11:33:40 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8C5C4113E; Mon, 12 Apr 2021 11:33:39 -0700 (PDT) X-Received: from usa.arm.com (a074742.blr.arm.com [10.162.16.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 207D83F694; Mon, 12 Apr 2021 11:33:37 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Samer El-Haj-Mahmoud , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V3 1/6] Platform/Sgi: include SSDT table for RD-V1 platform Date: Tue, 13 Apr 2021 00:03:25 +0530 Message-Id: <20210412183330.5890-2-pranav.madhu@arm.com> In-Reply-To: <20210412183330.5890-1-pranav.madhu@arm.com> References: <20210412183330.5890-1-pranav.madhu@arm.com> MIME-Version: 1.0 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,pranav.madhu@arm.com X-Gm-Message-State: AOPf3afQSvwy3ixCAfPMu61gx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1618252420; bh=Ovnb9XbW54H42Hhxm1CdHl4CT8PsfOR3jVlzKgJusTY=; h=Cc:Date:From:Reply-To:Subject:To; b=mYBHdSppEx+xDMFiQLlFU1v3QIRuzIcYUotxJnoC5Yo7D6xp4VY3JcXGdHykBDNQnPJ Oa9e8dvZMXkkgxvmn8wBktAubBiPH4AUm2xz4ZTpGczkrumRK1UaMALh29FKoStHpR19g 4bcLSoPTyqwH/GEwcvXc0FBq6B5NaT8XHYs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Ssdt ACPI table in SgiPkg describes the PCIe controller and the root complex resources. Include this table for RD-V1 and RD-V1-MC platforms. Signed-off-by: Pranav Madhu Reviewed-by: Sami Mujawar --- Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf | 1 + Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf | 1 + 2 files changed, 2 insertions(+) diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf b/Platform/A= RM/SgiPkg/AcpiTables/RdV1AcpiTables.inf index a5f936b8a758..583ffac70b71 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf @@ -24,6 +24,7 @@ RdV1/Dsdt.asl RdV1/Madt.aslc Spcr.aslc + Ssdt.asl =20 [Packages] ArmPkg/ArmPkg.dec diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf b/Platform= /ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf index 04edfc487738..d0d9473057a9 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf @@ -26,6 +26,7 @@ RdV1Mc/Madt.aslc RdV1Mc/Srat.aslc Spcr.aslc + Ssdt.asl =20 [Packages] ArmPkg/ArmPkg.dec --=20 2.17.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 (#73978): https://edk2.groups.io/g/devel/message/73978 Mute This Topic: https://groups.io/mt/82046077/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 Wed May 1 05:34:27 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+73979+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+73979+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1618252422; cv=none; d=zohomail.com; s=zohoarc; b=bjyUOODtUtbn6CfepvC3nI+VMISR18L6/gaCYk72E/6Q7MaBv/M7En8bJax/J7Lg1gRb2Dlmt5a1w78J9Uj5AGhVJBGhj5tfsy7iBEIvkOp/AVHlJZ9u0sQ2IRGnzng5Q3pJKcYhDURL8dj5x9y7Q61PSEGuMNcBX9ok4zp9DfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618252422; 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=OFsHyd1ondpuKFlH5Z7ivLQf1x2qhYcG0nEcU2nN+QM=; b=mYo4zVd+LRtiFmonaGbKlfi4j9BQGLrGsZ3Q8QMc3ox0LeEpbwBdxeWJtfwMNCwF7iRbW6a/Du/S/11TRMNpO7N9mZXYoJyswcJdpZo3SZSRYSFj0OrhvqdyDJzUvnHbzwlMc897pdVjwdxh7NiDSSpCLwKxpXe3uQykcuX6JCU= 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+73979+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1618252422731764.085180300313; Mon, 12 Apr 2021 11:33:42 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6Is1YY1788612xK9PdNNDu3U; Mon, 12 Apr 2021 11:33:42 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.1423.1618252421833168716 for ; Mon, 12 Apr 2021 11:33:41 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 70D41113E; Mon, 12 Apr 2021 11:33:41 -0700 (PDT) X-Received: from usa.arm.com (a074742.blr.arm.com [10.162.16.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0534A3F694; Mon, 12 Apr 2021 11:33:39 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Samer El-Haj-Mahmoud , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V3 2/6] Platform/Sgi: fix the list of CPU devices on RD-V1-MC platform Date: Tue, 13 Apr 2021 00:03:26 +0530 Message-Id: <20210412183330.5890-3-pranav.madhu@arm.com> In-Reply-To: <20210412183330.5890-1-pranav.madhu@arm.com> References: <20210412183330.5890-1-pranav.madhu@arm.com> MIME-Version: 1.0 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,pranav.madhu@arm.com X-Gm-Message-State: 1YrsA4xbZBhNmY3EHLVKE0eJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1618252422; bh=0A/Is8+QTAQcy3NHpDmAoOxyi+SEpGtR43j/ZdZDi4M=; h=Cc:Date:From:Reply-To:Subject:To; b=CMr+lBub5jfmyqXIHR+viOCqPfvBop+vMS4CkYrITPo57I2XRIDRXa5wbuqtbkjOj/k YJ6efkDVNI0wTj7fpbKUraUIVaeG9oZdQtrzh03ZXOxVoOtLKq+iwRCt+W5M+S+5gk3b+ s1RXwKNgWtjTaEOyDAf4CzszzeRLsMrmG/E= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" RD-V1-MC platform has four CPUs in each of its four coherently connected chips. So remove a incorrect CPU device entry in DSDT table that lists a additional non-existent CPU. Signed-off-by: Pranav Madhu Reviewed-by: Sami Mujawar --- Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl b/Platform/ARM/= SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl index aef6473857b0..9bf57d05a646 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl @@ -109,11 +109,5 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD",= "ARMSGI", Name (_UID, 15) Name (_STA, 0xF) } - - Device (CP16) { // Zeus core 16 - Name (_HID, "ACPI0007") - Name (_UID, 16) - Name (_STA, 0xF) - } } // Scope(_SB) } --=20 2.17.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 (#73979): https://edk2.groups.io/g/devel/message/73979 Mute This Topic: https://groups.io/mt/82046079/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 Wed May 1 05:34:27 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+73980+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+73980+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1618252429; cv=none; d=zohomail.com; s=zohoarc; b=bjoVaJNzYxtYWbNbVMP/uwYRjZClU6MgiZ+6xfAZ+fMKvMM/eLei71qvotocFnLKfpQ8PWpZ+aaaKeQ4m/qtfVXZc6KdWTXp0GK1tL7SZUAjrq6jjDoDYsY5uIV6SohHGnWBuL3HHUdWybGfwGtyA8/cVXVgg2j0t5mJ1+G+JuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618252429; 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=CjV/N/rDbJq5fAFFn33UddjmmD28PS1SUDyvCAQgJHM=; b=X4fpuMNIrWVvK/E4rMoWFh6qH8S+nxPZXte2C/Rx69yTJy1VYuAkXbYVtco7R8hcV4+OBJRwr9K1rKQixRIb/OhqXEUFpJlRVzN66U066nnDJ/MvaPoG89Qk+bNLnjbmsCHToSN9PmZLSp88Qa6oJYKyr7a/ZjLskTJDc6CBqx8= 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+73980+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 161825242962811.651064148775845; Mon, 12 Apr 2021 11:33:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 0HG9YY1788612xWVQDWkyR8R; Mon, 12 Apr 2021 11:33:49 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.1424.1618252423685636392 for ; Mon, 12 Apr 2021 11:33:43 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4C10D113E; Mon, 12 Apr 2021 11:33:43 -0700 (PDT) X-Received: from usa.arm.com (a074742.blr.arm.com [10.162.16.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DDA003F694; Mon, 12 Apr 2021 11:33:41 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Samer El-Haj-Mahmoud , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V3 3/6] Platform/Sgi: fix CPU acpi-id for RD-V1-MC platform Date: Tue, 13 Apr 2021 00:03:27 +0530 Message-Id: <20210412183330.5890-4-pranav.madhu@arm.com> In-Reply-To: <20210412183330.5890-1-pranav.madhu@arm.com> References: <20210412183330.5890-1-pranav.madhu@arm.com> MIME-Version: 1.0 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,pranav.madhu@arm.com X-Gm-Message-State: WyCLMswJxcID7IICnN7Xp3mZx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1618252429; bh=y3JnYQ9PV0dCQgYYTERnZe69TxS57WMlNihE6UyhYoI=; h=Cc:Date:From:Reply-To:Subject:To; b=FUqUkgD9dRVv87JTOLFgOsbyKOWJvDUmMcNXv+cetweMbijdcvnP4g38om+/KwfwZ09 xQcLLyiYStgAdMdr92j0bWhE6I+sLG3E0BuZJt+kAYO6R1Fykw+FJaSZ+PdEDNG08GW/9 VfT4gwikSAdBi39rCwkMJV2xwGze4EF5ZL8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Fix the incorrect ACPI _UID (Unique ID) object for CPU devices listed for the RD-V1-MC platform. Signed-off-by: Pranav Madhu Reviewed-by: Sami Mujawar --- Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Madt.aslc | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Madt.aslc b/Platform/ARM= /SgiPkg/AcpiTables/RdV1Mc/Madt.aslc index 0da56ed2a39b..9b3e4f2be370 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Madt.aslc +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Madt.aslc @@ -69,55 +69,55 @@ STATIC EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE Mad= t =3D { =20 // Chip 1 EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core0 - 0, 0, GET_MPID(0x01000000ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, + 0, 4, GET_MPID(0x01000000ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, FixedPcdGet32 (PcdGicDistributorBase), 0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */), EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core1 - 0, 1, GET_MPID(0x01000100ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, + 0, 5, GET_MPID(0x01000100ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, FixedPcdGet32 (PcdGicDistributorBase), 0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */), EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core2 - 0, 2, GET_MPID(0x01000200ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, + 0, 6, GET_MPID(0x01000200ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, FixedPcdGet32 (PcdGicDistributorBase), 0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */), EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core3 - 0, 3, GET_MPID(0x01000300ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, + 0, 7, GET_MPID(0x01000300ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, FixedPcdGet32 (PcdGicDistributorBase), 0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */), =20 // Chip 2 EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core0 - 0, 0, GET_MPID(0x02000000ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, + 0, 8, GET_MPID(0x02000000ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, FixedPcdGet32 (PcdGicDistributorBase), 0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */), EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core1 - 0, 1, GET_MPID(0x02000100ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, + 0, 9, GET_MPID(0x02000100ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, FixedPcdGet32 (PcdGicDistributorBase), 0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */), EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core2 - 0, 2, GET_MPID(0x02000200ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, + 0, 10, GET_MPID(0x02000200ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, FixedPcdGet32 (PcdGicDistributorBase), 0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */), EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core3 - 0, 3, GET_MPID(0x02000300ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, + 0, 11, GET_MPID(0x02000300ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, FixedPcdGet32 (PcdGicDistributorBase), 0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */), =20 // Chip 3 EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core0 - 0, 0, GET_MPID(0x03000000ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, + 0, 12, GET_MPID(0x03000000ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, FixedPcdGet32 (PcdGicDistributorBase), 0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */), EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core1 - 0, 1, GET_MPID(0x03000100ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, + 0, 13, GET_MPID(0x03000100ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, FixedPcdGet32 (PcdGicDistributorBase), 0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */), EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core2 - 0, 2, GET_MPID(0x03000200ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, + 0, 14, GET_MPID(0x03000200ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, FixedPcdGet32 (PcdGicDistributorBase), 0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */), EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core3 - 0, 3, GET_MPID(0x03000300ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, + 0, 15, GET_MPID(0x03000300ULL, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23, FixedPcdGet32 (PcdGicDistributorBase), 0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */), }, --=20 2.17.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 (#73980): https://edk2.groups.io/g/devel/message/73980 Mute This Topic: https://groups.io/mt/82046080/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 Wed May 1 05:34:27 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+73981+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+73981+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1618252426; cv=none; d=zohomail.com; s=zohoarc; b=nyoaDEY0CpRLu63bLBH7yVzFJbMBdMTr8lEmqr3WD09J5HXtgVHbY+DT7zmRIV5h0vb6TehaP0N59NyfRd++wawzKwY1o/vwbsYoa8SFoT3edW9kvicL0PNoJHtxZ6XGuUjdVdGCsy/m+uOT+VWHMP3kbinRH8oRi6JSDjWOZm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618252426; 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=oUjdWelv3/cNegmRnhVgdn5v4OO2c9/rXWIlvndT3EI=; b=gTmpzWxnrZQFgtfeY2xKSbCNNjGc58f3yob5nmEoEI1n/EPNTFb2rF88+aWZR4WnGZRKsIs5yt90+7zLAvsEsRyN/nXT5mvUCVVwRn6ycR0kApdB10yqiQKM9ibYSrhTMsOTw8hgYrjIPVkeaMfuwHf54fRvuUJbXupdnJWSaBk= 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+73981+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1618252426825344.67809952374523; Mon, 12 Apr 2021 11:33:46 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZFLZYY1788612x9omTWWzLsb; Mon, 12 Apr 2021 11:33:46 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.1385.1618252425553966426 for ; Mon, 12 Apr 2021 11:33:45 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2774C113E; Mon, 12 Apr 2021 11:33:45 -0700 (PDT) X-Received: from usa.arm.com (a074742.blr.arm.com [10.162.16.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B922E3F694; Mon, 12 Apr 2021 11:33:43 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Samer El-Haj-Mahmoud , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V3 4/6] Platform/Sgi: update ACPI table revision Date: Tue, 13 Apr 2021 00:03:28 +0530 Message-Id: <20210412183330.5890-5-pranav.madhu@arm.com> In-Reply-To: <20210412183330.5890-1-pranav.madhu@arm.com> References: <20210412183330.5890-1-pranav.madhu@arm.com> MIME-Version: 1.0 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,pranav.madhu@arm.com X-Gm-Message-State: XxBLjKNmJc6VXCVpG9P7EMKUx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1618252426; bh=vFkns3pkjraUH4m3uKOacEorqerFhteurciR9lbBoUU=; h=Cc:Date:From:Reply-To:Subject:To; b=DPzmFLaWZitsfKZtppnDqPVxSUrSzaaDOvkBKp7F3OkqyUZXMI86h1W+74zrXJdk46j hBwz/JffJyWEMzQqRmjgkBAUfeYmYX5lGiNL2Pmaqd2l8bDtDREXwqddhbLggBFKgOhR+ 86oalu4MlK7BoMY7KIG0nOSQb0iXxZKkId0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Fix the ACPI DSDT/SSDT table version numbers. As per ACPI 6.3 specification, the DSDT/SSDT table should use version 2 instead of 1. In addition to this, update 'PcdAcpiExposedTableVersions' to avoid building RSDT table into ACPI firmware volume because the platforms supported under SgiPkg are 64-bit systems only and require only the XSDT table. Signed-off-by: Pranav Madhu Reviewed-by: Sami Mujawar --- Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 5 ++++- Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl | 4 ++-- Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl | 4 ++-- Platform/ARM/SgiPkg/AcpiTables/RdN2/Dsdt.asl | 4 ++-- Platform/ARM/SgiPkg/AcpiTables/RdV1/Dsdt.asl | 4 ++-- Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl | 4 ++-- Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl | 4 ++-- Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl | 4 ++-- Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl | 4 ++-- 9 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/= SgiPlatform.dsc.inc index ed7c7d6c4581..12a8f8884c89 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2020, ARM Limited. All rights reserved. +# Copyright (c) 2018-2021, ARM Limited. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -106,6 +106,9 @@ gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000 gArmTokenSpaceGuid.PcdSystemMemorySize|0x7F000000 =20 + # ACPI Table Version + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20 + # # PCIe # diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl b/Platform/AR= M/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl index d66c7cbf4183..04fd3bd0a1f8 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl @@ -1,7 +1,7 @@ /** @file * Differentiated System Description Table Fields (DSDT) * -* Copyright (c) 2018-2020, ARM Ltd. All rights reserved. +* Copyright (c) 2018-2021, ARM Ltd. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -10,7 +10,7 @@ #include "SgiPlatform.h" #include "SgiAcpiHeader.h" =20 -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", +DefinitionBlock ("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM_REVISION) { Scope (_SB) { // diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl b/Platform/AR= M/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl index cb05eed35878..d9bac33898b1 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl @@ -1,7 +1,7 @@ /** @file * Differentiated System Description Table Fields (DSDT) * -* Copyright (c) 2018-2020, ARM Ltd. All rights reserved. +* Copyright (c) 2018-2021, ARM Ltd. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -10,7 +10,7 @@ #include "SgiPlatform.h" #include "SgiAcpiHeader.h" =20 -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", +DefinitionBlock ("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM_REVISION) { Scope (_SB) { =20 diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2/Dsdt.asl b/Platform/ARM/Sg= iPkg/AcpiTables/RdN2/Dsdt.asl index 8688fd8d6b90..42cb8655b4fb 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN2/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2/Dsdt.asl @@ -1,7 +1,7 @@ /** @file * Differentiated System Description Table Fields (DSDT) * -* Copyright (c) 2020, Arm Ltd. All rights reserved. +* Copyright (c) 2020-2021, Arm Ltd. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -10,7 +10,7 @@ #include "SgiPlatform.h" #include "SgiAcpiHeader.h" =20 -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", +DefinitionBlock ("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM_REVISION) { Scope (_SB) { Device (CP00) { // Neoverse N2 core 0 diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1/Dsdt.asl b/Platform/ARM/Sg= iPkg/AcpiTables/RdV1/Dsdt.asl index 7cc0614f4d60..f3e31e4085a3 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1/Dsdt.asl @@ -1,7 +1,7 @@ /** @file * Differentiated System Description Table Fields (DSDT) * -* Copyright (c) 2020, Arm Ltd. All rights reserved. +* Copyright (c) 2020-2021, Arm Ltd. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -10,7 +10,7 @@ #include "SgiPlatform.h" #include "SgiAcpiHeader.h" =20 -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", +DefinitionBlock ("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM_REVISION) { Scope (_SB) { Device (CP00) { // Neoverse V1 core 0 diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl b/Platform/ARM/= SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl index 9bf57d05a646..b1e88587080c 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl @@ -1,7 +1,7 @@ /** @file * Differentiated System Description Table Fields (DSDT) * -* Copyright (c) 2020, Arm Limited. All rights reserved. +* Copyright (c) 2020-2021, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -10,7 +10,7 @@ #include "SgiPlatform.h" #include "SgiAcpiHeader.h" =20 -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", +DefinitionBlock ("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM_REVISION) { Scope (_SB) { =20 diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl b/Platform/ARM/= SgiPkg/AcpiTables/Sgi575/Dsdt.asl index bf0c964b7ae2..fe0b92137bde 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl @@ -1,7 +1,7 @@ /** @file * Differentiated System Description Table Fields (DSDT) * -* Copyright (c) 2018, ARM Ltd. All rights reserved. +* Copyright (c) 2018 - 2021, ARM Ltd. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -10,7 +10,7 @@ #include "SgiPlatform.h" #include "SgiAcpiHeader.h" =20 -DefinitionBlock("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", EFI_ACPI_A= RM_OEM_REVISION) { +DefinitionBlock("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_A= RM_OEM_REVISION) { Scope(_SB) { =20 Device(CP00) { // A75-0: Cluster 0, Cpu 0 diff --git a/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl b/Platform/ARM/SgiPkg/= AcpiTables/Ssdt.asl index 49c630d53140..f02d5cea8b3c 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl @@ -1,7 +1,7 @@ /** @file * Secondary System Description Table (SSDT) * -* Copyright (c) 2018, ARM Limited. All rights reserved. +* Copyright (c) 2018 - 2021, ARM Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -9,7 +9,7 @@ =20 #include "SgiAcpiHeader.h" =20 -DefinitionBlock("SsdtPci.aml", "SSDT", 1, "ARMLTD", "ARMSGI", EFI_ACPI_ARM= _OEM_REVISION) { +DefinitionBlock("SsdtPci.aml", "SSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_ARM= _OEM_REVISION) { Scope (_SB) { // PCI Root Complex Device (PCI0) { diff --git a/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl b/Platform/ARM/SgiP= kg/AcpiTables/SsdtRos.asl index 785f426fc29b..6b36da23cf0b 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl @@ -1,7 +1,7 @@ /** @file * Secondary System Description Table Fields (SSDT) * -* Copyright (c) 2020, Arm Ltd. All rights reserved. +* Copyright (c) 2020-2021, Arm Ltd. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -10,7 +10,7 @@ #include "SgiPlatform.h" #include "SgiAcpiHeader.h" =20 -DefinitionBlock ("SsdtRosTable.aml", "SSDT", 1, "ARMLTD", "ARMSGI", +DefinitionBlock ("SsdtRosTable.aml", "SSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM_REVISION) { Scope (_SB) { // UART PL011 --=20 2.17.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 (#73981): https://edk2.groups.io/g/devel/message/73981 Mute This Topic: https://groups.io/mt/82046081/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 Wed May 1 05:34:27 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+73982+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+73982+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1618252428; cv=none; d=zohomail.com; s=zohoarc; b=nc54+2P3RZdqeR/MVuBuLwID8+Q8rRILtfgd6KmSYHLhAvaGtmW8PEv+zpIGGYl5nCPo8Z3yznjClXtpGCmZzMNBZQQT14lmGFX68DJp4VFdJkAq6D6rW1cc12V0TiNR+RfUqV1kwyfdl8g7qyG+T8H1L2TgNWuAMd+rAT0WRL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618252428; 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=a+lPzU/040uhSp+ZgqWp9sv3JR8X4/kYjJa1kCBb/jU=; b=LC2NWXifFbOYZPhuUtJhRykazAEPeG/ut/ZGFzVswX8v3NvxlXDoGe83mVTd2nxakJBGFg1eFMnQ0A4fml8KSckJdusG8ZKGCHT9Wm5+aEqiqL9gyG/DugHhl9WpZa/qokBfMK5TeM5rk6O1aQygdCvdZHwZvhn20Xtn5PIn7aA= 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+73982+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1618252428489526.8748372475293; Mon, 12 Apr 2021 11:33:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id YIVjYY1788612xybARtaDlvt; Mon, 12 Apr 2021 11:33:47 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.1474.1618252427373919119 for ; Mon, 12 Apr 2021 11:33:47 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0272711FB; Mon, 12 Apr 2021 11:33:47 -0700 (PDT) X-Received: from usa.arm.com (a074742.blr.arm.com [10.162.16.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 944443F694; Mon, 12 Apr 2021 11:33:45 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Samer El-Haj-Mahmoud , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V3 5/6] Platform/Sgi: define PCD for timer interrupt numbers Date: Tue, 13 Apr 2021 00:03:29 +0530 Message-Id: <20210412183330.5890-6-pranav.madhu@arm.com> In-Reply-To: <20210412183330.5890-1-pranav.madhu@arm.com> References: <20210412183330.5890-1-pranav.madhu@arm.com> MIME-Version: 1.0 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,pranav.madhu@arm.com X-Gm-Message-State: g3NSayggu769I9s3VEsQYINIx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1618252427; bh=EJV2h+0tPp4SavGYKLI5k5E+4JTFkr+WBuSt2LtkCzA=; h=Cc:Date:From:Reply-To:Subject:To; b=ZP/hZOiWfe4+oWnMKePnmBk3nNhlfYg+zV/K72DXTY6mGfBAKpVdK6uJfIIuKSmTOnr 3UqLjCcDkusp7tGliNo5np9KoA3cAiOFpWQv+Iz14fEa25zIc2IitVGOZI4GUqJaZJDlo E+l7qEPbq2NYX5QfcNRtvN63ZaMNrLh935Q= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The generic timer and watchdog timer interrupt numbers on the RD-N2 platform is different than those on the other platforms supported by SgiPkg. So in order to reuse the existing GTDT ACPI table for all the supported platforms including RD-N2, introduce and use PCD to provide the interrupt numbers for watchdog and generic timers. Signed-off-by: Pranav Madhu Reviewed-by: Sami Mujawar --- Platform/ARM/SgiPkg/SgiPlatform.dec | 6 ++++++ Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc | 6 ++++++ Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc | 6 ++++++ Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf | 4 ++++ Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf | 4 ++++ Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf | 4 ++++ Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf | 4 ++++ Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf | 4 ++++ Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf | 4 ++++ Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf | 4 ++++ Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc | 8 ++++---- 11 files changed, 50 insertions(+), 4 deletions(-) diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dec b/Platform/ARM/SgiPkg/SgiP= latform.dec index 3f0d38a013f2..86ead241a67c 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dec +++ b/Platform/ARM/SgiPkg/SgiPlatform.dec @@ -57,5 +57,11 @@ gArmSgiTokenSpaceGuid.PcdSysPeriphBase|0x00000000|UINT64|0x0000000E gArmSgiTokenSpaceGuid.PcdSysPeriphSysRegBase|0x0|UINT64|0x0000000F =20 + # Timer & Watchdog interrupts + gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv|0|UINT32|0x00000011 + gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv|0|UINT32|0x00000012 + gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv|0|UINT32|0x00000013 + gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv|0|UINT32|0x00000014 + [Ppis] gNtFwConfigDtInfoPpiGuid =3D { 0x6f606eb3, 0x9123, 0x4e15, { 0xa8, 0= x9b, 0x0f, 0xac, 0x66, 0xef, 0xd0, 0x17 } } diff --git a/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc b/Platform/ARM/SgiPkg= /SgiMemoryMap.dsc.inc index e423a6b50c91..efbb013b0b60 100644 --- a/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc @@ -44,3 +44,9 @@ gArmTokenSpaceGuid.PcdPciMmio64Base|0x5000000000 gArmTokenSpaceGuid.PcdPciMmio64Size|0x3000000000 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x60000000 + + # Timer & Watchdog interrupts + gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv|92 + gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv|91 + gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv|93 + gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv|94 diff --git a/Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc b/Platform/ARM/SgiPk= g/SgiMemoryMap2.dsc.inc index 41291eddfe74..1167f1a6ff9d 100644 --- a/Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc @@ -44,3 +44,9 @@ gArmTokenSpaceGuid.PcdPciMmio64Base|0x4000000000 gArmTokenSpaceGuid.PcdPciMmio64Size|0x4000000000 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x1010000000 + + # Timer & Watchdog interrupts + gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv|109 + gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv|108 + gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv|110 + gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv|111 diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf b/Platfo= rm/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf index 7ebd70b197a6..2dd2275665a2 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf @@ -50,11 +50,15 @@ gArmTokenSpaceGuid.PcdPciBusMin gArmTokenSpaceGuid.PcdPciBusMax =20 + gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv + gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv gArmSgiTokenSpaceGuid.PcdVirtioBlkBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioBlkSize gArmSgiTokenSpaceGuid.PcdVirtioBlkInterrupt gArmSgiTokenSpaceGuid.PcdVirtioNetBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioNetSize gArmSgiTokenSpaceGuid.PcdVirtioNetInterrupt + gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv + gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv =20 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf b/Platfo= rm/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf index 2d4354f33018..22e33239070b 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf @@ -50,11 +50,15 @@ gArmTokenSpaceGuid.PcdPciBusMin gArmTokenSpaceGuid.PcdPciBusMax =20 + gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv + gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv gArmSgiTokenSpaceGuid.PcdVirtioBlkBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioBlkSize gArmSgiTokenSpaceGuid.PcdVirtioBlkInterrupt gArmSgiTokenSpaceGuid.PcdVirtioNetBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioNetSize gArmSgiTokenSpaceGuid.PcdVirtioNetInterrupt + gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv + gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv =20 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf b/Plat= form/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf index db168c518e21..76886d1c6a17 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf @@ -59,11 +59,15 @@ gArmTokenSpaceGuid.PcdPciBusMin gArmTokenSpaceGuid.PcdPciBusMax =20 + gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv + gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv gArmSgiTokenSpaceGuid.PcdVirtioBlkBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioBlkSize gArmSgiTokenSpaceGuid.PcdVirtioBlkInterrupt gArmSgiTokenSpaceGuid.PcdVirtioNetBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioNetSize gArmSgiTokenSpaceGuid.PcdVirtioNetInterrupt + gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv + gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv =20 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf b/Platform/A= RM/SgiPkg/AcpiTables/RdN2AcpiTables.inf index 63fc249bb77b..2ec3e42473a9 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf @@ -50,11 +50,15 @@ gArmTokenSpaceGuid.PcdPciBusMin gArmTokenSpaceGuid.PcdPciBusMax =20 + gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv + gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv gArmSgiTokenSpaceGuid.PcdVirtioBlkBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioBlkSize gArmSgiTokenSpaceGuid.PcdVirtioBlkInterrupt gArmSgiTokenSpaceGuid.PcdVirtioNetBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioNetSize gArmSgiTokenSpaceGuid.PcdVirtioNetInterrupt + gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv + gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv =20 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf b/Platform/A= RM/SgiPkg/AcpiTables/RdV1AcpiTables.inf index 583ffac70b71..a21dcfafef1a 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf @@ -50,11 +50,15 @@ gArmTokenSpaceGuid.PcdPciBusMin gArmTokenSpaceGuid.PcdPciBusMax =20 + gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv + gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv gArmSgiTokenSpaceGuid.PcdVirtioBlkBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioBlkSize gArmSgiTokenSpaceGuid.PcdVirtioBlkInterrupt gArmSgiTokenSpaceGuid.PcdVirtioNetBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioNetSize gArmSgiTokenSpaceGuid.PcdVirtioNetInterrupt + gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv + gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv =20 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf b/Platform= /ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf index d0d9473057a9..c49546ec0b27 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf @@ -59,11 +59,15 @@ gArmTokenSpaceGuid.PcdPciBusMin gArmTokenSpaceGuid.PcdPciBusMax =20 + gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv + gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv gArmSgiTokenSpaceGuid.PcdVirtioBlkBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioBlkSize gArmSgiTokenSpaceGuid.PcdVirtioBlkInterrupt gArmSgiTokenSpaceGuid.PcdVirtioNetBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioNetSize gArmSgiTokenSpaceGuid.PcdVirtioNetInterrupt + gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv + gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv =20 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf b/Platform= /ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf index 466e0fb658eb..2121fd39f2f0 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf @@ -49,11 +49,15 @@ gArmTokenSpaceGuid.PcdPciBusMin gArmTokenSpaceGuid.PcdPciBusMax =20 + gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv + gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv gArmSgiTokenSpaceGuid.PcdVirtioBlkBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioBlkSize gArmSgiTokenSpaceGuid.PcdVirtioBlkInterrupt gArmSgiTokenSpaceGuid.PcdVirtioNetBaseAddress gArmSgiTokenSpaceGuid.PcdVirtioNetSize gArmSgiTokenSpaceGuid.PcdVirtioNetInterrupt + gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv + gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv =20 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc b/Platform/ARM/SgiPkg= /AcpiTables/Gtdt.aslc index a8b587ba881d..b53cbb228f92 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc +++ b/Platform/ARM/SgiPkg/AcpiTables/Gtdt.aslc @@ -23,11 +23,11 @@ #define SGI_GT_BLOCK_CTL_BASE 0x2A810000 #define SGI_GT_BLOCK_FRAME1_CTL_BASE 0x2A820000 #define SGI_GT_BLOCK_FRAME1_CTL_EL0_BASE 0xFFFFFFFFFFFFFFFF -#define SGI_GT_BLOCK_FRAME1_GSIV 0x5B +#define SGI_GT_BLOCK_FRAME1_GSIV FixedPcdGet32 (PcdGtFrame1Gsiv) =20 #define SGI_GT_BLOCK_FRAME0_CTL_BASE 0x2A830000 #define SGI_GT_BLOCK_FRAME0_CTL_EL0_BASE 0xFFFFFFFFFFFFFFFF -#define SGI_GT_BLOCK_FRAME0_GSIV 0x5C +#define SGI_GT_BLOCK_FRAME0_GSIV FixedPcdGet32 (PcdGtFrame0Gsiv) =20 #define SGI_GTX_TIMER_FLAGS 0 #define GTX_TIMER_SECURE EFI_ACPI_6_2_GTDT_GT_BLOCK_COMMO= N_FLAG_SECURE_TIMER @@ -127,13 +127,13 @@ STATIC EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLES = Gtdt =3D { EFI_ACPI_6_2_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT ( FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), - 93, + FixedPcdGet32 (PcdWdogWS0Gsiv), 0 ), EFI_ACPI_6_2_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT ( FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), - 94, + FixedPcdGet32 (PcdWdogWS1Gsiv), EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER ) } --=20 2.17.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 (#73982): https://edk2.groups.io/g/devel/message/73982 Mute This Topic: https://groups.io/mt/82046084/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 Wed May 1 05:34:27 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+73983+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+73983+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1618252430; cv=none; d=zohomail.com; s=zohoarc; b=Z/P/BTJSLk+Ij7k0+fTr1hwkWL9p50yKhwWKr81V3kya1t11tinzQrlqgo0sygO3JVN5AplHUAz/5/uxV9NTxcRtDCaQYL0/C39ypimr6AqXhpN/szo4hZv9BX4NOWyv6jYA/mNDgUIuCyFbnGMRzEzqWWW0+iAGGxaHy5EJmkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618252430; 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=MTNQx668NHOES/vTFbxVzhk8Dan/0fbPD8Do3tDvH9s=; b=Uc7yS6ecJHRfbuwP5SVne3zJDiZFSdfRtdigX5T30bLvm0/ZM9bGSQ2IlYHsxz0FZQXbM5ppGL92PkvY4Y/TQQAS/Sazg93L2MJ5642TAD0NHD4GwIA4d0zLzIAXE0ShxK6M1FV8yNpD6wh1plkVd+YJhzHX4PzkFtawqWUekqo= 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+73983+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1618252430168232.88925422142518; Mon, 12 Apr 2021 11:33:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id qzzEYY1788612xN76Y4TVgYm; Mon, 12 Apr 2021 11:33:49 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.1527.1618252429151018686 for ; Mon, 12 Apr 2021 11:33:49 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D14B9113E; Mon, 12 Apr 2021 11:33:48 -0700 (PDT) X-Received: from usa.arm.com (a074742.blr.arm.com [10.162.16.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6F09E3F694; Mon, 12 Apr 2021 11:33:47 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Samer El-Haj-Mahmoud , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V3 6/6] Platform/Sgi: add SMMU and timer entries to memory description table Date: Tue, 13 Apr 2021 00:03:30 +0530 Message-Id: <20210412183330.5890-7-pranav.madhu@arm.com> In-Reply-To: <20210412183330.5890-1-pranav.madhu@arm.com> References: <20210412183330.5890-1-pranav.madhu@arm.com> MIME-Version: 1.0 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,pranav.madhu@arm.com X-Gm-Message-State: fFVbrKLVyxS21nONx32TAmtax1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1618252429; bh=KmFBuHP4xaZZ9X6RBtgS1z05nXlrQuEB1kOBGjaYe2Y=; h=Cc:Date:From:Reply-To:Subject:To; b=RvimvMqf89xeUmPY++HO2mK2OIaKYqnIaZZ32h82Iu4yVcjjB7bWV8iJ3DiniqrTAQN eBo6WjGqPa6Kr+xWa9bKc3Yh0FdpzM0n5LCSM0UtQ+ahISvAczykiqy92HUSgGdtcBwrr fhgUx17Xc+LJGQohvymnYtpOr12IZVWHl8I= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add PCDs for base address and address space size for generic timer and SMMU controllers. Use those PCDs to add platform memory map entries. The ServerReady SBSA tests, when executed, accesses these controllers and so the memory mapping for generic timer and SMMU controllers are required. In addition to this, PCDs for watchdog timer controller base address and size are introduced instead of using macros for the same. This allows the base address and address space size for watchdog timer controller to be specified by platform description files. Signed-off-by: Pranav Madhu Reviewed-by: Sami Mujawar --- Platform/ARM/SgiPkg/SgiPlatform.dec | 14 ++++++++- Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc | 4 +++ Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc | 4 +++ Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 10 ++++++ Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf | 11 +++++++ Platform/ARM/SgiPkg/Include/SgiPlatform.h | 4 --- Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c | 32 ++++++++++++= +++++--- 7 files changed, 70 insertions(+), 9 deletions(-) diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dec b/Platform/ARM/SgiPkg/SgiP= latform.dec index 86ead241a67c..3effd49592ea 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dec +++ b/Platform/ARM/SgiPkg/SgiPlatform.dec @@ -57,11 +57,23 @@ gArmSgiTokenSpaceGuid.PcdSysPeriphBase|0x00000000|UINT64|0x0000000E gArmSgiTokenSpaceGuid.PcdSysPeriphSysRegBase|0x0|UINT64|0x0000000F =20 - # Timer & Watchdog interrupts + # Counter, Timer and Watchdog gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv|0|UINT32|0x00000011 gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv|0|UINT32|0x00000012 + gArmSgiTokenSpaceGuid.PcdTimerBase0Base|0|UINT32|0x00000015 + gArmSgiTokenSpaceGuid.PcdTimerBase0Size|0|UINT32|0x00000016 + gArmSgiTokenSpaceGuid.PcdTimerControlBase|0|UINT32|0x00000017 + gArmSgiTokenSpaceGuid.PcdTimerControlSize|0|UINT32|0x00000018 + gArmSgiTokenSpaceGuid.PcdTimerCounterReadBase|0|UINT32|0x00000019 + gArmSgiTokenSpaceGuid.PcdTimerCounterReadSize|0|UINT32|0x0000001A + gArmSgiTokenSpaceGuid.PcdWdogBase|0|UINT32|0x0000001B + gArmSgiTokenSpaceGuid.PcdWdogSize|0|UINT32|0x0000001C gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv|0|UINT32|0x00000013 gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv|0|UINT32|0x00000014 =20 + # SMMU + gArmSgiTokenSpaceGuid.PcdSmmuBase|0|UINT32|0x0000001D + gArmSgiTokenSpaceGuid.PcdSmmuSize|0|UINT32|0x0000001E + [Ppis] gNtFwConfigDtInfoPpiGuid =3D { 0x6f606eb3, 0x9123, 0x4e15, { 0xa8, 0= x9b, 0x0f, 0xac, 0x66, 0xef, 0xd0, 0x17 } } diff --git a/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc b/Platform/ARM/SgiPkg= /SgiMemoryMap.dsc.inc index efbb013b0b60..d3d650323891 100644 --- a/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc @@ -50,3 +50,7 @@ gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv|91 gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv|93 gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv|94 + + # SMMU + gArmSgiTokenSpaceGuid.PcdSmmuBase|0x4F000000 + gArmSgiTokenSpaceGuid.PcdSmmuSize|0x01000000 diff --git a/Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc b/Platform/ARM/SgiPk= g/SgiMemoryMap2.dsc.inc index 1167f1a6ff9d..c593156e17be 100644 --- a/Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc @@ -50,3 +50,7 @@ gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv|108 gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv|110 gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv|111 + + # SMMU + gArmSgiTokenSpaceGuid.PcdSmmuBase|0x40000000 + gArmSgiTokenSpaceGuid.PcdSmmuSize|0x10000000 diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/= SgiPlatform.dsc.inc index 12a8f8884c89..42e3600d15f4 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc @@ -152,6 +152,16 @@ # Ethernet / Virtio Network gArmSgiTokenSpaceGuid.PcdVirtioNetSize|0x10000 =20 + # Counter, Timer and Watchdog + gArmSgiTokenSpaceGuid.PcdTimerBase0Base|0x2A830000 + gArmSgiTokenSpaceGuid.PcdTimerBase0Size|0x00010000 + gArmSgiTokenSpaceGuid.PcdTimerControlBase|0x2A810000 + gArmSgiTokenSpaceGuid.PcdTimerControlSize|0x00010000 + gArmSgiTokenSpaceGuid.PcdTimerCounterReadBase|0x2A800000 + gArmSgiTokenSpaceGuid.PcdTimerCounterReadSize|0x00010000 + gArmSgiTokenSpaceGuid.PcdWdogBase|0x2A440000 + gArmSgiTokenSpaceGuid.PcdWdogSize|0x00020000 + # # Set the base address and size of the buffer used # for communication between the Normal world edk2 diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf b/Plat= form/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf index 333247d0d808..22e247ea4fae 100644 --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf @@ -64,9 +64,20 @@ =20 gArmTokenSpaceGuid.PcdMmBufferBase gArmTokenSpaceGuid.PcdMmBufferSize + gArmSgiTokenSpaceGuid.PcdSmcCs0Base gArmSgiTokenSpaceGuid.PcdSmcCs1Base + gArmSgiTokenSpaceGuid.PcdSmmuBase + gArmSgiTokenSpaceGuid.PcdSmmuSize gArmSgiTokenSpaceGuid.PcdSysPeriphBase + gArmSgiTokenSpaceGuid.PcdTimerBase0Base + gArmSgiTokenSpaceGuid.PcdTimerBase0Size + gArmSgiTokenSpaceGuid.PcdTimerControlBase + gArmSgiTokenSpaceGuid.PcdTimerControlSize + gArmSgiTokenSpaceGuid.PcdTimerCounterReadBase + gArmSgiTokenSpaceGuid.PcdTimerCounterReadSize + gArmSgiTokenSpaceGuid.PcdWdogBase + gArmSgiTokenSpaceGuid.PcdWdogSize =20 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64 diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/SgiPk= g/Include/SgiPlatform.h index d6ab585cce80..818879b5f81e 100644 --- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h +++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h @@ -21,10 +21,6 @@ #define SGI_SUBSYS_UART1_BASE 0x2A410000 #define SGI_SUBSYS_UART1_SZ 0x00010000 =20 -// Sub System Peripherals - Generic Watchdog -#define SGI_SUBSYS_GENERIC_WDOG_BASE 0x2A440000 -#define SGI_SUBSYS_GENERIC_WDOG_SZ SIZE_128KB - // Register offsets into the System Registers Block #define SGI_SYSPH_SYS_REG_FLASH 0x4C #define SGI_SYSPH_SYS_REG_FLASH_RWEN 0x1 diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c b/Pla= tform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c index 9bdc63b9e3d4..8139b75d8ee4 100644 --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c @@ -17,7 +17,7 @@ =20 // Total number of descriptors, including the final "end-of-table" descrip= tor. #define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS \ - (10 + (FixedPcdGet32 (PcdChipCount) * 2)) + (14 + (FixedPcdGet32 (PcdChipCount) * 2)) =20 /** Returns the Virtual Memory Map of the platform. @@ -124,9 +124,9 @@ ArmPlatformGetVirtualMemoryMap ( VirtualMemoryTable[Index].Attributes =3D ARM_MEMORY_REGION_ATTRIBUT= E_DEVICE; =20 // Sub System Peripherals - Generic Watchdog - VirtualMemoryTable[++Index].PhysicalBase =3D SGI_SUBSYS_GENERIC_WDOG_BA= SE; - VirtualMemoryTable[Index].VirtualBase =3D SGI_SUBSYS_GENERIC_WDOG_BA= SE; - VirtualMemoryTable[Index].Length =3D SGI_SUBSYS_GENERIC_WDOG_SZ; + VirtualMemoryTable[++Index].PhysicalBase =3D FixedPcdGet32 (PcdWdogBase= ); + VirtualMemoryTable[Index].VirtualBase =3D FixedPcdGet32 (PcdWdogBase= ); + VirtualMemoryTable[Index].Length =3D FixedPcdGet32 (PcdWdogSize= ); VirtualMemoryTable[Index].Attributes =3D ARM_MEMORY_REGION_ATTRIBUT= E_DEVICE; =20 // Sub System Peripherals - GIC-600 @@ -135,6 +135,30 @@ ArmPlatformGetVirtualMemoryMap ( VirtualMemoryTable[Index].Length =3D FixedPcdGet64(PcdGicSize); VirtualMemoryTable[Index].Attributes =3D ARM_MEMORY_REGION_ATTRIBUT= E_DEVICE; =20 + // Sub System Peripherals - Counter + VirtualMemoryTable[++Index].PhysicalBase =3D FixedPcdGet32 (PcdTimerCou= nterReadBase); + VirtualMemoryTable[Index].VirtualBase =3D FixedPcdGet32 (PcdTimerCou= nterReadBase); + VirtualMemoryTable[Index].Length =3D FixedPcdGet32 (PcdTimerCou= nterReadSize); + VirtualMemoryTable[Index].Attributes =3D ARM_MEMORY_REGION_ATTRIBUT= E_DEVICE; + + // Sub System Peripherals - Timer Control + VirtualMemoryTable[++Index].PhysicalBase =3D FixedPcdGet32 (PcdTimerCon= trolBase); + VirtualMemoryTable[Index].VirtualBase =3D FixedPcdGet32 (PcdTimerCon= trolBase); + VirtualMemoryTable[Index].Length =3D FixedPcdGet32 (PcdTimerCon= trolSize); + VirtualMemoryTable[Index].Attributes =3D ARM_MEMORY_REGION_ATTRIBUT= E_DEVICE; + + // Sub System Peripherals - Timer Base0 + VirtualMemoryTable[++Index].PhysicalBase =3D FixedPcdGet32 (PcdTimerBas= e0Base); + VirtualMemoryTable[Index].VirtualBase =3D FixedPcdGet32 (PcdTimerBas= e0Base); + VirtualMemoryTable[Index].Length =3D FixedPcdGet32 (PcdTimerBas= e0Size); + VirtualMemoryTable[Index].Attributes =3D ARM_MEMORY_REGION_ATTRIBUT= E_DEVICE; + + // Sub System Peripherals - SMMU + VirtualMemoryTable[++Index].PhysicalBase =3D FixedPcdGet32 (PcdSmmuBase= ); + VirtualMemoryTable[Index].VirtualBase =3D FixedPcdGet32 (PcdSmmuBase= ); + VirtualMemoryTable[Index].Length =3D FixedPcdGet32 (PcdSmmuSize= ); + VirtualMemoryTable[Index].Attributes =3D ARM_MEMORY_REGION_ATTRIBUT= E_DEVICE; + // Expansion AXI - Platform Peripherals - HDLCD1 VirtualMemoryTable[++Index].PhysicalBase =3D FixedPcdGet32 (PcdArmHdLcd= Base); VirtualMemoryTable[Index].VirtualBase =3D FixedPcdGet32 (PcdArmHdLcd= Base); --=20 2.17.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 (#73983): https://edk2.groups.io/g/devel/message/73983 Mute This Topic: https://groups.io/mt/82046085/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-