From: Pierre Gondois <Pierre.Gondois@arm.com>

A NameSeg is made 4 chars.
Cf. ACPI 6.4 s20.2.2 "Name Objects Encoding":
NameSeg := <leadnamechar namechar namechar namechar>
Notice that NameSegs shorter than 4 characters are filled
with trailing underscores (‘_’s).

AML_NAME_SEG_SIZE is currently defined in:
- DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h
- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
Since the value can be inferred from the ACPI specification
and to avoid multiple definitions, move it to
MdePkg/Include/IndustryStandard/

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h | 1 -
 MdePkg/Include/IndustryStandard/AcpiAml.h          | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
index 50d4c96edb63..1b26729e71c3 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
@@ -56,7 +56,6 @@ typedef struct _EFI_AML_NODE_LIST EFI_AML_NODE_LIST;
 //  Size is the total size of this ACPI node buffer.
 //  Children is the children linked list of this node.
 //
-#define AML_NAME_SEG_SIZE  4
 
 struct _EFI_AML_NODE_LIST {
   UINT32                  Signature;
diff --git a/MdePkg/Include/IndustryStandard/AcpiAml.h b/MdePkg/Include/IndustryStandard/AcpiAml.h
index 74622e912ea4..4255ca3d7087 100644
--- a/MdePkg/Include/IndustryStandard/AcpiAml.h
+++ b/MdePkg/Include/IndustryStandard/AcpiAml.h
@@ -2,7 +2,7 @@
   This file contains AML code definition in the latest ACPI spec.
 
   Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
-  Copyright (c) 2019, ARM Limited. All rights reserved.<BR>
+  Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -176,4 +176,9 @@
 #define AML_FIELD_CONNECTION_OP      0x02
 #define AML_FIELD_EXT_ACCESS_OP      0x03
 
+//
+// AML Name segment definitions
+//
+#define AML_NAME_SEG_SIZE            4
+
 #endif
-- 
2.17.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#75923): https://edk2.groups.io/g/devel/message/75923
Mute This Topic: https://groups.io/mt/83245171/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: Pierre.Gondois@arm.com <Pierre.Gondois@arm.com>
> 发送时间: 2021年6月2日 6:05
> 收件人: devel@edk2.groups.io; dandan.bi@intel.com;
> gaoliming@byosoft.com.cn; michael.d.kinney@intel.com;
> Sami.Mujawar@arm.com; Alexei.Fedorov@arm.com
> 主题: [PATCH v1 1/2] MdePkg/MdeModulePkg: Move AML_NAME_SEG_SIZE
> definition
> 
> From: Pierre Gondois <Pierre.Gondois@arm.com>
> 
> A NameSeg is made 4 chars.
> Cf. ACPI 6.4 s20.2.2 "Name Objects Encoding":
> NameSeg := <leadnamechar namechar namechar namechar>
> Notice that NameSegs shorter than 4 characters are filled
> with trailing underscores (‘_’s).
> 
> AML_NAME_SEG_SIZE is currently defined in:
> - DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h
> - MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
> Since the value can be inferred from the ACPI specification
> and to avoid multiple definitions, move it to
> MdePkg/Include/IndustryStandard/
> 
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
>  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h | 1 -
>  MdePkg/Include/IndustryStandard/AcpiAml.h          | 7 ++++++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
> b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
> index 50d4c96edb63..1b26729e71c3 100644
> --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
> +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiSdt.h
> @@ -56,7 +56,6 @@ typedef struct _EFI_AML_NODE_LIST
> EFI_AML_NODE_LIST;
>  //  Size is the total size of this ACPI node buffer.
>  //  Children is the children linked list of this node.
>  //
> -#define AML_NAME_SEG_SIZE  4
> 
>  struct _EFI_AML_NODE_LIST {
>    UINT32                  Signature;
> diff --git a/MdePkg/Include/IndustryStandard/AcpiAml.h
> b/MdePkg/Include/IndustryStandard/AcpiAml.h
> index 74622e912ea4..4255ca3d7087 100644
> --- a/MdePkg/Include/IndustryStandard/AcpiAml.h
> +++ b/MdePkg/Include/IndustryStandard/AcpiAml.h
> @@ -2,7 +2,7 @@
>    This file contains AML code definition in the latest ACPI spec.
> 
>    Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
> -  Copyright (c) 2019, ARM Limited. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -176,4 +176,9 @@
>  #define AML_FIELD_CONNECTION_OP      0x02
>  #define AML_FIELD_EXT_ACCESS_OP      0x03
> 
> +//
> +// AML Name segment definitions
> +//
> +#define AML_NAME_SEG_SIZE            4
> +
>  #endif
> --
> 2.17.1





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#75928): https://edk2.groups.io/g/devel/message/75928
Mute This Topic: https://groups.io/mt/83250178/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-