| Message ID | 20170622110243.10038-1-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | 157fb7bf29eea497b22025f53b5547e4748b6c2d |
| Headers | show |
On 22 June 2017 at 11:02, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > This updates the IORT header to include the definitions that were added > in revision C of the IORT spec that was made public recently. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Ping? And also, would anyone mind if we pull this (and the patch that adds this file) into the UDK2017 branch? > --- > MdePkg/Include/IndustryStandard/IoRemappingTable.h | 19 +++++++++++++++++-- > 1 file changed, 17 insertions(+), 2 deletions(-) > > diff --git a/MdePkg/Include/IndustryStandard/IoRemappingTable.h b/MdePkg/Include/IndustryStandard/IoRemappingTable.h > index 430df3b956bb..c113afdd2784 100644 > --- a/MdePkg/Include/IndustryStandard/IoRemappingTable.h > +++ b/MdePkg/Include/IndustryStandard/IoRemappingTable.h > @@ -1,7 +1,7 @@ > /** @file > - ACPI IO Remapping Table (IORT) as specified in ARM spec DEN0049B > + ACPI IO Remapping Table (IORT) as specified in ARM spec DEN0049C > > - http://infocenter.arm.com/help/topic/com.arm.doc.den0049b/DEN0049B_IO_Remapping_Table.pdf > + http://infocenter.arm.com/help/topic/com.arm.doc.den0049c/DEN0049C_IO_Remapping_Table.pdf > > Copyright (c) 2017, Linaro Limited. All rights reserved.<BR> > > @@ -26,6 +26,7 @@ > #define EFI_ACPI_IORT_TYPE_ROOT_COMPLEX 0x2 > #define EFI_ACPI_IORT_TYPE_SMMUv1v2 0x3 > #define EFI_ACPI_IORT_TYPE_SMMUv3 0x4 > +#define EFI_ACPI_IORT_TYPE_PMCG 0x5 > > #define EFI_ACPI_IORT_MEM_ACCESS_PROP_CCA BIT0 > > @@ -41,6 +42,8 @@ > #define EFI_ACPI_IORT_SMMUv1v2_MODEL_v2 0x1 > #define EFI_ACPI_IORT_SMMUv1v2_MODEL_MMU400 0x2 > #define EFI_ACPI_IORT_SMMUv1v2_MODEL_MMU500 0x3 > +#define EFI_ACPI_IORT_SMMUv1v2_MODEL_MMU401 0x4 > +#define EFI_ACPI_IORT_SMMUv1v2_MODEL_CAVIUM_THX_v2 0x5 > > #define EFI_ACPI_IORT_SMMUv1v2_FLAG_DVM BIT0 > #define EFI_ACPI_IORT_SMMUv1v2_FLAG_COH_WALK BIT1 > @@ -178,6 +181,18 @@ typedef struct { > UINT32 Sync; > } EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE; > > +/// > +/// Node type 5: PMCG node > +/// > +typedef struct { > + EFI_ACPI_6_0_IO_REMAPPING_NODE Node; > + > + UINT64 Base; > + UINT32 OverflowInterruptGsiv; > + UINT32 NodeReference; > +//EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE OverflowInterruptMsiMapping[1]; > +} EFI_ACPI_6_0_IO_REMAPPING_PMCG_NODE; > + > #pragma pack() > > #endif > -- > 2.9.3 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Liming is taking leave today, and Reviewed-by: Star Zeng <star.zeng@intel.com>. And we have no concern to pull this to UDK2017 branch. Thanks, Star -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ard Biesheuvel Sent: Tuesday, June 27, 2017 12:57 AM To: edk2-devel@lists.01.org; Gao, Liming <liming.gao@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com> Cc: Leif Lindholm <leif.lindholm@linaro.org>; Ard Biesheuvel <ard.biesheuvel@linaro.org> Subject: Re: [edk2] [PATCH] MdePkg/IndustryStandard: update ACPI/IORT definitions to revision C On 22 June 2017 at 11:02, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > This updates the IORT header to include the definitions that were > added in revision C of the IORT spec that was made public recently. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Ping? And also, would anyone mind if we pull this (and the patch that adds this file) into the UDK2017 branch? > --- > MdePkg/Include/IndustryStandard/IoRemappingTable.h | 19 > +++++++++++++++++-- > 1 file changed, 17 insertions(+), 2 deletions(-) > > diff --git a/MdePkg/Include/IndustryStandard/IoRemappingTable.h > b/MdePkg/Include/IndustryStandard/IoRemappingTable.h > index 430df3b956bb..c113afdd2784 100644 > --- a/MdePkg/Include/IndustryStandard/IoRemappingTable.h > +++ b/MdePkg/Include/IndustryStandard/IoRemappingTable.h > @@ -1,7 +1,7 @@ > /** @file > - ACPI IO Remapping Table (IORT) as specified in ARM spec DEN0049B > + ACPI IO Remapping Table (IORT) as specified in ARM spec DEN0049C > > - > http://infocenter.arm.com/help/topic/com.arm.doc.den0049b/DEN0049B_IO_ > Remapping_Table.pdf > + > + http://infocenter.arm.com/help/topic/com.arm.doc.den0049c/DEN0049C_I > + O_Remapping_Table.pdf > > Copyright (c) 2017, Linaro Limited. All rights reserved.<BR> > > @@ -26,6 +26,7 @@ > #define EFI_ACPI_IORT_TYPE_ROOT_COMPLEX 0x2 > #define EFI_ACPI_IORT_TYPE_SMMUv1v2 0x3 > #define EFI_ACPI_IORT_TYPE_SMMUv3 0x4 > +#define EFI_ACPI_IORT_TYPE_PMCG 0x5 > > #define EFI_ACPI_IORT_MEM_ACCESS_PROP_CCA BIT0 > > @@ -41,6 +42,8 @@ > #define EFI_ACPI_IORT_SMMUv1v2_MODEL_v2 0x1 > #define EFI_ACPI_IORT_SMMUv1v2_MODEL_MMU400 0x2 > #define EFI_ACPI_IORT_SMMUv1v2_MODEL_MMU500 0x3 > +#define EFI_ACPI_IORT_SMMUv1v2_MODEL_MMU401 0x4 > +#define EFI_ACPI_IORT_SMMUv1v2_MODEL_CAVIUM_THX_v2 0x5 > > #define EFI_ACPI_IORT_SMMUv1v2_FLAG_DVM BIT0 > #define EFI_ACPI_IORT_SMMUv1v2_FLAG_COH_WALK BIT1 > @@ -178,6 +181,18 @@ typedef struct { > UINT32 Sync; > } EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE; > > +/// > +/// Node type 5: PMCG node > +/// > +typedef struct { > + EFI_ACPI_6_0_IO_REMAPPING_NODE Node; > + > + UINT64 Base; > + UINT32 OverflowInterruptGsiv; > + UINT32 NodeReference; > +//EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE OverflowInterruptMsiMapping[1]; > +} EFI_ACPI_6_0_IO_REMAPPING_PMCG_NODE; > + > #pragma pack() > > #endif > -- > 2.9.3 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
On 27 June 2017 at 05:11, Zeng, Star <star.zeng@intel.com> wrote: > Liming is taking leave today, and Reviewed-by: Star Zeng <star.zeng@intel.com>. > And we have no concern to pull this to UDK2017 branch. > Thanks. Pushed to master: 157fb7bf29ee MdePkg/IndustryStandard: update ACPI/IORT definitions to revision C Pushed to UDK2017: b21ac25c0624 MdePkg/IndustryStandard: add definitions for ACPI 6.0 IORT 51bf49ee53a2 MdePkg/IndustryStandard: update ACPI/IORT definitions to revision C -- Ard. > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ard Biesheuvel > Sent: Tuesday, June 27, 2017 12:57 AM > To: edk2-devel@lists.01.org; Gao, Liming <liming.gao@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com> > Cc: Leif Lindholm <leif.lindholm@linaro.org>; Ard Biesheuvel <ard.biesheuvel@linaro.org> > Subject: Re: [edk2] [PATCH] MdePkg/IndustryStandard: update ACPI/IORT definitions to revision C > > On 22 June 2017 at 11:02, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: >> This updates the IORT header to include the definitions that were >> added in revision C of the IORT spec that was made public recently. >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > Ping? And also, would anyone mind if we pull this (and the patch that adds this file) into the UDK2017 branch? > >> --- >> MdePkg/Include/IndustryStandard/IoRemappingTable.h | 19 >> +++++++++++++++++-- >> 1 file changed, 17 insertions(+), 2 deletions(-) >> >> diff --git a/MdePkg/Include/IndustryStandard/IoRemappingTable.h >> b/MdePkg/Include/IndustryStandard/IoRemappingTable.h >> index 430df3b956bb..c113afdd2784 100644 >> --- a/MdePkg/Include/IndustryStandard/IoRemappingTable.h >> +++ b/MdePkg/Include/IndustryStandard/IoRemappingTable.h >> @@ -1,7 +1,7 @@ >> /** @file >> - ACPI IO Remapping Table (IORT) as specified in ARM spec DEN0049B >> + ACPI IO Remapping Table (IORT) as specified in ARM spec DEN0049C >> >> - >> http://infocenter.arm.com/help/topic/com.arm.doc.den0049b/DEN0049B_IO_ >> Remapping_Table.pdf >> + >> + http://infocenter.arm.com/help/topic/com.arm.doc.den0049c/DEN0049C_I >> + O_Remapping_Table.pdf >> >> Copyright (c) 2017, Linaro Limited. All rights reserved.<BR> >> >> @@ -26,6 +26,7 @@ >> #define EFI_ACPI_IORT_TYPE_ROOT_COMPLEX 0x2 >> #define EFI_ACPI_IORT_TYPE_SMMUv1v2 0x3 >> #define EFI_ACPI_IORT_TYPE_SMMUv3 0x4 >> +#define EFI_ACPI_IORT_TYPE_PMCG 0x5 >> >> #define EFI_ACPI_IORT_MEM_ACCESS_PROP_CCA BIT0 >> >> @@ -41,6 +42,8 @@ >> #define EFI_ACPI_IORT_SMMUv1v2_MODEL_v2 0x1 >> #define EFI_ACPI_IORT_SMMUv1v2_MODEL_MMU400 0x2 >> #define EFI_ACPI_IORT_SMMUv1v2_MODEL_MMU500 0x3 >> +#define EFI_ACPI_IORT_SMMUv1v2_MODEL_MMU401 0x4 >> +#define EFI_ACPI_IORT_SMMUv1v2_MODEL_CAVIUM_THX_v2 0x5 >> >> #define EFI_ACPI_IORT_SMMUv1v2_FLAG_DVM BIT0 >> #define EFI_ACPI_IORT_SMMUv1v2_FLAG_COH_WALK BIT1 >> @@ -178,6 +181,18 @@ typedef struct { >> UINT32 Sync; >> } EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE; >> >> +/// >> +/// Node type 5: PMCG node >> +/// >> +typedef struct { >> + EFI_ACPI_6_0_IO_REMAPPING_NODE Node; >> + >> + UINT64 Base; >> + UINT32 OverflowInterruptGsiv; >> + UINT32 NodeReference; >> +//EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE OverflowInterruptMsiMapping[1]; >> +} EFI_ACPI_6_0_IO_REMAPPING_PMCG_NODE; >> + >> #pragma pack() >> >> #endif >> -- >> 2.9.3 >> > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/MdePkg/Include/IndustryStandard/IoRemappingTable.h b/MdePkg/Include/IndustryStandard/IoRemappingTable.h index 430df3b956bb..c113afdd2784 100644 --- a/MdePkg/Include/IndustryStandard/IoRemappingTable.h +++ b/MdePkg/Include/IndustryStandard/IoRemappingTable.h @@ -1,7 +1,7 @@ /** @file - ACPI IO Remapping Table (IORT) as specified in ARM spec DEN0049B + ACPI IO Remapping Table (IORT) as specified in ARM spec DEN0049C - http://infocenter.arm.com/help/topic/com.arm.doc.den0049b/DEN0049B_IO_Remapping_Table.pdf + http://infocenter.arm.com/help/topic/com.arm.doc.den0049c/DEN0049C_IO_Remapping_Table.pdf Copyright (c) 2017, Linaro Limited. All rights reserved.<BR> @@ -26,6 +26,7 @@ #define EFI_ACPI_IORT_TYPE_ROOT_COMPLEX 0x2 #define EFI_ACPI_IORT_TYPE_SMMUv1v2 0x3 #define EFI_ACPI_IORT_TYPE_SMMUv3 0x4 +#define EFI_ACPI_IORT_TYPE_PMCG 0x5 #define EFI_ACPI_IORT_MEM_ACCESS_PROP_CCA BIT0 @@ -41,6 +42,8 @@ #define EFI_ACPI_IORT_SMMUv1v2_MODEL_v2 0x1 #define EFI_ACPI_IORT_SMMUv1v2_MODEL_MMU400 0x2 #define EFI_ACPI_IORT_SMMUv1v2_MODEL_MMU500 0x3 +#define EFI_ACPI_IORT_SMMUv1v2_MODEL_MMU401 0x4 +#define EFI_ACPI_IORT_SMMUv1v2_MODEL_CAVIUM_THX_v2 0x5 #define EFI_ACPI_IORT_SMMUv1v2_FLAG_DVM BIT0 #define EFI_ACPI_IORT_SMMUv1v2_FLAG_COH_WALK BIT1 @@ -178,6 +181,18 @@ typedef struct { UINT32 Sync; } EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE; +/// +/// Node type 5: PMCG node +/// +typedef struct { + EFI_ACPI_6_0_IO_REMAPPING_NODE Node; + + UINT64 Base; + UINT32 OverflowInterruptGsiv; + UINT32 NodeReference; +//EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE OverflowInterruptMsiMapping[1]; +} EFI_ACPI_6_0_IO_REMAPPING_PMCG_NODE; + #pragma pack() #endif
This updates the IORT header to include the definitions that were added in revision C of the IORT spec that was made public recently. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- MdePkg/Include/IndustryStandard/IoRemappingTable.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) -- 2.9.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel