1. Patchew
  2. EDK2
  3. [edk2-devel] [PATCH v1 00/13] Create a SSDT CPU topology generator
  4. View patch

[edk2-devel] [PATCH v1 05/13] DynamicTablesPkg: Helper function to compute package length

PierreGondois posted 13 patches 4 years, 7 months ago
There is a newer version of this series
[edk2-devel] [PATCH v1 05/13] DynamicTablesPkg: Helper function to compute package length
Posted by PierreGondois 4 years, 7 months ago 
From: Pierre Gondois <Pierre.Gondois@arm.com>

Some AML object have a PkgLen which indicates the size of the
AML object. The package length can be encoded in 1 to 4 bytes.
The bytes used to encode the PkgLen is itself counted in the
PkgLen value. So, if an AML object's size increments/decrements,
the number of bytes used to encode the PkgLen value can itself
increment/decrement.

Therefore, a helper function AmlComputePkgLength() is introduced
to simply computation of the PkgLen.

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
 .../Library/Common/AmlLib/AmlEncoding/Aml.c   | 87 ++++++++++++++++++-
 .../Library/Common/AmlLib/AmlEncoding/Aml.h   | 47 +++++++++-
 2 files changed, 132 insertions(+), 2 deletions(-)

diff --git a/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.c b/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.c
index eadafca97ea5..d829b1869846 100644
--- a/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.c
+++ b/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.c
@@ -2,7 +2,7 @@
   AML grammar definitions.
 
   Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>
-  Copyright (c) 2019 - 2020, Arm Limited. All rights reserved.<BR>
+  Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -803,3 +803,88 @@ AmlComputePkgLengthWidth (
   // Length < 2^6
   return 1;
 }
+
+/** Given a length, compute the value of a PkgLen.
+
+  In AML, some object have a PkgLen, telling the size of the AML object.
+  It can be encoded in 1 to 4 bytes. The bytes used to encode the PkgLen is
+  itself counted in the PkgLen value.
+  This means that if an AML object sees its size increment/decrement,
+  the number of bytes used to encode the PkgLen value can itself
+  increment/decrement.
+
+  For instance, the AML encoding of a DeviceOp is:
+    DefDevice := DeviceOp PkgLength NameString TermList
+  If:
+   - sizeof (NameString) = 4 (the name is "DEV0" for instance);
+   - sizeof (TermList) = (2^6-6)
+  then the PkgLen is encoded on 1 byte. Indeed, its value is:
+    sizeof (PkgLen) + sizeof (NameString) + sizeof (TermList) =
+    sizeof (PkgLen) + 4 + (2^6-6)
+  So:
+    PkgLen = sizeof (PkgLen) + (2^6-2)
+
+  The input arguments Length and PkgLen represent, for the DefDevice:
+    DefDevice := DeviceOp PkgLength NameString TermList
+                                    |------Length-----|
+                          |--------*PgkLength---------|
+
+  @param  [in]  Length  The length to encode as a PkgLen.
+                        Length cannot exceed 2^28 - 4 (4 bytes for the
+                        PkgLen encoding).
+                        The size of the PkgLen encoding bytes should not be
+                        counted in this length value.
+  @param  [out] PkgLen  If success, contains the value of the PkgLen,
+                        ready to encode in the PkgLen format.
+                        This value takes into account the size of PkgLen
+                        encoding.
+
+  @retval EFI_SUCCESS             The function completed successfully.
+  @retval EFI_INVALID_PARAMETER   Invalid parameter.
+**/
+EFI_STATUS
+EFIAPI
+AmlComputePkgLength (
+  IN  UINT32    Length,
+  OUT UINT32  * PkgLen
+  )
+{
+  UINT32  PkgLenWidth;
+  UINT32  ReComputedPkgLenWidth;
+
+  if (PkgLen == NULL) {
+    ASSERT (0);
+    return EFI_INVALID_PARAMETER;
+  }
+
+  // Compute the PkgLenWidth.
+  PkgLenWidth = AmlComputePkgLengthWidth (Length);
+  if (PkgLenWidth == 0) {
+    ASSERT (0);
+    return EFI_INVALID_PARAMETER;
+  }
+
+  // Add it to the Length.
+  Length += PkgLenWidth;
+
+  // Check that adding the PkgLenWidth didn't trigger a domino effect,
+  // increasing the encoding width of the PkgLen again.
+  // The PkgLen is encoded in at most 4 bytes. It is possible to increase
+  // the PkgLen width if its encoding is less than 3 bytes.
+  ReComputedPkgLenWidth = AmlComputePkgLengthWidth (Length);
+  if (ReComputedPkgLenWidth != PkgLenWidth) {
+    if ((ReComputedPkgLenWidth != 0)   &&
+        (ReComputedPkgLenWidth < 4)) {
+      // No need to recompute the PkgLen since a new threshold cannot
+      // be reached by incrementing the value by one.
+      Length += 1;
+    } else {
+      ASSERT (0);
+      return EFI_INVALID_PARAMETER;
+    }
+  }
+
+  *PkgLen = Length;
+
+  return EFI_SUCCESS;
+}
diff --git a/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.h b/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.h
index 35c0680b6159..0641500fcd5f 100644
--- a/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.h
+++ b/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.h
@@ -2,7 +2,7 @@
   AML grammar definitions.
 
   Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>
