From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id DFA55D8119E for ; Thu, 21 Mar 2024 16:00:22 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=oqnSKjP7oz/5IsPnvEkpmQL7421ovpRnpSWeqikqUIA=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1711036821; v=1; b=DTiA/C8S/eFUWJbfczgmzMv1wadX09OL1Lgt+NsE4L8YK4ffaiC5WT2qPs2SvfObR2aDMUdx bKSk7XB/djswLqCHxP6eaz99+91BBugt/U9HuJsDSYjI3vEsbOosuE7/zRjrM+dVxsZIItswv6G Unk+TUNH9VWH2A3Fcp2RwW9bOF1c6LcrHz1sWRO1z1fYboYBIkhgH7a5TPhr0/Waeq49Twt2s0B tTKsoTuGso5FnufQTTTRRoaLxy/AkC00iJsh7RcJyF93DruiD3KP+KhNaD0aw7/f5VAex0J4q5Z shJfXgK07WrdutveaNIUN6VBJ9otYHpWtAT7vNPyjvdww== X-Received: by 127.0.0.2 with SMTP id HisiYY7687511xEG9YmQ8mfd; Thu, 21 Mar 2024 09:00:21 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.572.1711036820914515863 for ; Thu, 21 Mar 2024 09:00:21 -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 D594E1007; Thu, 21 Mar 2024 09:00:54 -0700 (PDT) X-Received: from e126645.nice.arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 21AE73F67D; Thu, 21 Mar 2024 09:00:17 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io Cc: Pierre Gondois , Sami Mujawar , Pierre Gondois , Yeo Reum Yun , Sunil V L , AbdulLateef Attar , Jeshua Smith , Jeff Brasen , Girish Mahadevan , Leif Lindholm , Meenakshi Aggarwal Subject: [edk2-devel] [PATCH 03/19] DynamicTablesPkg: Move Pci Interrupt Map Info to Arch Common Date: Thu, 21 Mar 2024 16:59:08 +0100 Message-Id: <20240321155924.707272-4-pierre.gondois@arm.com> In-Reply-To: <20240321155924.707272-1-pierre.gondois@arm.com> References: <20240321155924.707272-1-pierre.gondois@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Thu, 21 Mar 2024 09:00:21 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: zmQV7YWC9vy3lugCEzniZ5lJx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b="DTiA/C8S"; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none) From: Sami Mujawar Move Pci Interrupt Map Info object from Arm Namespace to the Arch Common namespace. Correspondingly also update the following modules to reflect the changes introduced by the move: - SSDT PCIe library - ConfigurationManagerObjectParser - Dynamic Plat Repo TokenFixer map - FdtHwInfoParserLib/Pci/ArmPciConfigSpaceParser. Cc: Pierre Gondois Cc: Yeo Reum Yun Cc: AbdulLateef Attar Cc: Jeshua Smith Cc: Jeff Brasen Cc: Girish Mahadevan Cc: Leif Lindholm Cc: Meenakshi Aggarwal Signed-off-by: Sami Mujawar Signed-off-by: Pierre Gondois --- .../Include/ArchCommonNameSpaceObjects.h | 38 ++++++++++++ .../Include/ArmNameSpaceObjects.h | 60 ++++--------------- .../AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 26 ++++---- .../DynamicPlatRepoLib/CmObjectTokenFixer.c | 21 ++++--- .../ConfigurationManagerObjectParser.c | 6 +- .../Pci/ArmPciConfigSpaceParser.c | 14 ++--- .../Pci/ArmPciConfigSpaceParser.h | 4 +- DynamicTablesPkg/Readme.md | 24 ++++---- 8 files changed, 96 insertions(+), 97 deletions(-) diff --git a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h b/Dynami= cTablesPkg/Include/ArchCommonNameSpaceObjects.h index c5639e050881..429505b6509a 100644 --- a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h @@ -30,6 +30,7 @@ typedef enum ArchCommonObjectID { EArchCommonObjCmRef, ///< 7 - CM Object Refere= nce=0D EArchCommonObjPciConfigSpaceInfo, ///< 8 - PCI Configuratio= n Space Info=0D EArchCommonObjPciAddressMapInfo, ///< 9 - Pci Address Map = Info=0D + EArchCommonObjPciInterruptMapInfo, ///< 10 - Pci Interrupt Ma= p Info=0D EArchCommonObjMax=0D } EARCH_COMMON_OBJECT_ID;=0D =0D @@ -185,6 +186,43 @@ typedef struct CmArchCommonGenericInterrupt { UINT32 Flags;=0D } CM_ARCH_COMMON_GENERIC_INTERRUPT;=0D =0D +/** A structure that describes a PCI Interrupt Map.=0D +=0D + The legacy PCI interrupts used by PCI devices are described by this obje= ct.=0D +=0D + Cf Devicetree Specification - Release v0.3=0D + s2.4.3 "Interrupt Nexus Properties"=0D +=0D + ID: EArchCommonObjPciInterruptMapInfo=0D +*/=0D +typedef struct CmArchCommonPciInterruptMapInfo {=0D + /// Pci Bus.=0D + /// Value on 8 bits (max 255).=0D + UINT8 PciBus;=0D +=0D + /// Pci Device.=0D + /// Value on 5 bits (max 31).=0D + UINT8 PciDevice;=0D +=0D + /** PCI interrupt=0D +=0D + ACPI bindings are used:=0D + Cf. ACPI 6.4, s6.2.13 _PRT (PCI Routing Table):=0D + "0-INTA, 1-INTB, 2-INTC, 3-INTD"=0D +=0D + Device-tree bindings are shifted by 1:=0D + "INTA=3D1, INTB=3D2, INTC=3D3, INTD=3D4"=0D + */=0D + UINT8 PciInterrupt;=0D +=0D + /** Interrupt controller interrupt.=0D +=0D + Cf Devicetree Specification - Release v0.3=0D + s2.4.3 "Interrupt Nexus Properties": "parent interrupt specifier"=0D + */=0D + CM_ARCH_COMMON_GENERIC_INTERRUPT IntcInterrupt;=0D +} CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO;=0D +=0D #pragma pack()=0D =0D #endif // ARCH_COMMON_NAMESPACE_OBJECTS_H_=0D diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTables= Pkg/Include/ArmNameSpaceObjects.h index 60ec34a7b31a..5d7c84f51df6 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -56,18 +56,17 @@ typedef enum ArmObjectID { EArmObjGenericInitiatorAffinityInfo, ///< 25 - G= eneric Initiator Affinity=0D EArmObjCmn600Info, ///< 26 - C= MN-600 Info=0D EArmObjLpiInfo, ///< 27 - L= pi Info=0D - EArmObjPciInterruptMapInfo, ///< 28 - P= ci Interrupt Map Info=0D - EArmObjRmr, ///< 29 - R= eserved Memory Range Node=0D - EArmObjMemoryRangeDescriptor, ///< 30 - M= emory Range Descriptor=0D - EArmObjCpcInfo, ///< 31 - C= ontinuous Performance Control Info=0D - EArmObjPccSubspaceType0Info, ///< 32 - P= cc Subspace Type 0 Info=0D - EArmObjPccSubspaceType1Info, ///< 33 - P= cc Subspace Type 2 Info=0D - EArmObjPccSubspaceType2Info, ///< 34 - P= cc Subspace Type 2 Info=0D - EArmObjPccSubspaceType3Info, ///< 35 - P= cc Subspace Type 3 Info=0D - EArmObjPccSubspaceType4Info, ///< 36 - P= cc Subspace Type 4 Info=0D - EArmObjPccSubspaceType5Info, ///< 37 - P= cc Subspace Type 5 Info=0D - EArmObjEtInfo, ///< 38 - E= mbedded Trace Extension/Module Info=0D - EArmObjPsdInfo, ///< 39 - P= -State Dependency (PSD) Info=0D + EArmObjRmr, ///< 28 - R= eserved Memory Range Node=0D + EArmObjMemoryRangeDescriptor, ///< 29 - M= emory Range Descriptor=0D + EArmObjCpcInfo, ///< 30 - C= ontinuous Performance Control Info=0D + EArmObjPccSubspaceType0Info, ///< 31 - P= cc Subspace Type 0 Info=0D + EArmObjPccSubspaceType1Info, ///< 32 - P= cc Subspace Type 2 Info=0D + EArmObjPccSubspaceType2Info, ///< 33 - P= cc Subspace Type 2 Info=0D + EArmObjPccSubspaceType3Info, ///< 34 - P= cc Subspace Type 3 Info=0D + EArmObjPccSubspaceType4Info, ///< 35 - P= cc Subspace Type 4 Info=0D + EArmObjPccSubspaceType5Info, ///< 36 - P= cc Subspace Type 5 Info=0D + EArmObjEtInfo, ///< 37 - E= mbedded Trace Extension/Module Info=0D + EArmObjPsdInfo, ///< 38 - P= -State Dependency (PSD) Info=0D EArmObjMax=0D } EARM_OBJECT_ID;=0D =0D @@ -885,43 +884,6 @@ typedef struct CmArmLpiInfo { CHAR8 StateName[16];=0D } CM_ARM_LPI_INFO;=0D =0D -/** A structure that describes a PCI Interrupt Map.=0D -=0D - The legacy PCI interrupts used by PCI devices are described by this obje= ct.=0D -=0D - Cf Devicetree Specification - Release v0.3=0D - s2.4.3 "Interrupt Nexus Properties"=0D -=0D - ID: EArmObjPciInterruptMapInfo=0D -*/=0D -typedef struct CmArmPciInterruptMapInfo {=0D - /// Pci Bus.=0D - /// Value on 8 bits (max 255).=0D - UINT8 PciBus;=0D -=0D - /// Pci Device.=0D - /// Value on 5 bits (max 31).=0D - UINT8 PciDevice;=0D -=0D - /** PCI interrupt=0D -=0D - ACPI bindings are used:=0D - Cf. ACPI 6.4, s6.2.13 _PRT (PCI Routing Table):=0D - "0-INTA, 1-INTB, 2-INTC, 3-INTD"=0D -=0D - Device-tree bindings are shifted by 1:=0D - "INTA=3D1, INTB=3D2, INTC=3D3, INTD=3D4"=0D - */=0D - UINT8 PciInterrupt;=0D -=0D - /** Interrupt controller interrupt.=0D -=0D - Cf Devicetree Specification - Release v0.3=0D - s2.4.3 "Interrupt Nexus Properties": "parent interrupt specifier"=0D - */=0D - CM_ARCH_COMMON_GENERIC_INTERRUPT IntcInterrupt;=0D -} CM_ARM_PCI_INTERRUPT_MAP_INFO;=0D -=0D /** A structure that describes the=0D RMR node for the Platform.=0D =0D diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c index e86f1cb529f0..2b488016e545 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c @@ -45,7 +45,7 @@ Requirements: - EArchCommonObjCmRef=0D - EArchCommonObjPciConfigSpaceInfo=0D - EArchCommonObjPciAddressMapInfo=0D - - EArmObjPciInterruptMapInfo=0D + - EArchCommonObjPciInterruptMapInfo=0D */=0D =0D /** This macro expands to a function that retrieves the cross-CM-object-=0D @@ -79,9 +79,9 @@ GET_OBJECT_LIST ( Interrupt Mapping Information from the Configuration Manager.=0D */=0D GET_OBJECT_LIST (=0D - EObjNameSpaceArm,=0D - EArmObjPciInterruptMapInfo,=0D - CM_ARM_PCI_INTERRUPT_MAP_INFO=0D + EObjNameSpaceArchCommon,=0D + EArchCommonObjPciInterruptMapInfo,=0D + CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO=0D );=0D =0D /** Initialize the MappingTable.=0D @@ -310,12 +310,12 @@ GeneratePrt ( IN OUT AML_OBJECT_NODE_HANDLE PciNode=0D )=0D {=0D - EFI_STATUS Status;=0D - INT32 Index;=0D - AML_OBJECT_NODE_HANDLE PrtNode;=0D - CM_ARCH_COMMON_OBJ_REF *RefInfo;=0D - UINT32 RefCount;=0D - CM_ARM_PCI_INTERRUPT_MAP_INFO *IrqMapInfo;=0D + EFI_STATUS Status;=0D + INT32 Index;=0D + AML_OBJECT_NODE_HANDLE PrtNode;=0D + CM_ARCH_COMMON_OBJ_REF *RefInfo;=0D + UINT32 RefCount;=0D + CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO *IrqMapInfo;=0D =0D ASSERT (Generator !=3D NULL);=0D ASSERT (CfgMgrProtocol !=3D NULL);=0D @@ -325,7 +325,7 @@ GeneratePrt ( PrtNode =3D NULL;=0D =0D // Get the array of CM_ARCH_COMMON_OBJ_REF referencing the=0D - // CM_ARM_PCI_INTERRUPT_MAP_INFO objects.=0D + // CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO objects.=0D Status =3D GetEArchCommonObjCmRef (=0D CfgMgrProtocol,=0D PciInfo->InterruptMapToken,=0D @@ -352,8 +352,8 @@ GeneratePrt ( }=0D =0D for (Index =3D 0; Index < RefCount; Index++) {=0D - // Get CM_ARM_PCI_INTERRUPT_MAP_INFO structures one by one.=0D - Status =3D GetEArmObjPciInterruptMapInfo (=0D + // Get CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO structures one by one.=0D + Status =3D GetEArchCommonObjPciInterruptMapInfo (=0D CfgMgrProtocol,=0D RefInfo[Index].ReferenceToken,=0D &IrqMapInfo,=0D diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTok= enFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectToke= nFixer.c index 0e12b0f8b167..4d660265cfe3 100644 --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer= .c +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer= .c @@ -171,18 +171,17 @@ CM_OBJECT_TOKEN_FIXER TokenFixer[EArmObjMax] =3D { NULL, ///< 25 - Generic Initiator Affinity=0D NULL, ///< 26 - CMN-600 Info=0D NULL, ///< 27 - Lpi Info=0D - NULL, ///< 28 - Pci Interrupt Map Info=0D - NULL, ///< 29 - Reserved Memory Range Node=0D - NULL, ///< 30 - Memory Range Descriptor=0D - NULL, ///< 31 - Continuous Performance Contr= ol Info=0D - NULL, ///< 32 - Pcc Subspace Type 0 Info=0D + NULL, ///< 28 - Reserved Memory Range Node=0D + NULL, ///< 29 - Memory Range Descriptor=0D + NULL, ///< 30 - Continuous Performance Contr= ol Info=0D + NULL, ///< 31 - Pcc Subspace Type 0 Info=0D + NULL, ///< 32 - Pcc Subspace Type 2 Info=0D NULL, ///< 33 - Pcc Subspace Type 2 Info=0D - NULL, ///< 34 - Pcc Subspace Type 2 Info=0D - NULL, ///< 35 - Pcc Subspace Type 3 Info=0D - NULL, ///< 36 - Pcc Subspace Type 4 Info=0D - NULL, ///< 37 - Pcc Subspace Type 5 Info=0D - NULL, ///< 38 - Embedded Trace Extension/Mod= ule Info=0D - NULL ///< 39 - P-State Dependency (PSD) Inf= o=0D + NULL, ///< 34 - Pcc Subspace Type 3 Info=0D + NULL, ///< 35 - Pcc Subspace Type 4 Info=0D + NULL, ///< 36 - Pcc Subspace Type 5 Info=0D + NULL, ///< 37 - Embedded Trace Extension/Mod= ule Info=0D + NULL ///< 38 - P-State Dependency (PSD) Inf= o=0D };=0D =0D /** CmObj token fixer.=0D diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationMa= nagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/Config= urationManagerObjectParser.c index 1fd1edb8eb7f..4ca35d65fca3 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c @@ -449,9 +449,9 @@ STATIC CONST CM_OBJ_PARSER CmArchCommonPciAddressMapIn= foParser[] =3D { { "AddressSize", 8, "0x%llx", NULL },=0D };=0D =0D -/** A parser for EArmObjPciInterruptMapInfo.=0D +/** A parser for EArchCommonObjPciInterruptMapInfo.=0D */=0D -STATIC CONST CM_OBJ_PARSER CmPciInterruptMapInfoParser[] =3D {=0D +STATIC CONST CM_OBJ_PARSER CmArchCommonPciInterruptMapInfoParser[] =3D {= =0D { "PciBus", 1, "0x%x", NU= LL },=0D { "PciDevice", 1, "0x%x", NU= LL },=0D { "PciInterrupt", 1, "0x%x", NU= LL },=0D @@ -680,6 +680,7 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArchCommonNamespaceOb= jectParser[] =3D { CM_PARSER_ADD_OBJECT (EArchCommonObjCmRef, CmArchCom= monObjRefParser),=0D CM_PARSER_ADD_OBJECT (EArchCommonObjPciConfigSpaceInfo, CmArchCom= monPciConfigSpaceInfoParser),=0D CM_PARSER_ADD_OBJECT (EArchCommonObjPciAddressMapInfo, CmArchCom= monPciAddressMapInfoParser),=0D + CM_PARSER_ADD_OBJECT (EArchCommonObjPciInterruptMapInfo, CmArchCom= monPciInterruptMapInfoParser),=0D CM_PARSER_ADD_OBJECT_RESERVED (EArchCommonObjMax)=0D };=0D =0D @@ -714,7 +715,6 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectPar= ser[] =3D { CM_PARSER_ADD_OBJECT (EArmObjGenericInitiatorAffinityInfo,CmArmGenericIn= itiatorAffinityInfoParser),=0D CM_PARSER_ADD_OBJECT (EArmObjCmn600Info, CmArmCmn600Inf= oParser),=0D CM_PARSER_ADD_OBJECT (EArmObjLpiInfo, CmArmLpiInfoPa= rser),=0D - CM_PARSER_ADD_OBJECT (EArmObjPciInterruptMapInfo, CmPciInterrupt= MapInfoParser),=0D CM_PARSER_ADD_OBJECT (EArmObjRmr, CmArmRmrInfoPa= rser),=0D CM_PARSER_ADD_OBJECT (EArmObjMemoryRangeDescriptor, CmArmMemoryRan= geDescriptorInfoParser),=0D CM_PARSER_ADD_OBJECT (EArmObjCpcInfo, CmArmCpcInfoPa= rser),=0D diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSp= aceParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigS= paceParser.c index b20d265a839e..b064e62c17bc 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpacePars= er.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpacePars= er.c @@ -311,8 +311,8 @@ ParseIrqMap ( =0D UINT32 PciAddressAttr;=0D =0D - CM_ARM_PCI_INTERRUPT_MAP_INFO *PciInterruptMapInfo;=0D - UINT32 BufferSize;=0D + CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO *PciInterruptMapInfo;=0D + UINT32 BufferSize;=0D =0D Data =3D fdt_getprop (Fdt, HostPciNode, "interrupt-map", &DataSize);=0D if ((Data =3D=3D NULL) || (DataSize <=3D 0)) {=0D @@ -455,9 +455,9 @@ ParseIrqMap ( } // for=0D =0D PciInfo->Mapping[PciMappingTableInterrupt].ObjectId =3D=0D - CREATE_CM_ARM_OBJECT_ID (EArmObjPciInterruptMapInfo);=0D + CREATE_CM_ARCH_COMMON_OBJECT_ID (EArchCommonObjPciInterruptMapInfo);=0D PciInfo->Mapping[PciMappingTableInterrupt].Size =3D=0D - sizeof (CM_ARM_PCI_INTERRUPT_MAP_INFO) * IrqMapCount;=0D + sizeof (CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO) * IrqMapCount;=0D PciInfo->Mapping[PciMappingTableInterrupt].Data =3D PciInterruptMapInfo= ;=0D PciInfo->Mapping[PciMappingTableInterrupt].Count =3D IrqMapCount;=0D =0D @@ -581,7 +581,7 @@ PciNodeParser ( CmObj of the following types are concerned:=0D - EArchCommonObjPciConfigSpaceInfo=0D - EArchCommonObjPciAddressMapInfo=0D - - EArmObjPciInterruptMapInfo=0D + - EArchCommonObjPciInterruptMapInfo=0D =0D @param [in] FdtParserHandle A handle to the parser instance.=0D @param [in] PciTableInfo PCI_PARSER_TABLE structure containing the= =0D @@ -701,12 +701,12 @@ FreeParserTable ( UINT64 AddressSize; // {Populated}=0D } CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO;=0D =0D - typedef struct CmArmPciInterruptMapInfo {=0D + typedef struct CmArchCommonPciInterruptMapInfo {=0D UINT8 PciBus; // {Populated}=0D UINT8 PciDevice; // {Populated}=0D UINT8 PciInterrupt; // {Populated}=0D CM_ARCH_COMMON_GENERIC_INTERRUPT IntcInterrupt; // {Populated}=0D - } CM_ARM_PCI_INTERRUPT_MAP_INFO;=0D + } CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO;=0D =0D A parser parses a Device Tree to populate a specific CmObj type. None,=0D one or many CmObj can be created by the parser.=0D diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSp= aceParser.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigS= paceParser.h index 33457cd6e95c..e68013838515 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpacePars= er.h +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpacePars= er.h @@ -109,12 +109,12 @@ typedef struct PciParserTable { UINT64 AddressSize; // {Populated}=0D } CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO;=0D =0D - typedef struct CmArmPciInterruptMapInfo {=0D + typedef struct CmArchCommonPciInterruptMapInfo {=0D UINT8 PciBus; // {Populated}=0D UINT8 PciDevice; // {Populated}=0D UINT8 PciInterrupt; // {Populated}=0D CM_ARCH_COMMON_GENERIC_INTERRUPT IntcInterrupt; // {Populated}=0D - } CM_ARM_PCI_INTERRUPT_MAP_INFO;=0D + } CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO;=0D =0D A parser parses a Device Tree to populate a specific CmObj type. None,=0D one or many CmObj can be created by the parser.=0D diff --git a/DynamicTablesPkg/Readme.md b/DynamicTablesPkg/Readme.md index 0caae7dc4527..558cf69afad6 100644 --- a/DynamicTablesPkg/Readme.md +++ b/DynamicTablesPkg/Readme.md @@ -468,18 +468,17 @@ The CM_OBJECT_ID type is used to identify the Configu= ration Manager | 25 | Generic Initiator Affinity Info | Move to Arch Common = NS |=0D | 26 | CMN 600 Info | |=0D | 27 | Low Power Idle State Info | Move to Arch Common = NS |=0D -| 28 | PCI Interrupt Map Info | Move to Arch Common = NS |=0D -| 29 | Reserved Memory Range Node | |=0D -| 30 | Memory Range Descriptor | |=0D -| 31 | Continuous Performance Control Info | Move to Arch Common = NS |=0D -| 32 | Pcc Subspace Type 0 Info | Move to Arch Common = NS |=0D -| 33 | Pcc Subspace Type 1 Info | Move to Arch Common = NS |=0D -| 34 | Pcc Subspace Type 2 Info | Move to Arch Common = NS |=0D -| 35 | Pcc Subspace Type 3 Info | Move to Arch Common = NS |=0D -| 36 | Pcc Subspace Type 4 Info | Move to Arch Common = NS |=0D -| 37 | Pcc Subspace Type 5 Info | Move to Arch Common = NS |=0D -| 38 | Embedded Trace Extension/Module Info | |=0D -| 39 | P-State Dependency (PSD) Info | Move to Arch Common = NS |=0D +| 28 | Reserved Memory Range Node | |=0D +| 29 | Memory Range Descriptor | |=0D +| 30 | Continuous Performance Control Info | Move to Arch Common = NS |=0D +| 31 | Pcc Subspace Type 0 Info | Move to Arch Common = NS |=0D +| 32 | Pcc Subspace Type 1 Info | Move to Arch Common = NS |=0D +| 33 | Pcc Subspace Type 2 Info | Move to Arch Common = NS |=0D +| 34 | Pcc Subspace Type 3 Info | Move to Arch Common = NS |=0D +| 35 | Pcc Subspace Type 4 Info | Move to Arch Common = NS |=0D +| 36 | Pcc Subspace Type 5 Info | Move to Arch Common = NS |=0D +| 37 | Embedded Trace Extension/Module Info | |=0D +| 38 | P-State Dependency (PSD) Info | Move to Arch Common = NS |=0D | `*` | All other values are reserved. | |=0D =0D #### Object ID's in the Arch Common Namespace:=0D @@ -496,4 +495,5 @@ The CM_OBJECT_ID type is used to identify the Configura= tion Manager | 7 | CM Object Reference | |=0D | 8 | PCI Configuration Space Info | |=0D | 9 | PCI Address Map Info | |=0D +| 10 | PCI Interrupt Map Info | |=0D | `*` | All other values are reserved. | |=0D --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116981): https://edk2.groups.io/g/devel/message/116981 Mute This Topic: https://groups.io/mt/105068151/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-