1. Patchew
  2. EDK2
  3. [edk2-devel] [PATCH 0/4] Add support for generating ACPI ThermalZones
  4. View patch

[edk2-devel] [PATCH 3/4] DynamicTablesPkg: Add support to add Strings to package

Jeff Brasen via groups.io posted 4 patches 2 years, 7 months ago
There is a newer version of this series
[edk2-devel] [PATCH 3/4] DynamicTablesPkg: Add support to add Strings to package
Posted by Jeff Brasen via groups.io 2 years, 7 months ago 
Add API to add a String to a package created with NamedPackage API.



Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>

Reviewed-by: Swatisri Kantamsetti <swatisrik@nvidia.com>

Reviewed-by: Ashish Singhal <ashishsingha@nvidia.com>

---

 .../Include/Library/AmlLib/AmlLib.h           | 17 ++++

 .../Common/AmlLib/CodeGen/AmlCodeGen.c        | 82 +++++++++++++++++++

 2 files changed, 99 insertions(+)



diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h

index b82c7a3ce8..043e7ee901 100644

--- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h

+++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h

@@ -1472,4 +1472,21 @@ AmlCreateCpcNode (

   OUT AML_OBJECT_NODE_HANDLE  *NewCpcNode   OPTIONAL

   );

 

+/** AML code generation to add a string to the package in a named node.

+

+

+  @param [in]  String         String to add

+  @param [in]  NamedNode      Node to add the string to the included package.

+

+  @retval EFI_SUCCESS             Success.

+  @retval EFI_INVALID_PARAMETER   Invalid parameter.

+  @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.

+**/

+EFI_STATUS

+EFIAPI

+AmlAddStringToNamedPackage (

+  IN CHAR8                   *String,

+  IN AML_OBJECT_NODE_HANDLE  NamedNode

+  );

+

 #endif // AML_LIB_H_

diff --git a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c

index 2b95839e4c..a0d01032d5 100644

--- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c

+++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c

@@ -3665,3 +3665,85 @@ error_handler:

   AmlDeleteTree ((AML_NODE_HANDLE)CpcNode);

   return Status;

 }

+

+/** AML code generation to add a string to the package in a named node.

+

+

+  @param [in]  Name           String to add

+  @param [in]  NamedNode      Node to add the string to the included package.

+

+  @retval EFI_SUCCESS             Success.

+  @retval EFI_INVALID_PARAMETER   Invalid parameter.

+  @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.

+**/

+EFI_STATUS

+EFIAPI

+AmlAddStringToNamedPackage (

+  IN CHAR8                   *String,

+  IN AML_OBJECT_NODE_HANDLE  NamedNode

+  )

+{

+  EFI_STATUS              Status;

+  AML_DATA_NODE           *DataNode;

+  CHAR8                   *AmlNameString;

+  UINT32                  AmlNameStringSize;

+  AML_OBJECT_NODE_HANDLE  PackageNode;

+

+  DataNode = NULL;

+

+  if ((NamedNode == NULL)                                              ||

+      (AmlGetNodeType ((AML_NODE_HANDLE)NamedNode) != EAmlNodeObject)  ||

+      (!AmlNodeHasOpCode (NamedNode, AML_NAME_OP, 0)))

+  {

+    ASSERT (0);

+    return EFI_INVALID_PARAMETER;

+  }

+

+  PackageNode = (AML_OBJECT_NODE_HANDLE)AmlGetFixedArgument (

+                                          NamedNode,

+                                          EAmlParseIndexTerm1

+                                          );

+  if ((PackageNode == NULL)                                             ||

+      (AmlGetNodeType ((AML_NODE_HANDLE)PackageNode) != EAmlNodeObject) ||

+      (!AmlNodeHasOpCode (PackageNode, AML_PACKAGE_OP, 0)))

+  {

+    ASSERT (0);

+    return EFI_INVALID_PARAMETER;

+  }

+

+  Status = ConvertAslNameToAmlName (String, &AmlNameString);

+  if (EFI_ERROR (Status)) {

+    ASSERT (0);

+    return Status;

+  }

+

+  Status = AmlGetNameStringSize (AmlNameString, &AmlNameStringSize);

+  if (EFI_ERROR (Status)) {

+    ASSERT (0);

+    goto exit_handler;

+  }

+

+  Status = AmlCreateDataNode (

+             EAmlNodeDataTypeNameString,

+             (UINT8 *)AmlNameString,

+             AmlNameStringSize,

+             &DataNode

+             );

+  if (EFI_ERROR (Status)) {

+    ASSERT (0);

+    goto exit_handler;

+  }

+

+  Status = AmlVarListAddTail (

+             (AML_NODE_HANDLE)PackageNode,

+             (AML_NODE_HANDLE)DataNode

+             );

+  ASSERT_EFI_ERROR (Status);

+

+exit_handler:

+  if (AmlNameString != NULL) {

+    FreePool (AmlNameString);

+  }

+

+  return Status;

+}

