From nobody Fri Mar 29 14:30: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+73591+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+73591+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1617255353; cv=none; d=zohomail.com; s=zohoarc; b=cw/rByyut0Kf8QVtMxgGqm/KTH3BC2Rce1+3YXEawuENK+fpE/LsHc6crc/hWJDRQuIr2RKYB8bGiCNE+bXpJ7smrV9PNZBf9uBW6XGoID/Ty38JOujyJzow4qTILiZo1XmicOu0jaMS8zO18NJCvEYwaXiq2K0hUhZJvh6BZyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617255353; 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=9+hYWe4rF++S6ZME28u24SL72T+jfCUdl8GDP/lkdRA=; b=Y82rCs9iJXWqh1mjP9se/948N6XgT+60n7U44l9Z6SJlwXZjlZnZt8uv9DlF6VFIEb5+0KybZ/MoVvZpinZG1gypS7A4AaqW3YxAXIHevHiTP4c/lCJ0RZohr1fxtp4OQqPRfbPlOnkR86ey0G1xc5k0NP3OEwjlDNfuWWPS5GY= 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+73591+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 1617255353950116.44102655527331; Wed, 31 Mar 2021 22:35:53 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 7TVIYY1788612xK65EXhggEL; Wed, 31 Mar 2021 22:35:53 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.3592.1617255352989253592 for ; Wed, 31 Mar 2021 22:35:53 -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 9823BD6E; Wed, 31 Mar 2021 22:35:52 -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 2CD7D3F694; Wed, 31 Mar 2021 22:35:50 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V2 1/6] Platform/Sgi: include SSDT table for RD-V1 platform Date: Thu, 1 Apr 2021 11:05:38 +0530 Message-Id: <20210401053543.17308-2-pranav.madhu@arm.com> In-Reply-To: <20210401053543.17308-1-pranav.madhu@arm.com> References: <20210401053543.17308-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: yjju2kcvj4ilEQ5QCl57ce8jx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1617255353; bh=OKSQzyxAZwttP27UfOCowEDem3p2PuTH9MDrqdr/G78=; h=Cc:Date:From:Reply-To:Subject:To; b=Ubsr17nJDKavkYsvSHtDCq6BcVAkZYfFKHro16iRwfLkAmOfWyqIiTW/Tg50Fp/EIo5 hLPKagpK2Q8Ii07BJ4sXoMVtLpuF6NHqLFq8oATn6jEY8aTX7mDfGUe1PilUM61tKPDc8 DUk/pJVGX6LObdfwtu+7dHlIx11n9IErv00= 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 051825993af0..2d6a65b103b4 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf @@ -25,6 +25,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 (#73591): https://edk2.groups.io/g/devel/message/73591 Mute This Topic: https://groups.io/mt/81769416/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 Fri Mar 29 14:30: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+73592+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+73592+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1617255357; cv=none; d=zohomail.com; s=zohoarc; b=SCcD/BlHCR8V/NgGnGepYqtUZw3IYqH08V8MuGTH9kvSgjKm/6ouAgASGPGHfAGGaaMcN8uEHJNOhZ58HxiPP2cvK0wniqYNkEin7r2iVo5VRr1FXf+VL7KgzZnQhKSCfZE+n0wBo9p93qQNYXnt/IFMUglwdD1f+vRR9hcBlpU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617255357; 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=Kv/7eyR4hhaedXWnk3gd3D2z9H7i6QhypLoM7YwLZWs=; b=FtDNiL/GAkbeLGJWm2DQDGBO3rhud2Bl4v1j9v3STpsyAGJd9Rww3Pcvl7DLhDP5GT2MXf5nXSWGvjsEB+4ccO8Gyw5pTpNo2AOsaukH3VdrXC/9GPrOOxNKszsnDw/x80w9tUysvBUnkjRzPywEWSzSUN95vdqFpzaAZgvX0WI= 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+73592+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 1617255357825476.59949256848085; Wed, 31 Mar 2021 22:35:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aRXPYY1788612xI9pkcmtvsM; Wed, 31 Mar 2021 22:35:55 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.3602.1617255354839025457 for ; Wed, 31 Mar 2021 22:35:54 -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 7D8CFD6E; Wed, 31 Mar 2021 22:35:54 -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 109713F694; Wed, 31 Mar 2021 22:35:52 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V2 2/6] Platform/Sgi: fix the list of CPU devices on RD-V1-MC platform Date: Thu, 1 Apr 2021 11:05:39 +0530 Message-Id: <20210401053543.17308-3-pranav.madhu@arm.com> In-Reply-To: <20210401053543.17308-1-pranav.madhu@arm.com> References: <20210401053543.17308-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: gz9Iz4dh1cdu6wPToD5WhDKnx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1617255355; bh=QNvozL0GZjsudUMM35PHofnh4fGPoBeQ3vFgIEI/JMo=; h=Cc:Date:From:Reply-To:Subject:To; b=nUTH0zP9avVRfylI84cNnfzy8Oam6B+vw1f/f70F9+Ro4+PswkUjwtPxEt+TtLKGWCl gMGe0DIT5oGTLFvAQnkKVOoI3kJqwTGUZbXGJ/wo9pQkWmEC3Ha/Te0PkXvyq6HEjq9e4 HDB4A6nupFpVfv+Jf/A6M+/ZM0jOSVcRpPw= 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 (#73592): https://edk2.groups.io/g/devel/message/73592 Mute This Topic: https://groups.io/mt/81769417/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 Fri Mar 29 14:30: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+73593+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+73593+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1617255362; cv=none; d=zohomail.com; s=zohoarc; b=b4rmquMuJpPJpZB96owB9x/4XTsEhrawYlnogD7QX6wpI5UEq/OyHQoIzDNFDlldOR2i29+E6HkFzONkCfrgwjh0iy06lfQUdw1X/JtiRK8dfUDrLMpu12bU9QytzfBn+55M41WVv2f+N5bGdnF/9R3DMV2QFn9kMY08Gublwpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617255362; 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=iVgSSvF4iIqKdHD9unX50OVMKJDbQazgCgRQKe2z/lM=; b=UADz9RuoEZFnw/Y6H/nox1AjZecLiVuEW7JtJpbpkKEPQHaDhVsFE3dBqQwypJeBdUei7Wilo/bcUZtHl835R2YsQEBFzjKWkqdGHaFMljGTEZIvR/Eay7pPZvDRj2QSaWyR3MIlhE/QJRyd41U0yil/OoVoCY5zTt+k+g6XhrM= 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+73593+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 1617255362808142.58693021566648; Wed, 31 Mar 2021 22:36:02 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id C2lUYY1788612xbctWGyPpYf; Wed, 31 Mar 2021 22:36:02 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.3408.1617255356704207215 for ; Wed, 31 Mar 2021 22:35:56 -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 59954D6E; Wed, 31 Mar 2021 22:35:56 -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 EA3123F694; Wed, 31 Mar 2021 22:35:54 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V2 3/6] Platform/Sgi: fix CPU acpi-id for RD-V1-MC platform Date: Thu, 1 Apr 2021 11:05:40 +0530 Message-Id: <20210401053543.17308-4-pranav.madhu@arm.com> In-Reply-To: <20210401053543.17308-1-pranav.madhu@arm.com> References: <20210401053543.17308-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: d30FUBEetx6ro2nDRFMtJuwVx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1617255362; bh=je5YxPj9VVNd2/YF2OnZOx+FJ8vQpEuZVkAUtO9Syxg=; h=Cc:Date:From:Reply-To:Subject:To; b=pHDZjW9m1S+p8q3CuwUmZwtUnsRovnRNll1+l6rgEUuSP6/GzF9OJ5qWyZK1Mx73m/d RcV5EDJUKFJMzVxtPzHzKfAiyn66OnjQkxkeu3TSeo0WUzMj0tgXVEp633CHp1qb6njpn zaMYI02xJtuere9Fqm4w9UxU1a08YRSMPSM= 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 (#73593): https://edk2.groups.io/g/devel/message/73593 Mute This Topic: https://groups.io/mt/81769418/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 Fri Mar 29 14:30: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+73594+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+73594+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1617255359; cv=none; d=zohomail.com; s=zohoarc; b=A/xHQ3fw2Y4YVG6kXAPszgmi20r02Yx69WiIOeaViYtCCS+fxbXsBMhJcxoWqfoROuwLWWYeFrtKf6tm95me9mZ19GLiiPzQR5+ov8i06eNVcJ6Qp2Am99VAxjq4o9HFSf+hJGJxP1I6sSPSxgFqe7CPC2vUXKer5/jjaXgBtUE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617255359; 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=WrzJTv1BTSJGb5CZp8/O5NbBh1QADV0SIe4PFKGh07k=; b=T21V31hlNHmYUxP7BbTSAd6HaZAmxnunq5ub9kjmJgo6Qr1oonD2nzEIw1SToy0ZAVUNpY3Pq0oCOyPBW2cWHcWq6Y7aRE6uxbAPeKxrrzPLej2Y8Zk+lUZJLpv37qkyEPsi2hy1khvywekD7wI7RlUdiZB8OG+17aqsW/7vY8g= 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+73594+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 1617255359587773.8324931639827; Wed, 31 Mar 2021 22:35:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id a9zcYY1788612xKk6bU1wjlA; Wed, 31 Mar 2021 22:35:59 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.3594.1617255358587903076 for ; Wed, 31 Mar 2021 22:35:58 -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 32DD4D6E; Wed, 31 Mar 2021 22:35:58 -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 C481B3F694; Wed, 31 Mar 2021 22:35:56 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V2 4/6] Platform/Sgi: update ACPI table revision Date: Thu, 1 Apr 2021 11:05:41 +0530 Message-Id: <20210401053543.17308-5-pranav.madhu@arm.com> In-Reply-To: <20210401053543.17308-1-pranav.madhu@arm.com> References: <20210401053543.17308-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: da23zDtsE2GkmDisAy4Z1R79x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1617255359; bh=yOsJrphgTWJQaZ5lIQ5sW8sy6o4kpnXbKzyMzTfTdYk=; h=Cc:Date:From:Reply-To:Subject:To; b=n56oril9lKdQE5Z4cjOclrHJ6cMJ8i5iMrwd3+1uNlO8GZk/9M+G56XgIP9lMMo37Z2 5w0zMqGb7KBDV7r/JwZWme/kmGkrXnWQRHgnnAMb3x9NdLsK4lRUaU00g/vr0aTvZqAl/ bHwlFstE2I9Hg6W4toED5D+NlLAtYToUFWs= 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 (#73594): https://edk2.groups.io/g/devel/message/73594 Mute This Topic: https://groups.io/mt/81769419/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 Fri Mar 29 14:30: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+73595+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+73595+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1617255366; cv=none; d=zohomail.com; s=zohoarc; b=bRQCbwGrEPs1EccoPv3E+EELL9qJutV9kAbphPMJH5PbJXXh5gmIKOGoKlW9tFSgfcAhfLhd0k7gMFOGQE6nhPbahijd9Am3JEZr0saBaRcs2SspUXzWXdwj0MFsDzTquIUYKcwYNn7Q7gibp5xFlBuCfV5y7fjbvqms6olwe+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617255366; 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=B+UaxvWNyw66R9kQ2bUME3w2IGIHVPGG9ZJr3BJdM+0=; b=J5DABump3N785VArVQp7sxsBxBaABOnF+Y+8DOsp68lIUVjfYf3/gDNvZmKY7KUgWVx+tKWbUXIiQSRyz+NOaQgA+4U8MCAAPaMeW+3A/IWfaxQpYzwB5S6DZ/xI5Mqrhz1uH2RuCuzcWD0xzER8SQ/oFS+nb9KOqyuXeWKicI4= 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+73595+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 1617255366557265.2517165359544; Wed, 31 Mar 2021 22:36:06 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id E7zxYY1788612xNugLqdLojB; Wed, 31 Mar 2021 22:36:06 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.3603.1617255360452977351 for ; Wed, 31 Mar 2021 22:36:00 -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 0D611ED1; Wed, 31 Mar 2021 22:36:00 -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 9F7C13F694; Wed, 31 Mar 2021 22:35:58 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V2 5/6] Platform/Sgi: define PCD for timer interrupt numbers Date: Thu, 1 Apr 2021 11:05:42 +0530 Message-Id: <20210401053543.17308-6-pranav.madhu@arm.com> In-Reply-To: <20210401053543.17308-1-pranav.madhu@arm.com> References: <20210401053543.17308-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: AAln1vkqsptFcrhWsrvHCZ1lx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1617255366; bh=o/d5NLRVndre2eQ5EBrToQHGOHd8D2Ia0DG7ctMuDGo=; h=Cc:Date:From:Reply-To:Subject:To; b=fTw8yJFTQOvoHZ9/B7y/XYYNAWPl9QDBdsxF5Q5h3EOi1fQgsLXLGjUP0coj5iE0CEk 4TIAHaLXshjxC3leJt12J2sgQ1QsPbPk7RoU3rxRA+LSnl0mtpCbyfIAqjemrMCnFH4GC 7tTXQkYdlo2YJZmoMl/Jlpy+fyIB6dqhTnY= 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 d44f02ab0c16..ba400de0454b 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf @@ -58,11 +58,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 2d6a65b103b4..08351b1e98e6 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf @@ -58,11 +58,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 (#73595): https://edk2.groups.io/g/devel/message/73595 Mute This Topic: https://groups.io/mt/81769420/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 Fri Mar 29 14:30: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+73596+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+73596+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1617255363; cv=none; d=zohomail.com; s=zohoarc; b=cHlp+o5Jh0/zIF7Ng8yPPl/MR9NWZrpDUPl5kzix+l99Zxh385epVvG0ZlwCuybGmOzZ7X09ke/9Zqsq+VE+eRR0ZGzkJT9HCyiP26OLnXs4hsgbOmDFNGkQ/KHJ5nHdIYCDY9YpmmGabXy8Vnnq8sr0/yEr3/b5QAO64+3S/tA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617255363; 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=U2EVxZYk0YURFCK7tetbUFsPFNQ2KybW/RA+z2V2cOQ=; b=ZOR9PvNrLp4NBGjidEVhcRuwDLlk9Fohi42hPSt33aIC5dqY7lnITwH/c6cmdDMdkwzcQKPG1yWszii2joCX77Ydxvpk7iZ69gWY8a7Xulsi7p3p5joKc1mNmCycLAXcTiFDFj3GJVO+4loz01fyAMgw3GkF6WTr68ueiUmAaNU= 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+73596+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 1617255363331195.29606000773197; Wed, 31 Mar 2021 22:36:03 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id DcEnYY1788612xN73HnjJNZi; Wed, 31 Mar 2021 22:36:02 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.3612.1617255362189233330 for ; Wed, 31 Mar 2021 22:36:02 -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 DC320D6E; Wed, 31 Mar 2021 22:36:01 -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 7A1623F694; Wed, 31 Mar 2021 22:36:00 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V2 6/6] Platform/Sgi: add SMMU and timer entries to memory description table Date: Thu, 1 Apr 2021 11:05:43 +0530 Message-Id: <20210401053543.17308-7-pranav.madhu@arm.com> In-Reply-To: <20210401053543.17308-1-pranav.madhu@arm.com> References: <20210401053543.17308-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: 3EvTu90dGFsjUoFA4Z2qcpYHx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1617255362; bh=yPduU95GTkMh6cWJlqkJm6Bzx4pdLGH5dhjGJpQ/kv4=; h=Cc:Date:From:Reply-To:Subject:To; b=pS4DZ1Y6O07bvqoZN+6BlpjPdDc8TYCqJoc8cqANETaWjcIWrKUiWUL1GuaOG18jYld VRaCRArUhwAcuOKtKr13RnOMMAQ/68kh/wMA4+lqiV2bkljEpXW8ru06I4V0uOYwqqnm5 KGaaLj3ZzWUrFUsAoRbLYjoB/G5O1RzipGs= 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..5c10c6f1635c 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.PcdTimerCounterReadBase|0|UINT32|0x00000015 + gArmSgiTokenSpaceGuid.PcdTimerCounterReadSize|0|UINT32|0x00000016 gArmSgiTokenSpaceGuid.PcdGtFrame0Gsiv|0|UINT32|0x00000011 gArmSgiTokenSpaceGuid.PcdGtFrame1Gsiv|0|UINT32|0x00000012 + gArmSgiTokenSpaceGuid.PcdTimerBase0Base|0|UINT32|0x00000017 + gArmSgiTokenSpaceGuid.PcdTimerBase0Size|0|UINT32|0x00000018 + gArmSgiTokenSpaceGuid.PcdTimerControlBase|0|UINT32|0x00000019 + gArmSgiTokenSpaceGuid.PcdTimerControlSize|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..e59a399690c1 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.PcdTimerCounterReadBase|0x2A800000 + gArmSgiTokenSpaceGuid.PcdTimerCounterReadSize|0x00010000 + gArmSgiTokenSpaceGuid.PcdTimerBase0Base|0x2A830000 + gArmSgiTokenSpaceGuid.PcdTimerBase0Size|0x00010000 + gArmSgiTokenSpaceGuid.PcdTimerControlBase|0x2A810000 + gArmSgiTokenSpaceGuid.PcdTimerControlSize|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..f8e517f9efed 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.PcdTimerCounterReadBase + gArmSgiTokenSpaceGuid.PcdTimerCounterReadSize gArmSgiTokenSpaceGuid.PcdSmcCs0Base gArmSgiTokenSpaceGuid.PcdSmcCs1Base + gArmSgiTokenSpaceGuid.PcdSmmuBase + gArmSgiTokenSpaceGuid.PcdSmmuSize gArmSgiTokenSpaceGuid.PcdSysPeriphBase + gArmSgiTokenSpaceGuid.PcdTimerBase0Base + gArmSgiTokenSpaceGuid.PcdTimerBase0Size + gArmSgiTokenSpaceGuid.PcdTimerControlBase + gArmSgiTokenSpaceGuid.PcdTimerControlSize + 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 (#73596): https://edk2.groups.io/g/devel/message/73596 Mute This Topic: https://groups.io/mt/81769421/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-