-  Copyright (c) 2019 - 2020, Arm Limited. All rights reserved.<BR>
+  Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -326,5 +326,50 @@ AmlComputePkgLengthWidth (
   IN  UINT32  Length
   );
 
+/** Given a length, compute the value of a PkgLen.
+
+  In AML, some object have a PkgLen, telling the size of the AML object.
+  It can be encoded in 1 to 4 bytes. The bytes used to encode the PkgLen is
+  itself counted in the PkgLen value.
+  This means that if an AML object sees its size increment/decrement,
+  the number of bytes used to encode the PkgLen value can itself
+  increment/decrement.
+
+  For instance, the AML encoding of a DeviceOp is:
+    DefDevice := DeviceOp PkgLength NameString TermList
+  If:
+   - sizeof (NameString) = 4 (the name is "DEV0" for instance);
+   - sizeof (TermList) = (2^6-6)
+  then the PkgLen is encoded on 1 byte. Indeed, its value is:
+    sizeof (PkgLen) + sizeof (NameString) + sizeof (TermList) =
+    sizeof (PkgLen) + 4 + (2^6-6)
+  So:
+    PkgLen = sizeof (PkgLen) + (2^6-2)
+
+  The input arguments Length and PkgLen represent, for the DefDevice:
+    DefDevice := DeviceOp PkgLength NameString TermList
+                                    |------Length-----|
+                          |--------*PgkLength---------|
+
+  @param  [in]  Length  The length to encode as a PkgLen.
+                        Length cannot exceed 2^28 - 4 (4 bytes for the
+                        PkgLen encoding).
+                        The size of the PkgLen encoding bytes should not be
+                        counted in this length value.
+  @param  [out] PkgLen  If success, contains the value of the PkgLen,
+                        ready to encode in the PkgLen format.
+                        This value takes into account the size of PkgLen
+                        encoding.
+
+  @retval EFI_SUCCESS             The function completed successfully.
+  @retval EFI_INVALID_PARAMETER   Invalid parameter.
+**/
+EFI_STATUS
+EFIAPI
+AmlComputePkgLength (
+  IN  UINT32    Length,
+  OUT UINT32  * PkgLen
+  );
+
 #endif // AML_H_
 
-- 
2.17.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#76946): https://edk2.groups.io/g/devel/message/76946
Mute This Topic: https://groups.io/mt/83735655/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v1 05/13] DynamicTablesPkg: Helper function to compute package length
Posted by Sami Mujawar 4 years, 4 months ago 
  Hi Pierre,