-- 

2.25.1





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#106544): https://edk2.groups.io/g/devel/message/106544
Mute This Topic: https://groups.io/mt/99861341/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 3/4] DynamicTablesPkg: Add support to add Strings to package
Posted by PierreGondois 2 years, 7 months ago 
Hello Jeff,

On 6/30/23 01:01, Jeff Brasen wrote:
> Add API to add a String to a package created with NamedPackage API.
> 
> Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
> Reviewed-by: Swatisri Kantamsetti <swatisrik@nvidia.com>
> Reviewed-by: Ashish Singhal <ashishsingha@nvidia.com>
> ---
>   .../Include/Library/AmlLib/AmlLib.h           | 17 ++++
>   .../Common/AmlLib/CodeGen/AmlCodeGen.c        | 82 +++++++++++++++++++
>   2 files changed, 99 insertions(+)
> 
> diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h
> index b82c7a3ce8..043e7ee901 100644
> --- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h
> +++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h
> @@ -1472,4 +1472,21 @@ AmlCreateCpcNode (
>     OUT AML_OBJECT_NODE_HANDLE  *NewCpcNode   OPTIONAL
>     );
>   
> +/** AML code generation to add a string to the package in a named node.
> +
> +
> +  @param [in]  String         String to add
> +  @param [in]  NamedNode      Node to add the string to the included package.
> +
> +  @retval EFI_SUCCESS             Success.
> +  @retval EFI_INVALID_PARAMETER   Invalid parameter.
> +  @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.
> +**/
> +EFI_STATUS
> +EFIAPI
> +AmlAddStringToNamedPackage (
> +  IN CHAR8                   *String,
> +  IN AML_OBJECT_NODE_HANDLE  NamedNode
> +  );
> +
>   #endif // AML_LIB_H_
> diff --git a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c
> index 2b95839e4c..a0d01032d5 100644
> --- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c
> +++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c
> @@ -3665,3 +3665,85 @@ error_handler:
>     AmlDeleteTree ((AML_NODE_HANDLE)CpcNode);
>     return Status;
>   }
> +
> +/** AML code generation to add a string to the package in a named node.
> +
> +
> +  @param [in]  Name           String to add
> +  @param [in]  NamedNode      Node to add the string to the included package.
> +
> +  @retval EFI_SUCCESS             Success.
> +  @retval EFI_INVALID_PARAMETER   Invalid parameter.
> +  @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.
> +**/
> +EFI_STATUS
> +EFIAPI
> +AmlAddStringToNamedPackage (
> +  IN CHAR8                   *String,
> +  IN AML_OBJECT_NODE_HANDLE  NamedNode
> +  )
> +{
> +  EFI_STATUS              Status;
> +  AML_DATA_NODE           *DataNode;
> +  CHAR8                   *AmlNameString;
> +  UINT32                  AmlNameStringSize;
> +  AML_OBJECT_NODE_HANDLE  PackageNode;
> +
> +  DataNode = NULL;
> +
> +  if ((NamedNode == NULL)                                              ||
> +      (AmlGetNodeType ((AML_NODE_HANDLE)NamedNode) != EAmlNodeObject)  ||
> +      (!AmlNodeHasOpCode (NamedNode, AML_NAME_OP, 0)))
> +  {
> +    ASSERT (0);
> +    return EFI_INVALID_PARAMETER;
> +  }
> +
> +  PackageNode = (AML_OBJECT_NODE_HANDLE)AmlGetFixedArgument (
> +                                          NamedNode,
> +                                          EAmlParseIndexTerm1
> +                                          );
> +  if ((PackageNode == NULL)                                             ||
> +      (AmlGetNodeType ((AML_NODE_HANDLE)PackageNode) != EAmlNodeObject) ||
> +      (!AmlNodeHasOpCode (PackageNode, AML_PACKAGE_OP, 0)))
> +  {
> +    ASSERT (0);
> +    return EFI_INVALID_PARAMETER;
> +  }
> +
> +  Status = ConvertAslNameToAmlName (String, &AmlNameString);
> +  if (EFI_ERROR (Status)) {
> +    ASSERT (0);
> +    return Status;
> +  }

IIUC, the function adds a NameString to the package,
is it possible to rename the funciton to:
AmlAddNameStringToNamedPackage ()


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

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.