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 177F1AC17FE for ; Thu, 21 Mar 2024 16:00:19 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=lxubTiOe+BKItxybsi9HwZZtOHMBOg7e4X4+TSkTtVs=; 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=1711036818; v=1; b=btuWRcQOECjOtxkyUQUNwlIzSkBu5ots75gEWIdAPdBdN45CmFlXDR5pMnMgpdrrnDqal5Ae Mtak1SAB7ApCuEKaKgZxue8KnEt+1Vy28WFKn5Xy9e5K5iwLyE1SzmGZbT30T5QV3DilhU0x+cg GXgl4dOVWjhaZeta1LteJhqd210Q23ZWxqCPrOTnObiQwAbJKnzs0PELt36ToaoTDrQveUMbCMM eQhT/bixm5ygN4evPAHfhTPYEE18jCkVX0oX3ZepWoEA5CeUqG2l11zTPIjt2YCE0eVgzq+80GL /uSosM/yc0UvOkP43H7LPN68Q/yEindyxZRr5E1KIeXkg== X-Received: by 127.0.0.2 with SMTP id KvnBYY7687511xxlDAuamaLE; Thu, 21 Mar 2024 09:00:18 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.593.1711036817978703369 for ; Thu, 21 Mar 2024 09:00:18 -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 035731063; Thu, 21 Mar 2024 09:00:52 -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 EBEC03F67D; Thu, 21 Mar 2024 09:00:14 -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 02/19] DynamicTablesPkg: Move CM_ARM_GENERIC_INTERRUPT struct to Arch Common Date: Thu, 21 Mar 2024 16:59:07 +0100 Message-Id: <20240321155924.707272-3-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:18 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: vwO7SAqcCaoOkhCHs9wpP9Vcx7686176AA= 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=btuWRcQO; 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 The CM_ARM_GENERIC_INTERRUPT struct describes a standard interrupt and is generic. Therefore move it to the Arch Common namespace header file and rename it as CM_ARCH_COMMON_GENERIC_INTERRUPT. Correspondingly also update the following modules to reflect the changes introduced by the move: - SSDT CMN600 generator - ConfigurationManagerObjectParser - 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 | 15 +++++ .../Include/ArmNameSpaceObjects.h | 55 +++++++------------ .../SsdtCmn600Generator.c | 16 +++--- .../ConfigurationManagerObjectParser.c | 36 ++++++------ .../Pci/ArmPciConfigSpaceParser.c | 8 +-- .../Pci/ArmPciConfigSpaceParser.h | 8 +-- 6 files changed, 69 insertions(+), 69 deletions(-) diff --git a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h b/Dynami= cTablesPkg/Include/ArchCommonNameSpaceObjects.h index bbc5d7dc55cd..c5639e050881 100644 --- a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h @@ -170,6 +170,21 @@ typedef struct CmArchCommonPciAddressMapInfo { UINT64 AddressSize;=0D } CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO;=0D =0D +/** A structure that describes the=0D + Generic Interrupts.=0D +*/=0D +typedef struct CmArchCommonGenericInterrupt {=0D + /// Interrupt number=0D + UINT32 Interrupt;=0D +=0D + /// Flags=0D + /// BIT0: 0: Interrupt is Level triggered=0D + /// 1: Interrupt is Edge triggered=0D + /// BIT1: 0: Interrupt is Active high=0D + /// 1: Interrupt is Active low=0D + UINT32 Flags;=0D +} CM_ARCH_COMMON_GENERIC_INTERRUPT;=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 5b318bbb10c3..60ec34a7b31a 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -632,21 +632,6 @@ typedef struct CmArmIdMapping { UINT32 Flags;=0D } CM_ARM_ID_MAPPING;=0D =0D -/** A structure that describes the Arm=0D - Generic Interrupts.=0D -*/=0D -typedef struct CmArmGenericInterrupt {=0D - /// Interrupt number=0D - UINT32 Interrupt;=0D -=0D - /// Flags=0D - /// BIT0: 0: Interrupt is Level triggered=0D - /// 1: Interrupt is Edge triggered=0D - /// BIT1: 0: Interrupt is Active high=0D - /// 1: Interrupt is Active low=0D - UINT32 Flags;=0D -} CM_ARM_GENERIC_INTERRUPT;=0D -=0D /** A structure that describes the SMMU interrupts for the Platform.=0D =0D Interrupt Interrupt number.=0D @@ -654,7 +639,7 @@ typedef struct CmArmGenericInterrupt { =0D ID: EArmObjSmmuInterruptArray=0D */=0D -typedef CM_ARM_GENERIC_INTERRUPT CM_ARM_SMMU_INTERRUPT;=0D +typedef CM_ARCH_COMMON_GENERIC_INTERRUPT CM_ARM_SMMU_INTERRUPT;=0D =0D /** A structure that describes the AML Extended Interrupts.=0D =0D @@ -664,7 +649,7 @@ typedef CM_ARM_GENERIC_INTERRUPT CM_ARM_SMMU_INTERRUPT; resource descriptor.=0D See EFI_ACPI_EXTENDED_INTERRUPT_FLAG_xxx in Acpi10.h=0D */=0D -typedef CM_ARM_GENERIC_INTERRUPT CM_ARM_EXTENDED_INTERRUPT;=0D +typedef CM_ARCH_COMMON_GENERIC_INTERRUPT CM_ARM_EXTENDED_INTERRUPT;=0D =0D /** A structure that describes the Processor Hierarchy Node (Type 0) in PP= TT=0D =0D @@ -927,14 +912,14 @@ typedef struct CmArmPciInterruptMapInfo { Device-tree bindings are shifted by 1:=0D "INTA=3D1, INTB=3D2, INTC=3D3, INTD=3D4"=0D */=0D - UINT8 PciInterrupt;=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_ARM_GENERIC_INTERRUPT IntcInterrupt;=0D + CM_ARCH_COMMON_GENERIC_INTERRUPT IntcInterrupt;=0D } CM_ARM_PCI_INTERRUPT_MAP_INFO;=0D =0D /** A structure that describes the=0D @@ -1085,10 +1070,10 @@ typedef struct CmArmPccSubspaceType1Info { The Subspace of Type0 contains information that can be re-used=0D in other Subspace types.=0D */=0D - PCC_SUBSPACE_GENERIC_INFO GenericPccInfo;=0D + PCC_SUBSPACE_GENERIC_INFO GenericPccInfo;=0D =0D /// Platform Interrupt.=0D - CM_ARM_GENERIC_INTERRUPT PlatIrq;=0D + CM_ARCH_COMMON_GENERIC_INTERRUPT PlatIrq;=0D } CM_ARM_PCC_SUBSPACE_TYPE1_INFO;=0D =0D /** A structure that describes a=0D @@ -1102,13 +1087,13 @@ typedef struct CmArmPccSubspaceType2Info { The Subspace of Type0 contains information that can be re-used=0D in other Subspace types.=0D */=0D - PCC_SUBSPACE_GENERIC_INFO GenericPccInfo;=0D + PCC_SUBSPACE_GENERIC_INFO GenericPccInfo;=0D =0D /// Platform Interrupt.=0D - CM_ARM_GENERIC_INTERRUPT PlatIrq;=0D + CM_ARCH_COMMON_GENERIC_INTERRUPT PlatIrq;=0D =0D /// Platform Interrupt Register.=0D - PCC_MAILBOX_REGISTER_INFO PlatIrqAckReg;=0D + PCC_MAILBOX_REGISTER_INFO PlatIrqAckReg;=0D } CM_ARM_PCC_SUBSPACE_TYPE2_INFO;=0D =0D /** A structure that describes a=0D @@ -1122,24 +1107,24 @@ typedef struct CmArmPccSubspaceType3Info { The Subspace of Type0 contains information that can be re-used=0D in other Subspace types.=0D */=0D - PCC_SUBSPACE_GENERIC_INFO GenericPccInfo;=0D + PCC_SUBSPACE_GENERIC_INFO GenericPccInfo;=0D =0D /// Platform Interrupt.=0D - CM_ARM_GENERIC_INTERRUPT PlatIrq;=0D + CM_ARCH_COMMON_GENERIC_INTERRUPT PlatIrq;=0D =0D /// Platform Interrupt Register.=0D - PCC_MAILBOX_REGISTER_INFO PlatIrqAckReg;=0D + PCC_MAILBOX_REGISTER_INFO PlatIrqAckReg;=0D =0D /// Command Complete Check Register.=0D /// The WriteMask field is not used.=0D - PCC_MAILBOX_REGISTER_INFO CmdCompleteCheckReg;=0D + PCC_MAILBOX_REGISTER_INFO CmdCompleteCheckReg;=0D =0D /// Command Complete Update Register.=0D - PCC_MAILBOX_REGISTER_INFO CmdCompleteUpdateReg;=0D + PCC_MAILBOX_REGISTER_INFO CmdCompleteUpdateReg;=0D =0D /// Error Status Register.=0D /// The WriteMask field is not used.=0D - PCC_MAILBOX_REGISTER_INFO ErrorStatusReg;=0D + PCC_MAILBOX_REGISTER_INFO ErrorStatusReg;=0D } CM_ARM_PCC_SUBSPACE_TYPE3_INFO;=0D =0D /** A structure that describes a=0D @@ -1163,21 +1148,21 @@ typedef struct CmArmPccSubspaceType5Info { MaximumPeriodicAccessRate doesn't need to be populated for=0D this structure.=0D */=0D - PCC_SUBSPACE_GENERIC_INFO GenericPccInfo;=0D + PCC_SUBSPACE_GENERIC_INFO GenericPccInfo;=0D =0D /// Version.=0D - UINT16 Version;=0D + UINT16 Version;=0D =0D /// Platform Interrupt.=0D - CM_ARM_GENERIC_INTERRUPT PlatIrq;=0D + CM_ARCH_COMMON_GENERIC_INTERRUPT PlatIrq;=0D =0D /// Command Complete Check Register.=0D /// The WriteMask field is not used.=0D - PCC_MAILBOX_REGISTER_INFO CmdCompleteCheckReg;=0D + PCC_MAILBOX_REGISTER_INFO CmdCompleteCheckReg;=0D =0D /// Error Status Register.=0D /// The WriteMask field is not used.=0D - PCC_MAILBOX_REGISTER_INFO ErrorStatusReg;=0D + PCC_MAILBOX_REGISTER_INFO ErrorStatusReg;=0D } CM_ARM_PCC_SUBSPACE_TYPE5_INFO;=0D =0D /** An enum describing the Arm Embedded Trace device type.=0D diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn= 600Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/Ssd= tCmn600Generator.c index b990686d40a3..60d9e72140e9 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Gene= rator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Gene= rator.c @@ -65,10 +65,10 @@ ValidateCmn600Info ( IN CONST UINT32 Cmn600Count=0D )=0D {=0D - UINT32 Index;=0D - UINT32 DtcIndex;=0D - CONST CM_ARM_CMN_600_INFO *Cmn600Info;=0D - CONST CM_ARM_GENERIC_INTERRUPT *DtcInterrupt;=0D + UINT32 Index;=0D + UINT32 DtcIndex;=0D + CONST CM_ARM_CMN_600_INFO *Cmn600Info;=0D + CONST CM_ARCH_COMMON_GENERIC_INTERRUPT *DtcInterrupt;=0D =0D if ((Cmn600InfoList =3D=3D NULL) ||=0D (Cmn600Count =3D=3D 0))=0D @@ -231,10 +231,10 @@ FixupCmn600Info ( OUT EFI_ACPI_DESCRIPTION_HEADER **Table=0D )=0D {=0D - EFI_STATUS Status;=0D - EFI_STATUS Status1;=0D - UINT8 Index;=0D - CONST CM_ARM_GENERIC_INTERRUPT *DtcInt;=0D + EFI_STATUS Status;=0D + EFI_STATUS Status1;=0D + UINT8 Index;=0D + CONST CM_ARCH_COMMON_GENERIC_INTERRUPT *DtcInt;=0D =0D EFI_ACPI_DESCRIPTION_HEADER *SsdtCmn600Template;=0D AML_ROOT_NODE_HANDLE RootNodeHandle;=0D diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationMa= nagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/Config= urationManagerObjectParser.c index 2d0e62876606..1fd1edb8eb7f 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerOb= jectParser.c @@ -317,7 +317,7 @@ STATIC CONST CM_OBJ_PARSER CmArmIdMappingParser[] =3D { =0D /** A parser for EArmObjSmmuInterruptArray.=0D */=0D -STATIC CONST CM_OBJ_PARSER CmArmGenericInterruptParser[] =3D {=0D +STATIC CONST CM_OBJ_PARSER CmArchCommonGenericInterruptParser[] =3D {=0D { "Interrupt", 4, "0x%x", NULL },=0D { "Flags", 4, "0x%x", NULL }=0D };=0D @@ -452,12 +452,12 @@ STATIC CONST CM_OBJ_PARSER CmArchCommonPciAddressMap= InfoParser[] =3D { /** A parser for EArmObjPciInterruptMapInfo.=0D */=0D STATIC CONST CM_OBJ_PARSER CmPciInterruptMapInfoParser[] =3D {=0D - { "PciBus", 1, "0x%x", NULL },=0D - { "PciDevice", 1, "0x%x", NULL },=0D - { "PciInterrupt", 1, "0x%x", NULL },=0D - { "IntcInterrupt", sizeof (CM_ARM_GENERIC_INTERRUPT),=0D - NULL, NULL, CmArmGenericInterruptParser,=0D - ARRAY_SIZE (CmArmGenericInterruptParser) },=0D + { "PciBus", 1, "0x%x", NU= LL },=0D + { "PciDevice", 1, "0x%x", NU= LL },=0D + { "PciInterrupt", 1, "0x%x", NU= LL },=0D + { "IntcInterrupt", sizeof (CM_ARCH_COMMON_GENERIC_INTERRUPT),=0D + NULL, NULL, CmArchCommonGenericInterruptParser,=0D + ARRAY_SIZE (CmArchCommonGenericInterruptParser) },=0D };=0D =0D /** A parser for EArmObjRmr.=0D @@ -595,9 +595,9 @@ STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType1InfoPa= rser[] =3D { { "GenericPccInfo", sizeof (PCC_SUBSPACE_GENERIC_INFO),=0D NULL, NULL, CmArmPccSubspaceType0InfoParser,=0D ARRAY_SIZE (CmArmPccSubspaceType0InfoParser) },=0D - { "PlatIrq", sizeof (CM_ARM_GENERIC_INTERRUPT),=0D - NULL, NULL, CmArmGenericInterruptParser,=0D - ARRAY_SIZE (CmArmGenericInterruptParser) },=0D + { "PlatIrq", sizeof (CM_ARCH_COMMON_GENERIC_INTERRUPT),=0D + NULL, NULL, CmArchCommonGenericInterruptParser,=0D + ARRAY_SIZE (CmArchCommonGenericInterruptParser) },=0D };=0D =0D /** A parser for EArmObjPccSubspaceType2Info.=0D @@ -606,8 +606,8 @@ STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType2InfoPa= rser[] =3D { { "GenericPccInfo", sizeof (PCC_SUBSPACE_GENERIC_INFO),=0D NULL, NULL, CmArmPccSubspaceType0InfoParser,=0D ARRAY_SIZE (CmArmPccSubspaceType0InfoParser) },=0D - { "PlatIrq", sizeof (CM_ARM_GENERIC_INTERRUPT), NULL,NULL,=0D - CmArmGenericInterruptParser, ARRAY_SIZE (CmArmGenericInterruptParser) = },=0D + { "PlatIrq", sizeof (CM_ARCH_COMMON_GENERIC_INTERRUPT),NULL,NULL,= =0D + CmArchCommonGenericInterruptParser, ARRAY_SIZE (CmArchCommonGenericInt= erruptParser) },=0D { "PlatIrqAckReg", sizeof (PCC_MAILBOX_REGISTER_INFO),=0D NULL, NULL, CmArmMailboxRegisterInfoParser,=0D ARRAY_SIZE (CmArmMailboxRegisterInfoParser) },=0D @@ -619,8 +619,8 @@ STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType34InfoP= arser[] =3D { { "GenericPccInfo", sizeof (PCC_SUBSPACE_GENERIC_INFO),=0D NULL, NULL, CmArmPccSubspaceType0InfoParser,=0D ARRAY_SIZE (CmArmPccSubspaceType0InfoParser) },=0D - { "PlatIrq", sizeof (CM_ARM_GENERIC_INTERRUPT), NULL,NULL,= =0D - CmArmGenericInterruptParser, ARRAY_SIZE (CmArmGenericInterruptParser) = },=0D + { "PlatIrq", sizeof (CM_ARCH_COMMON_GENERIC_INTERRUPT),NULL= ,NULL,=0D + CmArchCommonGenericInterruptParser, ARRAY_SIZE (CmArchCommonGenericInt= erruptParser) },=0D { "PlatIrqAckReg", sizeof (PCC_MAILBOX_REGISTER_INFO),=0D NULL, NULL, CmArmMailboxRegisterInfoParser,=0D ARRAY_SIZE (CmArmMailboxRegisterInfoParser) },=0D @@ -641,9 +641,9 @@ STATIC CONST CM_OBJ_PARSER CmArmPccSubspaceType5InfoPa= rser[] =3D { { "GenericPccInfo", sizeof (PCC_SUBSPACE_GENERIC_INFO),=0D NULL, NULL, CmArmPccSubspaceType0InfoParser,=0D ARRAY_SIZE (CmArmPccSubspaceType0InfoParser) },=0D - { "Version", 2, "0x%x",NULL = },=0D - { "PlatIrq", sizeof (CM_ARM_GENERIC_INTERRUPT), NULL, NULL,= =0D - CmArmGenericInterruptParser, ARRAY_SIZE (CmArmGenericInterruptParser) = },=0D + { "Version", 2, "0x%x= ",NULL },=0D + { "PlatIrq", sizeof (CM_ARCH_COMMON_GENERIC_INTERRUPT),NULL,= NULL,=0D + CmArchCommonGenericInterruptParser, ARRAY_SIZE (CmArchCommonGenericInt= erruptParser) },=0D { "CmdCompleteCheckReg", sizeof (PCC_MAILBOX_REGISTER_INFO),=0D NULL, NULL, CmArmMailboxRegisterInfoParser,=0D ARRAY_SIZE (CmArmMailboxRegisterInfoParser) },=0D @@ -705,7 +705,7 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectPar= ser[] =3D { CM_PARSER_ADD_OBJECT (EArmObjPmcg, CmArmPmcgNodeP= arser),=0D CM_PARSER_ADD_OBJECT (EArmObjGicItsIdentifierArray, CmArmGicItsIde= ntifierParser),=0D CM_PARSER_ADD_OBJECT (EArmObjIdMappingArray, CmArmIdMapping= Parser),=0D - CM_PARSER_ADD_OBJECT (EArmObjSmmuInterruptArray, CmArmGenericIn= terruptParser),=0D + CM_PARSER_ADD_OBJECT (EArmObjSmmuInterruptArray, CmArchCommonGe= nericInterruptParser),=0D CM_PARSER_ADD_OBJECT (EArmObjProcHierarchyInfo, CmArmProcHiera= rchyInfoParser),=0D CM_PARSER_ADD_OBJECT (EArmObjCacheInfo, CmArmCacheInfo= Parser),=0D CM_PARSER_ADD_OBJECT (EArmObjMemoryAffinityInfo, CmArmMemoryAff= inityInfoParser),=0D diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSp= aceParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigS= paceParser.c index aef0f27a15ae..b20d265a839e 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpacePars= er.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpacePars= er.c @@ -702,10 +702,10 @@ FreeParserTable ( } CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO;=0D =0D typedef struct CmArmPciInterruptMapInfo {=0D - UINT8 PciBus; // {Populated}=0D - UINT8 PciDevice; // {Populated}=0D - UINT8 PciInterrupt; // {Populated}=0D - CM_ARM_GENERIC_INTERRUPT IntcInterrupt; // {Populated}=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 =0D A parser parses a Device Tree to populate a specific CmObj type. None,=0D diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSp= aceParser.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigS= paceParser.h index ba7090fd7e47..33457cd6e95c 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpacePars= er.h +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpacePars= er.h @@ -110,10 +110,10 @@ typedef struct PciParserTable { } CM_ARCH_COMMON_PCI_ADDRESS_MAP_INFO;=0D =0D typedef struct CmArmPciInterruptMapInfo {=0D - UINT8 PciBus; // {Populated}=0D - UINT8 PciDevice; // {Populated}=0D - UINT8 PciInterrupt; // {Populated}=0D - CM_ARM_GENERIC_INTERRUPT IntcInterrupt; // {Populated}=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 =0D A parser parses a Device Tree to populate a specific CmObj type. None,=0D --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116980): https://edk2.groups.io/g/devel/message/116980 Mute This Topic: https://groups.io/mt/105068148/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-