Re: [edk2] [PATCH edk2-platforms v3 13/15] Hisilicon/D05/ACPI: Add ITS PXM
On Tue, Feb 06, 2018 at 03:04:48PM +, Leif Lindholm wrote: > On Fri, Feb 02, 2018 at 08:05:41PM +0800, Heyi Guo wrote: > > Add ITS affinity structure in SRAT. > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Ming Huang > > Signed-off-by: Heyi Guo > > Reviewed-by: Ard Biesheuvel > > Reviewed-by: Graeme Gregory > > Err, a comment - and apologies if I missed this in other patches: this > should probably be > Graeme Gregory > > For my part: > Reviewed-by: Leif Lindholm > Apologies yes, it should be the @linaro.org version, I must have kicked off the wrong macro in vi. Graeme > > --- > > Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc | 10 ++ > > Silicon/Hisilicon/Include/Library/AcpiNextLib.h | 10 +- > > 2 files changed, 19 insertions(+), 1 deletion(-) > > > > diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc > > b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc > > index b448a29..8ea0c4b 100644 > > --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc > > +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc > > @@ -121,6 +121,16 @@ EFI_ACPI_STATIC_RESOURCE_AFFINITY_TABLE Srat = { > > > > EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x0003,0x003E,0x0001,0x), > >//GICC Affinity Processor 62 > > > > EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x0003,0x003F,0x0001,0x) > > //GICC Affinity Processor 63 > >}, > > + { > > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x, 0x), > > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0001, 0x0001), > > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x, 0x0002), > > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0001, 0x0003), > > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0002, 0x0004), > > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0003, 0x0005), > > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0002, 0x0006), > > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0003, 0x0007) > > + }, > > }; > > > > // > > diff --git a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h > > b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h > > index 60f9925..fd05a3b 100644 > > --- a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h > > +++ b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h > > @@ -39,6 +39,13 @@ > > ACPIProcessorUID, Flags, ClockDomain > > \ > >} > > > > +#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT( > > \ > > +ProximityDomain, ItsId) > > \ > > + { > > \ > > +4, sizeof (EFI_ACPI_6_2_GIC_ITS_AFFINITY_STRUCTURE), ProximityDomain, > > \ > > +{EFI_ACPI_RESERVED_BYTE, EFI_ACPI_RESERVED_BYTE}, ItsId > >\ > > + } > > + > > #define EFI_ACPI_6_1_MEMORY_AFFINITY_STRUCTURE_INIT( > >\ > > ProximityDomain, AddressBaseLow, AddressBaseHigh, LengthLow, > > LengthHigh, Flags) \ > >{ > >\ > > @@ -70,12 +77,13 @@ > > // > > #define EFI_ACPI_PROCESSOR_LOCAL_GICC_AFFINITY_STRUCTURE_COUNT 64 > > #define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT10 > > - > > +#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 8 > > > > typedef struct { > >EFI_ACPI_6_0_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER Header; > >EFI_ACPI_6_0_MEMORY_AFFINITY_STRUCTURE > > Memory[EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT]; > >EFI_ACPI_6_0_GICC_AFFINITY_STRUCTURE > > Gicc[EFI_ACPI_PROCESSOR_LOCAL_GICC_AFFINITY_STRUCTURE_COUNT]; > > + EFI_ACPI_6_2_GIC_ITS_AFFINITY_STRUCTURE > > Its[EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT]; > > } EFI_ACPI_STATIC_RESOURCE_AFFINITY_TABLE; > > > > #pragma pack() > > -- > > 1.9.1 > > ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH edk2-platforms v3 13/15] Hisilicon/D05/ACPI: Add ITS PXM
On Fri, Feb 02, 2018 at 08:05:41PM +0800, Heyi Guo wrote: > Add ITS affinity structure in SRAT. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ming Huang > Signed-off-by: Heyi Guo > Reviewed-by: Ard Biesheuvel > Reviewed-by: Graeme Gregory Err, a comment - and apologies if I missed this in other patches: this should probably be Graeme Gregory For my part: Reviewed-by: Leif Lindholm > --- > Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc | 10 ++ > Silicon/Hisilicon/Include/Library/AcpiNextLib.h | 10 +- > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc > b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc > index b448a29..8ea0c4b 100644 > --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc > +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc > @@ -121,6 +121,16 @@ EFI_ACPI_STATIC_RESOURCE_AFFINITY_TABLE Srat = { > > EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x0003,0x003E,0x0001,0x), >//GICC Affinity Processor 62 > > EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x0003,0x003F,0x0001,0x) > //GICC Affinity Processor 63 >}, > + { > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x, 0x), > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0001, 0x0001), > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x, 0x0002), > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0001, 0x0003), > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0002, 0x0004), > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0003, 0x0005), > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0002, 0x0006), > +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0003, 0x0007) > + }, > }; > > // > diff --git a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h > b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h > index 60f9925..fd05a3b 100644 > --- a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h > +++ b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h > @@ -39,6 +39,13 @@ > ACPIProcessorUID, Flags, ClockDomain >\ >} > > +#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT( >\ > +ProximityDomain, ItsId) >\ > + { >\ > +4, sizeof (EFI_ACPI_6_2_GIC_ITS_AFFINITY_STRUCTURE), ProximityDomain, >\ > +{EFI_ACPI_RESERVED_BYTE, EFI_ACPI_RESERVED_BYTE}, ItsId > \ > + } > + > #define EFI_ACPI_6_1_MEMORY_AFFINITY_STRUCTURE_INIT( > \ > ProximityDomain, AddressBaseLow, AddressBaseHigh, LengthLow, LengthHigh, > Flags) \ >{ > \ > @@ -70,12 +77,13 @@ > // > #define EFI_ACPI_PROCESSOR_LOCAL_GICC_AFFINITY_STRUCTURE_COUNT 64 > #define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT10 > - > +#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 8 > > typedef struct { >EFI_ACPI_6_0_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER Header; >EFI_ACPI_6_0_MEMORY_AFFINITY_STRUCTURE > Memory[EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT]; >EFI_ACPI_6_0_GICC_AFFINITY_STRUCTURE > Gicc[EFI_ACPI_PROCESSOR_LOCAL_GICC_AFFINITY_STRUCTURE_COUNT]; > + EFI_ACPI_6_2_GIC_ITS_AFFINITY_STRUCTURE > Its[EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT]; > } EFI_ACPI_STATIC_RESOURCE_AFFINITY_TABLE; > > #pragma pack() > -- > 1.9.1 > ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH edk2-platforms v3 13/15] Hisilicon/D05/ACPI: Add ITS PXM
Add ITS affinity structure in SRAT. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang Signed-off-by: Heyi Guo Reviewed-by: Ard Biesheuvel Reviewed-by: Graeme Gregory --- Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc | 10 ++ Silicon/Hisilicon/Include/Library/AcpiNextLib.h | 10 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc index b448a29..8ea0c4b 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Srat.aslc @@ -121,6 +121,16 @@ EFI_ACPI_STATIC_RESOURCE_AFFINITY_TABLE Srat = { EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x0003,0x003E,0x0001,0x), //GICC Affinity Processor 62 EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x0003,0x003F,0x0001,0x) //GICC Affinity Processor 63 }, + { +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x, 0x), +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0001, 0x0001), +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x, 0x0002), +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0001, 0x0003), +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0002, 0x0004), +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0003, 0x0005), +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0002, 0x0006), +EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x0003, 0x0007) + }, }; // diff --git a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h index 60f9925..fd05a3b 100644 --- a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h +++ b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h @@ -39,6 +39,13 @@ ACPIProcessorUID, Flags, ClockDomain \ } +#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT( \ +ProximityDomain, ItsId) \ + { \ +4, sizeof (EFI_ACPI_6_2_GIC_ITS_AFFINITY_STRUCTURE), ProximityDomain, \ +{EFI_ACPI_RESERVED_BYTE, EFI_ACPI_RESERVED_BYTE}, ItsId \ + } + #define EFI_ACPI_6_1_MEMORY_AFFINITY_STRUCTURE_INIT( \ ProximityDomain, AddressBaseLow, AddressBaseHigh, LengthLow, LengthHigh, Flags) \ { \ @@ -70,12 +77,13 @@ // #define EFI_ACPI_PROCESSOR_LOCAL_GICC_AFFINITY_STRUCTURE_COUNT 64 #define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT10 - +#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 8 typedef struct { EFI_ACPI_6_0_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER Header; EFI_ACPI_6_0_MEMORY_AFFINITY_STRUCTURE Memory[EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT]; EFI_ACPI_6_0_GICC_AFFINITY_STRUCTURE Gicc[EFI_ACPI_PROCESSOR_LOCAL_GICC_AFFINITY_STRUCTURE_COUNT]; + EFI_ACPI_6_2_GIC_ITS_AFFINITY_STRUCTURE Its[EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT]; } EFI_ACPI_STATIC_RESOURCE_AFFINITY_TABLE; #pragma pack() -- 1.9.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel