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 C82AC74004C for ; Thu, 21 Mar 2024 16:00:16 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=IZhgRzMr8wsylUhgizvcCwYuY0PA2dVz+48IHLbZiQw=; 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=1711036815; v=1; b=bhZE1BRu638DJyiOI5GKCuHDjBl8bXSRIyJ8z5sd9BXT+7auWBCfZ7ph/Xhhwf9ltO0okFbx 5yVKqw7F3PWuyL+bdGWW+eunSle3Btnh69zztSWyMxCyZplW9LKiuXPPGxclHlzs1bmTaz80f1I D+DkBDG9Hqyec6eSbiKnysMDfqy1fAioDMk5OmpJJYl0EwNZpeuyqaa50qRzYWKkywcf2fmm1DR UWSHd4magYwMI3JsgsoSvfvQ8IQOy3Wbjv1UXjTGOk6r/oXXGtRdlZGL7msaA89VZUACHvgHwwO d1QN3qiLa0rQRJ3GXAvLiQ6vh/kau4S+97CT/0UdC4d0Q== X-Received: by 127.0.0.2 with SMTP id lNkDYY7687511xEm1qMF7zSQ; Thu, 21 Mar 2024 09:00:15 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.570.1711036814790540216 for ; Thu, 21 Mar 2024 09:00:14 -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 CB2591007; Thu, 21 Mar 2024 09:00:48 -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 7FBAC3F67D; Thu, 21 Mar 2024 09:00:11 -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 01/19] DynamicTablesPkg: Move Pci Address Map Info to Arch Common Date: Thu, 21 Mar 2024 16:59:06 +0100 Message-Id: <20240321155924.707272-2-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:14 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: ncTy1TyJiI7qDL4zalu3Ivykx7686176AA= 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=bhZE1BRu; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io From: Sami Mujawar Move Pci Address 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 generator - 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 | 28 ++++++++++ .../Include/ArmNameSpaceObjects.h | 52 +++++-------------- .../AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 30 +++++------ .../DynamicPlatRepoLib/CmObjectTokenFixer.c | 23 ++++---- .../ConfigurationManagerObjectParser.c | 6 +-- .../Pci/ArmPciConfigSpaceParser.c | 18 +++---- .../Pci/ArmPciConfigSpaceParser.h | 4 +- DynamicTablesPkg/Readme.md | 26 +++++----- 8 files changed, 93 insertions(+), 94 deletions(-) diff --git a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h b/Dynami= cTablesPkg/Include/ArchCommonNameSpaceObjects.h index 7c70ba023829..bbc5d7dc55cd 100644 --- a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h @@ -29,6 +29,7 @@ typedef enum ArchCommonObjectID { EArchCommonObjFixedFeatureFlags, ///< 6 - Fixed feature fl= ags for FADT=0D EArchCommonObjCmRef, ///< 7 - CM Object Refere= nce=0D EArchCommonObjPciConfigSpaceInfo, ///< 8 - PCI Configuratio= n Space Info=0D + EArchCommonObjPciAddressMapInfo, ///< 9 - Pci Address Map = Info=0D EArchCommonObjMax=0D } EARCH_COMMON_OBJECT_ID;=0D =0D @@ -142,6 +143,33 @@ typedef struct CmArchCommonPciConfigSpaceInfo { CM_OBJECT_TOKEN InterruptMapToken;=0D } CM_ARCH_COMMON_PCI_CONFIG_SPACE_INFO;=0D =0D +/** A structure that describes a PCI Address Map.=0D +=0D + The memory-ranges used by the PCI bus are described by this object.=0D +=0D + ID: EArchCommonObjPciAddressMapInfo=0D +*/=0D +typedef struct CmArchCommonPciAddressMapInfo {=0D + /** Pci address space code=0D +=0D + Available values are:=0D + - 0: Configuration Space=0D + - 1: I/O Space=0D + - 2: 32-bit-address Memory Space=0D + - 3: 64-bit-address Memory Space=0D + */=0D + UINT8 SpaceCode;=0D +=0D + /// PCI address=0D + UINT64 PciAddress;=0D +=0D + /// Cpu address=0D + UINT64 CpuAddress;=0D +=0D + /// Address size=0D + UINT64 AddressSize;=0D +} CM_ARCH_COMMON_PCI_ADDRESS_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 a701de4bcd60..5b318bbb10c3 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -56,19 +56,18 @@ typedef enum ArmObjectID { EArmObjGenericInitiatorAffinityInfo, ///< 25 - G= eneric Initiator Affinity=0D EArmObjCmn600Info, ///< 26 - C= MN-600 Info=0D EArmObjLpiInfo, ///< 27 - L= pi Info=0D - EArmObjPciAddressMapInfo, ///< 28 - P= ci Address Map Info=0D - EArmObjPciInterruptMapInfo, ///< 29 - P= ci Interrupt Map Info=0D - EArmObjRmr, ///< 30 - R= eserved Memory Range Node=0D - EArmObjMemoryRangeDescriptor, ///< 31 - M= emory Range Descriptor=0D - EArmObjCpcInfo, ///< 32 - C= ontinuous Performance Control Info=0D - EArmObjPccSubspaceType0Info, ///< 33 - P= cc Subspace Type 0 Info=0D - EArmObjPccSubspaceType1Info, ///< 34 - P= cc Subspace Type 2 Info=0D - EArmObjPccSubspaceType2Info, ///< 35 - P= cc Subspace Type 2 Info=0D - EArmObjPccSubspaceType3Info, ///< 36 - P= cc Subspace Type 3 Info=0D - EArmObjPccSubspaceType4Info, ///< 37 - P= cc Subspace Type 4 Info=0D - EArmObjPccSubspaceType5Info, ///< 38 - P= cc Subspace Type 5 Info=0D - EArmObjEtInfo, ///< 39 - E= mbedded Trace Extension/Module Info=0D - EArmObjPsdInfo, ///< 40 - P= -State Dependency (PSD) 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 EArmObjMax=0D } EARM_OBJECT_ID;=0D =0D @@ -901,33 +900,6 @@ typedef struct CmArmLpiInfo { CHAR8 StateName[16];=0D } CM_ARM_LPI_INFO;=0D =0D -/** A structure that describes a PCI Address Map.=0D -=0D - The memory-ranges used by the PCI bus are described by this object.=0D -=0D - ID: EArmObjPciAddressMapInfo=0D -*/=0D -typedef struct CmArmPciAddressMapInfo {=0D - /** Pci address space code=0D -=0D - Available values are:=0D - - 0: Configuration Space=0D - - 1: I/O Space=0D - - 2: 32-bit-address Memory Space=0D - - 3: 64-bit-address Memory Space=0D - */=0D - UINT8 SpaceCode;=0D -=0D - /// PCI address=0D - UINT64 PciAddress;=0D -=0D - /// Cpu address=0D - UINT64 CpuAddress;=0D -=0D - /// Address size=0D - UINT64 AddressSize;=0D -} CM_ARM_PCI_ADDRESS_MAP_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 diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c index 2a169e0f6c1c..e86f1cb529f0 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c @@ -44,7 +44,7 @@ Requirements: this Generator:=0D - EArchCommonObjCmRef=0D - EArchCommonObjPciConfigSpaceInfo=0D - - EArmObjPciAddressMapInfo=0D + - EArchCommonObjPciAddressMapInfo=0D - EArmObjPciInterruptMapInfo=0D */=0D =0D @@ -70,9 +70,9 @@ GET_OBJECT_LIST ( Address Mapping Information from the Configuration Manager.=0D */=0D GET_OBJECT_LIST (=0D - EObjNameSpaceArm,=0D - EArmObjPciAddressMapInfo,=0D - CM_ARM_PCI_ADDRESS_MAP_INFO=0D + EObjNameSpaceArchCommon,=0D + EArchCommonObjPciAddressMapInfo,=0D + CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO=0D );=0D =0D /** This macro expands to a function that retrieves the Pci=0D @@ -455,14 +455,14 @@ GeneratePciCrs ( IN OUT AML_OBJECT_NODE_HANDLE PciNode=0D )=0D {=0D - EFI_STATUS Status;=0D - BOOLEAN Translation;=0D - UINT32 Index;=0D - CM_ARCH_COMMON_OBJ_REF *RefInfo;=0D - UINT32 RefCount;=0D - CM_ARM_PCI_ADDRESS_MAP_INFO *AddrMapInfo;=0D - AML_OBJECT_NODE_HANDLE CrsNode;=0D - BOOLEAN IsPosDecode;=0D + EFI_STATUS Status;=0D + BOOLEAN Translation;=0D + UINT32 Index;=0D + CM_ARCH_COMMON_OBJ_REF *RefInfo;=0D + UINT32 RefCount;=0D + CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO *AddrMapInfo;=0D + AML_OBJECT_NODE_HANDLE CrsNode;=0D + BOOLEAN IsPosDecode;=0D =0D ASSERT (Generator !=3D NULL);=0D ASSERT (CfgMgrProtocol !=3D NULL);=0D @@ -506,7 +506,7 @@ GeneratePciCrs ( }=0D =0D // Get the array of CM_ARCH_COMMON_OBJ_REF referencing the=0D - // CM_ARM_PCI_ADDRESS_MAP_INFO objects.=0D + // CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO objects.=0D Status =3D GetEArchCommonObjCmRef (=0D CfgMgrProtocol,=0D PciInfo->AddressMapToken,=0D @@ -519,8 +519,8 @@ GeneratePciCrs ( }=0D =0D for (Index =3D 0; Index < RefCount; Index++) {=0D - // Get CM_ARM_PCI_ADDRESS_MAP_INFO structures one by one.=0D - Status =3D GetEArmObjPciAddressMapInfo (=0D + // Get CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO structures one by one.=0D + Status =3D GetEArchCommonObjPciAddressMapInfo (=0D CfgMgrProtocol,=0D RefInfo[Index].ReferenceToken,=0D &AddrMapInfo,=0D diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTok= enFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectToke= nFixer.c index 41f66ee7b689..0e12b0f8b167 100644 --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer= .c +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer= .c @@ -171,19 +171,18 @@ 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 Address Map Info=0D - NULL, ///< 29 - Pci Interrupt Map Info=0D - NULL, ///< 30 - Reserved Memory Range Node=0D - NULL, ///< 31 - Memory Range Descriptor=0D - NULL, ///< 32 - Continuous Performance Contr= ol Info=0D - NULL, ///< 33 - Pcc Subspace Type 0 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, ///< 33 - Pcc Subspace Type 2 Info=0D NULL, ///< 34 - Pcc Subspace Type 2 Info=0D - NULL, ///< 35 - Pcc Subspace Type 2 Info=0D - NULL, ///< 36 - Pcc Subspace Type 3 Info=0D - NULL, ///< 37 - Pcc Subspace Type 4 Info=0D - NULL, ///< 38 - Pcc Subspace Type 5 Info=0D - NULL, ///< 39 - Embedded Trace Extension/Mod= ule Info=0D - NULL ///< 40 - P-State Dependency (PSD) Inf= o=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 };=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 73dbb9879dcc..2d0e62876606 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c @@ -440,9 +440,9 @@ STATIC CONST CM_OBJ_PARSER CmArmLpiInfoParser[] =3D { { "StateName", 16, = NULL, PrintString },=0D };=0D =0D -/** A parser for EArmObjPciAddressMapInfo.=0D +/** A parser for EArchCommonObjPciAddressMapInfo.=0D */=0D -STATIC CONST CM_OBJ_PARSER CmArmPciAddressMapInfoParser[] =3D {=0D +STATIC CONST CM_OBJ_PARSER CmArchCommonPciAddressMapInfoParser[] =3D {=0D { "SpaceCode", 1, "%d", NULL },=0D { "PciAddress", 8, "0x%llx", NULL },=0D { "CpuAddress", 8, "0x%llx", NULL },=0D @@ -679,6 +679,7 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArchCommonNamespaceOb= jectParser[] =3D { CM_PARSER_ADD_OBJECT (EArchCommonObjFixedFeatureFlags, CmArchCom= monFixedFeatureFlagsParser),=0D 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_RESERVED (EArchCommonObjMax)=0D };=0D =0D @@ -713,7 +714,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 (EArmObjPciAddressMapInfo, CmArmPciAddres= sMapInfoParser),=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 diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSp= aceParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigS= paceParser.c index 7d9fe7b1da22..aef0f27a15ae 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpacePars= er.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpacePars= er.c @@ -188,8 +188,8 @@ ParseAddressMap ( UINT32 Count;=0D UINT32 PciAddressAttr;=0D =0D - CM_ARM_PCI_ADDRESS_MAP_INFO *PciAddressMapInfo;=0D - UINT32 BufferSize;=0D + CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO *PciAddressMapInfo;=0D + UINT32 BufferSize;=0D =0D // The mapping is done on AddressMapSize bytes.=0D AddressMapSize =3D (PCI_ADDRESS_CELLS + AddressCells + PCI_SIZE_CELLS) *= =0D @@ -208,7 +208,7 @@ ParseAddressMap ( Count =3D DataSize / AddressMapSize;=0D =0D // Allocate a buffer to store each address mapping.=0D - BufferSize =3D Count * sizeof (CM_ARM_PCI_ADDRESS_MAP_INFO);=0D + BufferSize =3D Count * sizeof (CM_ARCH_COMMON_PCI_ADDRESS_MAP_INF= O);=0D PciAddressMapInfo =3D AllocateZeroPool (BufferSize);=0D if (PciAddressMapInfo =3D=3D NULL) {=0D ASSERT (0);=0D @@ -246,9 +246,9 @@ ParseAddressMap ( } // for=0D =0D PciInfo->Mapping[PciMappingTableAddress].ObjectId =3D=0D - CREATE_CM_ARM_OBJECT_ID (EArmObjPciAddressMapInfo);=0D + CREATE_CM_ARCH_COMMON_OBJECT_ID (EArchCommonObjPciAddressMapInfo);=0D PciInfo->Mapping[PciMappingTableAddress].Size =3D=0D - sizeof (CM_ARM_PCI_ADDRESS_MAP_INFO) * Count;=0D + sizeof (CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO) * Count;=0D PciInfo->Mapping[PciMappingTableAddress].Data =3D PciAddressMapInfo;=0D PciInfo->Mapping[PciMappingTableAddress].Count =3D Count;=0D =0D @@ -413,7 +413,7 @@ ParseIrqMap ( =0D // Allocate a buffer to store each interrupt mapping.=0D IrqMapCount =3D DataSize / IrqMapSize;=0D - BufferSize =3D IrqMapCount * sizeof (CM_ARM_PCI_ADDRESS_MAP_INF= O);=0D + BufferSize =3D IrqMapCount * sizeof (CM_ARCH_COMMON_PCI_ADDRESS= _MAP_INFO);=0D PciInterruptMapInfo =3D AllocateZeroPool (BufferSize);=0D if (PciInterruptMapInfo =3D=3D NULL) {=0D ASSERT (0);=0D @@ -580,7 +580,7 @@ PciNodeParser ( =0D CmObj of the following types are concerned:=0D - EArchCommonObjPciConfigSpaceInfo=0D - - EArmObjPciAddressMapInfo=0D + - EArchCommonObjPciAddressMapInfo=0D - EArmObjPciInterruptMapInfo=0D =0D @param [in] FdtParserHandle A handle to the parser instance.=0D @@ -694,12 +694,12 @@ FreeParserTable ( UINT8 EndBusNumber; // {Populated}=0D } CM_ARCH_COMMON_PCI_CONFIG_SPACE_INFO;=0D =0D - typedef struct CmArmPciAddressMapInfo {=0D + typedef struct CmArchCommonPciAddressMapInfo {=0D UINT8 SpaceCode; // {Populated}=0D UINT64 PciAddress; // {Populated}=0D UINT64 CpuAddress; // {Populated}=0D UINT64 AddressSize; // {Populated}=0D - } CM_ARM_PCI_ADDRESS_MAP_INFO;=0D + } CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO;=0D =0D typedef struct CmArmPciInterruptMapInfo {=0D UINT8 PciBus; // {Populated}=0D diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSp= aceParser.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigS= paceParser.h index 4e269508a6e4..ba7090fd7e47 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpacePars= er.h +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpacePars= er.h @@ -102,12 +102,12 @@ typedef struct PciParserTable { UINT8 EndBusNumber; // {Populated}=0D } CM_ARCH_COMMON_PCI_CONFIG_SPACE_INFO;=0D =0D - typedef struct CmArmPciAddressMapInfo {=0D + typedef struct CmArchCommonPciAddressMapInfo {=0D UINT8 SpaceCode; // {Populated}=0D UINT64 PciAddress; // {Populated}=0D UINT64 CpuAddress; // {Populated}=0D UINT64 AddressSize; // {Populated}=0D - } CM_ARM_PCI_ADDRESS_MAP_INFO;=0D + } CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO;=0D =0D typedef struct CmArmPciInterruptMapInfo {=0D UINT8 PciBus; // {Populated}=0D diff --git a/DynamicTablesPkg/Readme.md b/DynamicTablesPkg/Readme.md index e0544fe40b1c..0caae7dc4527 100644 --- a/DynamicTablesPkg/Readme.md +++ b/DynamicTablesPkg/Readme.md @@ -468,19 +468,18 @@ 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 Address Map Info | Move to Arch Common = NS |=0D -| 29 | PCI Interrupt Map Info | Move to Arch Common = NS |=0D -| 30 | Reserved Memory Range Node | |=0D -| 31 | Memory Range Descriptor | |=0D -| 32 | Continuous Performance Control Info | Move to Arch Common = NS |=0D -| 33 | Pcc Subspace Type 0 Info | Move to Arch Common = NS |=0D -| 34 | Pcc Subspace Type 1 Info | Move to Arch Common = NS |=0D -| 35 | Pcc Subspace Type 2 Info | Move to Arch Common = NS |=0D -| 36 | Pcc Subspace Type 3 Info | Move to Arch Common = NS |=0D -| 37 | Pcc Subspace Type 4 Info | Move to Arch Common = NS |=0D -| 38 | Pcc Subspace Type 5 Info | Move to Arch Common = NS |=0D -| 39 | Embedded Trace Extension/Module Info | |=0D -| 40 | P-State Dependency (PSD) 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 | `*` | 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 | 6 | Fixed feature flags for FADT | |=0D | 7 | CM Object Reference | |=0D | 8 | PCI Configuration Space Info | |=0D +| 9 | PCI Address 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 (#116979): https://edk2.groups.io/g/devel/message/116979 Mute This Topic: https://groups.io/mt/105068145/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-