This patch looks good to me.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar


On 23/06/2021 12:40 PM, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> Some AML object have a PkgLen which indicates the size of the
> AML object. The package length can be encoded in 1 to 4 bytes.
> The bytes used to encode the PkgLen is itself counted in the
> PkgLen value. So, if an AML object's size increments/decrements,
> the number of bytes used to encode the PkgLen value can itself
> increment/decrement.
>
> Therefore, a helper function AmlComputePkgLength() is introduced
> to simply computation of the PkgLen.
>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
>   .../Library/Common/AmlLib/AmlEncoding/Aml.c   | 87 ++++++++++++++++++-
>   .../Library/Common/AmlLib/AmlEncoding/Aml.h   | 47 +++++++++-
>   2 files changed, 132 insertions(+), 2 deletions(-)
>
> diff --git a/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.c b/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.c
> index eadafca97ea5..d829b1869846 100644
> --- a/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.c
> +++ b/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.c
> @@ -2,7 +2,7 @@
>     AML grammar definitions.
>   
>     Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>
> -  Copyright (c) 2019 - 2020, Arm Limited. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.<BR>
>   
>     SPDX-License-Identifier: BSD-2-Clause-Patent
>   **/
> @@ -803,3 +803,88 @@ AmlComputePkgLengthWidth (
>     // Length < 2^6
>     return 1;
>   }
> +
> +/** Given a length, compute the value of a PkgLen.
> +
> +  In AML, some object have a PkgLen, telling the size of the AML object.
> +  It can be encoded in 1 to 4 bytes. The bytes used to encode the PkgLen is
> +  itself counted in the PkgLen value.
> +  This means that if an AML object sees its size increment/decrement,
> +  the number of bytes used to encode the PkgLen value can itself
> +  increment/decrement.
> +
> +  For instance, the AML encoding of a DeviceOp is:
> +    DefDevice := DeviceOp PkgLength NameString TermList
> +  If:
> +   - sizeof (NameString) = 4 (the name is "DEV0" for instance);
> +   - sizeof (TermList) = (2^6-6)
> +  then the PkgLen is encoded on 1 byte. Indeed, its value is:
> +    sizeof (PkgLen) + sizeof (NameString) + sizeof (TermList) =
> +    sizeof (PkgLen) + 4 + (2^6-6)
> +  So:
> +    PkgLen = sizeof (PkgLen) + (2^6-2)
> +
> +  The input arguments Length and PkgLen represent, for the DefDevice:
> +    DefDevice := DeviceOp PkgLength NameString TermList
> +                                    |------Length-----|
> +                          |--------*PgkLength---------|
> +
> +  @param  [in]  Length  The length to encode as a PkgLen.
> +                        Length cannot exceed 2^28 - 4 (4 bytes for the
> +                        PkgLen encoding).
> +                        The size of the PkgLen encoding bytes should not be
> +                        counted in this length value.
> +  @param  [out] PkgLen  If success, contains the value of the PkgLen,
> +                        ready to encode in the PkgLen format.
> +                        This value takes into account the size of PkgLen
> +                        encoding.
> +
> +  @retval EFI_SUCCESS             The function completed successfully.
> +  @retval EFI_INVALID_PARAMETER   Invalid parameter.
> +**/
> +EFI_STATUS
> +EFIAPI
> +AmlComputePkgLength (
> +  IN  UINT32    Length,
> +  OUT UINT32  * PkgLen
> +  )
> +{
> +  UINT32  PkgLenWidth;
> +  UINT32  ReComputedPkgLenWidth;
> +
> +  if (PkgLen == NULL) {
> +    ASSERT (0);
> +    return EFI_INVALID_PARAMETER;
> +  }
> +
> +  // Compute the PkgLenWidth.
> +  PkgLenWidth = AmlComputePkgLengthWidth (Length);
> +  if (PkgLenWidth == 0) {
> +    ASSERT (0);
> +    return EFI_INVALID_PARAMETER;
> +  }
> +
> +  // Add it to the Length.
> +  Length += PkgLenWidth;
> +
> +  // Check that adding the PkgLenWidth didn't trigger a domino effect,
> +  // increasing the encoding width of the PkgLen again.
> +  // The PkgLen is encoded in at most 4 bytes. It is possible to increase
> +  // the PkgLen width if its encoding is less than 3 bytes.
> +  ReComputedPkgLenWidth = AmlComputePkgLengthWidth (Length);
> +  if (ReComputedPkgLenWidth != PkgLenWidth) {
> +    if ((ReComputedPkgLenWidth != 0)   &&
> +        (ReComputedPkgLenWidth < 4)) {
> +      // No need to recompute the PkgLen since a new threshold cannot
> +      // be reached by incrementing the value by one.
> +      Length += 1;
> +    } else {
> +      ASSERT (0);
> +      return EFI_INVALID_PARAMETER;
> +    }
> +  }
> +
> +  *PkgLen = Length;
> +
> +  return EFI_SUCCESS;
> +}
> diff --git a/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.h b/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.h
> index 35c0680b6159..0641500fcd5f 100644
> --- a/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.h
> +++ b/DynamicTablesPkg/Library/Common/AmlLib/AmlEncoding/Aml.h
> @@ -2,7 +2,7 @@
>     AML grammar definitions.
>   
>     Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. <BR>
> -  Copyright (c) 2019 - 2020, Arm Limited. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.<BR>
>   
>     SPDX-License-Identifier: BSD-2-Clause-Patent
>   **/
> @@ -326,5 +326,50 @@ AmlComputePkgLengthWidth (
>     IN  UINT32  Length
>     );
>   
> +/** Given a length, compute the value of a PkgLen.
> +
> +  In AML, some object have a PkgLen, telling the size of the AML object.
> +  It can be encoded in 1 to 4 bytes. The bytes used to encode the PkgLen is
> +  itself counted in the PkgLen value.
> +  This means that if an AML object sees its size increment/decrement,
> +  the number of bytes used to encode the PkgLen value can itself
> +  increment/decrement.
> +
> +  For instance, the AML encoding of a DeviceOp is:
> +    DefDevice := DeviceOp PkgLength NameString TermList
> +  If:
> +   - sizeof (NameString) = 4 (the name is "DEV0" for instance);
> +   - sizeof (TermList) = (2^6-6)
> +  then the PkgLen is encoded on 1 byte. Indeed, its value is:
> +    sizeof (PkgLen) + sizeof (NameString) + sizeof (TermList) =
> +    sizeof (PkgLen) + 4 + (2^6-6)
> +  So:
> +    PkgLen = sizeof (PkgLen) + (2^6-2)
> +
> +  The input arguments Length and PkgLen represent, for the DefDevice:
> +    DefDevice := DeviceOp PkgLength NameString TermList
> +                                    |------Length-----|
> +                          |--------*PgkLength---------|
> +
> +  @param  [in]  Length  The length to encode as a PkgLen.
> +                        Length cannot exceed 2^28 - 4 (4 bytes for the
> +                        PkgLen encoding).
> +                        The size of the PkgLen encoding bytes should not be
> +                        counted in this length value.
> +  @param  [out] PkgLen  If success, contains the value of the PkgLen,
> +                        ready to encode in the PkgLen format.
> +                        This value takes into account the size of PkgLen
> +                        encoding.
> +
> +  @retval EFI_SUCCESS             The function completed successfully.
> +  @retval EFI_INVALID_PARAMETER   Invalid parameter.
> +**/
> +EFI_STATUS
> +EFIAPI
> +AmlComputePkgLength (
> +  IN  UINT32    Length,
> +  OUT UINT32  * PkgLen
> +  );
> +
>   #endif // AML_H_
>   



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#81363): https://edk2.groups.io/g/devel/message/81363
Mute This Topic: https://groups.io/mt/83735655/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.