Re: [edk2] [PATCH edk2-platforms v1 08/38] Silicon/Hisilicon/Acpi: Unify HisiAcipPlatformDxe
On Tue, Jul 24, 2018 at 03:08:52PM +0800, Ming Huang wrote:
> The EFI_ACPI_STATIC_RESOURCE_AFFINITY_TABLE struct is used by
> UpdateAcpiTable.c and Srat aslc. The struct may be different
> according to chips, so move some macro to PlatformArch.h.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ming Huang
> Signed-off-by: Heyi Guo
Drop Heyi's Signed-off-by and this one can have:
Reviewed-by: Leif Lindholm
/
Leif
> ---
> Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c | 2 --
> Silicon/Hisilicon/Hi1610/Include/PlatformArch.h | 6
> Silicon/Hisilicon/Hi1616/Include/PlatformArch.h | 6
> Silicon/Hisilicon/Hi1620/Include/PlatformArch.h | 6
> Silicon/Hisilicon/Include/Library/AcpiNextLib.h | 31
> ++--
> 5 files changed, 40 insertions(+), 11 deletions(-)
>
> diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c
> b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c
> index f5869841dc..54f49977c3 100644
> --- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c
> +++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c
> @@ -20,8 +20,6 @@
> #include
> #include
>
> -#define CORE_NUM_PER_SOCKET 32
> -#define NODE_IN_SOCKET 2
> #define CORECOUNT(X) ((X) * CORE_NUM_PER_SOCKET)
>
> STATIC
> diff --git a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
> b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
> index 45995c5893..f2e931f30b 100644
> --- a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
> +++ b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
> @@ -29,6 +29,12 @@
> // Max NUMA node number for each node type
> #define MAX_NUM_PER_TYPE 8
>
> +// for acpi
> +#define NODE_IN_SOCKET 2
> +#define CORE_NUM_PER_SOCKET 32
> +#define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT10
> +#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 8
> +
> #define S1_BASE 0x400
>
> #endif
> diff --git a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
> b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
> index 45995c5893..f2e931f30b 100644
> --- a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
> +++ b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
> @@ -29,6 +29,12 @@
> // Max NUMA node number for each node type
> #define MAX_NUM_PER_TYPE 8
>
> +// for acpi
> +#define NODE_IN_SOCKET 2
> +#define CORE_NUM_PER_SOCKET 32
> +#define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT10
> +#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 8
> +
> #define S1_BASE 0x400
>
> #endif
> diff --git a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h
> b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h
> index 7243a9ec35..2fc1b9219d 100644
> --- a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h
> +++ b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h
> @@ -30,5 +30,11 @@
> #define MAX_NUM_PER_TYPE 8
>
>
> +// for acpi
> +#define NODE_IN_SOCKET 2
> +#define CORE_NUM_PER_SOCKET 48
> +#define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT16
> +#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 1
> +
> #endif
>
> diff --git a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h
> b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h
> index fd05a3b960..2abffb65fc 100644
> --- a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h
> +++ b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h
> @@ -19,6 +19,21 @@
> #ifndef __ACPI_NEXT_LIB_H__
> #define __ACPI_NEXT_LIB_H__
>
> +#include
> +
> +///
> +/// ITS Affinity Structure Definition
> +///
> +#pragma pack(1)
> +typedef struct {
> + UINT8 Type;
> + UINT8 Length;
> + UINT32 ProximityDomain;
> + UINT16 Reserved;
> + UINT32 ItsHwId;
> +} EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE;
> +#pragma pack()
> +
> #define EFI_ACPI_6_1_GIC_ITS_INIT(GicITSHwId, GicITSBase) \
>{ \
> EFI_ACPI_6_1_GIC_ITS, sizeof (EFI_ACPI_6_1_GIC_ITS_STRUCTURE),
> EFI_ACPI_RESERVED_WORD, \
> @@ -42,8 +57,8 @@
> #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
> \
> +4, sizeof (EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE), ProximityDomain,
>\
> +EFI_ACPI_RESERVED_WORD, ItsId
>
[edk2] [PATCH edk2-platforms v1 08/38] Silicon/Hisilicon/Acpi: Unify HisiAcipPlatformDxe
The EFI_ACPI_STATIC_RESOURCE_AFFINITY_TABLE struct is used by
UpdateAcpiTable.c and Srat aslc. The struct may be different
according to chips, so move some macro to PlatformArch.h.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ming Huang
Signed-off-by: Heyi Guo
---
Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c | 2 --
Silicon/Hisilicon/Hi1610/Include/PlatformArch.h | 6
Silicon/Hisilicon/Hi1616/Include/PlatformArch.h | 6
Silicon/Hisilicon/Hi1620/Include/PlatformArch.h | 6
Silicon/Hisilicon/Include/Library/AcpiNextLib.h | 31
++--
5 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c
b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c
index f5869841dc..54f49977c3 100644
--- a/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c
+++ b/Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/UpdateAcpiTable.c
@@ -20,8 +20,6 @@
#include
#include
-#define CORE_NUM_PER_SOCKET 32
-#define NODE_IN_SOCKET 2
#define CORECOUNT(X) ((X) * CORE_NUM_PER_SOCKET)
STATIC
diff --git a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
index 45995c5893..f2e931f30b 100644
--- a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
+++ b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
@@ -29,6 +29,12 @@
// Max NUMA node number for each node type
#define MAX_NUM_PER_TYPE 8
+// for acpi
+#define NODE_IN_SOCKET 2
+#define CORE_NUM_PER_SOCKET 32
+#define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT10
+#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 8
+
#define S1_BASE 0x400
#endif
diff --git a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
index 45995c5893..f2e931f30b 100644
--- a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
+++ b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
@@ -29,6 +29,12 @@
// Max NUMA node number for each node type
#define MAX_NUM_PER_TYPE 8
+// for acpi
+#define NODE_IN_SOCKET 2
+#define CORE_NUM_PER_SOCKET 32
+#define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT10
+#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 8
+
#define S1_BASE 0x400
#endif
diff --git a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h
b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h
index 7243a9ec35..2fc1b9219d 100644
--- a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h
+++ b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h
@@ -30,5 +30,11 @@
#define MAX_NUM_PER_TYPE 8
+// for acpi
+#define NODE_IN_SOCKET 2
+#define CORE_NUM_PER_SOCKET 48
+#define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT16
+#define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 1
+
#endif
diff --git a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h
b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h
index fd05a3b960..2abffb65fc 100644
--- a/Silicon/Hisilicon/Include/Library/AcpiNextLib.h
+++ b/Silicon/Hisilicon/Include/Library/AcpiNextLib.h
@@ -19,6 +19,21 @@
#ifndef __ACPI_NEXT_LIB_H__
#define __ACPI_NEXT_LIB_H__
+#include
+
+///
+/// ITS Affinity Structure Definition
+///
+#pragma pack(1)
+typedef struct {
+ UINT8 Type;
+ UINT8 Length;
+ UINT32 ProximityDomain;
+ UINT16 Reserved;
+ UINT32 ItsHwId;
+} EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE;
+#pragma pack()
+
#define EFI_ACPI_6_1_GIC_ITS_INIT(GicITSHwId, GicITSBase) \
{ \
EFI_ACPI_6_1_GIC_ITS, sizeof (EFI_ACPI_6_1_GIC_ITS_STRUCTURE),
EFI_ACPI_RESERVED_WORD, \
@@ -42,8 +57,8 @@
#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
\
+4, sizeof (EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE), ProximityDomain,
\
+EFI_ACPI_RESERVED_WORD, ItsId
\
}
#define EFI_ACPI_6_1_MEMORY_AFFINITY_STRUCTURE_INIT(
\
@@ -75,15 +90,13 @@
// Define the number of each table type.
// This is where the table layout is modified.
//
-#define EFI_ACPI_PROCESSOR_LOCAL_GICC_AFFINITY_STRUCTURE_COUNT 64
-#define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT10
-#define
