From nobody Mon May 13 12:32:19 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+86168+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+86168+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1643384458; cv=none; d=zohomail.com; s=zohoarc; b=T7nXWVu/FjXfGHtDPcQjkF5R42g/PlMVlGqAqCVrV9Gz/fNPHDOCSbJvDqSZrvg+JssqidWS1mz61uxVZ7PFiz7cclTy08q/kAactI8FEXe2vpCp7H9Zs8PdOPcRBtEap6fl0BG+0KEFsfzQNjeapD642duX3pCsctIeJVsxbSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643384458; 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+NWjFpFUd5DCJjCjR4J9rUWQQIWlvXGu0i3ZELZiQ0=; b=kCKppbg+otN8IOW0Lrvbq29LWppsm2LrKReGluBT2F5P3uX8bMI85nsqVKe3wFOhRLSWJOOtiyY+e5tKE4mGo+5opwAWaM9tw5V8v3zosQRAUn7TaiKdTkX8KW2hsbPnFlrWRdSKYpfUsToGC5qxipGjThJ+WewhbpKAYMBKoIE= 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+86168+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1643384458637303.02164257377683; Fri, 28 Jan 2022 07:40:58 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id tzTSYY1788612xvIyId5aTtj; Fri, 28 Jan 2022 07:40:58 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.8485.1643384457116042712 for ; Fri, 28 Jan 2022 07:40:57 -0800 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 BA56D1396; Fri, 28 Jan 2022 07:40:56 -0800 (PST) X-Received: from e126645.home (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id ADE883F793; Fri, 28 Jan 2022 07:40:55 -0800 (PST) From: "PierreGondois" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [PATCH v3 1/8] DynamicTablesPkg: Print specifier macro for CM_OBJECT_ID Date: Fri, 28 Jan 2022 16:40:56 +0100 Message-Id: <20220128154103.20752-2-Pierre.Gondois@arm.com> In-Reply-To: <20220128154103.20752-1-Pierre.Gondois@arm.com> References: <20220128154103.20752-1-Pierre.Gondois@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,pierre.gondois@arm.com X-Gm-Message-State: iSKgX4yzGoGxm5Hd4xO6sR6Kx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1643384458; bh=YjlN402sau5Vmi9myuP6p51xvcRANcjU2vz45tAcXNg=; h=Cc:Date:From:Reply-To:Subject:To; b=ZYEkHLvcaOBy8hZs4fQQpL2f7snbzNu+4IO57l5A0Us5PcvrhiR4vzxo+dOZGFUS0M+ 6CcLBXsPnd29PwiQPvt9S5y4aUUPE4ElWQIUMJcjiUsqPrf7oY2t4F0Mo9pJYUtamdtKB 9kd5eN2iEwq8pU6Ai5rzvyG26lKDqapebzY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1643384460761100007 Content-Type: text/plain; charset="utf-8" From: Pierre Gondois Add a macro that specifies the format for printing CM_OBJECT_ID. This allows to print the CM_OBJECT_ID is a consistent way in the output logs. Signed-off-by: Pierre Gondois --- Notes: v2: - New patch, requested by Laszlo. DynamicTablesPkg/Include/ConfigurationManagerObject.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/DynamicTablesPkg/Include/ConfigurationManagerObject.h b/Dynami= cTablesPkg/Include/ConfigurationManagerObject.h index 60d825a2b253..74ad25d5d94a 100644 --- a/DynamicTablesPkg/Include/ConfigurationManagerObject.h +++ b/DynamicTablesPkg/Include/ConfigurationManagerObject.h @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2017 - 2022, ARM Limited. All rights reserved. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -84,6 +84,11 @@ Object ID's in the ARM Namespace: */ typedef UINT32 CM_OBJECT_ID; =20 +// +// Helper macro to format a CM_OBJECT_ID. +// +#define FMT_CM_OBJECT_ID "0x%lx" + /** A mask for Object ID */ #define OBJECT_ID_MASK 0xFF --=20 2.25.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 (#86168): https://edk2.groups.io/g/devel/message/86168 Mute This Topic: https://groups.io/mt/88746968/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 Mon May 13 12:32:19 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+86169+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+86169+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1643384459; cv=none; d=zohomail.com; s=zohoarc; b=BQmW1XdBl7d+jqZm/9Axuifm951+s31vodSdKnfpqgmQhsqqusDLXHoXNg+5Iz06ZEolRg6yjuYrVtdkZwlGUxItgZVovUSNKpb6mTYBN+2blsT2Z3dTY9KdRFQnUb43YIJCcZmGyTMF8CHZo2L1jiglvZaFdwrCsICqS3KX20o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643384459; 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=yJDYYFmgreOoxJd1Rs/1nsy0i/QIZNROuivWCoomnds=; b=dE5DEEpf/HoXoQa36uHWAAvA2SU23cyrtAXoi0NxNg6bY0Fw18JQVw5dZuBpGZag9cyTEM5HmlYd8mPBVvMk6/M0/cHtfH4GTOZ4PrEshqOzZE5OvARMArTlhgJgV4njuLfuJPLRMN/LMqPNoAQWDyHnqJBjoG7LQXEUsVkjZNg= 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+86169+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1643384459537316.2523137552621; Fri, 28 Jan 2022 07:40:59 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id gdJHYY1788612xa6KVwcK8CC; Fri, 28 Jan 2022 07:40:59 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.8486.1643384458391088681 for ; Fri, 28 Jan 2022 07:40:58 -0800 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 1D99412FC; Fri, 28 Jan 2022 07:40:58 -0800 (PST) X-Received: from e126645.home (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 238FA3F793; Fri, 28 Jan 2022 07:40:56 -0800 (PST) From: "PierreGondois" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [PATCH v3 2/8] DynamicTablesPkg: FdtHwInfoParserLib: Parse Pmu info Date: Fri, 28 Jan 2022 16:40:57 +0100 Message-Id: <20220128154103.20752-3-Pierre.Gondois@arm.com> In-Reply-To: <20220128154103.20752-1-Pierre.Gondois@arm.com> References: <20220128154103.20752-1-Pierre.Gondois@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,pierre.gondois@arm.com X-Gm-Message-State: vqZipaMubc9jOrWFZ39rScr6x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1643384459; bh=90lXnVhaiKzSfmkSPlVanAD9tUcMw9IDhgUmvgIZOuM=; h=Cc:Date:From:Reply-To:Subject:To; b=eTKQw3doCb+Sra/XqIl1UMt32dOxnoIF58U8/erYqf3fvs08HWfNT++5zz7OghT7aZD zHk0bo2v0JSA/nv6qKDXO8pWiXcBarRI7wvOyGnAlnezFMgG2vaNTXLVota/3xoA+f4F0 b8PMM2D9iPJQpe7ZWTQXYltQob8rjuic+GY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1643384461094100011 Content-Type: text/plain; charset="utf-8" From: Pierre Gondois Parse the Pmu interrupts if a pmu compatible node is present, and populate the MADT GicC structure accordingly. Signed-off-by: Pierre Gondois --- Notes: v3: - New patch. [Pierre] .../FdtHwInfoParserLib/Gic/ArmGicCParser.c | 131 +++++++++++++++++- .../FdtHwInfoParserLib/Gic/ArmGicCParser.h | 8 +- 2 files changed, 135 insertions(+), 4 deletions(-) diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.= c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.c index b4e6729a4ab2..961607378449 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.c @@ -1,13 +1,14 @@ /** @file Arm Gic cpu parser. =20 - Copyright (c) 2021, ARM Limited. All rights reserved.
+ Copyright (c) 2021 - 2022, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): - linux/Documentation/devicetree/bindings/arm/cpus.yaml - linux/Documentation/devicetree/bindings/interrupt-controller/arm,gic.y= aml - linux/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v= 3.yaml + - linux/Documentation/devicetree/bindings/arm/pmu.yaml **/ =20 #include "FdtHwInfoParser.h" @@ -34,6 +35,21 @@ STATIC CONST COMPATIBILITY_INFO CpuCompatibleInfo =3D { CpuCompatibleStr }; =20 +/** Pmu compatible strings. + + Any other "compatible" value is not supported by this module. +*/ +STATIC CONST COMPATIBILITY_STR PmuCompatibleStr[] =3D { + { "arm,armv8-pmuv3" } +}; + +/** COMPATIBILITY_INFO structure for the PmuCompatibleStr. +*/ +CONST COMPATIBILITY_INFO PmuCompatibleInfo =3D { + ARRAY_SIZE (PmuCompatibleStr), + PmuCompatibleStr +}; + /** Parse a "cpu" node. =20 @param [in] Fdt Pointer to a Flattened Device Tree (Fdt). @@ -639,6 +655,110 @@ GicCv3IntcNodeParser ( return EFI_SUCCESS; } =20 +/** Parse a Pmu compatible node, extracting Pmu information. + + This function modifies a CM_OBJ_DESCRIPTOR object. + The following CM_ARM_GICC_INFO fields are patched: + - PerformanceInterruptGsiv; + + @param [in] Fdt Pointer to a Flattened Device Tree (F= dt). + @param [in] GicIntcNode Offset of a Gic compatible + interrupt-controller node. + @param [in, out] GicCCmObjDesc The CM_ARM_GICC_INFO to patch. + + @retval EFI_SUCCESS The function completed successfully. + @retval EFI_ABORTED An error occurred. + @retval EFI_INVALID_PARAMETER Invalid parameter. +**/ +STATIC +EFI_STATUS +EFIAPI +GicCPmuNodeParser ( + IN CONST VOID *Fdt, + IN INT32 GicIntcNode, + IN OUT CM_OBJ_DESCRIPTOR *GicCCmObjDesc + ) +{ + EFI_STATUS Status; + INT32 IntCells; + INT32 PmuNode; + UINT32 PmuNodeCount; + UINT32 PmuIrq; + UINT32 Index; + CM_ARM_GICC_INFO *GicCInfo; + CONST UINT8 *Data; + INT32 DataSize; + + if (GicCCmObjDesc =3D=3D NULL) { + ASSERT (0); + return EFI_INVALID_PARAMETER; + } + + GicCInfo =3D (CM_ARM_GICC_INFO *)GicCCmObjDesc->Data; + PmuNode =3D 0; + + // Count the number of pmu nodes. + Status =3D FdtCountCompatNodeInBranch ( + Fdt, + 0, + &PmuCompatibleInfo, + &PmuNodeCount + ); + if (EFI_ERROR (Status)) { + ASSERT (0); + return Status; + } + + if (PmuNodeCount =3D=3D 0) { + return EFI_NOT_FOUND; + } + + Status =3D FdtGetNextCompatNodeInBranch ( + Fdt, + 0, + &PmuCompatibleInfo, + &PmuNode + ); + if (EFI_ERROR (Status)) { + ASSERT (0); + if (Status =3D=3D EFI_NOT_FOUND) { + // Should have found the node. + Status =3D EFI_ABORTED; + } + } + + // Get the number of cells used to encode an interrupt. + Status =3D FdtGetInterruptCellsInfo (Fdt, GicIntcNode, &IntCells); + if (EFI_ERROR (Status)) { + ASSERT (0); + return Status; + } + + Data =3D fdt_getprop (Fdt, PmuNode, "interrupts", &DataSize); + if ((Data =3D=3D NULL) || (DataSize !=3D (IntCells * sizeof (UINT32)))) { + // If error or not 1 interrupt. + ASSERT (0); + return EFI_ABORTED; + } + + PmuIrq =3D FdtGetInterruptId ((CONST UINT32 *)Data); + + // Only supports PPI 23 for now. + // According to BSA 1.0 s3.6 PPI assignments, PMU IRQ ID is 23. A non BSA + // compliant system may assign a different IRQ for the PMU, however this + // is not implemented for now. + if (PmuIrq !=3D BSA_PMU_IRQ) { + ASSERT (0); + return EFI_ABORTED; + } + + for (Index =3D 0; Index < GicCCmObjDesc->Count; Index++) { + GicCInfo[Index].PerformanceInterruptGsiv =3D PmuIrq; + } + + return EFI_SUCCESS; +} + /** CM_ARM_GICC_INFO parser function. =20 This parser expects FdtBranch to be the "\cpus" node node. @@ -649,7 +769,7 @@ GicCv3IntcNodeParser ( UINT32 AcpiProcessorUid; // {Populated} UINT32 Flags; // {Populated} UINT32 ParkingProtocolVersion; // {default =3D 0} - UINT32 PerformanceInterruptGsiv; // {default =3D 0} + UINT32 PerformanceInterruptGsiv; // {Populated} UINT64 ParkedAddress; // {default =3D 0} UINT64 PhysicalBaseAddress; // {Populated} UINT64 GICV; // {Populated} @@ -764,6 +884,13 @@ ArmGicCInfoParser ( goto exit_handler; } =20 + // Parse the Pmu Interrupt. + Status =3D GicCPmuNodeParser (Fdt, IntcNode, NewCmObjDesc); + if (EFI_ERROR (Status) && (Status !=3D EFI_NOT_FOUND)) { + ASSERT (0); + goto exit_handler; + } + // Add all the CmObjs to the Configuration Manager. Status =3D AddMultipleCmObj (FdtParserHandle, NewCmObjDesc, 0, NULL); if (EFI_ERROR (Status)) { diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.= h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.h index 2a0f966bf0c2..fd980484a28d 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.h +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.h @@ -1,7 +1,7 @@ /** @file Arm Gic cpu parser. =20 - Copyright (c) 2021, ARM Limited. All rights reserved.
+ Copyright (c) 2021 - 2022, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): @@ -12,6 +12,10 @@ #ifndef ARM_GICC_PARSER_H_ #define ARM_GICC_PARSER_H_ =20 +/* According to BSA 1.0 s3.6 PPI assignments, PMU IRQ ID is 23. +*/ +#define BSA_PMU_IRQ 23 + /** CM_ARM_GICC_INFO parser function. =20 This parser expects FdtBranch to be the "\cpus" node node. @@ -22,7 +26,7 @@ UINT32 AcpiProcessorUid; // {Populated} UINT32 Flags; // {Populated} UINT32 ParkingProtocolVersion; // {default =3D 0} - UINT32 PerformanceInterruptGsiv; // {default =3D 0} + UINT32 PerformanceInterruptGsiv; // {Populated} UINT64 ParkedAddress; // {default =3D 0} UINT64 PhysicalBaseAddress; // {Populated} UINT64 GICV; // {Populated} --=20 2.25.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 (#86169): https://edk2.groups.io/g/devel/message/86169 Mute This Topic: https://groups.io/mt/88746969/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 Mon May 13 12:32:19 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+86170+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+86170+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1643384461; cv=none; d=zohomail.com; s=zohoarc; b=I8yNXYOxJk8a2Pwr19J5xLRfKDligyIzRn9QDCOyj/myZNz62gHdX3J3kFd0eAHQ6cvYP2Ug9y0fmrFfLPnKPB9+HwkYrEteLH46qFXi7UHKSDlgcDiXKbgSOK+BXYUTy/5n7TBWhESkGZzpFP6g6LUEleNHs+jnJf+tVAIOeBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643384461; 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=O80HyfdetVaHi5QUR7P5Pf2+/nsEvCj+3tXzstmNPH4=; b=MT4dgUkh0+vavY9oHmd+5nOXpiVt9HZ7tvXFiW2x7DapX6bbFf3BdwA6rBMQNUKPK/Ec6ThY2ub1RcUkY+jtcR7UHNz83k2ZP/Cduse8ZRgFMPVgGqm+ZtW3nITDYz2O55wlkeQYeQu30e3GS4Yew7fqVichc20/YICTGxn0Mww= 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+86170+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1643384461388376.16615373041736; Fri, 28 Jan 2022 07:41:01 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id F3dNYY1788612xN9C7j1UtEn; Fri, 28 Jan 2022 07:41:00 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.8728.1643384459955138588 for ; Fri, 28 Jan 2022 07:41:00 -0800 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 986CC1396; Fri, 28 Jan 2022 07:40:59 -0800 (PST) X-Received: from e126645.home (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 752D43F793; Fri, 28 Jan 2022 07:40:58 -0800 (PST) From: "PierreGondois" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [PATCH v3 3/8] DynamicTablesPkg: AcpiSsdtPcieLibArm: Fix _PRT description Date: Fri, 28 Jan 2022 16:40:58 +0100 Message-Id: <20220128154103.20752-4-Pierre.Gondois@arm.com> In-Reply-To: <20220128154103.20752-1-Pierre.Gondois@arm.com> References: <20220128154103.20752-1-Pierre.Gondois@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,pierre.gondois@arm.com X-Gm-Message-State: x3EOlwMYozAJGkHOgHiJwDdYx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1643384460; bh=8sDvJTcOhHTAsFjnT2roVb7r3fc2ivAUwUiSdytXdV0=; h=Cc:Date:From:Reply-To:Subject:To; b=kKna6x0tFqECe6RTQz7v9ed/VoGhW7x1Thw9y2ihipMltBLWEvX9Q40ciyyrUZ4Cc9e DwRIs7E3+i/kfi9lrfUcdMy5IW9L3hvQzeOj7HhLmPNCr2xVYog/GVFJ9Ef8Jr935Zrf6 9boXd1EH/6MB6rQZg1hBoDfETaGJW6NKjOc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1643384463309100015 Content-Type: text/plain; charset="utf-8" From: Pierre Gondois In ACPI 6.4, s6.2.13, _PRT objects describing PCI legacy interrupts can be defined following 2 models. In the first model, a _SRS object must be described to modify the PCI interrupt. The _CRS and _PRS object allows to describe the PCI interrupt (level/edge triggered, active high/low). In the second model, the PCI interrupt cannot be described with a similar granularity. PCI interrupts are by default level triggered, active low. GicV2 SPI interrupts are level or edge triggered, active high. To correctly describe PCI interrupts, the first model is used, even though Arm Base Boot Requirements v1.0 requires to use the second mode. Signed-off-by: Pierre Gondois --- Notes: v3: - New patch. [Pierre] .../AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 47 +++++++++++++++++-- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c index 3e22587d4a25..6823a98795c8 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c @@ -1,7 +1,7 @@ /** @file SSDT Pcie Table Generator. =20 - Copyright (c) 2021, Arm Limited. All rights reserved.
+ Copyright (c) 2021 - 2022, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -295,6 +295,10 @@ GeneratePciDeviceInfo ( Method (_CRS, 0) { Return CRS0 }) + Method (_PRS, 0) { + Return CRS0 + }) + Method (_SRS, 1) { } Method (_DIS) { } } =20 @@ -302,9 +306,12 @@ GeneratePciDeviceInfo ( PCI Firmware Specification - Revision 3.3, s3.5. "Device State at Firmware/Operating System Handoff" =20 - The _PRS and _SRS are not supported, cf Arm Base Boot Requirements v1.0: + Warning: The Arm Base Boot Requirements v1.0 states the following: "The _PRS (Possible Resource Settings) and _SRS (Set Resource Settings) are not supported." + However, the first model to describe PCI legacy interrupts is used (cf. = ACPI + 6.4 s6.2.13) as PCI defaults (Level Triggered, Active Low) are not compa= tible + with GICv2 (must be Active High). =20 @param [in] Irq Interrupt controller interrupt. @param [in] IrqFlags Interrupt flags. @@ -416,7 +423,41 @@ GenerateLinkDevice ( return Status; } =20 - // ASL:Method (_DIS, 1) {} + // ASL: + // Method (_PRS, 0) { + // Return (CRS0) + // } + Status =3D AmlCodeGenMethodRetNameString ( + "_PRS", + "CRS0", + 0, + FALSE, + 0, + LinkNode, + NULL + ); + if (EFI_ERROR (Status)) { + ASSERT (0); + return Status; + } + + // ASL:Method (_SRS, 1) {} + // Not possible to disable interrupts. + Status =3D AmlCodeGenMethodRetNameString ( + "_SRS", + NULL, + 1, + FALSE, + 0, + LinkNode, + NULL + ); + if (EFI_ERROR (Status)) { + ASSERT (0); + return Status; + } + + // ASL:Method (_DIS, 0) {} // Not possible to disable interrupts. Status =3D AmlCodeGenMethodRetNameString ( "_DIS", --=20 2.25.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 (#86170): https://edk2.groups.io/g/devel/message/86170 Mute This Topic: https://groups.io/mt/88746970/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 Mon May 13 12:32:19 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+86171+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+86171+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1643384462; cv=none; d=zohomail.com; s=zohoarc; b=Ymr/j8me5qsCzHGntp9BkwsbRstS9CuD53nSo87yFtP6vVi71Xf6DwKnZ3BqwrFRxxtBV1WfQuUFV7LUVtoGIzPwh7VAmdstk51qqD0k/wDzwIWUaN4OxiVGSknxV04cmgINaEJtwk/aGFoEMxF1lnq8DKWJ2GwNoyLptVii+d4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643384462; 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=xNmYjSnHf8DrspUW/0MqvkO14di5ZJik3OVSW40BedU=; b=eTReJFSqQee0JigPV+tWijbyQbsxPz8o+/+LD5Hzxevm+nLpl8+YT1rsCyD1WIMgiVnHL0Bv16GrfBd8qA2phzkKjYQKAu4ydaF0IEiiqRFvpJPP9JhkPcx4OdCBonybf87XEV1tJ3ZwRW2mqziM/2A5op+zoi/1vEljVIoN2fM= 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+86171+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1643384462677842.9924800096082; Fri, 28 Jan 2022 07:41:02 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id rpahYY1788612xV21ECsYwEH; Fri, 28 Jan 2022 07:41:02 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.8477.1643384461299875447 for ; Fri, 28 Jan 2022 07:41:01 -0800 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 E92C912FC; Fri, 28 Jan 2022 07:41:00 -0800 (PST) X-Received: from e126645.home (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 031E33F793; Fri, 28 Jan 2022 07:40:59 -0800 (PST) From: "PierreGondois" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [PATCH v3 4/8] ArmVirtPkg: Add cspell exceptions Date: Fri, 28 Jan 2022 16:40:59 +0100 Message-Id: <20220128154103.20752-5-Pierre.Gondois@arm.com> In-Reply-To: <20220128154103.20752-1-Pierre.Gondois@arm.com> References: <20220128154103.20752-1-Pierre.Gondois@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,pierre.gondois@arm.com X-Gm-Message-State: WjfRCHhTFQpWihr32y3VJMasx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1643384462; bh=vbloSkOYukfyQhDeU8gd14b7jbUbELKQHf40qon8YN0=; h=Cc:Date:From:Reply-To:Subject:To; b=k474QwblVi+Rgqvfbwmhm/odKOMzzOrvyLT8GUcw3L8L7AkMHLOQeUcPasbai4Z0O3h yaUMj/IB/7Atnl7/JsZB+s7Tvyhvk49uowMpsT9x5RMrJqT7ZROvodsr3SWCqdaPBNC0n aBaQHCY/zZzOuIs0vD3VNKg8W2CG08wU6JU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1643384463503100017 Content-Type: text/plain; charset="utf-8" From: Pierre Gondois The cpsell tool checks for unknown words in the upstream CI. Add some new words to the list of exceptions. Signed-off-by: Pierre Gondois --- Notes: v2: - Adding 'acpiview'. Since the patch change, Laszlo's Reviewed-by is not added. [Pierre] ArmVirtPkg/ArmVirtPkg.ci.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ArmVirtPkg/ArmVirtPkg.ci.yaml b/ArmVirtPkg/ArmVirtPkg.ci.yaml index 67b0e9594f3e..d5d63ddd4fd7 100644 --- a/ArmVirtPkg/ArmVirtPkg.ci.yaml +++ b/ArmVirtPkg/ArmVirtPkg.ci.yaml @@ -6,7 +6,7 @@ # # Copyright (c) Microsoft Corporation # Copyright (c) 2020, Intel Corporation. All rights reserved.
-# Copyright (c) 2020, ARM Limited. All rights reserved. +# Copyright (c) 2020 - 2022, ARM Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -48,6 +48,7 @@ "MdePkg/MdePkg.dec", "MdeModulePkg/MdeModulePkg.dec", "ArmVirtPkg/ArmVirtPkg.dec", + "DynamicTablesPkg/DynamicTablesPkg.dec", "NetworkPkg/NetworkPkg.dec", "ArmPkg/ArmPkg.dec", "OvmfPkg/OvmfPkg.dec", @@ -98,6 +99,9 @@ "AuditOnly": False, # Fails right now with over 270 erro= rs "IgnoreFiles": [], # use gitignore syntax to ignore erro= rs in matching files "ExtendWords": [ + "acpiview", + "armltd", + "ssdts", "setjump", "plong", "lparam", --=20 2.25.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 (#86171): https://edk2.groups.io/g/devel/message/86171 Mute This Topic: https://groups.io/mt/88746972/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 Mon May 13 12:32:19 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+86172+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+86172+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1643384464; cv=none; d=zohomail.com; s=zohoarc; b=BK3V50CS69bun7Jwbol40KVrbh5gweTpfGp7Y0L7HHUjf9pGbAC+wbIVSaV0NlJmO87UPDuTcXOKH0EOmmshS9dgGyULgiuOxdbGoUowWw0UrNPuG/MjZWzfdlgImkq7/etG3PIFoyFYDoppIqshk+QHnEuuanqtzxN9ntRYOis= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643384464; 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=i+P+R9YJTQ5Hff6vJG4drWGJx3HwNjUFmF/FpGQzG44=; b=OpB8YzFQUGMmBZwxTFXHwSGVWVg/oNLZx62usZEQjj1nW+Dk7ZtHJy+fZP5p36f14riRFNG+iE1IPXBoZQvDRVEwJ1e2oDoNG8H0YMLVi9JcPSHEzCA/GXZ8EBuj8dLAL6qv5cPxhEgv/bHNRJMf/aD/zFQU3yOLa3BTsKIeX2A= 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+86172+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1643384464214747.633085870688; Fri, 28 Jan 2022 07:41:04 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id NCw9YY1788612xLOiDVl4CQr; Fri, 28 Jan 2022 07:41:03 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.8730.1643384462699721408 for ; Fri, 28 Jan 2022 07:41:02 -0800 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 5E33E1396; Fri, 28 Jan 2022 07:41:02 -0800 (PST) X-Received: from e126645.home (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 53E013F793; Fri, 28 Jan 2022 07:41:01 -0800 (PST) From: "PierreGondois" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [PATCH v3 5/8] ArmVirtPkg/Kvmtool: Add DSDT ACPI table Date: Fri, 28 Jan 2022 16:41:00 +0100 Message-Id: <20220128154103.20752-6-Pierre.Gondois@arm.com> In-Reply-To: <20220128154103.20752-1-Pierre.Gondois@arm.com> References: <20220128154103.20752-1-Pierre.Gondois@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,pierre.gondois@arm.com X-Gm-Message-State: 5IQqeR6SA7dIiC9DBwwS9wo9x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1643384463; bh=0TZiVmwGTRaE+I5lnpLAhT2YN+8jUzNqDl+VMol8xE0=; h=Cc:Date:From:Reply-To:Subject:To; b=wBsNrFm2qjikO3dm0BMJDJZx3Svh9Szae9AxIWp8p7SUHnh/N8GOKtDIZ5FthQj7Rjs XLUrRbxsqxeprX4JQIhDOCNzU4tJXqX/XB/fLz4CdBg/YtFQy/t4zFoq7cIxz1G28x7xe KOt639qXjWACTYu1EmawpCfvUBWJl2wR8FA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1643384465616100021 Content-Type: text/plain; charset="utf-8" From: Sami Mujawar Most ACPI tables for Kvmtool firmware are dynamically generated. The AML code is also generated at runtime for most components in appropriate SSDTs. Although there may not be much to describe in the DSDT, the DSDT table is mandatory. Therefore, add an empty stub for DSDT. Signed-off-by: Sami Mujawar Signed-off-by: Pierre Gondois Reviewed-by: Laszlo Ersek --- Notes: v2: - Coding style modifications. [Laszlo] .../KvmtoolCfgMgrDxe/AslTables/Dsdt.asl | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 ArmVirtPkg/KvmtoolCfgMgrDxe/AslTables/Dsdt.asl diff --git a/ArmVirtPkg/KvmtoolCfgMgrDxe/AslTables/Dsdt.asl b/ArmVirtPkg/Kv= mtoolCfgMgrDxe/AslTables/Dsdt.asl new file mode 100644 index 000000000000..5010beabfc4b --- /dev/null +++ b/ArmVirtPkg/KvmtoolCfgMgrDxe/AslTables/Dsdt.asl @@ -0,0 +1,21 @@ +/** @file + Differentiated System Description Table Fields (DSDT) + + Copyright (c) 2021 - 2022, ARM Ltd. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARM-KVMT", 1) { + Scope (_SB) { + // + // Most ACPI tables for Kvmtool firmware are + // dynamically generated. The AML code is also + // generated at runtime for most components in + // appropriate SSDTs. + // Although there may not be much to describe + // in the DSDT, the DSDT table is mandatory. + // Therefore, add an empty stub for DSDT. + // + } // Scope (_SB) +} --=20 2.25.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 (#86172): https://edk2.groups.io/g/devel/message/86172 Mute This Topic: https://groups.io/mt/88746974/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 Mon May 13 12:32:19 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+86173+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+86173+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1643384465; cv=none; d=zohomail.com; s=zohoarc; b=B2iS9jH+KYPD2Me6eiiuYF9oWd2sue10Bw/7iPvnWHDYp2B/z6PUEpPceBYWChntIDaaKWTheEDMrsMp16SCgFTOzxC1HgazVePVhXrc2SVkdIUXL58SXomYtERP8sDopFlf24FiEeY5R8Vr6T9WBeYpiSsYPJ1ohlpFfw3yRCk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643384465; 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=7PcaWHrHTwptMEgbEcVqlW3VQXSQQl+rRyJ1fnpknNs=; b=Mr5KE0dDxs1/vIhWRtden27eNEqNzz35zBKX16LzzFWIRrf7W2aMcJsTAk+EWk1Zx339GAiyQ+NkvXZD0v+TkGa2oiY9EdoXMt3bIxUoKy6zv5ZKB2gDfKSirazo4bv+DXrvDXApPhLNolZR5XOgPu3+DCgTWwQprAKCi1+ctnA= 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+86173+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1643384465719865.9691865033709; Fri, 28 Jan 2022 07:41:05 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id NkXxYY1788612xSdR1P21y7e; Fri, 28 Jan 2022 07:41:05 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.8480.1643384464137003372 for ; Fri, 28 Jan 2022 07:41:04 -0800 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 C913612FC; Fri, 28 Jan 2022 07:41:03 -0800 (PST) X-Received: from e126645.home (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BDDF03F793; Fri, 28 Jan 2022 07:41:02 -0800 (PST) From: "PierreGondois" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [PATCH v3 6/8] ArmVirtPkg/Kvmtool: Add Configuration Manager Date: Fri, 28 Jan 2022 16:41:01 +0100 Message-Id: <20220128154103.20752-7-Pierre.Gondois@arm.com> In-Reply-To: <20220128154103.20752-1-Pierre.Gondois@arm.com> References: <20220128154103.20752-1-Pierre.Gondois@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,pierre.gondois@arm.com X-Gm-Message-State: h3E8JjQj9lR4pEtCuF81Avzqx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1643384465; bh=HgdcIudsgZjbPMzc5SOFdi9WlCbZPBDFMzsRlV30mlI=; h=Cc:Date:From:Reply-To:Subject:To; b=WnVoOpodhmYJXTwobEFCQ4Zivo702IjE+UYHNdBfn12TXEXNjkIBpCsEvnHMkugQbld aRfbFlgqviu37uFOya+QT8IPKlN9fEuNs/Y1CCTDwo2N5NJme/+wLNLbX2nITuwZEXfsr 6Lod23u/1QeSpIvLV6HOMxx+P6yLWorR2MQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1643384468086100001 Content-Type: text/plain; charset="utf-8" From: Sami Mujawar Add Configuration Manager to enable ACPI tables for Kvmtool firmware. The Configuration Manager for Kvmtool uses the DT Hardware Information Parser module (FdtHwInfoParser) to parse the DT provided by Kvmtool. The FdtHwInfoParser parses the DT and invokes the callback function HW_INFO_ADD_OBJECT to add the Configuration Manager objects to the Platform Information repository. The information for some Configuration Manager objects may not be available in the DT. Such objects are initialised locally by the Configuration Manager. Support for the following ACPI tables is provided: - DBG2 - DSDT (Empty stub) - FADT - GTDT - MADT - SPCR - SSDT (Cpu Hierarchy) - SSDT (Pcie bus) Signed-off-by: Sami Mujawar Signed-off-by: Pierre Gondois Acked-by: Laszlo Ersek --- Notes: v2: - Only keep AARCH64 as a valid architecture. [Laszlo] - Move modifications to ArmVirtKvmTool.dsc to the next patch. [Laszlo] - Various coding style/error handling/ASSERT corrections. [Laszlo] - Remove dependency to PcdForceNoAcpi and rely on DEPEX to load the module. [Laszlo] - Not possible to make 'struct PlatformRepositoryInfo' an unamed struct since this is a redifinition. [Laszlo/Pierre] - Define 'FMT_CM_OBJECT_ID' print formatter in an earlier patch and use it in this patch. [Laszlo/Pierre] =20 v3: - Add address size limit for IORT PCI root complex. [Pierre] .../KvmtoolCfgMgrDxe/ConfigurationManager.c | 1065 +++++++++++++++++ .../KvmtoolCfgMgrDxe/ConfigurationManager.h | 125 ++ .../ConfigurationManagerDxe.inf | 54 + 3 files changed, 1244 insertions(+) create mode 100644 ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.c create mode 100644 ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.h create mode 100644 ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManagerDxe.inf diff --git a/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.c b/ArmVirtPk= g/KvmtoolCfgMgrDxe/ConfigurationManager.c new file mode 100644 index 000000000000..e8c1b13c8f2c --- /dev/null +++ b/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.c @@ -0,0 +1,1065 @@ +/** @file + Configuration Manager Dxe + + Copyright (c) 2021 - 2022, Arm Limited. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + + @par Glossary: + - Cm or CM - Configuration Manager + - Obj or OBJ - Object +**/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ConfigurationManager.h" + +// +// The platform configuration repository information. +// +STATIC +EDKII_PLATFORM_REPOSITORY_INFO mKvmtoolPlatRepositoryInfo =3D { + // + // Configuration Manager information + // + { CONFIGURATION_MANAGER_REVISION, CFG_MGR_OEM_ID }, + + // + // ACPI Table List + // + { + // + // FADT Table + // + { + EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, + EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_REVISION, + CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdFadt), + NULL + }, + // + // GTDT Table + // + { + EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, + EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION, + CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdGtdt), + NULL + }, + // + // MADT Table + // + { + EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, + EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION, + CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdMadt), + NULL + }, + // + // SPCR Table + // + { + EFI_ACPI_6_3_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE, + EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION, + CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdSpcr), + NULL + }, + // + // DSDT Table + // + { + EFI_ACPI_6_3_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE, + 0, // Unused + CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdDsdt), + (EFI_ACPI_DESCRIPTION_HEADER *)dsdt_aml_code + }, + // + // SSDT Cpu Hierarchy Table + // + { + EFI_ACPI_6_3_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE, + 0, // Unused + CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdSsdtCpuTopology), + NULL + }, + // + // DBG2 Table + // + { + EFI_ACPI_6_3_DEBUG_PORT_2_TABLE_SIGNATURE, + EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT_REVISION, + CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdDbg2), + NULL + }, + // + // PCI MCFG Table + // + { + EFI_ACPI_6_3_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDR= ESS_DESCRIPTION_TABLE_SIGNATURE, + EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_REVISION, + CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdMcfg), + NULL + }, + // + // SSDT table describing the PCI root complex + // + { + EFI_ACPI_6_3_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE, + 0, // Unused + CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdSsdtPciExpress), + NULL + }, + // + // IORT Table + // + { + EFI_ACPI_6_3_IO_REMAPPING_TABLE_SIGNATURE, + EFI_ACPI_IO_REMAPPING_TABLE_REVISION, + CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdIort), + NULL + }, + }, + + // + // Power management profile information + // + { EFI_ACPI_6_3_PM_PROFILE_ENTERPRISE_SERVER }, // PowerManagement Pro= file + + // + // ITS group node + // + { + // + // Reference token for this Iort node + // + REFERENCE_TOKEN (ItsGroupInfo), + // + // The number of ITS identifiers in the ITS node. + // + 1, + // + // Reference token for the ITS identifier array + // + REFERENCE_TOKEN (ItsIdentifierArray) + }, + + // + // ITS identifier array + // + { + { 0 }, // The ITS Identifier + }, + + // + // Root Complex node info + // + { + // + // Reference token for this Iort node + // + REFERENCE_TOKEN (RootComplexInfo), + // + // Number of ID mappings + // + 1, + // + // Reference token for the ID mapping array + // + REFERENCE_TOKEN (DeviceIdMapping[0]), + // + // Memory access properties : Cache coherent attributes + // + EFI_ACPI_IORT_MEM_ACCESS_PROP_CCA, + // + // Memory access properties : Allocation hints + // + 0, + // + // Memory access properties : Memory access flags + // + 0, + // + // ATS attributes + // + EFI_ACPI_IORT_ROOT_COMPLEX_ATS_UNSUPPORTED, + // + // PCI segment number + // + 0, + /// + /// Memory address size limit + /// + MEMORY_ADDRESS_SIZE_LIMIT + }, + + // + // Array of Device ID mappings + // + { + // + // Device ID mapping for Root complex node + // RootComplex -> ITS Group + // + { + // + // Input base + // + 0x0, + // + // Number of input IDs + // + 0x0000FFFF, + // + // Output Base + // + 0x0, + // + // Output reference + // + REFERENCE_TOKEN (ItsGroupInfo), + // + // Flags + // + 0 + }, + }, +}; + +/** + A helper function for returning the Configuration Manager Objects. + + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Object Pointer to the Object(s). + @param [in] ObjectSize Total size of the Object(s). + @param [in] ObjectCount Number of Objects. + @param [in, out] CmObjectDesc Pointer to the Configuration Manager Ob= ject + descriptor describing the requested Obj= ect. + + @retval EFI_SUCCESS Success. +**/ +STATIC +EFI_STATUS +EFIAPI +HandleCmObject ( + IN CONST CM_OBJECT_ID CmObjectId, + IN VOID *Object, + IN CONST UINTN ObjectSize, + IN CONST UINTN ObjectCount, + IN OUT CM_OBJ_DESCRIPTOR *CONST CmObjectDesc + ) +{ + CmObjectDesc->ObjectId =3D CmObjectId; + CmObjectDesc->Size =3D ObjectSize; + CmObjectDesc->Data =3D Object; + CmObjectDesc->Count =3D ObjectCount; + DEBUG (( + DEBUG_INFO, + "INFO: CmObjectId =3D " FMT_CM_OBJECT_ID ", " + "Ptr =3D 0x%p, Size =3D %lu, Co= unt =3D %lu\n", + CmObjectId, + CmObjectDesc->Data, + CmObjectDesc->Size, + CmObjectDesc->Count + )); + return EFI_SUCCESS; +} + +/** + A helper function for returning the Configuration Manager Objects that + match the token. + + @param [in] This Pointer to the Configuration Manager Pro= tocol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Object Pointer to the Object(s). + @param [in] ObjectSize Total size of the Object(s). + @param [in] ObjectCount Number of Objects. + @param [in] Token A token identifying the object. + @param [in] HandlerProc A handler function to search the object + referenced by the token. + @param [in, out] CmObjectDesc Pointer to the Configuration Manager Obj= ect + descriptor describing the requested Obje= ct. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +STATIC +EFI_STATUS +EFIAPI +HandleCmObjectRefByToken ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN VOID *Object, + IN CONST UINTN ObjectSize, + IN CONST UINTN ObjectCount, + IN CONST CM_OBJECT_TOKEN Token, + IN CONST CM_OBJECT_HANDLER_PROC HandlerProc, + IN OUT CM_OBJ_DESCRIPTOR *CONST CmObjectDesc + ) +{ + EFI_STATUS Status; + + CmObjectDesc->ObjectId =3D CmObjectId; + if (Token =3D=3D CM_NULL_TOKEN) { + CmObjectDesc->Size =3D ObjectSize; + CmObjectDesc->Data =3D Object; + CmObjectDesc->Count =3D ObjectCount; + Status =3D EFI_SUCCESS; + } else { + Status =3D HandlerProc (This, CmObjectId, Token, CmObjectDesc); + } + + DEBUG (( + DEBUG_INFO, + "INFO: Token =3D 0x%p, CmObjectId =3D " FMT_CM_OBJECT_ID ", " + "Ptr =3D 0x%p, Si= ze =3D %lu, Count =3D %lu\n", + (VOID *)Token, + CmObjectId, + CmObjectDesc->Data, + CmObjectDesc->Size, + CmObjectDesc->Count + )); + return Status; +} + +/** + Return an ITS identifier array. + + @param [in] This Pointer to the Configuration Manager Protocol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Token A token for identifying the object + @param [out] CmObject Pointer to the Configuration Manager Object + descriptor describing the requested Object. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +EFI_STATUS +EFIAPI +GetItsIdentifierArray ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN CONST CM_OBJECT_TOKEN Token, + OUT CM_OBJ_DESCRIPTOR *CONST CmObject + ) +{ + EDKII_PLATFORM_REPOSITORY_INFO *PlatformRepo; + + if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) { + ASSERT (This !=3D NULL); + ASSERT (CmObject !=3D NULL); + return EFI_INVALID_PARAMETER; + } + + PlatformRepo =3D This->PlatRepoInfo; + + if (Token !=3D (CM_OBJECT_TOKEN)&PlatformRepo->ItsIdentifierArray) { + return EFI_NOT_FOUND; + } + + CmObject->ObjectId =3D CmObjectId; + CmObject->Size =3D sizeof (PlatformRepo->ItsIdentifierArray); + CmObject->Data =3D (VOID *)&PlatformRepo->ItsIdentifierArray; + CmObject->Count =3D ARRAY_SIZE (PlatformRepo->ItsIdentifierArray); + return EFI_SUCCESS; +} + +/** + Return a device Id mapping array. + + @param [in] This Pointer to the Configuration Manager Protocol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Token A token for identifying the object + @param [out] CmObject Pointer to the Configuration Manager Object + descriptor describing the requested Object. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +EFI_STATUS +EFIAPI +GetDeviceIdMappingArray ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN CONST CM_OBJECT_TOKEN Token, + OUT CM_OBJ_DESCRIPTOR *CONST CmObject + ) +{ + EDKII_PLATFORM_REPOSITORY_INFO *PlatformRepo; + + if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) { + ASSERT (This !=3D NULL); + ASSERT (CmObject !=3D NULL); + return EFI_INVALID_PARAMETER; + } + + PlatformRepo =3D This->PlatRepoInfo; + + if (Token !=3D (CM_OBJECT_TOKEN)&PlatformRepo->DeviceIdMapping[0]) { + return EFI_NOT_FOUND; + } + + CmObject->ObjectId =3D CmObjectId; + CmObject->Size =3D sizeof (CM_ARM_ID_MAPPING); + CmObject->Data =3D (VOID *)Token; + CmObject->Count =3D 1; + return EFI_SUCCESS; +} + +/** + Function pointer called by the parser to add information. + + Callback function that the parser can use to add new + CmObj. This function must copy the CmObj data and not rely on + the parser preserving the CmObj memory. + This function is responsible of the Token allocation. + + @param [in] ParserHandle A handle to the parser instance. + @param [in] Context A pointer to the caller's context provided in + HwInfoParserInit (). + @param [in] CmObjDesc CM_OBJ_DESCRIPTOR containing the CmObj(s) to= add. + @param [out] Token If provided and success, contain the token + generated for the CmObj. + + @retval EFI_SUCCESS The function completed successfully. + @retval EFI_INVALID_PARAMETER Invalid parameter. +**/ +STATIC +EFI_STATUS +EFIAPI +HwInfoAdd ( + IN HW_INFO_PARSER_HANDLE ParserHandle, + IN VOID *Context, + IN CONST CM_OBJ_DESCRIPTOR *CmObjDesc, + OUT CM_OBJECT_TOKEN *Token OPTIONAL + ) +{ + EFI_STATUS Status; + EDKII_PLATFORM_REPOSITORY_INFO *PlatformRepo; + + if ((ParserHandle =3D=3D NULL) || + (Context =3D=3D NULL) || + (CmObjDesc =3D=3D NULL)) + { + ASSERT (ParserHandle !=3D NULL); + ASSERT (Context !=3D NULL); + ASSERT (CmObjDesc !=3D NULL); + return EFI_INVALID_PARAMETER; + } + + PlatformRepo =3D (EDKII_PLATFORM_REPOSITORY_INFO *)Context; + + DEBUG_CODE_BEGIN (); + // + // Print the received objects. + // + ParseCmObjDesc (CmObjDesc); + DEBUG_CODE_END (); + + Status =3D DynPlatRepoAddObject ( + PlatformRepo->DynamicPlatformRepo, + CmObjDesc, + Token + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + } + + return Status; +} + +/** + Cleanup the platform configuration repository. + + @param [in] This Pointer to the Configuration Manager Protocol. + + @retval EFI_SUCCESS Success + @retval EFI_INVALID_PARAMETER A parameter is invalid. +**/ +STATIC +EFI_STATUS +EFIAPI +CleanupPlatformRepository ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST This + ) +{ + EFI_STATUS Status; + EDKII_PLATFORM_REPOSITORY_INFO *PlatformRepo; + + if (This =3D=3D NULL) { + ASSERT (This !=3D NULL); + return EFI_INVALID_PARAMETER; + } + + PlatformRepo =3D This->PlatRepoInfo; + + // + // Shutdown the dynamic repo and free all objects. + // + Status =3D DynamicPlatRepoShutdown (PlatformRepo->DynamicPlatformRepo); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } + + // + // Shutdown parser. + // + Status =3D HwInfoParserShutdown (PlatformRepo->FdtParserHandle); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + } + + return Status; +} + +/** + Initialize the platform configuration repository. + + @param [in] This Pointer to the Configuration Manager Protocol. + + @retval EFI_SUCCESS Success + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_OUT_OF_RESOURCES An allocation has failed. +**/ +STATIC +EFI_STATUS +EFIAPI +InitializePlatformRepository ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST This + ) +{ + EFI_STATUS Status; + EDKII_PLATFORM_REPOSITORY_INFO *PlatformRepo; + VOID *Hob; + + if (This =3D=3D NULL) { + ASSERT (This !=3D NULL); + return EFI_INVALID_PARAMETER; + } + + Hob =3D GetFirstGuidHob (&gFdtHobGuid); + if ((Hob =3D=3D NULL) || (GET_GUID_HOB_DATA_SIZE (Hob) !=3D sizeof (UINT= 64))) { + ASSERT (FALSE); + ASSERT (GET_GUID_HOB_DATA_SIZE (Hob) !=3D sizeof (UINT64)); + return EFI_NOT_FOUND; + } + + PlatformRepo =3D This->PlatRepoInfo; + PlatformRepo->FdtBase =3D (VOID *)*(UINTN *)GET_GUID_HOB_DATA (Hob); + + // + // Initialise the dynamic platform repository. + // + Status =3D DynamicPlatRepoInit (&PlatformRepo->DynamicPlatformRepo); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } + + // + // Initialise the FDT parser + // + Status =3D HwInfoParserInit ( + PlatformRepo->FdtBase, + PlatformRepo, + HwInfoAdd, + &PlatformRepo->FdtParserHandle + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto ErrorHandler; + } + + Status =3D HwInfoParse (PlatformRepo->FdtParserHandle); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto ErrorHandler; + } + + Status =3D DynamicPlatRepoFinalise (PlatformRepo->DynamicPlatformRepo); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + goto ErrorHandler; + } + + return EFI_SUCCESS; + +ErrorHandler: + CleanupPlatformRepository (This); + return Status; +} + +/** + Return a standard namespace object. + + @param [in] This Pointer to the Configuration Manager Protoc= ol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Token An optional token identifying the object. If + unused this must be CM_NULL_TOKEN. + @param [in, out] CmObject Pointer to the Configuration Manager Object + descriptor describing the requested Object. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +EFI_STATUS +EFIAPI +GetStandardNameSpaceObject ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN CONST CM_OBJECT_TOKEN Token OPTIONAL, + IN OUT CM_OBJ_DESCRIPTOR *CONST CmObject + ) +{ + EFI_STATUS Status; + EDKII_PLATFORM_REPOSITORY_INFO *PlatformRepo; + UINTN AcpiTableCount; + CM_OBJ_DESCRIPTOR CmObjDesc; + + if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) { + ASSERT (This !=3D NULL); + ASSERT (CmObject !=3D NULL); + return EFI_INVALID_PARAMETER; + } + + Status =3D EFI_NOT_FOUND; + PlatformRepo =3D This->PlatRepoInfo; + + switch (GET_CM_OBJECT_ID (CmObjectId)) { + case EStdObjCfgMgrInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->CmInfo, + sizeof (PlatformRepo->CmInfo), + 1, + CmObject + ); + break; + + case EStdObjAcpiTableList: + AcpiTableCount =3D ARRAY_SIZE (PlatformRepo->CmAcpiTableList); + + // + // Get Pci config space information. + // + Status =3D DynamicPlatRepoGetObject ( + PlatformRepo->DynamicPlatformRepo, + CREATE_CM_ARM_OBJECT_ID (EArmObjPciConfigSpaceInfo), + CM_NULL_TOKEN, + &CmObjDesc + ); + if (Status =3D=3D EFI_NOT_FOUND) { + // + // The last 3 tables are for PCIe. If PCIe information is not + // present, Kvmtool was launched without the PCIe option. + // Therefore, reduce the table count by 3. + // + AcpiTableCount -=3D 3; + } else if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } + + // + // Get the Gic version. + // + Status =3D DynamicPlatRepoGetObject ( + PlatformRepo->DynamicPlatformRepo, + CREATE_CM_ARM_OBJECT_ID (EArmObjGicDInfo), + CM_NULL_TOKEN, + &CmObjDesc + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } + + if (((CM_ARM_GICD_INFO *)CmObjDesc.Data)->GicVersion < 3) { + // + // IORT is only required for GicV3/4 + // + AcpiTableCount -=3D 1; + } + + Status =3D HandleCmObject ( + CmObjectId, + PlatformRepo->CmAcpiTableList, + (sizeof (PlatformRepo->CmAcpiTableList[0]) * AcpiTableCou= nt), + AcpiTableCount, + CmObject + ); + break; + + default: + Status =3D EFI_NOT_FOUND; + DEBUG (( + DEBUG_ERROR, + "ERROR: CmObjectId " FMT_CM_OBJECT_ID ". Status =3D %r\n", + CmObjectId, + Status + )); + break; + } + + return Status; +} + +/** + Return an ARM namespace object. + + @param [in] This Pointer to the Configuration Manager Protoc= ol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Token An optional token identifying the object. If + unused this must be CM_NULL_TOKEN. + @param [in, out] CmObject Pointer to the Configuration Manager Object + descriptor describing the requested Object. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +EFI_STATUS +EFIAPI +GetArmNameSpaceObject ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN CONST CM_OBJECT_TOKEN Token OPTIONAL, + IN OUT CM_OBJ_DESCRIPTOR *CONST CmObject + ) +{ + EFI_STATUS Status; + EDKII_PLATFORM_REPOSITORY_INFO *PlatformRepo; + + if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) { + ASSERT (This !=3D NULL); + ASSERT (CmObject !=3D NULL); + return EFI_INVALID_PARAMETER; + } + + Status =3D EFI_NOT_FOUND; + PlatformRepo =3D This->PlatRepoInfo; + + // + // First check among the static objects. + // + switch (GET_CM_OBJECT_ID (CmObjectId)) { + case EArmObjPowerManagementProfileInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->PmProfileInfo, + sizeof (PlatformRepo->PmProfileInfo), + 1, + CmObject + ); + break; + + case EArmObjItsGroup: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->ItsGroupInfo, + sizeof (PlatformRepo->ItsGroupInfo), + 1, + CmObject + ); + break; + + case EArmObjGicItsIdentifierArray: + Status =3D HandleCmObjectRefByToken ( + This, + CmObjectId, + PlatformRepo->ItsIdentifierArray, + sizeof (PlatformRepo->ItsIdentifierArray), + ARRAY_SIZE (PlatformRepo->ItsIdentifierArray), + Token, + GetItsIdentifierArray, + CmObject + ); + break; + + case EArmObjRootComplex: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->RootComplexInfo, + sizeof (PlatformRepo->RootComplexInfo), + 1, + CmObject + ); + break; + + case EArmObjIdMappingArray: + Status =3D HandleCmObjectRefByToken ( + This, + CmObjectId, + PlatformRepo->DeviceIdMapping, + sizeof (PlatformRepo->DeviceIdMapping), + ARRAY_SIZE (PlatformRepo->DeviceIdMapping), + Token, + GetDeviceIdMappingArray, + CmObject + ); + break; + + default: + // + // No match found among the static objects. + // Check the dynamic objects. + // + Status =3D DynamicPlatRepoGetObject ( + PlatformRepo->DynamicPlatformRepo, + CmObjectId, + Token, + CmObject + ); + break; + } // switch + + if (Status =3D=3D EFI_NOT_FOUND) { + DEBUG (( + DEBUG_INFO, + "INFO: CmObjectId " FMT_CM_OBJECT_ID ". Status =3D %r\n", + CmObjectId, + Status + )); + } else { + ASSERT_EFI_ERROR (Status); + } + + return Status; +} + +/** + Return an OEM namespace object. + + @param [in] This Pointer to the Configuration Manager Protoc= ol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Token An optional token identifying the object. If + unused this must be CM_NULL_TOKEN. + @param [in, out] CmObject Pointer to the Configuration Manager Object + descriptor describing the requested Object. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +EFI_STATUS +EFIAPI +GetOemNameSpaceObject ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN CONST CM_OBJECT_TOKEN Token OPTIONAL, + IN OUT CM_OBJ_DESCRIPTOR *CONST CmObject + ) +{ + EFI_STATUS Status; + + Status =3D EFI_SUCCESS; + if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) { + ASSERT (This !=3D NULL); + ASSERT (CmObject !=3D NULL); + return EFI_INVALID_PARAMETER; + } + + switch (GET_CM_OBJECT_ID (CmObjectId)) { + default: + Status =3D EFI_NOT_FOUND; + DEBUG (( + DEBUG_ERROR, + "ERROR: CmObjectId " FMT_CM_OBJECT_ID ". Status =3D %r\n", + CmObjectId, + Status + )); + break; + } + + return Status; +} + +/** + The GetObject function defines the interface implemented by the + Configuration Manager Protocol for returning the Configuration + Manager Objects. + + @param [in] This Pointer to the Configuration Manager Protoc= ol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Token An optional token identifying the object. If + unused this must be CM_NULL_TOKEN. + @param [in, out] CmObject Pointer to the Configuration Manager Object + descriptor describing the requested Object. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +EFI_STATUS +EFIAPI +ArmKvmtoolPlatformGetObject ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN CONST CM_OBJECT_TOKEN Token OPTIONAL, + IN OUT CM_OBJ_DESCRIPTOR *CONST CmObject + ) +{ + EFI_STATUS Status; + + if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) { + ASSERT (This !=3D NULL); + ASSERT (CmObject !=3D NULL); + return EFI_INVALID_PARAMETER; + } + + switch (GET_CM_NAMESPACE_ID (CmObjectId)) { + case EObjNameSpaceStandard: + Status =3D GetStandardNameSpaceObject (This, CmObjectId, Token, CmOb= ject); + break; + case EObjNameSpaceArm: + Status =3D GetArmNameSpaceObject (This, CmObjectId, Token, CmObject); + break; + case EObjNameSpaceOem: + Status =3D GetOemNameSpaceObject (This, CmObjectId, Token, CmObject); + break; + default: + Status =3D EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: Unknown Namespace CmObjectId " FMT_CM_OBJECT_ID ". " + "Status = =3D %r\n", + CmObjectId, + Status + )); + break; + } + + return Status; +} + +/** + The SetObject function defines the interface implemented by the + Configuration Manager Protocol for updating the Configuration + Manager Objects. + + @param [in] This Pointer to the Configuration Manager Protoc= ol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Token An optional token identifying the object. If + unused this must be CM_NULL_TOKEN. + @param [in] CmObject Pointer to the Configuration Manager Object + descriptor describing the Object. + + @retval EFI_UNSUPPORTED This operation is not supported. +**/ +EFI_STATUS +EFIAPI +ArmKvmtoolPlatformSetObject ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN CONST CM_OBJECT_TOKEN Token OPTIONAL, + IN CM_OBJ_DESCRIPTOR *CONST CmObject + ) +{ + return EFI_UNSUPPORTED; +} + +// +// A structure describing the configuration manager protocol interface. +// +STATIC +CONST +EDKII_CONFIGURATION_MANAGER_PROTOCOL mKvmtoolPlatformConfigManagerProtoco= l =3D { + CREATE_REVISION (1, 0), + ArmKvmtoolPlatformGetObject, + ArmKvmtoolPlatformSetObject, + &mKvmtoolPlatRepositoryInfo +}; + +/** + Entrypoint of Configuration Manager Dxe. + + @param ImageHandle + @param SystemTable + + @retval EFI_SUCCESS + @retval EFI_LOAD_ERROR + @retval EFI_OUT_OF_RESOURCES +**/ +EFI_STATUS +EFIAPI +ConfigurationManagerDxeInitialize ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + + Status =3D gBS->InstallProtocolInterface ( + &ImageHandle, + &gEdkiiConfigurationManagerProtocolGuid, + EFI_NATIVE_INTERFACE, + (VOID *)&mKvmtoolPlatformConfigManagerProtocol + ); + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "ERROR: Failed to get Install Configuration Manager Protocol." \ + " Status =3D %r\n", + Status + )); + return Status; + } + + Status =3D InitializePlatformRepository ( + &mKvmtoolPlatformConfigManagerProtocol + ); + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "ERROR: Failed to initialize the Platform Configuration Repository."= \ + " Status =3D %r\n", + Status + )); + goto ErrorHandler; + } + + return Status; + +ErrorHandler: + gBS->UninstallProtocolInterface ( + &ImageHandle, + &gEdkiiConfigurationManagerProtocolGuid, + (VOID *)&mKvmtoolPlatformConfigManagerProtocol + ); + return Status; +} + +/** + Unload function for this image. + + @param ImageHandle Handle for the image of this driver. + + @retval EFI_SUCCESS Driver unloaded successfully. + @retval other Driver can not unloaded. +**/ +EFI_STATUS +EFIAPI +ConfigurationManagerDxeUnloadImage ( + IN EFI_HANDLE ImageHandle + ) +{ + return CleanupPlatformRepository (&mKvmtoolPlatformConfigManagerProtocol= ); +} diff --git a/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.h b/ArmVirtPk= g/KvmtoolCfgMgrDxe/ConfigurationManager.h new file mode 100644 index 000000000000..3373948bc4eb --- /dev/null +++ b/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.h @@ -0,0 +1,125 @@ +/** @file + + Copyright (c) 2021 - 2022, Arm Limited. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + + @par Glossary: + - Cm or CM - Configuration Manager + - Obj or OBJ - Object +**/ + +#ifndef CONFIGURATION_MANAGER_H_ +#define CONFIGURATION_MANAGER_H_ + +/// +/// C array containing the compiled AML template. +/// This symbol is defined in the auto generated C file +/// containing the AML bytecode array. +/// +extern CHAR8 dsdt_aml_code[]; + +/// +/// The configuration manager version. +/// +#define CONFIGURATION_MANAGER_REVISION CREATE_REVISION (1, 0) + +/// +/// The OEM ID +/// +#define CFG_MGR_OEM_ID { 'A', 'R', 'M', 'L', 'T', 'D' } + +/// +/// Memory address size limit. Assume the whole address space. +/// +#define MEMORY_ADDRESS_SIZE_LIMIT 64 + +/** A function that prepares Configuration Manager Objects for returning. + + @param [in] This Pointer to the Configuration Manager Protocol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Token A token for identifying the object. + @param [out] CmObject Pointer to the Configuration Manager Object + descriptor describing the requested Object. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +typedef EFI_STATUS (*CM_OBJECT_HANDLER_PROC) ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN CONST CM_OBJECT_TOKEN Token, + IN OUT CM_OBJ_DESCRIPTOR *CONST CmObject + ); + +/// +/// A helper macro for mapping a reference token. +/// +#define REFERENCE_TOKEN(Field) \ + (CM_OBJECT_TOKEN)((UINT8*)&mKvmtoolPlatRepositoryInfo + \ + OFFSET_OF (EDKII_PLATFORM_REPOSITORY_INFO, Field)) + +/// +/// The number of ACPI tables to install +/// +#define PLAT_ACPI_TABLE_COUNT 10 + +/// +/// A structure describing the platform configuration +/// manager repository information +/// +typedef struct PlatformRepositoryInfo { + /// + /// Configuration Manager Information. + /// + CM_STD_OBJ_CONFIGURATION_MANAGER_INFO CmInfo; + + /// + /// List of ACPI tables + /// + CM_STD_OBJ_ACPI_TABLE_INFO CmAcpiTableList[PLAT_ACPI_TABLE= _COUNT]; + + /// + /// Power management profile information + /// + CM_ARM_POWER_MANAGEMENT_PROFILE_INFO PmProfileInfo; + + /// + /// ITS Group node + /// + CM_ARM_ITS_GROUP_NODE ItsGroupInfo; + + /// + /// ITS Identifier array + /// + CM_ARM_ITS_IDENTIFIER ItsIdentifierArray[1]; + + /// + /// PCI Root complex node + /// + CM_ARM_ROOT_COMPLEX_NODE RootComplexInfo; + + /// + /// Array of DeviceID mapping + /// + CM_ARM_ID_MAPPING DeviceIdMapping[1]; + + /// + /// Dynamic platform repository. + /// CmObj created by parsing the Kvmtool device tree are stored here. + /// + DYNAMIC_PLATFORM_REPOSITORY_INFO *DynamicPlatformRepo; + + /// + /// Base address of the FDT. + /// + VOID *FdtBase; + + /// + /// A handle to the FDT HwInfoParser. + /// + HW_INFO_PARSER_HANDLE FdtParserHandle; +} EDKII_PLATFORM_REPOSITORY_INFO; + +#endif // CONFIGURATION_MANAGER_H_ diff --git a/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManagerDxe.inf b/ArmV= irtPkg/KvmtoolCfgMgrDxe/ConfigurationManagerDxe.inf new file mode 100644 index 000000000000..a333966a8c96 --- /dev/null +++ b/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManagerDxe.inf @@ -0,0 +1,54 @@ +## @file +# Configuration Manager Dxe +# +# Copyright (c) 2021 - 2022, Arm Limited. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +[Defines] + INF_VERSION =3D 0x0001001B + BASE_NAME =3D ConfigurationManagerDxe + FILE_GUID =3D 3C80D366-510C-4154-BB3A-E12439AD337C + MODULE_TYPE =3D DXE_DRIVER + VERSION_STRING =3D 1.0 + ENTRY_POINT =3D ConfigurationManagerDxeInitialize + UNLOAD_IMAGE =3D ConfigurationManagerDxeUnloadImage + +# +# The following information is for reference only and not required by the = build tools. +# +# VALID_ARCHITECTURES =3D AARCH64 +# + +[Sources] + AslTables/Dsdt.asl + ConfigurationManager.c + ConfigurationManager.h + ConfigurationManagerDxe.inf + +[Packages] + ArmVirtPkg/ArmVirtPkg.dec + DynamicTablesPkg/DynamicTablesPkg.dec + EmbeddedPkg/EmbeddedPkg.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec + +[LibraryClasses] + DynamicPlatRepoLib + HobLib + HwInfoParserLib + PrintLib + TableHelperLib + UefiBootServicesTableLib + UefiDriverEntryPoint + UefiRuntimeServicesTableLib + +[Protocols] + gEdkiiConfigurationManagerProtocolGuid + +[Guids] + gFdtHobGuid + +[Depex] + gEdkiiPlatformHasAcpiGuid --=20 2.25.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 (#86173): https://edk2.groups.io/g/devel/message/86173 Mute This Topic: https://groups.io/mt/88746976/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 Mon May 13 12:32:19 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+86174+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+86174+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1643384467; cv=none; d=zohomail.com; s=zohoarc; b=b8FoCNx/3nz2J+vz0UuONBvzWjkv9Qn3izlX71CZ7pmNRQPzSj3l19paYUOXmsYdgmqZ7gwXqZ1u18kU0TGeaIffeayqQi/Szhp1wEYtfV7PlL9TZiKldaWB3umKZUYGB7aMdJSxWofQTtarwW5VgAbH648jI3bSRhSVXkVdaJE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643384467; 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=mUKpy43idx9DA4EGGeyd9RPkmJ5WLNeNu1il1vQTacw=; b=jpmSe5ZSv7OnXHUg7t+5EUG0nIZjYfVbAn2+cAV6a7asNUCgJmDd4ybuivmRiL5OvYW+yVIoatKdkbbPQW6edx7pGJjeZcnfuV2B+hZ21E7PAOXBNcG3BEVD5TEQM563EZt6S75tS9JxWFutlVWVTKVuycqoFzCywap4xGm1imI= 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+86174+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1643384467286379.4259870588477; Fri, 28 Jan 2022 07:41:07 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8BjXYY1788612xK6wQSBSsal; Fri, 28 Jan 2022 07:41:06 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.8731.1643384465574609748 for ; Fri, 28 Jan 2022 07:41:05 -0800 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 401A61396; Fri, 28 Jan 2022 07:41:05 -0800 (PST) X-Received: from e126645.home (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 33EDC3F793; Fri, 28 Jan 2022 07:41:04 -0800 (PST) From: "PierreGondois" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [PATCH v3 7/8] ArmVirtPkg/Kvmtool: Enable ACPI support Date: Fri, 28 Jan 2022 16:41:02 +0100 Message-Id: <20220128154103.20752-8-Pierre.Gondois@arm.com> In-Reply-To: <20220128154103.20752-1-Pierre.Gondois@arm.com> References: <20220128154103.20752-1-Pierre.Gondois@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,pierre.gondois@arm.com X-Gm-Message-State: SVWPY4hgChNj58C3mL0Mal6Yx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1643384466; bh=bdwQtPCaqH9dsyZ8AF0GG/d0KE+PgFlRxIFif7Xu9sQ=; h=Cc:Date:From:Reply-To:Subject:To; b=POjleUhQny6I9wlT/ixzVTQB5Wz4K4X60hpdvCFepqFte67dDUYcIpMQyeq0KQ7doiI 8MPQfT3CeV8puJwFQIRpXRcpoVa/bML5IXbvBknBgmgRvo/aAxKBFb6M+4lcl8z8M6hY9 CChfnG/Z6/ffO0a+pfo3dynO53du9EbJ75E= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1643384468483100005 Content-Type: text/plain; charset="utf-8" From: Sami Mujawar A Configuration Manager that uses the Dynamic Tables framework to generate ACPI tables for Kvmtool Guests has been provided. This Configuration Manager uses the FdtHwInfoParser module to parse the Kvmtool Device Tree and generate the required Configuration Manager objects for generating the ACPI tables. Therefore, enable ACPI table generation for Kvmtool. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3742 Signed-off-by: Sami Mujawar Signed-off-by: Pierre Gondois --- Notes: v2: - Remove Pcds that are redefined to their default value, and modules already included in ArmVirtPkg/ArmVirt.dsc.inc [Laszlo] - Use guards as '!if $(ARCH) =3D=3D AARCH64' to conditionnaly generate ACPI tables. This allows to prevent the 32bits ARM/ACPI combination without restricting the DynamicTablesPkg to AARCH64. This means that KvmTool on ARM will use the DT. Not adding Laszlo's Acked-by since this is not exactly what was suggested. [Laszlo/Pierre] ArmVirtPkg/ArmVirtKvmTool.dsc | 17 ++++++++++++++--- ArmVirtPkg/ArmVirtKvmTool.fdf | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index 9d23072d8fa8..1ded9df0fc5d 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -29,6 +29,10 @@ [Defines] =20 !include ArmVirtPkg/ArmVirt.dsc.inc =20 +!if $(ARCH) =3D=3D AARCH64 +!include DynamicTablesPkg/DynamicTables.dsc.inc +!endif + !include MdePkg/MdeLibs.dsc.inc =20 [LibraryClasses.common] @@ -71,6 +75,9 @@ [LibraryClasses.common] PlatformHookLib|ArmVirtPkg/Library/Fdt16550SerialPortHookLib/Fdt16550Ser= ialPortHookLib.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort= Lib16550.inf =20 + HwInfoParserLib|DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoPar= serLib.inf + DynamicPlatRepoLib|DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/Dy= namicPlatRepoLib.inf + [LibraryClasses.common.SEC, LibraryClasses.common.PEI_CORE, LibraryClasses= .common.PEIM] PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf PlatformHookLib|ArmVirtPkg/Library/Fdt16550SerialPortHookLib/EarlyFdt165= 50SerialPortHookLib.inf @@ -195,9 +202,6 @@ [PcdsDynamicDefault.common] gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640 gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480 =20 - ## Force DTB - gArmVirtTokenSpaceGuid.PcdForceNoAcpi|TRUE - # Setup Flash storage variables gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x40000 @@ -353,3 +357,10 @@ [Components.common] } OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf OvmfPkg/Virtio10Dxe/Virtio10.inf + +!if $(ARCH) =3D=3D AARCH64 + # + # ACPI Support + # + ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManagerDxe.inf +!endif diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf index 14a5fce43a09..9e006e83ee5c 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.fdf +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf @@ -1,5 +1,5 @@ # -# Copyright (c) 2018 - 2021, ARM Limited. All rights reserved. +# Copyright (c) 2018 - 2022, ARM Limited. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -201,6 +201,19 @@ [FV.FvMain] INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf INF OvmfPkg/Virtio10Dxe/Virtio10.inf =20 +!if $(ARCH) =3D=3D AARCH64 + # + # ACPI Support + # + INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf + # + # Dynamic Table fdf + # + !include DynamicTablesPkg/DynamicTables.fdf.inc + + INF ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManagerDxe.inf +!endif + # # TianoCore logo (splash screen) # --=20 2.25.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 (#86174): https://edk2.groups.io/g/devel/message/86174 Mute This Topic: https://groups.io/mt/88746978/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 Mon May 13 12:32:19 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+86175+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+86175+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1643384468; cv=none; d=zohomail.com; s=zohoarc; b=MR+qqFwJ9+Q2h6mw8PB4exKC6mD8h9/YqtUvLyfk2N5tdP8Y40LqYDaB2EKCOw5WqXKJmfRHo7cbFGHLljr2JuSJvobUzYjGqnQDutT/NyhWGRY4+13wb6JQTpzaX3QL6U5SyV/aRywEtdZw66iZvne2MMKQm4NAHMEqsZIkcKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643384468; 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=zDIQRxnuK97R4wHxvy9OUNfLYFqv+bwMXtr+DTUHfDM=; b=DYn5Ry/g3PHaaHMBlotr+X9b7/+koaz4z6AfQ0oqH0tfKzTm86V4Z5VGOFb17lWfM/LjhXaE6PAmNMLw4gPYfy0mqL5phLqVc0b0hDAXI1b10q466cyf+34Fw3rvNAloJazMWDmkQs/eZE8Re2fLfLIoPmeY1YF7euY9PGNiF8Y= 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+86175+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1643384468939813.166214564886; Fri, 28 Jan 2022 07:41:08 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id LyloYY1788612xwAqYsOW9Rm; Fri, 28 Jan 2022 07:41:08 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.8826.1643384466968847194 for ; Fri, 28 Jan 2022 07:41:07 -0800 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 AAD6412FC; Fri, 28 Jan 2022 07:41:06 -0800 (PST) X-Received: from e126645.home (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9D77B3F793; Fri, 28 Jan 2022 07:41:05 -0800 (PST) From: "PierreGondois" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [PATCH v3 8/8] ArmVirtPkg/Kvmtool: Enable Acpiview Date: Fri, 28 Jan 2022 16:41:03 +0100 Message-Id: <20220128154103.20752-9-Pierre.Gondois@arm.com> In-Reply-To: <20220128154103.20752-1-Pierre.Gondois@arm.com> References: <20220128154103.20752-1-Pierre.Gondois@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,pierre.gondois@arm.com X-Gm-Message-State: ZMMmOoXzDpaLG1KMBHzGLQekx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1643384468; bh=5UXt0zsHcBNiS6D/Yc2kWsoddjnOXIR8jll/r27sodQ=; h=Cc:Date:From:Reply-To:Subject:To; b=rsYv8z970tli9L2rrApCT0m4+i/FgwdOURI3AzjuGa8QeR5h8GpkdZ22mUMJXHOGDy3 0mKjlaFglmuHCjHAzmNVwowTf4aXkbxbpuO1/UddJxvKLs3RK6ZjhA261mypL+lG8Cktb 5IYo8aXcHSbjwDmPE+mBGp1Y3vk5AL204MU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1643384470977100001 Content-Type: text/plain; charset="utf-8" From: Sami Mujawar Acpiview is a command line tool allowing to display, dump, or check installed ACPI tables. Add a 'ACPIVIEW_ENABLE' switch to enable it on an ArmVirt platform. The switch is set for the ArmVirtKvmTool platform. Signed-off-by: Sami Mujawar Signed-off-by: Pierre Gondois Acked-by: Laszlo Ersek --- Notes: v2: - Only add AcpiView for ArmVirtKvmTool instead of all ArmVirt platforms. This is done using a 'ACPIVIEW_ENABLE' switch. [Laszlo] ArmVirtPkg/ArmVirt.dsc.inc | 5 ++++- ArmVirtPkg/ArmVirtKvmTool.dsc | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 5a1598d90ca7..98b95c7407fd 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -1,5 +1,5 @@ # -# Copyright (c) 2011-2015, ARM Limited. All rights reserved. +# Copyright (c) 2011 - 2022, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. # Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved. # Copyright (c) Microsoft Corporation. @@ -397,6 +397,9 @@ [Components.common] NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Comm= andsLib.inf NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Co= mmandsLib.inf NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comm= andsLib.inf +!if $(ACPIVIEW_ENABLE) =3D=3D TRUE + NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewC= ommandLib.inf +!endif NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1= CommandsLib.inf NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1= CommandsLib.inf !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index 1ded9df0fc5d..8ddd6164d974 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -1,7 +1,7 @@ # @file # Workspace file for KVMTool virtual platform. # -# Copyright (c) 2018 - 2021, ARM Limited. All rights reserved. +# Copyright (c) 2018 - 2022, ARM Limited. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -27,6 +27,9 @@ [Defines] SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D ArmVirtPkg/ArmVirtKvmTool.fdf =20 +[Defines.AARCH64] + DEFINE ACPIVIEW_ENABLE =3D TRUE + !include ArmVirtPkg/ArmVirt.dsc.inc =20 !if $(ARCH) =3D=3D AARCH64 --=20 2.25.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 (#86175): https://edk2.groups.io/g/devel/message/86175 Mute This Topic: https://groups.io/mt/88746979/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-