From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.4822.1622585101849846563 for ; Tue, 01 Jun 2021 15:05:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: pierre.gondois@arm.com) 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 6441B6D; Tue, 1 Jun 2021 15:05:01 -0700 (PDT) Received: from e120189.arm.com (unknown [10.57.3.149]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0E14F3F774; Tue, 1 Jun 2021 15:04:59 -0700 (PDT) From: "PierreGondois" To: 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 Subject: [PATCH v1 2/2] DynamicTablesPkg: Use AML_NAME_SEG_SIZE define Date: Tue, 1 Jun 2021 23:04:50 +0100 Message-Id: <20210601220450.28003-3-Pierre.Gondois@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210601220450.28003-1-Pierre.Gondois@arm.com> References: <20210601220450.28003-1-Pierre.Gondois@arm.com> From: Pierre Gondois Use the newly introduced defined value in: MdePkg/Include/IndustryStandard/AcpiAml.h Signed-off-by: Pierre Gondois --- .../Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c | 4 ++-- .../AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c | 4 ++-- DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h | 9 +-------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c index 97a5c55fa3f6..1e8c2bfca5de 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCmn600LibArm/SsdtCmn600Generator.c @@ -1,7 +1,7 @@ /** @file SSDT CMN-600 AML Table Generator. - Copyright (c) 2020, Arm Limited. All rights reserved.
+ Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -511,7 +511,7 @@ BuildSsdtCmn600TableEx ( UINT64 Index; CM_ARM_CMN_600_INFO * Cmn600Info; UINT32 Cmn600Count; - CHAR8 NewName[5]; + CHAR8 NewName[AML_NAME_SEG_SIZE + 1]; EFI_ACPI_DESCRIPTION_HEADER ** TableList; ASSERT (This != NULL); diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c index 6a1e7487dfaf..570f53aacf16 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtSerialPortLibArm/SsdtSerialPortGenerator.c @@ -1,7 +1,7 @@ /** @file SSDT Serial Port Table Generator. - Copyright (c) 2020, Arm Limited. All rights reserved.
+ Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -171,7 +171,7 @@ BuildSsdtSerialPortTableEx ( CM_ARM_SERIAL_PORT_INFO * SerialPortInfo; UINT32 SerialPortCount; UINTN Index; - CHAR8 NewName[5]; + CHAR8 NewName[AML_NAME_SEG_SIZE + 1]; UINT64 Uid; EFI_ACPI_DESCRIPTION_HEADER ** TableList; diff --git a/DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h b/DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h index cbae14d78802..fff99e644b8d 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h +++ b/DynamicTablesPkg/Library/Common/AmlLib/AmlDefines.h @@ -1,7 +1,7 @@ /** @file AML Defines. - Copyright (c) 2020, Arm Limited. All rights reserved.
+ Copyright (c) 2020 - 2021, Arm Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -138,13 +138,6 @@ typedef enum EAmlParseIndex { */ #define AML_FIELD_NAMED_OP 0x04 -/** Size of a NameSeg. - Cf. ACPI 6.3 specification, s20.2. - - @ingroup TreeStructures -*/ - #define AML_NAME_SEG_SIZE 4U - /** AML object types. The ACPI specification defines several object types. They are listed -- 2.17.1